From 889c669b8819d62c91528440300613d31167c915 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 23 Mar 2011 01:54:52 +0100 Subject: * apt-pkg/deb/deblistparser.h: - enable StripMultiArch by default for ParseDepends --- apt-pkg/deb/deblistparser.h | 2 +- debian/changelog | 4 +++- 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 Sun, 20 Mar 2011 19:51:41 +0100 + -- David Kalnischkies Wed, 23 Mar 2011 01:53:27 +0100 apt (0.8.13) unstable; urgency=low -- cgit v1.2.3