merged from the debian-experimental-ma branch

diff --cc debian/changelog
index e90aebef6d89a52e7ce460d9f1db882a6ac2359d,6945b48f59247dc2954d27478807acb79afecc62..0ca0f285a9c13cce48be0fd925e1093272382f15
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,34 -1,27 +1,52 @@@
 -  [ Michael Vogt ]
 -  * 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
 -
+ apt (0.7.26~exp13) UNRELEASEDexperimental; urgency=low
+ 
 -    - Add dependency on gnupg to apt, apt-key uses it.
+   [ 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.
+ 
+  -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 30 Jul 2010 17:37:14 +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 ]

diff --cc debian/control
index 534473a295593f3b0b3efe62512d94533e5a178a,f03b96f6720ddd81e280a6320113d5ef8bd9f958..c1283f7d215a9c2c84f49da5dcd25f590d01d696
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -13,10 -12,9 +13,10 @@@ Vcs-Bzr: http://bzr.debian.org/apt/debi
  
  Package: apt
  Architecture: any
 -Depends: ${shlibs:Depends}, debian-archive-keyring, ${misc:Depends}, gnupg
 +Depends: ${shlibs:Depends}, ${misc:Depends}
  Replaces: manpages-pl (<< 20060617-3~)
  Provides: ${libapt-pkg:provides}
- Recommends: ubuntu-keyring
++Recommends: ubuntu-keyring, gpg
  Conflicts: python-apt (<< 0.7.93.2~)
  Suggests: aptitude | synaptic | wajig, dpkg-dev, apt-doc, bzip2, lzma, python-apt
  Description: Advanced front-end for dpkg