From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Thu, 25 Nov 2010 14:58:53 +0000 (+0100)
Subject: merged lp:~pitti/apt/compressed-indexes
X-Git-Tag: 0.8.11~6^2~4
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/6ff4a64c8588a721cb1dfb8303864a6e20ccd76e?ds=inline

merged lp:~pitti/apt/compressed-indexes
---

6ff4a64c8588a721cb1dfb8303864a6e20ccd76e
diff --cc debian/changelog
index 545476459,cbf3a5dcc..98c127143
--- a/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