Merge remote-tracking branch 'upstream/debian/sid' into debian/experimental

Conflicts:
	test/integration/test-bug-747261-arch-specific-conflicts

diff --cc apt-pkg/deb/debindexfile.cc
Simple merge

diff --cc apt-pkg/deb/deblistparser.h
index 5a2282f9c7c89d413c702ad4703ac43dc6c6aa60,3b6963211649d503454bab13a1b6c6e1a5f3f2de..56a83b36e41cc3232a9015bf1ea25ed1ae7db1a1
--- 1/apt-pkg/deb/deblistparser.h
--- 2/apt-pkg/deb/deblistparser.h
+++ b/apt-pkg/deb/deblistparser.h
@@@ -102,17 -101,20 +102,28 @@@ class debListParser : public pkgCacheGe
  
     debListParser(FileFd *File, std::string const &Arch = "");
     virtual ~debListParser() {};
 +};
  
 -   private:
 -   APT_HIDDEN unsigned char ParseMultiArch(bool const showErrors);
 +class debDebFileParser : public debListParser
 +{
 + private:
 +   std::string DebFile;
 +
 + public:
 +   debDebFileParser(FileFd *File, std::string const &DebFile);
 +   virtual bool UsePackage(pkgCache::PkgIterator &Pkg,
 +                         pkgCache::VerIterator &Ver);
  };
  
+ class debTranslationsParser : public debListParser
+ {
+  public:
+    // a translation can never be a real package
+    virtual std::string Architecture() { return ""; }
+    virtual std::string Version() { return ""; }
+ 
+    debTranslationsParser(FileFd *File, std::string const &Arch = "")
+       : debListParser(File, Arch) {};
+ };
+ 
  #endif

diff --cc apt-pkg/packagemanager.cc
Simple merge

diff --cc apt-pkg/packagemanager.h
Simple merge

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