merge with current debian apt/sid

diff --combined debian/changelog
index 7cd353718d570566bfe8323e7791b7cfdc30cbb8,255248d63499136d5b3e7a24cd2c61da3e2c3f0a..11d9814c3a6217217f75c4aee4e4b5b7c0bfb227
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,28 -1,21 +1,41 @@@
  apt (0.8.15.9) UNRELEASED; urgency=low
  
-  -- David Kalnischkies <kalnischkies@gmail.com>  Mon, 03 Oct 2011 23:35:40 +0200
 +  [ David Kalnischkies ]
++  * Symbol file update
 +  * doc/apt-get.8.xml:
 +    - change wording of autoremove description as suggested
 +      by Robert Simmons, thanks! (Closes: #641490)
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - use std::vector instead of fixed size arrays to store args and
 +      multiarch-packagename strings
 +    - load the dpkg base arguments only one time and reuse them later
 +  * cmdline/apt-get.cc:
 +    - follow Provides in the evaluation of saving candidates, too, for
 +      statisfying garbage package dependencies (Closes: #640590)
 +  * apt-pkg/algorithms.cc:
 +    - if a package is garbage, don't try to save it with FixByInstall
 +  * apt-pkg/init.cc:
 +    - silently ignore *.orig and *.save files by default
 +  * apt-pkg/policy.cc:
 +    - accept generic release pin expressions again in -t (Closes: #644166)
 +  * apt-pkg/deb/debmetaindex.cc:
 +    - none is a separator, not a language: no need for Index (Closes: #624218)
 +  * apt-pkg/aptconfiguration.cc:
 +    - do not builtin languages only if none is forced (Closes: #643787)
 +
 -  
 -  [ David Kalnischkies ]
 -  * Symbol file update
+   [ Christian Perrier ]
+   * Fix spelling error (sensée) in French translation. Thanks
+     to Corentin Le Gall for spotting it.
 -  
+ 
+   [ Colin Watson ]
+   * ftparchive/cachedb.cc:
+     - fix buffersize in bytes2hex
 -  
 - -- Christian Perrier <bubulle@debian.org>  Wed, 14 Sep 2011 20:13:40 +0200
++
+   [ Michael Vogt ]
+   * ftparchive/cachedb.cc:
+     - make buffer fully dynamic (thanks to Colin Watson)
++
++ -- David Kalnischkies <kalnischkies@gmail.com>  Wed, 05 Oct 2011 23:03:16 +0200
  
  apt (0.8.15.8) unstable; urgency=low