* 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

diff --cc apt-pkg/acquire-item.cc
Simple merge

diff --cc configure.in
index de9e6fa380f33c1e875c08010cb2d4e56745a276,6130ab544bca7d0729b927d141cc9ccb3bc9d718..b08311e7234ebee30c3f9f6552920898e3825170
--- 1/configure.in
--- 2/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 14f565453c2cf8f516fa75b38e4a0c828ef9ff4d,9e9b46ab9c36a9ebd16290465bea3f857f0695b8..ccf6b8eadb3bc11a543fc25ff4f1ad09eb38e0e6
--- 1/debian/changelog
--- 2/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: