* apt-pkg/deb/deblistparser.h:

  - enable StripMultiArch by default for ParseDepends

diff --git a/apt-pkg/deb/deblistparser.h b/apt-pkg/deb/deblistparser.h
index 4bc1bd93c286d2dee1375439258c38f1662d4102..06ea7329126e46bc2493d997d72b9e8a0af70eeb 100644 (file)
--- a/apt-pkg/deb/deblistparser.h
+++ b/apt-pkg/deb/deblistparser.h
@@ -69,7 +69,7 @@ class debListParser : public pkgCacheGenerator::ListParser
    static const char *ParseDepends(const char *Start,const char *Stop,
                            string &Package,string &Ver,unsigned int &Op,
                            bool const &ParseArchFlags = false,
-                           bool const &StripMultiArch = false);
+                           bool const &StripMultiArch = true);
    static const char *ConvertRelation(const char *I,unsigned int &Op);
 
    debListParser(FileFd *File, string const &Arch = "");

diff --git a/debian/changelog b/debian/changelog
index b691a1938b050cd85161be6bafb4493049f74409..fc246451b00208498a4196b2fbfdd9275a0081d1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,10 @@ apt (0.8.13.1) UNRELEASED; urgency=low
     - 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
 
- -- David Kalnischkies <kalnischkies@gmail.com>  Sun, 20 Mar 2011 19:51:41 +0100
+ -- David Kalnischkies <kalnischkies@gmail.com>  Wed, 23 Mar 2011 01:53:27 +0100
 
 apt (0.8.13) unstable; urgency=low