Merge apt--mvo--0

Patches applied:

 * michael.vogt@canonical.com--2004/apt--mvo--0--patch-5
   * added apt-key update method

 * michael.vogt@canonical.com--2004/apt--mvo--0--patch-6
   * if a sign-file download fails, delete the the partial download in "partial/" also

 * michael.vogt@canonical.com--2004/apt--mvo--0--patch-7
   * changelog updated, version is now 0.6.27ubuntu4; added DEB_BUILD_PROG_OPTS to debian/rules

 * michael.vogt@canonical.com--2004/apt--mvo--0--patch-8
   * removed Release.gpg files in partial/ before fetching a new one

 * michael.vogt@canonical.com--2004/apt--mvo--0--patch-9
   * some comments about the pkgAcqMetaSig::Custom600Headers() added

 * michael.vogt@canonical.com--2004/apt--mvo--0--patch-10
   * fix permissions in po/

 * michael.vogt@canonical.com--2004/apt--mvo--0--patch-11
   * use gpg --with-colons

diff --git a/configure.in b/configure.in
index b46decc11821f4b227ac6c5f4b38249a642c3241..b40a53b7f69f26c033787e335cc01d222bdee252 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_DEFINE_UNQUOTED(VERSION,"0.6.27ubuntu4")
+AC_DEFINE_UNQUOTED(VERSION,"0.6.29")
 PACKAGE="apt"
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_SUBST(PACKAGE)

diff --git a/debian/changelog b/debian/changelog
index 421914b3682464d756f10cce494e2d800576af3a..1551df078851810efabfcd7ba0d1928dfcf3743f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+apt (0.6.29) unstable; urgency=low
+
+  * Merge apt--mvo--0 (0.6.27ubuntu4)
+  
+
+ -- Matt Zimmerman <mdz@canonical.com>  Tue, 28 Dec 2004 17:18:02 -0800
+
+apt (0.6.28) hoary; urgency=low
+
+  * Merge apt--mvo--0
+  * Rebuild source to get rid of arch metadata and temporary files in
+    0.6.27ubuntu3
+
+ -- Matt Zimmerman <mdz@canonical.com>  Thu, 23 Dec 2004 18:53:16 -0800
+
 apt (0.6.27ubuntu4) hoary; urgency=low
 
   * remove old sig-file in partial/ before starting to fetch a new sig-file