* apt-pkg/contrib/configuration.cc:

  - fix double delete (LP: #848907)
  - ignore only the invalid regexp instead of all options
* apt-pkg/acquire-item.h, apt-pkg/deb/debmetaindex.cc:
  - fix fetching language information by adding OptionalSubIndexTarget
* methods/https.cc:
  - cleanup broken downloads properly

* ftparchive/cachedb.cc:
  - fix buffersize in bytes2hex
* apt-pkg/deb/deblistparser.cc:
  - fix crash when the dynamic mmap needs to be grown in
    LoadReleaseInfo (LP: #854090)

diff --cc apt-pkg/contrib/configuration.cc
Simple merge

diff --cc apt-pkg/deb/deblistparser.cc
Simple merge

diff --cc apt-pkg/deb/debmetaindex.cc
Simple merge

diff --cc debian/changelog
index 7e1ce4f4ea7775e43cb2e12a8b5be7e84289a1f7,4ca81c32902152b4712da899e0e0967e63febf7e..a06abbbc08dfcb8864107da9584b8d562354b5b2
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,42 -1,39 +1,64 @@@
 -apt (0.8.16~exp5) experimental; urgency=low
++apt (0.8.16~exp7) UNRELEASEDexperimental; urgency=low
+ 
+   [ Michael Vogt ]
 -  * apt-pkg/makefile:
 -    - install sha256.h compat header
 -  * apt-pkg/pkgcachegen.{cc,h}:
 -    - use ref-to-ptr semantic in NewDepends() to ensure that the   
 -      libapt does not segfault if the cache is remapped in between
 -      (LP: #812862)
 -    - fix crash when P.Arch() was used but the cache got remapped
 -  * apt-pkg/acquire-item.{cc,h}:
 -    - do not check for a "Package" tag in optional index targets
 -      like the translations index
 -  * apt-pkg/acquire.cc:
 -    - fix potential divide-by-zero
 -  * methods/mirror.cc:
 -    - include the architecture(s) in the query string as well so 
 -      that the server can make better decisions
+   * apt-pkg/contrib/configuration.cc:
+     - fix double delete (LP: #848907)
+     - ignore only the invalid regexp instead of all options
+   * apt-pkg/acquire-item.h, apt-pkg/deb/debmetaindex.cc:
+     - fix fetching language information by adding OptionalSubIndexTarget
+   * methods/https.cc:
+     - cleanup broken downloads properly
+   
+   [ Colin Watson ]
+   * ftparchive/cachedb.cc:
+     - fix buffersize in bytes2hex
+ 
+   [ David Kalnischkies ]  
+   * apt-pkg/deb/deblistparser.cc:
+     - fix crash when the dynamic mmap needs to be grown in
+       LoadReleaseInfo (LP: #854090)
+ 
 - -- Michael Vogt <mvo@debian.org>  Fri, 05 Aug 2011 10:57:08 +0200
++ -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 05 Oct 2011 18:14:11 +0200
++
 +apt (0.8.16~exp6) experimental; urgency=low
 +
 +  [ Christopher Baines ]
 +  * enable APT in unpack/configure ordering to handle loops as well
 +    as tight dependencies between immediate packages better
 +    enabling also the possibility to mark all packages as immediate
 +    (at least Closes: #353290, #540227, #559733, #621836, #639290)
 +
 +  [ David Kalnischkies ]
 +  * [abi-break] Support large files in the complete toolset. Indexes of this
 +    size are pretty unlikely for now, but we need it for deb
 +    packages which could become bigger than 4GB now (LP: #815895)
 +  * merged the debian-sid branch
 +  
 +  [ Michael Vogt ]
 +  * bump ABI version
 +
 + -- Michael Vogt <mvo@debian.org>  Wed, 14 Sep 2011 21:06:51 +0200
 +
 +apt (0.8.16~exp5) experimental; urgency=low
 +
 +  * merged the latest debian-sid fixes
 +  * apt-pkg/makefile:
 +    - install sha256.h compat header
 +  * apt-pkg/pkgcachegen.{cc,h}:
 +    - use ref-to-ptr semantic in NewDepends() to ensure that the   
 +      libapt does not segfault if the cache is remapped in between
 +      (LP: #812862)
 +    - fix crash when P.Arch() was used but the cache got remapped
 +  * apt-pkg/acquire-item.{cc,h}:
 +    - do not check for a "Package" tag in optional index targets
 +      like the translations index
 +  * apt-pkg/acquire.cc:
 +    - fix potential divide-by-zero
 +  * methods/mirror.cc:
 +    - include the architecture(s) in the query string as well so 
 +      that the server can make better decisions
 +
 + -- Michael Vogt <mvo@debian.org>  Mon, 15 Aug 2011 14:52:54 +0200
  
  apt (0.8.16~exp4) experimental; urgency=low
  

diff --cc ftparchive/cachedb.cc
Simple merge

diff --cc methods/https.cc
Simple merge