Merge remote-tracking branch 'mvo/debian/sid' into debian/sid

diff --git a/debian/changelog b/debian/changelog
index 5d37588507aa405d89a18469ef8778c118b8b3ea..4b808646416a6c95e02c2bbacf780758d5b50ae3 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,18 +1,4 @@
-apt (0.9.11~exp3) UNRELEASEDexperimental; urgency=low
-
-  * fix incorrect bugnumber for the Pre-Install-Pkgs hook
-
- -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 19 Aug 2013 15:53:47 +0200
-
-apt (0.9.11~exp2) experimental; urgency=low
-
-  * add lintian override for no-shlibs-control-file so that
-    the internal libapt-private.so.0.0.0 can be shipped
-  * adjust apt.install.in to only install libapt-private.so.*
-
- -- Michael Vogt <mvo@debian.org>  Mon, 19 Aug 2013 14:54:58 +0200
-
-apt (0.9.11~exp1) experimental; urgency=low
+apt (0.9.11) unstable; urgency=low
 
   [ Daniel Hartwig ]
   * Clarify units of Acquire::http::Dl-Limit (closes: #705445)
@@ -31,6 +17,9 @@ apt (0.9.11~exp1) experimental; urgency=low
     - install libapt-private* into the apt binary
     - add PACKAGE_MATCHER_ABI_COMPAT define so that this branch can be 
       merged without breaking ABI
+    - add lintian override for no-shlibs-control-file so that
+      the internal libapt-private.so.0.0.0 can be shipped
+    - adjust apt.install.in to only install libapt-private.so.*
 
   [ David Kalnischkies ]
   * ensure that pkgTagFile isn't writing past Buffer length (Closes: 719629)
@@ -40,7 +29,7 @@ apt (0.9.11~exp1) experimental; urgency=low
   [ Christian PERRIER ]
   * French translation update.
 
- -- Michael Vogt <mvo@debian.org>  Mon, 19 Aug 2013 13:25:45 +0200
+ -- Michael Vogt <mvo@debian.org>  Wed, 21 Aug 2013 17:51:09 +0200
 
 apt (0.9.10) unstable; urgency=low