summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2011-08-17 11:27:50 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2011-08-17 11:27:50 +0200
commit01380ef62a453e44613dba87086177162a52c5fa (patch)
tree4b69db9e0e7081f338be79ac807bc07eed633dd8 /debian
parentbb3e64527b0c1ccf3f31a5a56c21819e25f128ae (diff)
parentd95dbc2ffd4acd5776ae6de300be320ef459325e (diff)
merged lp:~donkult/apt/sid
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog4
1 files changed, 4 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 80189bcc9..f0a08aab3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,10 @@ apt (0.8.16~exp5ubuntu6) UNRELEASED; urgency=low
[ David Kalnischkies ]
* lots of cppcheck fixes
+ * apt-pkg/packagemanager.cc, apt-pkg/pkgcache.cc:
+ - ignore "self"-conflicts for all architectures of a package
+ instead of just for the architecture of the package locked at
+ in the ordering of installations too (Closes: #802901)
-- Michael Vogt <michael.vogt@ubuntu.com> Thu, 11 Aug 2011 18:09:45 +0200