merged lp:~pitti/apt/compressed-indexes

diff --combined debian/changelog
index 545476459eaca336e0eb919c7f5401d1d34671fd,cbf3a5dcc13adf00df2a44aa260b6f6869d3fb99..98c127143fdc9ec7d8aa765bd6fd96d50345b1ce
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,4 +1,19 @@@
 -apt (0.8.9) UNRELEASED; urgency=low
 +apt (0.8.10) unstable; urgency=low
 +
++  [ Michael Vogt ]
 +  * methods/http.cc:
 +    - do not hang if Acquire::http::ProxyAutoDetect can not be
 +      executed or returns no data (LP: #654393)
 +
++  [ Martin Pitt ]
++  * test/integration/test-compressed-indexes, test/test-indexes.sh:
++    - Explicitly disable compressed indexes at the start. This ensures that we
++      will actually test uncompressed indexes regardless of the internal
++      default value of Acquire::GzipIndexes.
++
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 22 Nov 2010 10:40:45 +0100
 +
 +apt (0.8.9) unstable; urgency=low
  
    [ Christian Perrier ]
    * Fix "typos" in French manpages translations. Thanks to
@@@ -15,7 -7,6 +22,7 @@@
  
    [ Programs translations ]
    * Slovenian update by Andrej Žnidaršič and Rosetta Slovenian team
 +  ! German update by Holger Wansing. Closes: #603619
  
    [ David Kalnischkies ]
    * apt-pkg/aptconfiguration.cc:
@@@ -29,13 -20,14 +36,13 @@@
    * apt-pkg/depcache.cc:
      - don't install previously not installed providers in a try
        to statisfy a "Breaks: provides" dependency by upgrade
 +  * cmdline/acqprogress.cc:
 +    - don't ask the user for media change if quiet >= 2, stdout is not
 +      a tty and assume-yes, force-yes or trivial-only option is set to
 +      avoid cpu eating endless loops in unattended runs like apt.cron
 +      (Closes: #602354, LP: #665580)
  
 -  [ Martin Pitt ]
 -  * test/integration/test-compressed-indexes, test/test-indexes.sh:
 -    - Explicitly disable compressed indexes at the start. This ensures that we
 -      will actually test uncompressed indexes regardless of the internal
 -      default value of Acquire::GzipIndexes.
 -
 - -- David Kalnischkies <kalnischkies@gmail.com>  Wed, 10 Nov 2010 13:22:39 +0100
 + -- Michael Vogt <mvo@debian.org>  Thu, 18 Nov 2010 09:25:04 +0100
  
  apt (0.8.8) unstable; urgency=low