merged from lp:~donkult/apt/sid

diff --combined debian/changelog
index e49a8e224f46f2d2261a32e2a9cb1b54d661458f,634b372535e47fd5e24440564cd6f39b1b21b3c9..d25443df11d41f3cce6f75567be299247e906892
--- 1/debian/changelog
--- 2/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)
@@@ -30,6 -25,9 +30,9 @@@
    * apt-pkg/clean.cc:
      - run autoclean against pkg:arch and not always against pkg:native as
        this removes valid cache entries (Closes: #679371)
+   * apt-pkg/deb/deblistparser.cc:
+     - negative dependencies need to apply to all architectures,
+       but those with a specific architecture only apply to this one
  
   -- David Kalnischkies <kalnischkies@gmail.com>  Sun, 01 Jul 2012 08:20:57 +0200