From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Thu, 5 Jan 2012 19:20:24 +0000 (+0100)
Subject: merged from debian-experimental2
X-Git-Tag: 0.9.13.exp1ubuntu1~113
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/570590c0640f71c98893051420517894be8eb6eb?ds=inline;hp=--cc

merged from debian-experimental2
---

570590c0640f71c98893051420517894be8eb6eb
diff --cc debian/changelog
index d0619f2da,06c84f31c..964df30d4
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,3 +1,11 @@@
 +apt (0.8.16~exp9ubuntu1) UNRELEASED; urgency=low
 +
 +  * merge from debian/experimental:
 +    - new ABI
-     - header reshuffling that may cause FTBFS
 +  * DO NOT UPLOAD YET; THERE IS ANOTHER ABI BREAK COMMING SOON
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 10 Nov 2011 16:51:36 +0100
 +
  apt (0.8.16~exp9) UNRELEASED; urgency=low
  
    [ Julian Andres Klode ]
@@@ -45,6 -35,9 +44,8 @@@
      - drop the explicit export of gz-compression handling
    * apt-pkg/cdrom.cc:
      - support InRelease files on cdrom
 -  
+   [ Michael Vogt ]
+   * g++ 4.7 fixes
  
   -- David Kalnischkies <kalnischkies@gmail.com>  Sun, 11 Dec 2011 19:34:58 +0100