merged from donkults experimental branch

diff --cc debian/changelog
index c8679604328a82da306d41bf817a1501133a3f28,4e337df486c598a6d88dd9128c8e376a896feaf3..463165c1b42774e5106a3a658cf795e40b16a0e0
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -3,13 -3,23 +3,26 @@@ apt (0.8.16~exp14) UNRELEASED; urgency=
    [ Michael Vogt ]
    * apt-pkg/packagemanager.cc:
      - fix inconsistent clog/cout usage in the debug output
-   * debian/control:
-     - suggest xz-lzma instead of lzma
-   
 +    - add APT::pkgPackageManager::MaxLoopCount to ensure that the
 +      ordering code does not get into a endless loop when it flip-flops
 +      between two states
+ 
    [ David Kalnischkies ]
+   * do not update po and pot files in the process of the build as this
+     causes timestamp changes for the mo files which therefore can't
+     be refcounted by dpkg for your M-A: same packages
+     (Closes: #659333, LP: #924628)
+   * apt-inst/database.{cc,h}, apt-inst/deb/dpkgdb.{cc,h}:
+     - drop instead of fix as it is only needed if you want to reimplement dpkg
+       and comes straight from the beginning of last decade (Closes: #663372)
+   * apt-inst/deb/debfile.cc:
+     - {Extract,Merge}Control() is another instance of "lets reimplement dpkg"
+       so shot of this code before someone ends up using this…
+   * debian/libapt-pkg4.12:
+     - update symbols file
+   * debian/apt-utils.install:
+     - ship the ftparchive, apt-extractemplates and apt-sortpkgs locales
+       in the apt-utils package instead of the apt package
    * apt-pkg/packagemanager.cc:
      - recheck all dependencies if we changed a package in SmartConfigure
        as this could break an earlier dependency (LP: #940396)