merge with the final changelog from debian-sid

[apt.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 67e60dc3480bb36b73b018c32398710495236470..07276ef61a49741988e5b8c572443fdc981c4716 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+apt (0.8.15.7) UNRELEASED; urgency=low
+
+  [ David Kalnischkies ]
+  * 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)
+
+ -- David Kalnischkies <kalnischkies@gmail.com>  Wed, 17 Aug 2011 11:08:02 +0200
+
 apt (0.8.15.6) unstable; urgency=low
 
   [ Michael Vogt ]