summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2011-08-17 11:38:45 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2011-08-17 11:38:45 +0200
commitec78b277382e27509a6dec91af4a7a524a422e0f (patch)
tree0bf1e6fe47a5082ecfa5f56e8535f67d24b95b0f /debian
parentd4882aa1e1a37b3092950180036676a930a5792f (diff)
parentd95dbc2ffd4acd5776ae6de300be320ef459325e (diff)
merged from lp:~donkult/apt/sid
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog10
1 files changed, 10 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 67e60dc34..07276ef61 100644
--- 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 ]