merge Michaels wonderful "fix" for the currently unwanted ABI Break

diff --combined debian/changelog
index 5cd6eeb4acbeafbc39f4cbc941495ef58d50d750,64e67670920fac55611fd841878c5f633fe0caaf..cb46394b5a5d51b1af2eaa11b8c3ee0c4a9fccd7
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,45 -1,3 +1,45 @@@
 +apt (0.7.26) UNRELEASED; urgency=low
 +
 +  [ David Kalnischkies ]
 +  * [BREAK] add possibility to download and use multiply
 +    Translation files, configurable with Acquire::Translation
 +    (Closes: #444222, #448216, #550564)
 +  * Ignore :qualifiers after package name in build dependencies
 +    for now as long we don't understand them (Closes: #558103)
 +  * doc/apt.conf.5.xml:
 +    - briefly document the behaviour of the new https options
 +  * methods/connect.cc:
 +    - add AI_ADDRCONFIG to ai_flags as suggested by Aurelien Jarno
 +      in response to Bernhard R. Link, thanks! (Closes: #505020)
 +  * methods/rred.cc:
 +    - rewrite to be able to handle even big patch files
 +    - adopt optional mmap+iovec patch from Morten Hustveit
 +      (Closes: #463354) which should speed up a bit. Thanks!
 +  * apt-pkg/contrib/mmap.{cc,h}:
 +    - extend it to have a growable flag - unused now but maybe...
 +  * apt-pkg/pkgcache.h:
 +    - use long instead of short for {Ver,Desc}File size,
 +      patch from Víctor Manuel Jáquez Leal, thanks! (Closes: #538917)
 +  * apt-pkg/acquire-item.cc:
 +    - allow also to skip the last patch if target is reached,
 +      thanks Bernhard R. Link! (Closes: #545699)
 +  * methods/http{,s}.cc
 +    - add config setting for User-Agent to the Acquire group,
 +      thanks Timothy J. Miller! (Closes: #355782)
 +    - add https options which default to http ones (Closes: #557085)
 +  * ftparchive/writer.{cc,h}:
 +    - add APT::FTPArchive::AlwaysStat to disable the too aggressive
 +      caching if versions are build multiply times (not recommend)
 +      Patch by Christoph Goehre, thanks! (Closes: #463260)
 +  * ftparchive/*:
 +    - fix a few typos in strings, comments and manpage,
 +      thanks Karl Goetz! (Closes: #558757)
 +  * debian/apt.cron.daily:
 +    - check cache size even if we do nothing else otherwise, thanks
 +      Francesco Poli for patch(s) and patience! (Closes: #459344)
 +
 + -- Michael Vogt <mvo@debian.org>  Thu, 10 Dec 2009 22:02:38 +0100
 +
  apt (0.7.25) UNRELEASED; urgency=low
  
    [ Christian Perrier ]
@@@ -78,6 -36,8 +78,8 @@@
      (thanks also to Jussi Hakala and Julian Andres Klode)
    * apt-pkg/deb/dpkgpm.cc:
      - add "purge" to list of known actions
+   * apt-pkg/init.h:
+     - add compatibilty with old ABI name until the next ABI break
  
    [ Brian Murray ]
    * apt-pkg/depcache.cc, apt-pkg/indexcopy.cc: