cherry pick from experimental

diff --git a/debian/changelog b/debian/changelog
index 821719e15140cf72385e5900a03e76d32cd6ea4f..1c2fd765fed2c891a6aca04afc289b98aa8a879a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,17 @@
 apt (0.8.16~exp12ubuntu6) UNRELEASED; urgency=low
 
-  * cherry pick r2222 from 
+  * cherry pick from
     http://bzr.debian.org/bzr/bzr/apt/apt/debian-experimental2/:
     * apt-pkg/packagemanager.cc:
-    - fix bug in predepends handling - ensure that packages that needs
-      unpackaging are unpacked before they are configured (LP: #927993)
+      - fix bug in predepends handling - ensure that packages that needs
+        unpackaging are unpacked before they are configured (LP: #927993)
+    * apt-pkg/packagemanager.cc:
+      - do not try to a void a breaks if the broken package pre-depends
+        on the breaker, but let dpkg auto-deconfigure it
+    * apt-pkg/packagemanager.cc:
+      - recheck all dependencies if we changed a package in SmartConfigure
+        as this could break an earlier dependency (LP: #940396)
+    * recheck dependencies in SmartUnpack after a change, too
 
  -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 13 Mar 2012 13:35:36 +0100