From: David Kalnischkies <kalnischkies@gmail.com>
Date: Wed, 17 Aug 2011 09:15:36 +0000 (+0200)
Subject: merge with the final changelog from debian-sid
X-Git-Tag: 0.8.15.7~3^2
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/d95dbc2ffd4acd5776ae6de300be320ef459325e

merge with the final changelog from debian-sid
---

d95dbc2ffd4acd5776ae6de300be320ef459325e
diff --cc debian/changelog
index de8f64de4,67e60dc34..07276ef61
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,4 +1,14 @@@
- apt (0.8.15.5.6+nmu1) UNRELEASED; urgency=low
++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.5.6) UNRELEASED; urgency=low
+ apt (0.8.15.6) unstable; urgency=low
  
    [ Michael Vogt ]
    * apt-pkg/contrib/fileutl.{cc,h}: