* merged with mainline

diff --combined debian/changelog
index a9214c51527c21f39318437233b14759d5b322d3,4de7f3f0dade56e7e1db3d7071568d227bdfc871..4e75aa818dd4f8c4ba885134ec756d8f522c82f3
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -5,8 -5,31 +5,31 @@@ apt (0.6.45) unstable; urgency=lo
    * ftparchive/cachedb.cc:
      - applied patch from ajt to fix Clean() function
        (closes: #379576)
+   * doc/apt-get.8.xml:
+     - fix path to the apt user build (Closes: #375640)
+   * apt-pkg/deb/dpkgpm.cc:
+     - make progress reporting more robust against multiline error
+       messages (first half of a fix for #374195)
+   * doc/examples/configure-index:
+     - document Debug::pkgAcquire::Auth     
+   * methods/gpgv.cc:
+     - deal with gpg error "NODATA". Closes: #296103, Thanks to 
+       Luis Rodrigo Gallardo Cruz for the patch
+   * apt-inst/contrib/extracttar.cc:
+     - fix for string mangling, closes: #373864
+   * Merged from Christian Perrier bzr branch:
+     * ko.po: Updated to 512t. Closes: #378901
+     * hu.po: Updated to 512t. Closes: #376330
+     * km.po: New Khmer translation: 506t6f. Closes: #375068
+     * ne.po: New Nepali translation: 512t. Closes: #373729
+     * vi.po: Updated to 512t. Closes: #368038
+     * zh_TW.po: Remove an extra %s in one string. Closes: #370551
+     * dz.po: New Dzongkha translation: 512t
+     * ro.po: Updated to 512t
+     * eu.po: Updated
+     * eu.po: Updated
  
-  --
+  -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 25 Jul 2006 11:55:22 +0200
  
  apt  (0.6.44.2) unstable; urgency=low 
    
@@@ -36,32 -59,22 +59,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 62858742795e0b184aaea915a37f5b156738187e,f8abd75ed7e9863600cac66e5490ed6e4cd6d794..883a94434fd39911a0bb4ab3cdfa30839fe353f7
--- 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 
@@@ -249,6 -247,7 +249,7 @@@ Debu
    pkgDepCache::AutoInstall "false"; // what packages apt install to satify dependencies
    pkgAcquire "false";
    pkgAcquire::Worker "false";
+   pkgAcquire::Auth "false";
    pkgDPkgPM "false";
    pkgDPkgProgressReporting "false";
    pkgOrderList "false";