Strip any newlines from Uploaders field on dpkg-source -b.

Closes: #254449

diff --git a/ChangeLog b/ChangeLog
index 58295c2c0d37b58b0f8e96c1115f253ad6622c96..e65bdde5e5101a3d7b17799d5769b514f079a5c7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,12 @@
 2006-02-11  Frank Lichtenheld  <djpig@debian.org>
 
        * scripts/dpkg-source.pl: Add .git to
-       $diff_ignore_default_regexp
+       $diff_ignore_default_regexp.
+
+       * scripts/dpkg-source.pl: Remove any
+       newlines from Uploaders field to allow
+       people to make it multi-line in the
+       source package.
 
 2006-02-10  Denis Barbier  <barbier@linuxfr.org>
 

diff --git a/debian/changelog b/debian/changelog
index f7a14ac8a92f482ce8c2ed7e31a439ac05bab8d5..3a03e033c3b56e96d8c37b92b55dc14913bdc0f6 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -51,6 +51,8 @@ dpkg (1.13.14~) UNRELEASED; urgency=low
   * Let dpkg-source -x touch all patched files to have the same
     timestamp to mitigate time-skew problems (Denis Barbier).
     Closes: #105750
+  * Strip any newlines from Uploaders field on dpkg-source -b.
+    Closes: #254449
 
   [ Christian Perrier ]
   * Switch to po4a for manpages translation. Closes: #320122

diff --git a/scripts/dpkg-source.pl b/scripts/dpkg-source.pl
index d5cd8e2eecabab7743ac5a51fae52340e1a0909c..4a6a44d245f16ff4187bf9efffd3d5e3f26a3870 100755 (executable)
--- a/scripts/dpkg-source.pl
+++ b/scripts/dpkg-source.pl
@@ -173,7 +173,8 @@ if ($opmode eq 'build') {
         $v= $fi{$_};
         if (s/^C //) {
             if (m/^Source$/i) { &setsourcepackage; }
-            elsif (m/^(Standards-Version|Origin|Maintainer|Uploaders)$/i) { $f{$_}= $v; }
+            elsif (m/^(Standards-Version|Origin|Maintainer)$/i) { $f{$_}= $v; }
+           elsif (m/^Uploaders$/i) { ($f{$_}= $v) =~ s/[\r\n]//g; }
            elsif (m/^Build-(Depends|Conflicts)(-Indep)?$/i) {
                my $dep = parsedep(substvars($v),1);
                &error("error occoured while parsing $_") unless defined $dep;