merged from http://bzr.debian.org/apt/apt/debian-experimental-ma

diff --cc debian/changelog
index 928a4b3d8810969347c92b732a30c874c9669f6e,33bd66b1c42844460c9c20ff9e2d59a2fe1a6f79..5f80dfb0c9dcb2dd58fc7d72909ddfd43e29390d
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,34 -1,22 +1,36 @@@
- apt (0.7.26~exp11ubuntu3) maverick; urgency=low
- 
-   * debian/control:
-     - add dependency on zlib-dev for libapt-pkg-dev
-    * apt-pkg/cacheset.cc:
-      - make CacheSetHelper::canNotFindAllVer display a notice
-        only (for compat reasons). Otherwise tools like sbuild
-        blow up
- 
-  -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 30 Jul 2010 08:57:15 +0200
- 
- apt (0.7.26~exp11ubuntu2) maverick; urgency=low
- 
-   * remove debian-archive-keyring dependency and readd
-     recommends to the ubuntu-keyring
- 
-  -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 29 Jul 2010 20:02:39 +0200
- 
- apt (0.7.26~exp11ubuntu1) maverick; urgency=low
++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
 +
-  -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 29 Jul 2010 17:03:48 +0200
++ -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 30 Jul 2010 12:53:21 +0200
++
+ apt (0.7.26~exp12) experimental; urgency=low
+ 
+   [ Michael Vogt ]
+   * debian/control:
+     - add dependency on zlib-dev for libapt-pkg-dev
+ 
+   [ David Kalnischkies ]
+   * apt-pkg/cacheset.cc:
+     - [ABI BREAK] add an ErrorType option to CacheSetHelper
+   * cmdline/apt-cache.cc:
+     - use Notice instead of Error in the CacheSetHelper messages
+       for compat reasons. Otherwise tools like sbuild blow up
+     - return success in show if a virtual package was given
+   * debian/control:
+     - remove libcurl3-gnutls-dev alternative as the package is gone
+     - increase needed version of libcurl4-gnutls-dev to >= 7.19.0
+       as we use CURLOPT_{ISSUERCERT,CRLFILE} (Closes: #589642)
+ 
+  -- Michael Vogt <mvo@debian.org>  Fri, 30 Jul 2010 11:55:48 +0200
  
  apt (0.7.26~exp11) experimental; urgency=low
  

diff --cc debian/control
Simple merge