diff options
| author | Joey Hess <joey@gnu.kitenet.net> | 2009-09-01 13:40:52 -0400 |
|---|---|---|
| committer | Joey Hess <joey@gnu.kitenet.net> | 2009-09-01 13:45:53 -0400 |
| commit | 71e10953d25187a6528623dbd49901a89463426c (patch) | |
| tree | 961d17313aefe50842c1df40837d81b488630d8a /Debian/Debhelper/Dh_Lib.pm | |
| parent | a432550b565cd01d4a67b8cb929f90fa29d299f7 (diff) | |
-a == -s
The -a flag now does the same thing as the -s flag, so debhelper users do
not need to worry about using the -s flag when building a package that only
builds for some architectures, and dh will also work in that situation.
Closes: #540794
Diffstat (limited to 'Debian/Debhelper/Dh_Lib.pm')
| -rw-r--r-- | Debian/Debhelper/Dh_Lib.pm | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/Debian/Debhelper/Dh_Lib.pm b/Debian/Debhelper/Dh_Lib.pm index 4ccd12ae..5a0b7947 100644 --- a/Debian/Debhelper/Dh_Lib.pm +++ b/Debian/Debhelper/Dh_Lib.pm @@ -667,9 +667,8 @@ sub sourcepackage { } # Returns a list of packages in the control file. -# Must pass "arch" or "indep" or "same" to specify arch-dependant or -# -independant or same arch packages. If nothing is specified, returns all -# packages. +# Pass "arch" or "indep" to specify arch-dependant or +# independant. If nothing is specified, returns all packages. # As a side effect, populates %package_arches and %package_types with the # types of all packages (not only those returned). my (%package_types, %package_arches); @@ -717,8 +716,7 @@ sub getpackages { if ($package && (($type eq 'indep' && $arch eq 'all') || - ($type eq 'arch' && $arch ne 'all') || - ($type eq 'same' && ($arch eq 'any' || + ($type eq 'arch' && ($arch eq 'any' || ($arch ne 'all' && samearch(buildarch(), $arch)))) || ! $type)) { |