From: Michael Vogt <mvo@debian.org>
Date: Thu, 29 May 2014 10:14:42 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/debian/sid' into debian/experimental
X-Git-Tag: 1.1.exp1~18
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/1f46d14620a0b58a9239fa3faa59ba79a98f6c98

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

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

1f46d14620a0b58a9239fa3faa59ba79a98f6c98
diff --cc apt-pkg/deb/deblistparser.h
index 5a2282f9c,3b6963211..56a83b36e
--- a/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