Fix dpkg-source to not emit duplicated entries for the Architecture field

in the .dsc file.

diff --git a/ChangeLog b/ChangeLog
index e24cfd4622617c8e74468d18af43d306e181dd47..1906f4ca9274d7eab3bba65c9cbb9f24bcdc4cd5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-06-06  Guillem Jover  <guillem@debian.org>
+
+       * scripts/dpkg-source.pl (%archadded): Move to an outer scope to
+       avoid duped entries in the output Architecture field.
+
 2007-05-24  Guillem Jover  <guillem@debian.org>
 
        * ostable: Add gnulp-linux.

diff --git a/debian/changelog b/debian/changelog
index bfca261bdfa7048351e6c8d2b52b840ecfdc9357..a178c243c3d6f21c818b9e35f0ac4e5900fbf9ca 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ dpkg (1.14.5) UNRELEASED; urgency=low
 
   [ Guillem Jover ]
   * Add lpia support to ostable and triplettable.
+  * Fix dpkg-source to not emit duplicated entries for the Architecture field
+    in the .dsc file.
 
   [ Updated dselect translations ]
   * French (Christian Perrier)

diff --git a/scripts/dpkg-source.pl b/scripts/dpkg-source.pl
index 66a3f89715725624186349e829bc425b09069447..6c0fd7d89b3452b2f4e45816f78f2586fafe92ff 100755 (executable)
--- a/scripts/dpkg-source.pl
+++ b/scripts/dpkg-source.pl
@@ -229,6 +229,7 @@ if ($opmode eq 'build') {
     &init_substvars;
 
     my @sourcearch;
+    my %archadded;
     my $archspecific = 0; # XXX: Not used?!
     my %packageadded;
     my @binarypackages;
@@ -267,8 +268,6 @@ if ($opmode eq 'build') {
                    if (@sourcearch && grep($sourcearch[0] eq $_, 'any', 'all')) {
                        @sourcearch= ('any');
                    } else {
-                       my %archadded;
-
                        for my $a (split(/\s+/, $v)) {
                            &error(sprintf(_g("`%s' is not a legal architecture string"), $a))
                                unless $a =~ /^[\w-]+$/;