From: Martin Pitt <martin@piware.de>
Date: Wed, 13 Oct 2010 12:22:29 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: 0.8.7~5^2~1
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/eff581c2d4740bc439522e44538fd6f7f4069e06

merge from trunk
---

eff581c2d4740bc439522e44538fd6f7f4069e06
diff --cc debian/changelog
index f1737a5a2,58e6d28bd..3a552d01e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -5,17 -5,17 +5,27 @@@ apt (0.8.7) UNRELEASED; urgency=lo
    * Another typo fixed in French ("Anfin"). Thanks to bubulle
    * Wrong translation for "showauto" fixed. Thanks to Raphaël Hertzog
      Closes: #599265
+   
+   [ Michael Vogt ]
+   * debian/apt.cron.daily:
+     - source /etc/default/locale (if available) so that the 
+       apt-get update cron job fetches the right translated package
+       descriptions
+   * fix test failure on amd64
+   * apt-pkg/deb/debsystem.cc:
+     - fix issues with dir::state::status and dir::state::extended_states
+       when alternative rootdirs are used
  
 +  [ Martin Pitt ]
 +  * apt-pkg/deb/debindexfile.cc:
 +    - Use FileFd::Size() instead of stat()ing the sources/binary/translations
 +      indexes directly, so that we have transparent handling of gzipped
 +      indexes.
 +  * apt-pkg/contrib/fileutl.cc:
 +    - Fix FileFd::Size() for gzipped files to give the size of the
 +      uncompressed data. This fixes cache progress building progress going way
 +      over 100%.
 +
   -- Christian Perrier <bubulle@debian.org>  Tue, 05 Oct 2010 05:35:58 +0200
  
  apt (0.8.6) unstable; urgency=low