* merged with mainline

diff --cc apt-pkg/depcache.cc
index 22dd53f9779dff3885177a139e2ce24078dcdabd,58d1d25e54ed7c2b633f39d69dee14010773589f..6eb6c1d85283029f2bfeb0037d070dc7c74748fe
--- 1/apt-pkg/depcache.cc
--- 2/apt-pkg/depcache.cc
+++ b/apt-pkg/depcache.cc
@@@ -16,44 -16,10 +16,45 @@@
  #include <apt-pkg/error.h>
  #include <apt-pkg/sptr.h>
  #include <apt-pkg/algorithms.h>
 +
 +#include <apt-pkg/fileutl.h>
  #include <apt-pkg/configuration.h>
 +#include <apt-pkg/pkgsystem.h>
 +#include <apt-pkg/tagfile.h>
 +
 +#include <iostream>
 +#include <sstream>    
+ 
  #include <apti18n.h>    
 -                                                                      /*}}}*/
 +
 +pkgDepCache::ActionGroup::ActionGroup(pkgDepCache &cache) :
 +  cache(cache), released(false)
 +{
 +  ++cache.group_level;
 +}
 +
 +void pkgDepCache::ActionGroup::release()
 +{
 +  if(!released)
 +    {
 +      if(cache.group_level == 0)
 +      std::cerr << "W: Unbalanced action groups, expect badness" << std::endl;
 +      else
 +      {
 +        --cache.group_level;
 +
 +        if(cache.group_level == 0)
 +          cache.MarkAndSweep();
 +      }
 +
 +      released = false;
 +    }
 +}
 +
 +pkgDepCache::ActionGroup::~ActionGroup()
 +{
 +  release();
 +}
  
  // DepCache::pkgDepCache - Constructors                                       /*{{{*/
  // ---------------------------------------------------------------------
@@@ -837,9 -711,19 +838,14 @@@ void pkgDepCache::MarkInstall(PkgIterat
            }
         }
         
--       if (InstPkg.end() == false)
++       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
 -          if (P->CurrentVer == 0)
 -             PkgState[InstPkg->ID].Flags |= Flag::Auto;
 +         MarkInstall(InstPkg, true, Depth + 1, false);
-        
+        }
 -       
         continue;
        }
        

diff --cc cmdline/apt-get.cc
Simple merge

diff --cc debian/changelog
Simple merge

diff --cc debian/rules
index 94e3e2216a9c548fd675fe92ee115132bf64d7e8,a8bf88762e4fed8821d9f3f8bf480caf4cd94759..044f742d0a392c3bfe8266afd1a569c56f125fbb
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -335,6 -336,6 +336,6 @@@ cvs-mkul
  arch-build:
        rm -rf debian/arch-build
        mkdir -p debian/arch-build/apt-$(APT_DEBVER)
-       baz inventory -s | xargs cp -a --parents --target=debian/arch-build/apt-$(APT_DEBVER)
+       tar -c --exclude=arch-build --no-recursion -f - `bzr inventory` | (cd debian/arch-build/$(PKG)-$(APT_DEBVER);tar xf -)
        $(MAKE) -C debian/arch-build/apt-$(APT_DEBVER) startup doc
 -      (cd debian/arch-build/apt-$(APT_DEBVER); $(DEB_BUILD_PROG))
 +      (cd debian/arch-build/apt-$(APT_DEBVER); $(DEB_BUILD_PROG); dpkg-genchanges -S > ../apt_$(APT_DEBVER)_source.changes)

diff --cc doc/examples/configure-index
Simple merge

diff --cc share/debian-archive.gpg
index bb5ed5033368a3699a03fe69d5e4ed70b9fc94c6,ce412117ddd0c333f393327189a18af47fc0016a..0000000000000000000000000000000000000000
deleted file mode 100644,100644
Binary files differ

diff --cc share/debian-archive.gpg.moved
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..bb5ed5033368a3699a03fe69d5e4ed70b9fc94c6
new file mode 100644 (file)
Binary files differ