summaryrefslogtreecommitdiff
path: root/debian/changelog
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2012-01-13 09:16:50 +0100
committerMichael Vogt <michael.vogt@ubuntu.com>2012-01-13 09:16:50 +0100
commit6bfb4a2b25b576220e0c8bad1ba9479637667e19 (patch)
tree7f73eb0849a74e8217051d956d47780d70eca9dd /debian/changelog
parentd2fd8c8ff72f82db473d4431213032249eee41c3 (diff)
parent88a52816d7626326f94c17a3a8fcde08817b7f2b (diff)
merged from lp:~donkult/apt/experimental
Diffstat (limited to 'debian/changelog')
-rw-r--r--debian/changelog9
1 files changed, 9 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index c49c56bca..7ed580d3f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+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
+
+ -- David Kalnischkies <kalnischkies@gmail.com> Wed, 11 Jan 2012 17:59:33 +0100
+
apt (0.8.16~exp9ubuntu1) UNRELEASED; urgency=low
* merge from debian/experimental: