* apt-pkg/acquire-item.cc:

  - fix file removal on local repo i-m-s hit (LP: #131166)
* tests/local-repo:
  - added regression test for this bug
* apt-pkg/pkgcachegen.cc:
  - increase default mmap size
* tests/local-repo:
  - added local repository testcase

diff --cc apt-pkg/acquire-item.cc
Simple merge

diff --cc debian/changelog
index 710472d67e4fe7998cf9882d57ba8a6bb6ddf26e,24663ffa9ed1c8aeb770038e9aed4066d1887616..7b71c36087496d1e22747457b2fe47780b56a6a8
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,34 -1,4 +1,43 @@@
 -apt (0.7.7) UNRELEASED; urgency=low
++apt (0.7.6ubuntu5) UNRELEASED; urgency=low
++
++  * apt-pkg/acquire-item.cc:
++    - fix file removal on local repo i-m-s hit (LP: #131166)
++  * tests/local-repo:
++    - added regression test for this bug
++
++ -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 09 Aug 2007 12:34:07 +0200
++
 +apt (0.7.6ubuntu4) gutsy; urgency=low
 +
 +  * cmdline/apt-get.cc:
 +    - remove YnPrompt when a XS-Vcs- tag is found, improve the
 +      notice (LP: #129575)
 +  * methods/copy.cc:
 +    - take hashes here too
 +  * apt-pkg/acquire-worker.cc:
 +    - only pass on computed hash if we recived one from the method
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 08 Aug 2007 19:30:29 +0200
 +
 +apt (0.7.6ubuntu3) gutsy; urgency=low
 +
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - fix packagename extraction when writting apport reports
 +  * apt-pkg/pkgcachegen.cc:
 +    - increase default mmap size (LP: #125640)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 07 Aug 2007 09:52:00 +0200
 +
 +apt (0.7.6ubuntu2) gutsy; urgency=low
 +
 +  * doc/examples/sources.list:
 +    - change example source to gutsy
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - do not break if no /dev/pts is available
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 06 Aug 2007 15:17:57 +0200
 +
 +apt (0.7.6ubuntu1) gutsy; urgency=low
  
    * apt-inst/contrib/extracttar.cc:
      - fix fd leak for zero size files (thanks to Bill Broadley for