* 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

diff --cc debian/changelog
index 1829e067ce43502ad4def1d7e6ee048ca50997c8,d6bfa76eec5371834b974596977ac2b60942806d..928a4b3d8810969347c92b732a30c874c9669f6e
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,23 -1,13 +1,34 @@@
 -apt (0.7.26~exp12) UNRELEASEDexperimental; urgency=low
++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>  Thu, 29 Jul 2010 23:45:42 +0200
++ -- 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
 +
 +  * 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
  
  apt (0.7.26~exp11) experimental; urgency=low
  

diff --cc debian/control
Simple merge