* merged from mainline

diff --combined debian/changelog
index 6c0507e1df831865e268f53b18a274cae85e5e5e,db84bc65a87abed9a6c93c58789c2d95564588ee..88eb14871045b2668081a5bc4f54f554394c31d8
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,3 -1,21 +1,21 @@@
+ apt (0.6.46.1) unstable; urgency=low
+ 
+   * methods/gzip.cc:
+     - deal with empty files 
+   * Applied patch from Daniel Schepler to make apt bin-NMU able.  
+     (closes: bug#359634)
+   * rebuild against current g++ because of:
+     http://gcc.gnu.org/bugzilla/show_bug.cgi?id=29289
+     (closes: #390189)
+   * fix broken i18n in the dpkg progress reporting, thanks to 
+     Frans Pop and Steinar Gunderson. (closes: #389261)
+   * Merged from Christian Perrier bzr branch:
+     * fi.po: Updated to 514t. Closes: #390149
+     * eu.po: Updated to 514t. Closes: #389725
+     * vi.po: Updated to 514t. Closes: #388555
+   
+  --
+ 
  apt (0.6.46) unstable; urgency=low
  
    * debian/control:
@@@ -101,32 -119,22 +119,32 @@@ apt (0.6.44.1-0.1) unstable; urgency=lo
  
  apt (0.6.44.1) unstable; urgency=low
  
 +  * apt-pkg/acquire-item.cc:
 +    - fix reversed logic of the "Acquire::PDiffs" option
    * merged from 
      http://www.perrier.eu.org/debian/packages/d-i/level4/apt-main:
      - po/LINGUAS: added "bg" Closes: #360262
      - po/gl.po: Galician translation update. Closes: #366849
      - po/hu.po: Hungarian translation update. Closes: #365448
      - po/cs.po: Czech translation updated. Closes: #367244
 +  * apt-pkg/contrib/sha256.cc:
 +    - applied patch to fix unaligned access problem. Closes: #367417
 +      (thanks to David Mosberger)
  
   -- Michael Vogt <mvo@debian.org>  Tue, 16 May 2006 21:51:16 +0200
  
  apt (0.6.44) unstable; urgency=low
  
    * apt-pkg/acquire.cc: don't show ETA if it is 0 or absurdely large
 +  * apt-pkg/contrib/sha256.{cc,h},hashes.{cc,h}: support for sha256 
 +    (thanks to Anthony Towns)
 +  * ftparchive/cachedb.{cc,h},writer.{cc,h}: optimizations 
 +    (thanks to Anthony Towns)
 +  * apt pdiff support from experimental merged
 +  * apt-pkg/deb/dpkgpm.cc: wording fixes (thanks to Matt Zimmerman)
    * apt-pkg/deb/dpkgpm.cc: 
      - wording fixes (thanks to Matt Zimmerman)
 -    - fix error in dpkg interaction (closes: #364513, 
 -      thanks to Martin Dickopp)
 +    - fix error in dpkg interaction (closes: #364513, thanks to Martin Dickopp)
    * apt-pkg/tagfile.{cc,h}:
      - use MMap to read the entries (thanks to Zephaniah E. Hull for the
        patch) Closes: #350025

diff --combined doc/examples/configure-index
index 883a94434fd39911a0bb4ab3cdfa30839fe353f7,0f0abc30c9028365104b6576a4cc6a7ad00dd5ee..ac2f2997d9a75aa555ee8363bfa203808adeda7f
--- 1/doc/examples/configure-index
--- 2/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@@ -104,8 -104,6 +104,8 @@@ Acquir
    Queue-Mode "host";       // host|access
    Retries "0";
    Source-Symlinks "true";
 +
 +  PDiffs "true";     // try to get the IndexFile diffs
    
    // HTTP method configuration
    http 
@@@ -253,6 -251,7 +253,7 @@@ Debu
    pkgDPkgPM "false";
    pkgDPkgProgressReporting "false";
    pkgOrderList "false";
+   BuildDeps "false";
    
    pkgInitialize "false";   // This one will dump the configuration space
    NoLocking "false";