* apt-pkg/acquire-item.cc:

  - fix a merge modification (done by me) that prevents the
    fallback to the uncompressed 'Packages' to work correctly

diff --cc debian/changelog
index 0347e83ffd415fa67cf81ab5341581ac02f968ba,40e1cc23df9bdf889064752ef144c49116ec50a0..566ed4324fa7380dfee741073cfc389ac5c80a77
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,4 -1,4 +1,12 @@@
 -apt (0.7.17) unstable; urgency=low
++apt (0.7.17~exp3) experimental; urgency=low
++
++  * apt-pkg/acquire-item.cc:
++    - fix a merge modification (done by me) that prevents the
++      fallback to the uncompressed 'Packages' to work correctly
++
++ -- Michael Vogt <mvo@debian.org>  Wed, 29 Oct 2008 09:36:24 +0100
++
 +apt (0.7.17~exp2) experimental; urgency=low
  
    [ Eugene V. Lyubimkin ]
    * apt-pkg/acquire-item.cc:
@@@ -7,35 -7,8 +15,34 @@@
    * apt-pkg/algorithm.cc:
      - Strip username and password from source URL in error message.
        (Closes: #425150)
- 
 +  
 +  [ Michael Vogt ]
 +  * fix various -Wall warnings
 +
 + -- Michael Vogt <mvo@debian.org>  Tue, 28 Oct 2008 18:06:38 +0100
 +
 +apt (0.7.17~exp1) experimental; urgency=low
 +
 +  [ Luca Bruno ]
 +  * Fix typos:
 +    - apt-pkg/depcache.cc
 +  * Fix compilation warnings:
 +    - apt-pkg/acquire.cc
 +    - apt-pkg/versionmatch.cc
 +  * Compilation fixes and portability improvement for compiling APT against non-GNU libc
 +    (thanks to Martin Koeppe, closes: #392063):
 +    - buildlib/apti18n.h.in:
 +      + textdomain() and bindtextdomain() must not be visible when --disable-nls
 +    - buildlib/inttypes.h.in: undefine standard int*_t types
 +    - Append INTLLIBS to SLIBS:
 +      + cmdline/makefile
 +      + ftparchive/makefile
 +      + methods/makefile
 +  * doc/apt.conf.5.xml:
 +    - clarify whether configuration items of apt.conf are case-sensitive
 +      (thanks to Vincent McIntyre, closes: #345901)
  
 - -- Eugene V. Lyubimkin <jackyf.devel@gmail.com>  Fri, 24 Oct 2008 23:45:17 +0300
 + -- Luca Bruno <lethalman88@gmail.com>  Sat, 11 Oct 2008 09:17:46 +0200
  
  apt (0.7.16) unstable; urgency=low