Merge branch 'sid' (through tag '1.15.5.5')

Conflicts:
	debian/changelog

debian/changelog

@@ -56,6 +56,13 @@ dpkg (1.15.6) UNRELEASED; urgency=low
 
  -- Raphaël Hertzog <hertzog@debian.org>  Tue, 17 Nov 2009 17:24:47 +0100
 
+dpkg (1.15.5.5) unstable; urgency=low
+
+  * Allow again new lines in dpkg-source and dpkg-genchanges on substvar and
+    maintainer arguments.
+
+ -- Guillem Jover <guillem@debian.org>  Tue, 22 Dec 2009 09:49:49 +0100
+
 dpkg (1.15.5.4) unstable; urgency=low
 
   * Fix Dpkg::Index::get() and remove(). Thanks to Roderich Schupp

scripts/dpkg-genchanges.pl

@@ -170,19 +170,19 @@ while (@ARGV) {
 	$since = $1;
     } elsif (m/^-T(.*)$/) {
 	$varlistfile = $1;
-    } elsif (m/^-m(.*)$/) {
+    } elsif (m/^-m(.*)$/s) {
 	$forcemaint = $1;
-    } elsif (m/^-e(.*)$/) {
+    } elsif (m/^-e(.*)$/s) {
 	$forcechangedby = $1;
     } elsif (m/^-F([0-9a-z]+)$/) {
         $changelogformat = $1;
-    } elsif (m/^-D([^\=:]+)[=:](.*)$/) {
+    } elsif (m/^-D([^\=:]+)[=:](.*)$/s) {
 	$override{$1} = $2;
     } elsif (m/^-u(.*)$/) {
 	$uploadfilesdir = $1;
     } elsif (m/^-U([^\=:]+)$/) {
         $remove{$1} = 1;
-    } elsif (m/^-V(\w[-:0-9A-Za-z]*)[=:](.*)$/) {
+    } elsif (m/^-V(\w[-:0-9A-Za-z]*)[=:](.*)$/s) {
 	$substvars->set($1, $2);
     } elsif (m/^-(h|-help)$/) {
 	usage();

scripts/dpkg-source.pl

@@ -131,7 +131,7 @@ while (@options) {
         $changelogfile = $1;
     } elsif (m/^-F([0-9a-z]+)$/) {
         $changelogformat = $1;
-    } elsif (m/^-D([^\=:]+)[=:](.*)$/) {
+    } elsif (m/^-D([^\=:]+)[=:](.*)$/s) {
         $override{$1} = $2;
     } elsif (m/^-U([^\=:]+)$/) {
         $remove{$1} = 1;
@@ -151,7 +151,7 @@ while (@options) {
         $options{'no_check'} = 1;
     } elsif (m/^--require-valid-signature$/) {
         $options{'require_valid_signature'} = 1;
-    } elsif (m/^-V(\w[-:0-9A-Za-z]*)[=:](.*)$/) {
+    } elsif (m/^-V(\w[-:0-9A-Za-z]*)[=:](.*)$/s) {
         $substvars->set($1, $2);
     } elsif (m/^-T(.*)$/) {
         $varlistfile = $1;