merged from lp:~donkult/apt/experimental

diff --combined debian/changelog
index ceecf50a628c0ebb1b9e441d2122dc1a37a2ebb2,3c0de2c624d34dd74191e402807b47bb6f2e518a..25e7fa18ed6ea548675bedf09a3d2f55088943f6
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,21 -1,3 +1,21 @@@
 +apt (0.8.16~exp9) UNRELEASED; urgency=low
 +
 +  [ Julian Andres Klode ]
 +  * apt-pkg/cdrom.cc:
 +    - Accept .bz2, .xz files in addition to .gz files (Closes: #649451)
 +  
 +  [ Michael Vogt ]
 +  * apt-pkg/cdrom.cc:
 +    - use aptconfiguration to get the supported compression types
 +  * debian/control:
 +    - bump debhelper build-dep to debhelper (>= 8.1.3~)
 +    - set libapt-pkg-dev to multi-arch: same too
 + 
 +  [ Colin Watson ]
 +  * Convert libapt-pkg4.12 and libapt-inst1.4 to Multi-Arch: same.
 +  
 + -- Julian Andres Klode <jak@debian.org>  Mon, 21 Nov 2011 18:46:36 +0100
 +
  apt (0.8.16~exp8) experimental; urgency=low
  
    [ David Kalnischkies ]
@@@ -27,8 -9,20 +27,20 @@@
      - use a pointer-union to peace gcc strict-aliasing warning
    * apt-pkg/deb/deblistparser.cc:
      - M-A: foreign packages provide for other archs, too
+   * apt-pkg/cacheset.cc:
+     - make the cachesets real containers which can embedding any container
+       to be able to use the same interface regardless of set or list usage
+     - provide a {Package,Version}List similar to {Package,Version}Set
+   * cmdline/apt-{get,cache,mark}.cc:
+     - use Lists instead of Sets if input order should be preserved for
+       commands accepting lists of packages, e.g. policy (Closes: #625960)
+   * apt-pkg/depcache.cc:
+     - prefer native providers over foreigns even if the chain is foreign
+   * cmdline/apt-get.cc:
+     - ignore foreign architectures if we check if a provides has only one
+       resolver as it's basically the same for the user, so no need to choose
  
-  -- David Kalnischkies <kalnischkies@gmail.com>  Thu, 03 Nov 2011 09:40:29 -0500
+  -- David Kalnischkies <kalnischkies@gmail.com>  Wed, 23 Nov 2011 09:52:20 +0100
  
  apt (0.8.16~exp7) experimental; urgency=low