X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/3568a640bd363409cdeb1cb69eaa3261c79f2ff2..1e08114a73d9b79904eff1f286c765f7065bcdc0:/debian/changelog

diff --git a/debian/changelog b/debian/changelog
index f162e20f4..07276ef61 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,16 @@
+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 ]
   * apt-pkg/contrib/fileutl.{cc,h}:
     - add GetModificationTime() helper
   * apt-pkg/pkgcachegen.cc:
@@ -11,13 +22,17 @@ apt (0.8.15.6) unstable; urgency=low
     - use ref-to-ptr semantic in NewDepends() to ensure that the   
       libapt does not segfault if the cache is remapped in between
       (LP: #812862)
+    - fix crash when P.Arch() was used but the cache got remapped
   * test/integration/test-hashsum-verification:
     - add regression test for hashsum verification
   * apt-pkg/acquire-item.cc:
     - if no Release.gpg file is found, still load the hashes for
       verification (closes: #636314) and add test
+  
+  [ David Kalnischkies ]
+  * lots of cppcheck fixes
 
- -- Michael Vogt <mvo@debian.org>  Tue, 12 Jul 2011 11:54:47 +0200
+ -- Michael Vogt <mvo@debian.org>  Mon, 15 Aug 2011 09:20:35 +0200
 
 apt (0.8.15.5) unstable; urgency=low