summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Kalnischkies <kalnischkies@gmail.com>2011-03-23 01:54:52 +0100
committerDavid Kalnischkies <kalnischkies@gmail.com>2011-03-23 01:54:52 +0100
commit889c669b8819d62c91528440300613d31167c915 (patch)
treec241d2e3d718c385aa0f090263a28bc6785e02e5
parentdfc2b1be9e4e4b500b87df16c21ba85f59d8a587 (diff)
* apt-pkg/deb/deblistparser.h:
- enable StripMultiArch by default for ParseDepends
-rw-r--r--apt-pkg/deb/deblistparser.h2
-rw-r--r--debian/changelog4
2 files changed, 4 insertions, 2 deletions
diff --git a/apt-pkg/deb/deblistparser.h b/apt-pkg/deb/deblistparser.h
index 4bc1bd93c..06ea73291 100644
--- 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 b691a1938..fc246451b 100644
--- 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