merged from experimental

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

diff --cc cmdline/apt-get.cc
Simple merge

diff --cc debian/changelog
index 732d67cbfcc970220b1c720f89c41ca73d570b0f,0b49bf981d3d13bd4bc001434e857eb65b182c5f..1220528886f6919058df2d0f678c897be85884c2
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,45 +1,52 @@@
- apt (0.8.16~exp10ubuntu1) UNRELEASED; urgency=low
++apt (0.8.16~exp12ubuntu1~ppa1) precise; urgency=low
 +
 +  * merge from debian/experimental:
 +    - new ABI
-   * DO NOT UPLOAD YET; THERE IS ANOTHER ABI BREAK COMMING SOON
 +
-  -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 19 Jan 2012 09:05:16 +0100
++ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 24 Jan 2012 20:07:38 +0100
++
+ apt (0.8.16~exp12) experimental; urgency=low
+ 
+   [ Michael Vogt ]
+   * apt-pkg/deb/dpkgpm.cc:
+     - fix segfault on pkg removal
+ 
+   [ David Kalnischkies ]
+   * apt-pkg/cacheiterators.h:
+     - return the correct version arch for all+foreign, too
+   * apt-pkg/packagemanager.cc:
+     - ignore breaks on not-installed versions while searching for
+       breakage loops as we don't have to avoid them
+   * debian/control:
+     - remove APT from the short descriptions as lintian doesn't like it
+       and it doesn't transport any information for a reader anyway
+     - apply typofixes by Pascal De Vuyst, thanks! (Closes: #652834, #652835)
+   * debian/rules:
+     - apply patch to enable usage of hardning CPPFLAGS and LDFLAGS by
+       Moritz Muehlenhoff, thanks! (Closes: #653504)
+   * methods/https.cc:
+     - use curls list append instead of appending Range and If-Range by hand
+       which generates malformed requests, thanks Mel Collins for the hint!
+       (Closes: #646381)
+   * test/libapt/run-tests:
+     - hurd doesn't have dmesg yet and we don't really need it either,
+       so use with $0 a more stable data source for hashsumming
+ 
+   [ Pino Toscano ]
+   * test/libapt/globalerror_test.cc:
+     - errno 0 has a different strerror on hurd, so generate the expected
+       message dynamically instead of hardcoding 'Success' (Closes: #656530)
+ 
+  -- Michael Vogt <mvo@debian.org>  Tue, 24 Jan 2012 12:24:38 +0100
+ 
+ apt (0.8.16~exp11) experimental; urgency=low
+ 
+   [ David Kalnischkies ]
+   * apt-pkg/deb/dpkgpm.cc:
+     - redirect out/input of dpkg --assert-multi-arch to /dev/null
+     - if multi-arch is detected ensure that pkg:all is reported as pkg:all
+ 
+  -- Michael Vogt <mvo@debian.org>  Thu, 19 Jan 2012 13:48:18 +0100
  
  apt (0.8.16~exp10) experimental; urgency=low
  

diff --cc debian/control
index d7e29524370c97f2adef8793a28f7cee2fe83238,311346b0f652a67d9edcf1a6e7ac810cebb0ab97..2354834ab4935d8c74e30999008159eb7bcfdc5a
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -8,13 -7,12 +8,12 @@@ Uploaders: Michael Vogt <mvo@debian.org
   Julian Andres Klode <jak@debian.org>
  Standards-Version: 3.9.2
  Build-Depends: dpkg-dev (>= 1.15.8), debhelper (>= 8.1.3~), libdb-dev,
-  gettext (>= 0.12), libcurl4-gnutls-dev (>= 7.19.0), 
-  zlib1g-dev | libz-dev, debiandoc-sgml, xsltproc, docbook-xsl, docbook-xml, 
-  po4a (>= 0.34-2), autotools-dev, autoconf, automake, doxygen,
-  gcc-4.6 (>= 4.6.0-6ubuntu2)
+  gettext (>= 0.12), libcurl4-gnutls-dev (>= 7.19.0),
+  zlib1g-dev | libz-dev, debiandoc-sgml, xsltproc, docbook-xsl, docbook-xml,
+  po4a (>= 0.34-2), autotools-dev, autoconf, automake, doxygen
  Build-Conflicts: autoconf2.13, automake1.4
 -Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/
 -Vcs-Browser: http://bzr.debian.org/loggerhead/apt/debian-sid/
 +Vcs-Bzr: lp:~ubuntu-core-dev/apt/ubuntu
 +Vcs-Browser: http://code.launchpad.net/apt/ubuntu
  
  Package: apt
  Architecture: any

diff --cc debian/rules
Simple merge