dpkg-genchanges: Fix handling of 'all' in Architecture field

Exclude it for -B, exclude all other arches for -A

diff --git a/scripts/dpkg-genchanges.pl b/scripts/dpkg-genchanges.pl
index 2bfe8ae6679895b63f47621767830f8c14e2c5d6..9ff8a8d6f028daa3ca59992e78daa3e3562006a0 100755 (executable)
--- a/scripts/dpkg-genchanges.pl
+++ b/scripts/dpkg-genchanges.pl
@@ -420,6 +420,9 @@ if (!defined($f{'Date'})) {
 $f{'Binary'}= join(' ',grep(s/C //,keys %p2i));
 
 unshift(@archvalues,'source') unless is_binaryonly;
+@archvalues = ('all') if $include == ARCH_INDEP;
+@archvalues = grep {!debarch_eq('all',$_)} @archvalues
+    unless $include & ARCH_INDEP;
 $f{'Architecture'}= join(' ',@archvalues);
 
 $f{'Description'}= "\n ".join("\n ",sort @descriptions);