* merged with mainline

diff --combined debian/changelog
index 56e4c35f46bf520762426de58072cf822386a4f4,1cafdaa9009348a1bdae48f09ed13ce7ddfb1105..a9214c51527c21f39318437233b14759d5b322d3
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,20 -1,30 +1,30 @@@
- apt (0.6.44.2) unstable; urgency=low
+ apt (0.6.45) unstable; urgency=low
  
-   * apt-pkg/depcache.cc:
-     - added Debug::pkgDepCache::AutoInstall (thanks to infinity)
-   * apt-pkg/acquire-item.cc:
-     - fix missing chmod() in the new aquire code 
-       (thanks to Bastian Blank, Closes: #367425)
-   * merged from 
-     http://www.perrier.eu.org/debian/packages/d-i/level4/apt-main:
-     * sk.po: Completed to 512t
-     * eu.po: Completed to 512t
-     * fr.po: Completed to 512t
-     * sv.po: Completed to 512t
-     * Update all PO and the POT. Gives 506t6f for formerly
-       complete translations
- 
-  -- Michael Vogt <mvo@debian.org>  Wed, 14 Jun 2006 12:00:57 +0200
+   * apt-pkg/contrib/sha256.cc:
+     - fixed the sha256 generation (closes: #378183)
+   * ftparchive/cachedb.cc:
+     - applied patch from ajt to fix Clean() function
+       (closes: #379576)
+ 
+  --
+ 
+ apt  (0.6.44.2) unstable; urgency=low 
+   
+    * apt-pkg/depcache.cc:
+      - added Debug::pkgDepCache::AutoInstall (thanks to infinity)
+    * apt-pkg/acquire-item.cc:
+      - fix missing chmod() in the new aquire code
+        (thanks to Bastian Blank, Closes: #367425)
+    * merged from
+      http://www.perrier.eu.org/debian/packages/d-i/level4/apt-main:
+      * sk.po: Completed to 512t
+      * eu.po: Completed to 512t
+      * fr.po: Completed to 512t
+      * sv.po: Completed to 512t
+      * Update all PO and the POT. Gives 506t6f for formerly
+        complete translations
+ 
+  -- Michael Vogt <mvo@debian.org>  Wed, 14 Jun 2006 12:00:57 +0200 
  
  apt (0.6.44.1-0.1) unstable; urgency=low
  
@@@ -26,32 -36,22 +36,32 @@@
  
  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