summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2012-01-13 17:35:44 +0100
committerMichael Vogt <michael.vogt@ubuntu.com>2012-01-13 17:35:44 +0100
commit85e1885525977809ff6a3b70abb84d3a63e41817 (patch)
treee985e74ed4d613126b24839d710e4b49db753824 /debian
parent14ea309a018d1604db45e29baeeb155cf6401c60 (diff)
parent86fc2ca8909eb686e2ad751acb0f0eaf706d9d5e (diff)
merged from lp:~donkult/apt/experimental/
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog14
1 files changed, 14 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index a1b93a981..5eb4e593f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+apt (0.8.16~exp10) UNRELEASED; urgency=low
+
+ [ David Kalnischkies ]
+ * apt-pkg/depcache.cc:
+ - implicit conflicts (for multiarch) are supposed to conflict
+ only with real packages, not with virtual providers
+ * apt-pkg/pkgcache.cc:
+ - ignore implicit conflicts on providers in AllTarget, too
+ * apt-pkg/deb/dpkgpm.cc:
+ - check if dpkg supports multiarch with --assert-multi-arch
+ and if it does be always explicit about the architecture
+
+ -- David Kalnischkies <kalnischkies@gmail.com> Fri, 13 Jan 2012 17:29:07 +0100
+
apt (0.8.16~exp9) experimental; urgency=low
[ Julian Andres Klode ]