From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Thu, 10 Nov 2005 04:19:29 +0000 (+0000)
Subject: * merged with debians apt
X-Git-Tag: 0.7.24ubuntu1~289
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/dce5db2944b46964b41776dec4e2239a06678dfc?hp=--cc

* merged with debians apt


Patches applied:

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-88
   * finalized changelog

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-89
   * turn off "secure-acquire" when --allow-unauthenticated is given
---

dce5db2944b46964b41776dec4e2239a06678dfc
diff --cc configure.in
index de9e6fa38,6130ab544..b08311e72
--- a/configure.in
+++ b/configure.in
@@@ -18,7 -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.42.3")
++AC_DEFINE_UNQUOTED(VERSION,"0.6.42.3ubuntu1")
  PACKAGE="apt"
  AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
  AC_SUBST(PACKAGE)
diff --cc debian/changelog
index 14f565453,9e9b46ab9..ccf6b8ead
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,3 -1,3 +1,9 @@@
++apt (0.6.42.3ubuntu1) dapper; urgency=low
++
++  * synced with debian
++
++ -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 10 Nov 2005 05:05:56 +0100
++
  apt (0.6.42.3) unstable; urgency=low
  
    * Merge bubulle@debian.org--2005/apt--main--0 up to patch-129: