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

in the .dsc file.

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.

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)

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-]+$/;