merge with debian-experimental-ma

* Swedish translation update. Closes: #592366
* apt-pkg/pkgcache.cc:
  - re-evaluate the architectures cache when the cache is (re)opened
* apt-pkg/cdrom.cc:
  - fix off-by-one error in DropBinaryArch
* apt-pkg/contrib/fileutl.cc:
  - Add WriteAtomic mode.
  - Revert WriteEmpty to old behavior (LP: #613211)
* apt-pkg, methods:
  - Convert users of WriteEmpty to WriteAtomic.
* apt-pkg/depcache.cc:
  - Only try upgrade for Breaks if there is a newer version, otherwise
    handle it as Conflicts (by removing it) (helps for #591882).
* debian/control:
  - Add dependency on gnupg to apt, apt-key uses it.

diff --combined apt-pkg/pkgcache.cc
index 2b051cbb08529ebe7fa271a88a1fedde8b787683,ae11057edadd76fece69a8bdc2403cd8731755e9..bb28a33ca5dab5f84a07b0690feb79237529c437
--- 1/apt-pkg/pkgcache.cc
--- 2/apt-pkg/pkgcache.cc
+++ b/apt-pkg/pkgcache.cc
@@@ -111,7 -111,10 +111,10 @@@ bool pkgCache::Header::CheckSizes(Heade
  /* */
  pkgCache::pkgCache(MMap *Map, bool DoMap) : Map(*Map)
  {
-    MultiArchEnabled = APT::Configuration::getArchitectures().size() > 1;
+    // call getArchitectures() with cached=false to ensure that the 
+    // architectures cache is re-evaulated. this is needed in cases
+    // when the APT::Architecture field changes between two cache creations
+    MultiArchEnabled = APT::Configuration::getArchitectures(false).size() > 1;
     if (DoMap == true)
        ReMap();
  }
@@@ -661,30 -664,6 +664,30 @@@ void pkgCache::DepIterator::GlobOr(DepI
     }
  }
                                                                        /*}}}*/
 +// ostream operator to handle string representation of a dependecy    /*{{{*/
 +// ---------------------------------------------------------------------
 +/* */
 +std::ostream& operator<<(ostream& out, pkgCache::DepIterator D)
 +{
 +   if (D.end() == true)
 +      return out << "invalid dependency";
 +
 +   pkgCache::PkgIterator P = D.ParentPkg();
 +   pkgCache::PkgIterator T = D.TargetPkg();
 +
 +   out << (P.end() ? "invalid pkg" : P.FullName(false)) << " " << D.DepType()
 +      << " on ";
 +   if (T.end() == true)
 +      out << "invalid pkg";
 +   else
 +      out << T;
 +
 +   if (D->Version != 0)
 +      out << " (" << D.CompType() << " " << D.TargetVer() << ")";
 +
 +   return out;
 +}
 +                                                                      /*}}}*/
  // VerIterator::CompareVer - Fast version compare for same pkgs               /*{{{*/
  // ---------------------------------------------------------------------
  /* This just looks over the version list to see if B is listed before A. In

diff --combined debian/changelog
index 69b1649c6f19e2a1a6e5df5c4af9ea0f1f679891,6945b48f59247dc2954d27478807acb79afecc62..1207fb52fad270097d5cee9fc112a2e4e6fb8867
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,18 -1,26 +1,36 @@@
 -apt (0.7.26~exp13) UNRELEASEDexperimental; urgency=low
 +apt (0.8.0~pre1) UNRELASED; urgency=low
 +
++  [ Programs translations ]
++  * Swedish translation update. Closes: #592366
+ 
    [ Michael Vogt ]
 +  * merge of the debian-expermental-ma branch
 +  * refresh po/pot files in doc/ and po/
+   * apt-pkg/pkgcache.cc:
+     - re-evaluate the architectures cache when the cache is (re)opened
  
-   [ Programs translations ]
-   * Swedish translation update. Closes: #592366
+   [ Colin Watson ]
+   * apt-pkg/cdrom.cc:
+     - fix off-by-one error in DropBinaryArch
+ 
+   [ Julian Andres Klode ]
+   * apt-pkg/contrib/fileutl.cc:
+     - Add WriteAtomic mode.
+     - Revert WriteEmpty to old behavior (LP: #613211)
+   * apt-pkg, methods:
+     - Convert users of WriteEmpty to WriteAtomic.
+   * apt-pkg/depcache.cc:
+     - Only try upgrade for Breaks if there is a newer version, otherwise
+       handle it as Conflicts (by removing it) (helps for #591882).
+   * debian/control:
+     - Add dependency on gnupg to apt, apt-key uses it.
  
 - -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 30 Jul 2010 17:37:14 +0200
 +  [ David Kalnischkies ]
 +  * apt-pkg/algorithms.cc:
 +    - change the debug outputs to display also arch of the
 +      package and version dependencies information
 +
 + -- David Kalnischkies <kalnischkies@gmail.com>  Tue, 10 Aug 2010 15:56:11 +0200
  
  apt (0.7.26~exp12) experimental; urgency=low
  
@@@ -358,7 -366,6 +376,7 @@@ apt (0.7.26~exp5) experimental; urgency
    [ Christian Perrier ]
    * Slovak translation update. Closes: #581159
    * Italian translation update. Closes: #581742
 +  * Swedish translation update. Closes: #592366
  
   -- Michael Vogt <mvo@debian.org>  Tue, 25 May 2010 16:01:42 +0200