[maemo-commits] [maemo-commits] r11558 - in projects/haf/trunk/apt: . debian

[From: subversion at stage.maemo.org]

Author: marivoll
Date: 2007-05-09 21:53:04 +0300 (Wed, 09 May 2007)
New Revision: 11558

Modified:
   projects/haf/trunk/apt/configure
   projects/haf/trunk/apt/configure.in
   projects/haf/trunk/apt/debian/changelog
   projects/haf/trunk/apt/debian/rules
   projects/haf/trunk/apt/ignoretimeconflict.patch
Log:
apt (0.6.46.4.osso7) unstable; urgency=low

  * Updated ignoretimeconflict.patch to also ignore time conflicts during
    signature verification.

 -- Marius Vollmer <marius.vollmer at nokia.com>  Wed,  9 May 2007 21:47:26 +0300


Modified: projects/haf/trunk/apt/configure
===================================================================
--- projects/haf/trunk/apt/configure	2007-05-09 18:33:35 UTC (rev 11557)
+++ projects/haf/trunk/apt/configure	2007-05-09 18:53:04 UTC (rev 11558)
@@ -1347,7 +1347,7 @@
 
 
 cat >>confdefs.h <<_ACEOF
-#define VERSION "0.6.46.4.osso6"
+#define VERSION "0.6.46.4.osso7"
 _ACEOF
 
 PACKAGE="apt"

Modified: projects/haf/trunk/apt/configure.in
===================================================================
--- projects/haf/trunk/apt/configure.in	2007-05-09 18:33:35 UTC (rev 11557)
+++ projects/haf/trunk/apt/configure.in	2007-05-09 18:53:04 UTC (rev 11558)
@@ -18,7 +18,7 @@
 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.46.4.osso6")
+AC_DEFINE_UNQUOTED(VERSION,"0.6.46.4.osso7")
 PACKAGE="apt"
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_SUBST(PACKAGE)

Modified: projects/haf/trunk/apt/debian/changelog
===================================================================
--- projects/haf/trunk/apt/debian/changelog	2007-05-09 18:33:35 UTC (rev 11557)
+++ projects/haf/trunk/apt/debian/changelog	2007-05-09 18:53:04 UTC (rev 11558)
@@ -1,3 +1,10 @@
+apt (0.6.46.4.osso7) unstable; urgency=low
+
+  * Updated ignoretimeconflict.patch to also ignore time conflicts during
+    signature verification.
+
+ -- Marius Vollmer <marius.vollmer at nokia.com>  Wed,  9 May 2007 21:47:26 +0300
+
 apt (0.6.46.4.osso6) unstable; urgency=low
 
   * Bugfixed trusthook.patch to not get into infinite loops in certain

Modified: projects/haf/trunk/apt/debian/rules
===================================================================
--- projects/haf/trunk/apt/debian/rules	2007-05-09 18:33:35 UTC (rev 11557)
+++ projects/haf/trunk/apt/debian/rules	2007-05-09 18:53:04 UTC (rev 11558)
@@ -216,6 +216,8 @@
 	cp debian/bugscript debian/$@/usr/share/bug/apt/script
 
 #	cp share/debian-archive.gpg debian/$@/usr/share/$@
+	echo 'Acquire::gpgv::Options {"--ignore-time-conflict";};' \
+	     >$(DEBIAN_DIR)/$@/etc/apt/apt.conf.d/50gpgv
 
 #	head -n 500 ChangeLog > debian/ChangeLog
 

Modified: projects/haf/trunk/apt/ignoretimeconflict.patch
===================================================================
--- projects/haf/trunk/apt/ignoretimeconflict.patch	2007-05-09 18:33:35 UTC (rev 11557)
+++ projects/haf/trunk/apt/ignoretimeconflict.patch	2007-05-09 18:53:04 UTC (rev 11558)
@@ -11,3 +11,15 @@
          echo "OK"
          ;;
      del|rm|remove)
+Index: debian/rules
+===================================================================
+--- debian/rules	(revision 9926)
++++ debian/rules	(working copy)
+@@ -216,6 +216,8 @@
+ 	cp debian/bugscript debian/$@/usr/share/bug/apt/script
+ 
+ #	cp share/debian-archive.gpg debian/$@/usr/share/$@
++	echo 'Acquire::gpgv::Options {"--ignore-time-conflict";};' \
++	     >$(DEBIAN_DIR)/$@/etc/apt/apt.conf.d/50gpgv
+ 
+ #	head -n 500 ChangeLog > debian/ChangeLog