* apt-pkg/acquire-item.{cc,h}:
authorMichael Vogt <michael.vogt@ubuntu.com>
Fri, 7 Dec 2007 15:21:47 +0000 (16:21 +0100)
committerMichael Vogt <michael.vogt@ubuntu.com>
Fri, 7 Dec 2007 15:21:47 +0000 (16:21 +0100)
  - make the authentication download code more robust against
    servers/proxies with broken If-Range implementations

1  2 
apt-pkg/acquire-item.cc
apt-pkg/acquire-item.h
configure.in
debian/changelog

Simple merge
Simple merge
diff --cc configure.in
index a2b554a0caba5856eb499c5134ef18bcdcf073b9,5f19c98a6f36b3b69d743eabf9009a9c3f2779cd..52e85fc5bd09d1394b8590d2c6e7e5d6dd4f8d7e
@@@ -18,7 -18,7 +18,7 @@@ AC_CONFIG_AUX_DIR(buildlib
  AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
  
  dnl -- SET THIS TO THE RELEASE VERSION --
- AC_DEFINE_UNQUOTED(VERSION,"0.7.9ubuntu1")
 -AC_DEFINE_UNQUOTED(VERSION,"0.7.10")
++AC_DEFINE_UNQUOTED(VERSION,"0.7.9ubuntu1~ppa1")
  PACKAGE="apt"
  AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
  AC_SUBST(PACKAGE)
index 2bfbc100abb5880c081c59fa55f989d1ee09fb1c,854bec8c665735e0a1df2dedc3bc553e654d2cf5..acb025da11972fdcec8da6082bfdbe19800d9898
@@@ -22,8 -22,9 +22,11 @@@ apt (0.7.9ubuntu1) hardy; urgency=lo
      - remove cruft code that caused timestamp/I-M-S issues
    * ftparchive/contents.cc:
      - fix error output
 +  * methods/mirror.{cc,h}:
 +    - only update mirror list on IndexFile updates 
+   * apt-pkg/acquire-item.{cc,h}:
+     - make the authentication download code more robust against
+       servers/proxies with broken If-Range implementations
  
    [ Chris Cheney ]
    * ftparchive/contents.cc: