From: Michael Vogt <egon@debian-devbox>
Date: Fri, 13 Jul 2012 19:05:25 +0000 (+0200)
Subject: merged from donkult
X-Git-Tag: 0.9.7.2~2
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/f5294bcd79eb970a58a26f9abf7956c55ca71cf3?ds=inline;hp=-c

merged from donkult
---

f5294bcd79eb970a58a26f9abf7956c55ca71cf3
diff --combined debian/changelog
index d25443df1,54f96909c..085bec207
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,7 +1,12 @@@
  apt (0.9.7.2) UNRELEASED; urgency=low
  
 +
 +  [ Manpages translation updates ]
 +  * French (Christian Perrier)
 +
    [ Program translation updates ]
    * Greek (Θανάσης Νάτσης)
 +
    * Japanese (Kenshi Muto) (Closes: #679662)
    * Russian (Yuri Kozlov) (Closes: #679599)
    * Danish (Joe Dalton) (Closes: #680119)
@@@ -33,6 -28,12 +33,12 @@@
    * apt-pkg/deb/deblistparser.cc:
      - negative dependencies need to apply to all architectures,
        but those with a specific architecture only apply to this one
+   * apt-pkg/cachefilter.cc:
+     - remove architecture-specific arch to tuple expansion-rules as they lead
+       to the same tuples for different architectures (e.g. linux-arm for arm,
+       armel and armhf) while the dpkg-architecture code uses triples which
+       are different (in the first part, which we omit in our tuples), so e.g.
+       build-dep restrictions for armel ended up effecting armhf as well
  
   -- David Kalnischkies <kalnischkies@gmail.com>  Sun, 01 Jul 2012 08:20:57 +0200