Author: guillem
Date: 2007-06-06 00:08:09 +0000 (Wed, 06 Jun 2007)
New Revision: 805

Modified:
   trunk/ChangeLog
   trunk/debian/changelog
   trunk/scripts/dpkg-source.pl
Log:
Fix dpkg-source to not emit duplicated entries for the Architecture field
in the .dsc file.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2007-06-05 18:09:53 UTC (rev 804)
+++ trunk/ChangeLog     2007-06-06 00:08:09 UTC (rev 805)
@@ -1,3 +1,8 @@
+2007-06-06  Guillem Jover  <[EMAIL PROTECTED]>
+
+       * scripts/dpkg-source.pl (%archadded): Move to an outer scope to
+       avoid duped entries in the output Architecture field.
+
 2007-05-24  Guillem Jover  <[EMAIL PROTECTED]>
 
        * ostable: Add gnulp-linux.

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog      2007-06-05 18:09:53 UTC (rev 804)
+++ trunk/debian/changelog      2007-06-06 00:08:09 UTC (rev 805)
@@ -2,6 +2,8 @@
 
   [ 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)

Modified: trunk/scripts/dpkg-source.pl
===================================================================
--- trunk/scripts/dpkg-source.pl        2007-06-05 18:09:53 UTC (rev 804)
+++ trunk/scripts/dpkg-source.pl        2007-06-06 00:08:09 UTC (rev 805)
@@ -229,6 +229,7 @@
     &init_substvars;
 
     my @sourcearch;
+    my %archadded;
     my $archspecific = 0; # XXX: Not used?!
     my %packageadded;
     my @binarypackages;
@@ -267,8 +268,6 @@
                    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-]+$/;


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to