From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Fri, 13 Jan 2012 08:16:50 +0000 (+0100)
Subject: merged from lp:~donkult/apt/experimental
X-Git-Tag: 0.9.13.exp1ubuntu1~109
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/6bfb4a2b25b576220e0c8bad1ba9479637667e19?ds=inline

merged from lp:~donkult/apt/experimental
---

6bfb4a2b25b576220e0c8bad1ba9479637667e19
diff --cc debian/changelog
index c49c56bca,83704caeb..7ed580d3f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,12 +1,20 @@@
+ 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:
 +    - new ABI
 +  * DO NOT UPLOAD YET; THERE IS ANOTHER ABI BREAK COMMING SOON
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 10 Nov 2011 16:51:36 +0100
 +
  apt (0.8.16~exp9) experimental; urgency=low
  
    [ Julian Andres Klode ]