* merged with mainline

diff --combined apt-pkg/tagfile.cc
index 426174eb16aedecad024e964cf2d88e60c7bb51e,79ff18de4063af437eb8415859eead6dba428f5c..25e2930fac6906b4d24cb3cc5855fdb3bc3bc776
--- 1/apt-pkg/tagfile.cc
--- 2/apt-pkg/tagfile.cc
+++ b/apt-pkg/tagfile.cc
@@@ -98,6 -98,7 +98,7 @@@ bool pkgTagFile::Jump(pkgTagSection &Ta
     iOffset = Offset;
     Start = Buffer + iOffset;
     
+    // Start != End is a special case to not fail on empty TagFiles
     if (Start != End && Tag.Scan(Start,End - Start) == false)
        return _error->Error(_("Unable to parse package file %s (2)"),Fd.Name().c_str());
     
@@@ -342,8 -343,7 +343,8 @@@ static const char *iTFRewritePackageOrd
                            "Filename",
                            "Size",
                            "MD5Sum",
 -                          "SHA1Sum",
 +                          "SHA1",
 +                          "SHA256",
                             "MSDOS-Filename",   // Obsolete
                            "Description",
                            0};

diff --combined debian/changelog
index 3d60c1b27cb02689f01f93d4287a0e564016654f,0c31db6bd7cf8181358517fcf620251b558e1756..300579ad7166af23656f5e1cb99d5c46806e6f4a
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,3 -1,18 +1,18 @@@
+ apt (0.6.44.2) unstable; urgency=low
+ 
+   * apt-pkg/depcache.cc:
+     - added Debug::pkgDepCache::AutoInstall (thanks to infinity)
+   * 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
+ 
+  --
+ 
  apt (0.6.44.1-0.1) unstable; urgency=low
  
    * Non-maintainer upload.
@@@ -8,32 -23,22 +23,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