From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Mon, 16 Jan 2012 07:44:39 +0000 (+0100)
Subject: merged from donkult
X-Git-Tag: 0.9.13.exp1ubuntu1~108
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/e08e66ca82147b72454964fdd624002f9b23290e?ds=inline

merged from donkult
---

e08e66ca82147b72454964fdd624002f9b23290e
diff --cc debian/changelog
index 7ed580d3f,5eb4e593f..e524081c8
--- a/debian/changelog
+++ b/debian/changelog
@@@ -4,17 -4,14 +4,22 @@@ apt (0.8.16~exp10) UNRELEASED; urgency=
    * 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>  Wed, 11 Jan 2012 17:59:33 +0100
+  -- David Kalnischkies <kalnischkies@gmail.com>  Fri, 13 Jan 2012 17:29:07 +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 ]