merged from donkult

diff --combined debian/changelog
index 9a3962ba415c8ae62a222f3be5ed23f76e900560,8ca3e164acb11d63f9a1619121eeb3237907e0b4..437ded36555e90c720a67389ee6b43495095f43c
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,3 -1,17 +1,17 @@@
+ apt (0.8.8) UNRELEASED; urgency=low
+ 
+   [ David Kalnischkies ]
+   * apt-pkg/contrib/fileutl.cc:
+     - Add a FileFd::FileSize() method to get the size of the underlying
+       file and not the size of the content in the file as FileFd::Size()
+       does - the sizes can differ since the direct gzip integration
+   * methods/{gzip,bzip2}.cc:
+     - use FileSize() to determine if the file is invalid (Closes: #600852)
+   * apt-pkg/pkgcache.cc:
+     - fallback always to a suitable description (Closes: #601016)
+ 
+  -- David Kalnischkies <kalnischkies@gmail.com>  Tue, 26 Oct 2010 23:23:01 +0200
+ 
  apt (0.8.7) unstable; urgency=low
  
    [ Manpages translations ]
@@@ -15,9 -29,6 +29,9 @@@
    * apt-pkg/deb/debsystem.cc:
      - fix issues with dir::state::status and dir::state::extended_states
        when alternative rootdirs are used
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - ensure that history.log gets closed to avoid leaking a FD
 +      (closes: #601649)
  
    [ Martin Pitt ]
    * apt-pkg/deb/debindexfile.cc: