Author: djpig
Date: 2006-02-11 00:23:42 +0000 (Sat, 11 Feb 2006)
New Revision: 103
Modified:
trunk/ChangeLog
trunk/debian/changelog
trunk/scripts/dpkg-source.pl
Log:
Strip any newlines from Uploaders field on dpkg-source -b.
Closes: #254449
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2006-02-11 00:11:02 UTC (rev 102)
+++ trunk/ChangeLog 2006-02-11 00:23:42 UTC (rev 103)
@@ -1,8 +1,13 @@
2006-02-11 Frank Lichtenheld <[EMAIL PROTECTED]>
* 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 <[EMAIL PROTECTED]>
* scripts/dpkg-source.pl: Touch all patched files
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2006-02-11 00:11:02 UTC (rev 102)
+++ trunk/debian/changelog 2006-02-11 00:23:42 UTC (rev 103)
@@ -51,6 +51,8 @@
* 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
Modified: trunk/scripts/dpkg-source.pl
===================================================================
--- trunk/scripts/dpkg-source.pl 2006-02-11 00:11:02 UTC (rev 102)
+++ trunk/scripts/dpkg-source.pl 2006-02-11 00:23:42 UTC (rev 103)
@@ -173,7 +173,8 @@
$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;
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
