dpkg-source: strip spaces around newlines in Uploaders

diff --git a/debian/changelog b/debian/changelog
index dbac46e..e6caf76 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -96,6 +96,8 @@ dpkg (1.16.0) UNRELEASED; urgency=low
     It contains a list of packages that the source can build along with
     their sections and priorities. Closes: #619131
   * Remove duplicate word in german translation of dpkg(1). Closes: #616096
+  * Strip repeated non-significant spaces before and after newlines
+    in Uploaders. Closes: #598922
 
   [ Jonathan Nieder ]
   * Remove support for use of synchronous sync(2), due to its pernicious

diff --git a/scripts/dpkg-source.pl b/scripts/dpkg-source.pl
index 7fa8b71..7dd7f3f 100755 (executable)
--- a/scripts/dpkg-source.pl
+++ b/scripts/dpkg-source.pl
@@ -230,7 +230,7 @@ if ($options{'opmode'} =~ /^(-b|--print-format|--(before|after)-build)$/) {
            set_source_package($v);
            $fields->{$_} = $v;
        } elsif (m/^Uploaders$/i) {
-           ($fields->{$_} = $v) =~ s/[\r\n]/ /g; # Merge in a single-line
+           ($fields->{$_} = $v) =~ s/\s*[\r\n]\s*/ /g; # Merge in a single-line
        } elsif (m/^Build-(Depends|Conflicts)(-Indep)?$/i) {
            my $dep;
            my $type = field_get_dep_type($_);