Merge commit '1.15.7.1'

debian/changelog

@@ -5,6 +5,16 @@ dpkg (1.15.8) UNRELEASED; urgency=low
 
  -- Guillem Jover <guillem@debian.org>  Wed, 21 Apr 2010 04:40:12 +0200
 
+dpkg (1.15.7.1) unstable; urgency=low
+
+  * Fix dpkg-source -b (without -i) for source packages 1.0. Closes: #578693
+    It was erroneously ignoring all changes because the ignore regex was
+    wrong (due to the change to ignore debian/source/local-options).
+  * Add missing call to textdomain() in dpkg-mergechangelogs to make
+    translations work.
+
+ -- Raphaël Hertzog <hertzog@debian.org>  Thu, 22 Apr 2010 08:05:20 +0200
+
 dpkg (1.15.7) unstable; urgency=low
 
   [ Raphaël Hertzog ]

scripts/Dpkg/Source/Package/V1.pm

@@ -43,7 +43,7 @@ sub init_options {
     my ($self) = @_;
     # Don't call $self->SUPER::init_options() on purpose, V1.0 has no
     # ignore by default
-    if (defined $self->{'options'}{'diff_ignore_regexp'}) {
+    if ($self->{'options'}{'diff_ignore_regexp'}) {
 	$self->{'options'}{'diff_ignore_regexp'} .= '|(?:^|/)debian/source/local-options$';
     } else {
 	$self->{'options'}{'diff_ignore_regexp'} = '(?:^|/)debian/source/local-options$';

scripts/dpkg-mergechangelogs.pl

@@ -27,6 +27,8 @@ use Dpkg::Version;
 use Getopt::Long;
 use Scalar::Util qw(blessed);
 
+textdomain("dpkg-dev");
+
 sub merge_entries($$$);
 sub merge_block($$$;&);
 sub merge_entry_item($$$$);
@@ -50,7 +52,7 @@ BEGIN {
 sub version {
     printf _g("Debian %s version %s.\n"), $progname, $version;
 
-    printf "\n" . _g("Copyright (C) 2009-2010 Raphaël Hertzog.");
+    printf "\n" . _g("Copyright (C) 2009-2010 Raphael Hertzog.");
 
     printf "\n" . _g(
 "This is free software; see the GNU General Public License version 2 or