summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2012-03-13 13:57:45 +0100
committerMichael Vogt <michael.vogt@ubuntu.com>2012-03-13 13:57:45 +0100
commit6321c43f3a695e54332f14326f74ac92149c0240 (patch)
tree8d3f3a8e6b2ec3fb80d0b79a04bb9bb4ae9cdae3
parent4946b69be8d87c9955a90e056f29b0114f7c6b44 (diff)
cherry pick from experimental
-rw-r--r--debian/changelog13
1 files changed, 10 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index 821719e15..1c2fd765f 100644
--- 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