merged from lp:~mvo/apt/mvo (and lp:~donkult/apt/experimental)

diff --cc apt-pkg/deb/dpkgpm.cc
Simple merge

diff --cc apt-pkg/depcache.cc
Simple merge

diff --cc debian/changelog
index 128c9b0d51d61e1f5ef393e0477851c8d70e733c,122c2ce36b965f16537fdc9f397596c240fdcb96..4d086c569b8f415f8786a7f76738896d98a54f54
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,21 -1,39 +1,58 @@@
 -apt (0.8.16~exp13) UNRELEASED; urgency=low
++apt (0.8.16~exp12ubuntu2) precise; urgency=low
+ 
+   [ David Kalnischkies ]
+   * apt-pkg/deb/dpkgpm.cc:
+     - chroot if needed before dpkg --assert-multi-arch
+     - ensure that dpkg binary doesn't have the chroot-directory prefixed
+   * apt-pkg/depcache.cc:
+     - if a M-A:same package is marked for reinstall, mark all it's installed
+       silbings for reinstallation as well (LP: #859188)
+   * apt-pkg/contrib/configuration.cc:
+     - do not stop parent transversal in FindDir if the value is empty
+   * methods/http{s,}.cc:
+     - if a file without an extension is requested send an 'Accept: text/*'
+       header to avoid that the server chooses unsupported compressed files
+       in a content-negotation attempt (Closes: #657560)
+   * apt-pkg/aptconfiguration.cc:
+     - chroot if needed before calling dpkg --print-foreign-architectures
+ 
+   [ Steve Langasek ]
+   * cmdline/apt-get.cc:
+     - for cross-build-dependencies M-A: none should be DEB_HOST_ARCH,
+       not DEB_BUILD_ARCH (Closes: #646288)
+ 
+   [ Colin Watson ]
+   * apt-pkg/algorithms.cc:
+     - don't break out of the main-resolver loop for Breaks to deal with all
+       of them in a single iteration (Closes: #657695, LP: #922485)
+     - use a signed int instead of short for score calculation as upgrades
+       become so big now that it can overflow (Closes: #657732, LP: #917173)
+   
+   [ Michael Vogt ]
+   * apt-pkg/deb/dpkgpm.cc:
+     - fix crash when a package is in removed but residual config state
+       (LP: #923807)
+ 
 - -- David Kalnischkies <kalnischkies@gmail.com>  Mon, 30 Jan 2012 19:17:09 +0100
++ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 30 Jan 2012 21:03:12 +0100
++
 +apt (0.8.16~exp12ubuntu1) precise; urgency=low
 +
 +  [ Michael Vogt ]
 +  * merge from debian/experimental:
 +    - new ABI
 +
 +  [ Steve Langasek ]
 +  * apt-pkg/algorithms.cc: iterate Breaks the same way as Conflicts, so that
 +    we resolve virtual package Breaks more effectively.  Thanks to Colin
 +    Watson for the patch.  Closes: #657695, LP: #922485.
 +  * apt-pkg/algorithms.{cc,h}: use an int to represent resolver scores, not
 +    a signed short, because large upgrades can result in an overflow for
 +    core packages.  Thanks again to Colin Watson.  Closes: #657732,
 +    LP: #917173.
 +  * Multi-Arch: none build-deps should be DEB_HOST_ARCH, not DEB_BUILD_ARCH.
 +    Closes: #646288.
 +
 + -- Steve Langasek <steve.langasek@ubuntu.com>  Sun, 29 Jan 2012 00:44:16 +0000
  
  apt (0.8.16~exp12) experimental; urgency=low