* merged with the current debian version

Patches applied:

 * bubulle@debian.org--2005/apt--main--0--patch-132
   Completed Simplified Chinese translation

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-94
   * pkgDirStream has (slightly) better extract support now

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-95
   * merge fix for #339533

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-96
   * merged with bubulle

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-97
   * some more debug output

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-98
   * ABI change: merged more flexible pkgAcquireFile code

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-99
   * merged http download limit for apt (#146877)

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-100
   * applied parts of the string speedup patch from debian #319377 (ABI change)

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-101
   * fix for #340448

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

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

diff --cc apt-pkg/cacheiterators.h
Simple merge

diff --cc configure.in
index fb6441f583b80e3fba370407dfe12ee58eda2a36,18cdbfddeb2c9a9b7df52dc3789be0932dba13e7..8b2a301e0bcaf5e24795f3f03e35a0c66c5e00bb
--- 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.3ubuntu2")
 -AC_DEFINE_UNQUOTED(VERSION,"0.6.43")
++AC_DEFINE_UNQUOTED(VERSION,"0.6.43ubuntu1")
  PACKAGE="apt"
  AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
  AC_SUBST(PACKAGE)

diff --cc debian/changelog
index 8f03f2dc7f50f526076cd940364617eb6a547fac,b67fb490912ff023d83bc053619b63aea6c60c43..16fdd1596ee09ec6428ba9084801e13bdbbf5905
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,18 -1,19 +1,41 @@@
 - -- 
++apt (0.6.43ubuntu1) dapper; urgency=low
++
++  * merged with debian
++
++ -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 25 Nov 2005 11:36:29 +0100
++
+ apt (0.6.43) unstable; urgency=low
+ 
+   * Merge bubulle@debian.org--2005/apt--main--0 up to patch-132:  
+     * zh_CN.po: Completed to 510 strings(Closes: #338267)
+     * gl.po: Completed to 510 strings (Closes: #338356)
+   * added support for "/etc/apt/sources.list.d" directory 
+     (closes: #66325)
+   * make pkgDirStream (a bit) more complete
+   * fix bug in pkgCache::VerIterator::end() (thanks to Daniel Burrows)
+     (closes: #339533)
+   * pkgAcqFile is more flexible now (closes: #57091)
+   * support a download rate limit for http (closes: #146877)
+   * included lots of the speedup changes from #319377
+   * add stdint.h to contrib/md5.h (closes: #340448)
+   
++ -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 25 Nov 2005 11:22:31 +0100
++
 +apt (0.6.42.3ubuntu2) dapper; urgency=low
 +
 +  * Merge bubulle@debian.org--2005/apt--main--0 up to patch-131:  
 +    * zh_CN.po: Completed to 507 strings(Closes: #338267)
 +    * gl.po: Completed to 510 strings (Closes: #338356)
 +  * added support for "/etc/apt/sources.list.d" directory 
 +    (closes: #66325)
 +  
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 14 Nov 2005 15:30:12 +0100
 +
 +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