* merged from mainline

diff --combined apt-pkg/tagfile.cc
index fc020436ca37345e1e062be8d9d8371a60e52afd,9763d96a320e201f9cb7d9e36aaa8e83f1cc103d..426174eb16aedecad024e964cf2d88e60c7bb51e
--- 1/apt-pkg/tagfile.cc
--- 2/apt-pkg/tagfile.cc
+++ b/apt-pkg/tagfile.cc
@@@ -98,7 -98,7 +98,7 @@@ bool pkgTagFile::Jump(pkgTagSection &Ta
     iOffset = Offset;
     Start = Buffer + iOffset;
     
-    if (Tag.Scan(Start,End - Start) == false)
+    if (Start != End && Tag.Scan(Start,End - Start) == false)
        return _error->Error(_("Unable to parse package file %s (2)"),Fd.Name().c_str());
     
     return true;
@@@ -342,8 -342,7 +342,8 @@@ static const char *iTFRewritePackageOrd
                            "Filename",
                            "Size",
                            "MD5Sum",
 -                          "SHA1Sum",
 +                          "SHA1",
 +                          "SHA256",
                             "MSDOS-Filename",   // Obsolete
                            "Description",
                            0};

diff --combined debian/changelog
index c4bcf5c1c3fffe62a420bcc8ab84405974418964,66b5df264651be811f1feea293dfc26ffd8b992a..3d60c1b27cb02689f01f93d4287a0e564016654f
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,31 -1,29 +1,39 @@@
+ apt (0.6.44.1-0.1) unstable; urgency=low
+ 
+   * Non-maintainer upload.
+   * Don't give an error when parsing empty Packages/Sources files.
+     (Closes: #366931, #367086, #370160)
+ 
+  -- Steinar H. Gunderson <sesse@debian.org>  Fri,  9 Jun 2006 00:52:21 +0200
+ 
  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 7346ba9bb4324b4ea14c63fd498b769efbc5f3cd,b87e8503049e8ced9ce112aa9a55a57936fb2126..62858742795e0b184aaea915a37f5b156738187e
--- 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 
@@@ -246,6 -244,7 +246,7 @@@ DPk
  Debug 
  {
    pkgProblemResolver "false";
+   pkgDepCache::AutoInstall "false"; // what packages apt install to satify dependencies
    pkgAcquire "false";
    pkgAcquire::Worker "false";
    pkgDPkgPM "false";