merged from lp:~donkult/apt/sid

diff --combined apt-pkg/acquire-item.cc
index 184802ca38d45bb64dc1fb837d7e9a9fa933e18a,cf88ded7b243da48ac69de813331172712a8908b..39b9feff24f6c8670c2dab5ee74d5061b53cef0c
--- 1/apt-pkg/acquire-item.cc
--- 2/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@@ -17,7 -17,6 +17,6 @@@
  #include <apt-pkg/configuration.h>
  #include <apt-pkg/aptconfiguration.h>
  #include <apt-pkg/sourcelist.h>
- #include <apt-pkg/vendorlist.h>
  #include <apt-pkg/error.h>
  #include <apt-pkg/strutl.h>
  #include <apt-pkg/fileutl.h>
@@@ -841,7 -840,7 +840,7 @@@ string pkgAcqIndex::Custom600Headers(
     if (ShortDesc().find("Translation") != 0)
        msg += "\nFail-Ignore: true";
     struct stat Buf;
 -   if (stat(Final.c_str(),&Buf) != 0)
 +   if (stat(Final.c_str(),&Buf) == 0)
        msg += "\nLast-Modified: " + TimeRFC1123(Buf.st_mtime);
  
     return msg;
@@@ -1390,29 -1389,6 +1389,6 @@@ void pkgAcqMetaIndex::QueueIndexes(boo
                                                                        /*}}}*/
  bool pkgAcqMetaIndex::VerifyVendor(string Message)                    /*{{{*/
  {
- //    // Maybe this should be made available from above so we don't have
- //    // to read and parse it every time?
- //    pkgVendorList List;
- //    List.ReadMainList();
- 
- //    const Vendor* Vndr = NULL;
- //    for (std::vector<string>::const_iterator I = GPGVOutput.begin(); I != GPGVOutput.end(); I++)
- //    {
- //       string::size_type pos = (*I).find("VALIDSIG ");
- //       if (_config->FindB("Debug::Vendor", false))
- //          std::cerr << "Looking for VALIDSIG in \"" << (*I) << "\": pos " << pos 
- //                    << std::endl;
- //       if (pos != std::string::npos)
- //       {
- //          string Fingerprint = (*I).substr(pos+sizeof("VALIDSIG"));
- //          if (_config->FindB("Debug::Vendor", false))
- //             std::cerr << "Looking for \"" << Fingerprint << "\" in vendor..." <<
- //                std::endl;
- //          Vndr = List.FindVendor(Fingerprint) != "";
- //          if (Vndr != NULL);
- //          break;
- //       }
- //    }
     string::size_type pos;
  
     // check for missing sigs (that where not fatal because otherwise we had

diff --combined debian/changelog
index 2dacf93f5ee221ed59600bcc128907305ebe75de,e669077fed84726e8603ba63eacd450df3f4fd37..ba4455a60ddd7cb4d3634ae153744a1a7857cd0b
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,39 +1,46 @@@
+ apt (0.8.13.1) UNRELEASED; urgency=low
+ 
+   [ David Kalnischkies ]
+   * apt-pkg/deb/dpkgpm.cc:
+     - skip --configure if all packages disappeared
+   * apt-pkg/vendor.cc, apt-pkg/vendorlist.cc:
+     - mark them as deprecated as they are unused
+   * apt-pkg/deb/deblistparser.h:
+     - enable StripMultiArch by default for ParseDepends
+   * debian/apt.conf.autoremove:
+     - adapt to new gnumach kernel package naming (Closes: #619337)
+   * doc/apt_preferences.5.xml:
+     - correct typo spotted by Charles Plessy (Closes: #619088)
+     - document ButAutomaticUpgrades together with NotAutomatic
+       as suggested by Charles Plessy (Closes: #619083)
+   * apt-pkg/depcache.cc:
+     - remove pseudo handling leftover from SetReInstall
+     - do not change protected packages in autoinstall (Closes: #618848)
+   * apt-pkg/pkgcachegen.cc:
+     - make "all"->"native" an implementation detail of NewPackage
+       rather than rewrite it in higher methods
+   * apt-pkg/cacheiterator.h:
+     - return "all" instead of native architecture without breaking the abi
+       (too much) by extending enum instead of using bitflags (LP: #733741)
+   * apt-pkg/aptconfiguration.cc:
+     - use dpkg --print-foreign-architectures to get multiarch configuration
+       if non is specified with APT::Architectures (Closes: #612958)
+   * cmdline/apt-get.cc:
+     - do not show simulation notice for non-root commands (Closes: #619072)
+     - be able to disable resolver with APT::Get::CallResolver and disable
+       auto installation with APT::Get::AutoSolving
+   * apt-pkg/deb/deblistparser.cc:
+     - create foo:any provides for all architectures for an allowed package
+ 
+  -- David Kalnischkies <kalnischkies@gmail.com>  Tue, 29 Mar 2011 13:12:45 +0200
+ 
 +apt (0.8.13.1) unstable; urgency=low
 +
 +  * apt-pkg/acquire-item.cc: Use stat buffer if stat was
 +    successful, not if it failed (Closes: #620546)
 +
 + -- Julian Andres Klode <jak@debian.org>  Sat, 02 Apr 2011 20:55:35 +0200
 +
  apt (0.8.13) unstable; urgency=low
  
    [ Thorsten Spindler ]