From: Michael Vogt Date: Mon, 25 Jul 2011 13:54:03 +0000 (+0200) Subject: merged from lp:~donkult/apt/sid X-Git-Tag: 0.8.15.3 X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/35b55cbc1ccebe25a9e3cafd5f4fc1156bf79228?ds=inline merged from lp:~donkult/apt/sid --- 35b55cbc1ccebe25a9e3cafd5f4fc1156bf79228 diff --cc debian/changelog index 1ceeebfc5,c32edc4ad..18b59ec4e --- a/debian/changelog +++ b/debian/changelog @@@ -1,4 -1,4 +1,4 @@@ --apt (0.8.15.3) UNRELEASED; urgency=low ++apt (0.8.15.3) unstable; urgency=low [ Michael Vogt ] * apt-pkg/acquire-item.cc: @@@ -32,8 -32,15 +34,15 @@@ - apply madison typofix from John Feuerstein, thanks! (Closes: #633455) * apt-pkg/policy.cc: - emit an error on unknown APT::Default-Release value (Closes: #407511) + * apt-pkg/aptconfiguration.cc: + - ensure that native architecture is if not specified otherwise the + first architecture in the Architectures vector + * apt-pkg/deb/deblistparser.cc: + - Strip only :any and :native if MultiArch should be stripped as it is + save to ignore them in non-MultiArch contexts but if the dependency + is a specific architecture (and not the native) do not strip - -- David Kalnischkies Sat, 16 Jul 2011 16:43:37 +0200 - -- David Kalnischkies Mon, 25 Jul 2011 14:40:00 +0200 ++ -- Michael Vogt Mon, 25 Jul 2011 15:04:43 +0200 apt (0.8.15.2) unstable; urgency=high