summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorDavid Kalnischkies <kalnischkies@gmail.com>2011-08-17 11:13:50 +0200
committerDavid Kalnischkies <kalnischkies@gmail.com>2011-08-17 11:13:50 +0200
commit32d9baeab02d2399eb8bd2dfa53bb4f679eebd88 (patch)
tree08b5d70c4582c2669a14260b6418c6ccf4460ebb /debian
parent213b88053da331adf07b89ce35c8eb9cff914be4 (diff)
* 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)
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 d44d0aaa2..de8f64de4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+apt (0.8.15.5.6+nmu1) 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
[ Michael Vogt ]