Attached is a patch that mostly works for this, except that Architecture: all, Multi-Arch: no packages are regarded as satisfying build-dependencies when they probably shouldn't.
Comments welcome. -- Steve Langasek Give me a lever long enough and a Free OS Debian Developer to set it on, and I can move the world. Ubuntu Developer http://www.debian.org/ slanga...@ubuntu.com vor...@debian.org
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: vor...@debian.org-20111107010427-02kib9zl0vlcuts3
# target_branch: lp:~ubuntu-core-dev/apt/ubuntu
# testament_sha1: fb6450a380f6f5ec7d75f5a1d4bcf3638ea1ad94
# timestamp: 2011-11-06 17:06:24 -0800
# base_revision_id: michael.v...@ubuntu.com-20111020090518-\
# hrfjh6ryjlx2xkdd
#
# Begin patch
=== modified file 'cmdline/apt-get.cc'
--- cmdline/apt-get.cc 2011-09-13 15:51:34 +0000
+++ cmdline/apt-get.cc 2011-11-07 01:04:27 +0000
@@ -2835,10 +2835,14 @@
if ((BADVER(Ver)) == false)
{
string forbidden;
- if (Ver->MultiArch == pkgCache::Version::None || Ver->MultiArch == pkgCache::Version::All);
+ if (Ver->MultiArch == pkgCache::Version::None) || Ver->MultiArch == pkgCache::Version::All)
+ {
+ if (colon == string::npos)
+ Pkg = Ver.ParentPkg().Group().FindPkg(hostArch);
+ }
else if (Ver->MultiArch == pkgCache::Version::Same)
{
- if (colon != string::npos)
+ if (colon == string::npos)
Pkg = Ver.ParentPkg().Group().FindPkg(hostArch);
else if (strcmp(D->Package.c_str() + colon, ":any") == 0)
forbidden = "Multi-Arch: same";
=== modified file 'debian/changelog'
--- debian/changelog 2011-10-20 09:05:18 +0000
+++ debian/changelog 2011-11-07 01:04:27 +0000
@@ -3,6 +3,9 @@
[ Daniel Hahler ]
* doc/apt-key.8.xml: Ubuntu specific documentation changes (LP: #445903)
+ [ Steve Langasek ]
+ * Multi-Arch: none build-deps should be DEB_HOST_ARCH, not DEB_BUILD_ARCH.
+
-- Michael Vogt <michael.v...@ubuntu.com> Thu, 20 Oct 2011 10:58:20 +0200
apt (0.8.16~exp5ubuntu14.1) precise; urgency=low
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWa9EMQMAAmXfgGAwUXf//3/n
3wq//99+UAUsvAAW2QA0DBJImpkTRoxMaTahpkyaeoaaGmmgABkNDhppkYjCaYCGATTCMExMhpka
GgEiiNJqDR6agNAAAAAA02iAAOGmmRiMJpgIYBNMIwTEyGmRoaASSEMgBNTBqAyNI1MnqbTTSYgA
aeKbUqAQICglR/YV329mWK1MtUet72ZWbcyukWwmUbUpqVyKCFQRtkbdpz4tYqyQ1Z5K3PnLwLg0
2N+lgfE1BVCDbWVAnbiZJNZgKSkwBr3v7gqrwlBSyNf7KUSL4TEaHlIYtMaR44VG60s1PBalLkri
3FvDQca6BoV3oVHiH9hb5QcmbHyazZ2nPP+RwArRSBtN579R02BVTsqZqOJzQzKpYh5oY3IGRgvg
h+/iMztJwTB0aH9AtAwdIxoAZCy9QMd4EB4GkVhVH2BLuAnOk6yweFNBZwYfIUxYcuoCYDBKbKLn
QBwDcrAnMAwLD8a724sr54dWg8SllStc5bQVWM4WpTzhw5naGHVLAqKdVGRWK4Hm1CogJk8iPTy6
gCg2EGoRhSOtUUZEQPsHWT1JyoZRI3DT8RYaZybO6I+wqMB4SaKZTqcBynH2GsyPM2PURXDFJfJr
aXXl9I1khZQRdMMswwpIEC4po5agoLC80kmmgMRjItuu0FphXxhEy6g4shhF9gDigakvIDBTBhTA
ypMScYxLZVXzxRO6+EKysLGJUFk/PaTkYVPoDIZMV4ltELx5eYgYk5KlNe9kOLi44GQW6MQZPIhG
9VIo6uoR0e4c3MMLoYtzhtVmvtIPL71NYGFIG7nW/efG4jZ3CTkJhSQY6LgXdwjaJhUlYxtwLyPc
NUqDCXwoul8JHkf0RHgm5Fh3Efnjn/AfUpFsq8TtHfFrBjMPUsQsjE6wiiUDSWzKKmF4XbKwzRoL
HAzCdgoRYWWQeKcxnFkNWTbHmAsVKSLoVDGjMLmrKq5JRTklAW7V36w+R53gUi7TuXJxkrgHGQ86
TwHoLpxQPojuAxz+Q3IcCskL6i93zKug4lysJUCvkne0kkYfQRo3OMqg9o4HSSa40H5hFYoOsu5F
/OZ6FRcMxmU7BjjuLj8D2GRwKvuNy3m7a3rbAgiLy5BhZz9B2GxEoLSmF3CkfZNhdKBmHMaFVOUo
GQ+C0bS0zMSBwNpsMzUolK9ZuN5eHI5e/p3TOGAmHDEkm3+KJ0Yh6AySzEwFPqeUBYLYizUgYVoH
aK0T9qHeCVBj5HQvaaxTE1SPO2sw1vnxSOpBf2POywPgG42HgHcus8ANaJdAoo7AKwuA1m8Cf5vo
3mtB19SK5w6gnSJ1JfvnWcO9lnGh6meooHvsSgJiNJQmFEGoKAt2YiJkioUmK1DlyW35I4xJxMky
D7CcHWem1woo4I8EFKCpc0Ex30GTiN1unAWhbNnEEypCYrrKYxGkaUwoo9iXKiAmFzuQUcKyTJ+A
SQU0CjiQBM60PScJmGXgEBxOBBhm3kTQElWZmkZJ5QESTUIoGjApm7kakPmHor0rrBzVd5WElUxc
PKERTDawGIMF7IcSR8Udu0qOPoB6H1bgMipMgzAXUZ90wgxXBwOJwjRVqtWc5Er1lAhZ0Mf4u5Ip
woSFeiGIGA==
signature.asc
Description: Digital signature
