The following commit has been merged in the master branch:
commit 47126733bb08ea5e9cbdf88e865a0cf759d7449b
Author: Raphaël Hertzog <hert...@debian.org>
Date: Sun May 15 09:49:09 2011 +0200
dpkg-source: ensure "any" doesn't hide "all" in the Architecture field
"any" doesn't imply "all" so we should keep both values in the field. This
is important so that wanna-build can know what needs to be scheduled for
the buildd that deals with Architecture: all packages.
diff --git a/debian/changelog b/debian/changelog
index aed83cf..7ce1bfb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ dpkg (1.16.1) UNRELEASED; urgency=low
package provided by a package in triggers-pending status as satisfied.
* Do not fail when encountering a pre-dependency in triggers-awaited state,
instead process the awaited triggers. Closes: #526774
+ * "any" no longer hides "all" in the Architecture field of a .dsc.
[ Guillem Jover ]
* Install deb-src-control(5) man pages in dpkg-dev. Closes: #620520
diff --git a/scripts/dpkg-source.pl b/scripts/dpkg-source.pl
index 5b5d5c6..2419ff5 100755
--- a/scripts/dpkg-source.pl
+++ b/scripts/dpkg-source.pl
@@ -286,8 +286,13 @@ if ($options{'opmode'} =~
/^(-b|--print-format|--(before|after)-build)$/) {
}
}
if (grep($_ eq 'any', @sourcearch)) {
- # If we encounter one 'any' then the other arches become insignificant.
- @sourcearch = ('any');
+ # If we encounter one 'any' then the other arches become insignificant
+ # except for 'all' that must also be kept
+ if (grep($_ eq 'all', @sourcearch)) {
+ @sourcearch = ('any', 'all');
+ } else {
+ @sourcearch = ('any');
+ }
}
$fields->{'Architecture'} = join(' ', @sourcearch);
$fields->{'Package-List'} = sprintf("\n%s source %s %s %s", $sourcepackage,
--
dpkg's main repository
--
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
