* merged from mainline

diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc
index dd1c794c9912726d9b38d5f6e7e1b644c94aeacb..58d1d25e54ed7c2b633f39d69dee14010773589f 100644 (file)
--- a/apt-pkg/depcache.cc
+++ b/apt-pkg/depcache.cc
@@ -16,7 +16,8 @@
 #include <apt-pkg/error.h>
 #include <apt-pkg/sptr.h>
 #include <apt-pkg/algorithms.h>
-    
+#include <apt-pkg/configuration.h>
+
 #include <apti18n.h>    
                                                                        /*}}}*/
 
@@ -712,6 +713,10 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst,
         
         if (InstPkg.end() == false)
         {
+           if(_config->FindB("Debug::pkgDepCache::AutoInstall",false) == true)
+              std::clog << "Installing " << InstPkg.Name() 
+                        << " as dep of " << Pkg.Name() 
+                        << std::endl;
            MarkInstall(InstPkg,true,Depth + 1);
 
            // Set the autoflag, after MarkInstall because MarkInstall unsets it

diff --git a/apt-pkg/tagfile.cc b/apt-pkg/tagfile.cc
index fc020436ca37345e1e062be8d9d8371a60e52afd..426174eb16aedecad024e964cf2d88e60c7bb51e 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;
    
-   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;

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_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)

diff --git a/debian/changelog b/debian/changelog
index c4bcf5c1c3fffe62a420bcc8ab84405974418964..3d60c1b27cb02689f01f93d4287a0e564016654f 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
 
   * apt-pkg/acquire-item.cc:

diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index 7346ba9bb4324b4ea14c63fd498b769efbc5f3cd..62858742795e0b184aaea915a37f5b156738187e 100644 (file)
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -246,6 +246,7 @@ DPkg
 Debug 
 {
   pkgProblemResolver "false";
+  pkgDepCache::AutoInstall "false"; // what packages apt install to satify dependencies
   pkgAcquire "false";
   pkgAcquire::Worker "false";
   pkgDPkgPM "false";

diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml
index 9762005b059dc1d76543fa66ebf80049edcfba5c..e47418b27fe016dfb97f92838f089f991648b89d 100644 (file)
--- a/doc/sources.list.5.xml
+++ b/doc/sources.list.5.xml
@@ -204,7 +204,7 @@ deb http://http.us.debian.org/debian dists/stable-updates/
 
    <para>Uses HTTP to access the archive at nonus.debian.org, under the
    debian-non-US directory, and uses only files found under
-   <filename>unstable/binary-i3866</filename> on i386 machines, 
+   <filename>unstable/binary-i386</filename> on i386 machines, 
    <filename>unstable/binary-m68k</filename> on m68k, and so
    forth for other supported architectures. [Note this example only 
    illustrates how to use the substitution variable; non-us is no longer 

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"
-"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"
@@ -2089,15 +2089,15 @@ 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 ""
 
-#: apt-pkg/depcache.cc:61
+#: apt-pkg/depcache.cc:62
 msgid "Candidate versions"
 msgstr ""
 
-#: apt-pkg/depcache.cc:90
+#: apt-pkg/depcache.cc:91
 msgid "Dependency generation"
 msgstr ""