* ignore time conflicts on apt-key update (this is used at install time when the...

diff --git a/cmdline/apt-key b/cmdline/apt-key
index a96afe944f9efd078964c590ddb1f7d063f8dd22..be2b19a1af87a79fc42030259b3f2e7b8e6eb592 100755 (executable)
--- a/cmdline/apt-key
+++ b/cmdline/apt-key
@@ -21,7 +21,7 @@ update() {
     fi
 
     # add new keys
     fi
 
     # add new keys

-    $GPG_CMD --quiet --batch --keyring $ARCHIVE_KEYRING --export | $GPG --import
+    $GPG_CMD --quiet --batch --keyring $ARCHIVE_KEYRING --export | $GPG --ignore-time-conflict --import

 
     # remove no-longer used keys
     keys=`$GPG_CMD --keyring $REMOVED_KEYS --with-colons --list-keys|awk '/^pub/{FS=":";print $5}'`
 
     # remove no-longer used keys
     keys=`$GPG_CMD --keyring $REMOVED_KEYS --with-colons --list-keys|awk '/^pub/{FS=":";print $5}'`

diff --git a/configure.in b/configure.in
index 8c2fcbae6880067713945603a350a3b0c80c6cc3..3c5d6d69dc04115581868dd4d8dee1a0776f433b 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib)
 AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
 
 dnl -- SET THIS TO THE RELEASE VERSION --
 AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
 
 dnl -- SET THIS TO THE RELEASE VERSION --

-AC_DEFINE_UNQUOTED(VERSION,"0.6.32")
+AC_DEFINE_UNQUOTED(VERSION,"0.6.35")

 PACKAGE="apt"
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_SUBST(PACKAGE)
 PACKAGE="apt"
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_SUBST(PACKAGE)