From c6549f3c0c63e7c2c178200b40dac167efe53d46 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Wed, 6 Jun 2007 00:08:09 +0000 Subject: [PATCH] Fix dpkg-source to not emit duplicated entries for the Architecture field in the .dsc file. --- ChangeLog | 5 +++++ debian/changelog | 2 ++ scripts/dpkg-source.pl | 3 +-- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index e24cfd46..1906f4ca 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-06-06 Guillem Jover + + * scripts/dpkg-source.pl (%archadded): Move to an outer scope to + avoid duped entries in the output Architecture field. + 2007-05-24 Guillem Jover * ostable: Add gnulp-linux. diff --git a/debian/changelog b/debian/changelog index bfca261b..a178c243 100644 --- 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 66a3f897..6c0fd7d8 100755 --- 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-]+$/; -- 2.39.5