* merge the patch from Steinar

diff --git a/apt-pkg/tagfile.cc b/apt-pkg/tagfile.cc
index dc1ba3f9e991fe3aafcad402d36fd1ead5cb912e..9763d96a320e201f9cb7d9e36aaa8e83f1cc103d 100644 (file)
--- a/apt-pkg/tagfile.cc
+++ b/apt-pkg/tagfile.cc
@@ -98,7 +98,7 @@ bool pkgTagFile::Jump(pkgTagSection &Tag,unsigned long Offset)
    iOffset = Offset;
    Start = Buffer + iOffset;
    
    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;
       return _error->Error(_("Unable to parse package file %s (2)"),Fd.Name().c_str());
    
    return true;

diff --git a/configure.in b/configure.in
index 96adad5974bc944e660db273754614892f95591e..6d42f340e231f0410cd58824c176eedd7e0b7d97 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib)
 AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
 
 dnl -- SET THIS TO THE RELEASE VERSION --
 AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
 
 dnl -- SET THIS TO THE RELEASE VERSION --

-AC_DEFINE_UNQUOTED(VERSION,"0.6.44.1")
+AC_DEFINE_UNQUOTED(VERSION,"0.6.44.1-0.1")

 PACKAGE="apt"
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_SUBST(PACKAGE)
 PACKAGE="apt"
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_SUBST(PACKAGE)

diff --git a/debian/changelog b/debian/changelog
index 6ce11aafbbdc1a4394b43d32d8172be27d7fb144..66b5df264651be811f1feea293dfc26ffd8b992a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+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
 
   * merged from 
 apt (0.6.44.1) unstable; urgency=low
 
   * merged from 

diff --git a/po/apt-all.pot b/po/apt-all.pot
index d2209487a117a468c9cfa2ecabfb7af522f46919..6929345afc5dc14342c9c03b4d7aac9f4141cdd6 100644 (file)
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2006-05-08 11:02+0200\n"
+"POT-Creation-Date: 2006-05-27 13:46+0200\n"

 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"


@@ -2089,15 +2089,15 @@ msgstr ""
 msgid "extra"
 msgstr ""
 
 msgid "extra"
 msgstr ""
 

-#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
+#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90

 msgid "Building dependency tree"
 msgstr ""
 
 msgid "Building dependency tree"
 msgstr ""
 

-#: apt-pkg/depcache.cc:61
+#: apt-pkg/depcache.cc:62

 msgid "Candidate versions"
 msgstr ""
 
 msgid "Candidate versions"
 msgstr ""
 

-#: apt-pkg/depcache.cc:90
+#: apt-pkg/depcache.cc:91

 msgid "Dependency generation"
 msgstr ""
 
 msgid "Dependency generation"
 msgstr ""