From: Frank Lichtenheld <djpig@debian.org>
Date: Sat, 11 Feb 2006 00:23:42 +0000 (+0000)
Subject: Strip any newlines from Uploaders field on dpkg-source -b.
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7c7caa4ecaa91f5152b28c29d0b6ff0835f866fa;p=dpkg

Strip any newlines from Uploaders field on dpkg-source -b.
Closes: #254449
---

diff --git a/ChangeLog b/ChangeLog
index 58295c2c..e65bdde5 100644
--- 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 f7a14ac8..3a03e033 100644
--- 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 d5cd8e2e..4a6a44d2 100755
--- 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;