merged from debian

diff --cc debian/changelog
index ff0cb3a3d9201d44d9ba241daaebc765755390ae,2f1e89c653c622d4898d07751f3554ef9db44c0a..e850040782370fa253e05d8f64cc0cb6ab2064cb
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,53 -1,45 +1,101 @@@
++apt (0.8.0~pre1ubuntu1) maverick; urgency=low
++
++  * merged fixes from debian/experimental
++
++ -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 13 Aug 2010 17:49:40 +0200
++
+ apt (0.8.0~pre1) experimental; 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
+ 
+   [ 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.
+ 
+   [ David Kalnischkies ]
+   * apt-pkg/algorithms.cc:
+     - let the problem resolver install packages to fix or-groups
+       as a needed remove nuked another or-member (helps for #591882)
+     - change the debug outputs to display also arch of the
+       package and version dependencies information
+   * cmdline/apt-get.cc:
+     - let APT::Get::Arch-Only in build-dep default to false again
+       (Closes: #592628) Thanks Mohamed Amine IL Idrissi for report!
+     - purge packages in 'rc' state, thanks Rogier! (Closes: #150831)
+   * apt-pkg/pkgcache.cc:
+     - fix LongDesc handling in LANG=C environment
+ 
+  -- Michael Vogt <mvo@debian.org>  Fri, 13 Aug 2010 17:00:49 +0200
+ 
 +apt (0.7.26~exp12ubuntu4) maverick; urgency=low
 +
 +  [ 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).
 +  
 +  [ Michael Vogt ]
 +  * debian/control:
 +    - Add recommends on gnupg to apt, apt-key uses it.
 +      (changed from debian)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 11 Aug 2010 12:01:30 +0200
 +
 +apt (0.7.26~exp12ubuntu3) maverick; urgency=low
 +
 +  [ Colin Watson ]
 +  * apt-pkg/cdrom.cc:
 +    - fix off-by-one error in DropBinaryArch
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 02 Aug 2010 21:04:18 +0200
 +
 +apt (0.7.26~exp12ubuntu2) maverick; urgency=low
 +
 +  * debian/apt.postinst:
 +    - do not fail if ubuntu-keyring is not installed
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 02 Aug 2010 11:47:59 +0200
 +
 +apt (0.7.26~exp12ubuntu1) maverick; urgency=low
 +
 +  * ABI break upload
 +  * merged from debian/experimental, remaining changes:
 +    - use ubuntu keyring and ubuntu archive keyring in apt-key
 +    - run update-apt-xapian-index in apt.cron
 +    - support apt-key net-update and verify keys against master-keyring
 +    - run apt-key net-update in cron.daily
 +    - different example sources.list
 +  * debian/apt.postinst
 +    - drop set_apt_proxy_from_gconf(), no longer needed in maverick
 +  * apt-pkg/pkgcache.cc:
 +    - re-evaluate the architectures cache when the cache is (re)opened
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 30 Jul 2010 19:32:15 +0200
 +
  apt (0.7.26~exp12) experimental; urgency=low
  
    [ Michael Vogt ]