Merge git://anonscm.debian.org/debhelper/debhelper

Conflicts:
	debian/changelog
	dh

101 files changed, 4012 insertions, 1312 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..485dee64
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.idea
diff --git a/Debian/Debhelper/Buildsystem.pm b/Debian/Debhelper/Buildsystem.pm
index 8fde2159..03d7e320 100644
--- a/Debian/Debhelper/Buildsystem.pm
+++ b/Debian/Debhelper/Buildsystem.pm
@@ -294,39 +294,75 @@ sub _cd {
 }
 
 # Changes working directory to the source directory (if needed),
-# calls doit(@_) and changes working directory back to the top
-# directory.
+# calls print_and_doit(@_) and changes working directory back to the
+# top directory.
 sub doit_in_sourcedir {
 	my $this=shift;
 	if ($this->get_sourcedir() ne '.') {
 		my $sourcedir = $this->get_sourcedir();
 		$this->_cd($sourcedir);
-		doit(@_);
+		print_and_doit(@_);
 		$this->_cd($this->_rel2rel($this->{cwd}, $sourcedir));
 	}
 	else {
-		doit(@_);
+		print_and_doit(@_);
 	}
 	return 1;
 }
 
+# Changes working directory to the source directory (if needed),
+# calls print_and_doit(@_) and changes working directory back to the
+# top directory. Errors are ignored.
+sub doit_in_sourcedir_noerror {
+        my $this=shift;
+        my $ret;
+        if ($this->get_sourcedir() ne '.') {
+                my $sourcedir = $this->get_sourcedir();
+                $this->_cd($sourcedir);
+                $ret = print_and_doit_noerror(@_);
+                $this->_cd($this->_rel2rel($this->{cwd}, $sourcedir));
+        }
+        else {
+                $ret = print_and_doit_noerror(@_);
+        }
+        return $ret;
+}
+
 # Changes working directory to the build directory (if needed),
-# calls doit(@_) and changes working directory back to the top
-# directory.
+# calls print_and_doit(@_) and changes working directory back to the
+# top directory.
 sub doit_in_builddir {
 	my $this=shift;
 	if ($this->get_buildpath() ne '.') {
 		my $buildpath = $this->get_buildpath();
 		$this->_cd($buildpath);
-		doit(@_);
+		print_and_doit(@_);
 		$this->_cd($this->_rel2rel($this->{cwd}, $buildpath));
 	}
 	else {
-		doit(@_);
+		print_and_doit(@_);
 	}
 	return 1;
 }
 
+# Changes working directory to the build directory (if needed),
+# calls print_and_doit(@_) and changes working directory back to the
+# top directory. Errors are ignored.
+sub doit_in_builddir_noerror {
+        my $this=shift;
+        my $ret;
+        if ($this->get_buildpath() ne '.') {
+                my $buildpath = $this->get_buildpath();
+                $this->_cd($buildpath);
+                $ret = print_and_doit_noerror(@_);
+                $this->_cd($this->_rel2rel($this->{cwd}, $buildpath));
+        }
+        else {
+                $ret = print_and_doit_noerror(@_);
+        }
+        return $ret;
+}
+
 # In case of out of source tree building, whole build directory
 # gets wiped (if it exists) and 1 is returned. If build directory
 # had 2 or more levels, empty parent directories are also deleted.
@@ -413,3 +449,9 @@ sub clean {
 }
 
 1
+
+# Local Variables:
+# indent-tabs-mode: t
+# tab-width: 4
+# cperl-indent-level: 4
+# End:
diff --git a/Debian/Debhelper/Buildsystem/ant.pm b/Debian/Debhelper/Buildsystem/ant.pm
index 52def4f6..53eb0661 100644
--- a/Debian/Debhelper/Buildsystem/ant.pm
+++ b/Debian/Debhelper/Buildsystem/ant.pm
@@ -6,7 +6,8 @@
 package Debian::Debhelper::Buildsystem::ant;
 
 use strict;
-use base 'Debian::Debhelper::Buildsystem';
+use warnings;
+use parent qw(Debian::Debhelper::Buildsystem);
 
 sub DESCRIPTION {
 	"Ant (build.xml)"
@@ -26,12 +27,28 @@ sub new {
 
 sub build {
 	my $this=shift;
-	$this->doit_in_sourcedir("ant", @_);
+	my $d_ant_prop = $this->get_sourcepath('debian/ant.properties');
+	my @args;
+	if ( -f $d_ant_prop ) {
+		push(@args, '-propertyfile', $d_ant_prop);
+	}
+	$this->doit_in_sourcedir("ant", @args, @_);
 }
 
 sub clean {
 	my $this=shift;
-	$this->doit_in_sourcedir("ant", "clean", @_);
+	my $d_ant_prop = $this->get_sourcepath('debian/ant.properties');
+	my @args;
+	if ( -f $d_ant_prop ) {
+		push(@args, '-propertyfile', $d_ant_prop);
+	}
+	$this->doit_in_sourcedir("ant", @args, "clean", @_);
 }
 
 1
+
+# Local Variables:
+# indent-tabs-mode: t
+# tab-width: 4
+# cperl-indent-level: 4
+# End:
diff --git a/Debian/Debhelper/Buildsystem/autoconf.pm b/Debian/Debhelper/Buildsystem/autoconf.pm
index 56a42887..62ff8b3a 100644
--- a/Debian/Debhelper/Buildsystem/autoconf.pm
+++ b/Debian/Debhelper/Buildsystem/autoconf.pm
@@ -7,8 +7,9 @@
 package Debian::Debhelper::Buildsystem::autoconf;
 
 use strict;
+use warnings;
 use Debian::Debhelper::Dh_Lib qw(dpkg_architecture_value sourcepackage compat);
-use base 'Debian::Debhelper::Buildsystem::makefile';
+use parent qw(Debian::Debhelper::Buildsystem::makefile);
 
 sub DESCRIPTION {
 	"GNU Autoconf (configure)"
@@ -37,7 +38,9 @@ sub configure {
 	push @opts, "--infodir=\${prefix}/share/info";
 	push @opts, "--sysconfdir=/etc";
 	push @opts, "--localstatedir=/var";
-	if (defined $ENV{DH_VERBOSE} && $ENV{DH_VERBOSE} ne "") {
+	if (defined $ENV{DH_QUIET} && $ENV{DH_QUIET} ne "") {
+		push @opts, "--enable-silent-rules";
+	} else {
 		push @opts, "--disable-silent-rules";
 	}
 	my $multiarch=dpkg_architecture_value("DEB_HOST_MULTIARCH");
@@ -76,3 +79,9 @@ sub configure {
 }
 
 1
+
+# Local Variables:
+# indent-tabs-mode: t
+# tab-width: 4
+# cperl-indent-level: 4
+# End:
diff --git a/Debian/Debhelper/Buildsystem/cmake.pm b/Debian/Debhelper/Buildsystem/cmake.pm
index db971db1..9646d4b0 100644
--- a/Debian/Debhelper/Buildsystem/cmake.pm
+++ b/Debian/Debhelper/Buildsystem/cmake.pm
@@ -7,8 +7,9 @@
 package Debian::Debhelper::Buildsystem::cmake;
 
 use strict;
+use warnings;
 use Debian::Debhelper::Dh_Lib qw(compat);
-use base 'Debian::Debhelper::Buildsystem::makefile';
+use parent qw(Debian::Debhelper::Buildsystem::makefile);
 
 sub DESCRIPTION {
 	"CMake (CMakeLists.txt)"
@@ -75,3 +76,9 @@ sub test {
 }
 
 1
+
+# Local Variables:
+# indent-tabs-mode: t
+# tab-width: 4
+# cperl-indent-level: 4
+# End:
diff --git a/Debian/Debhelper/Buildsystem/makefile.pm b/Debian/Debhelper/Buildsystem/makefile.pm
index 2c68a836..7203349e 100644
--- a/Debian/Debhelper/Buildsystem/makefile.pm
+++ b/Debian/Debhelper/Buildsystem/makefile.pm
@@ -7,8 +7,9 @@
 package Debian::Debhelper::Buildsystem::makefile;
 
 use strict;
+use warnings;
 use Debian::Debhelper::Dh_Lib qw(escape_shell clean_jobserver_makeflags);
-use base 'Debian::Debhelper::Buildsystem';
+use parent qw(Debian::Debhelper::Buildsystem);
 
 # make makes things difficult by not providing a simple way to test
 # whether a Makefile target exists. Using -n and checking for a nonzero
@@ -150,3 +151,9 @@ sub clean {
 }
 
 1
+
+# Local Variables:
+# indent-tabs-mode: t
+# tab-width: 4
+# cperl-indent-level: 4
+# End:
diff --git a/Debian/Debhelper/Buildsystem/perl_build.pm b/Debian/Debhelper/Buildsystem/perl_build.pm
index 4cfbcb4c..39c79e2f 100644
--- a/Debian/Debhelper/Buildsystem/perl_build.pm
+++ b/Debian/Debhelper/Buildsystem/perl_build.pm
@@ -7,8 +7,9 @@
 package Debian::Debhelper::Buildsystem::perl_build;
 
 use strict;
+use warnings;
 use Debian::Debhelper::Dh_Lib qw(compat);
-use base 'Debian::Debhelper::Buildsystem';
+use parent qw(Debian::Debhelper::Buildsystem);
 use Config;
 
 sub DESCRIPTION {
@@ -58,7 +59,7 @@ sub build {
 
 sub test {
 	my $this=shift;
-	$this->do_perl("Build", "test", @_);
+	$this->do_perl("Build", "test", "--verbose", 1, @_);
 }
 
 sub install {
@@ -75,3 +76,9 @@ sub clean {
 }
 
 1
+
+# Local Variables:
+# indent-tabs-mode: t
+# tab-width: 4
+# cperl-indent-level: 4
+# End:
diff --git a/Debian/Debhelper/Buildsystem/perl_makemaker.pm b/Debian/Debhelper/Buildsystem/perl_makemaker.pm
index 60cda3d0..a98e9e9a 100644
--- a/Debian/Debhelper/Buildsystem/perl_makemaker.pm
+++ b/Debian/Debhelper/Buildsystem/perl_makemaker.pm
@@ -7,8 +7,9 @@
 package Debian::Debhelper::Buildsystem::perl_makemaker;
 
 use strict;
+use warnings;
 use Debian::Debhelper::Dh_Lib qw(compat);
-use base 'Debian::Debhelper::Buildsystem::makefile';
+use parent qw(Debian::Debhelper::Buildsystem::makefile);
 use Config;
 
 sub DESCRIPTION {
@@ -61,6 +62,12 @@ sub configure {
 		@flags, @_);
 }
 
+sub test {
+	my $this=shift;
+	# Make tests verbose
+	$this->SUPER::test("TEST_VERBOSE=1", @_);
+}
+
 sub install {
 	my $this=shift;
 	my $destdir=shift;
@@ -78,3 +85,9 @@ sub install {
 }
 
 1
+
+# Local Variables:
+# indent-tabs-mode: t
+# tab-width: 4
+# cperl-indent-level: 4
+# End:
diff --git a/Debian/Debhelper/Buildsystem/python_distutils.pm b/Debian/Debhelper/Buildsystem/python_distutils.pm
index c3d58cc0..0eef8f1e 100644
--- a/Debian/Debhelper/Buildsystem/python_distutils.pm
+++ b/Debian/Debhelper/Buildsystem/python_distutils.pm
@@ -8,9 +8,10 @@
 package Debian::Debhelper::Buildsystem::python_distutils;
 
 use strict;
+use warnings;
 use Cwd ();
 use Debian::Debhelper::Dh_Lib qw(error);
-use base 'Debian::Debhelper::Buildsystem';
+use parent qw(Debian::Debhelper::Buildsystem);
 
 sub DESCRIPTION {
 	"Python Distutils (setup.py)"
@@ -208,3 +209,9 @@ sub clean {
 }
 
 1
+
+# Local Variables:
+# indent-tabs-mode: t
+# tab-width: 4
+# cperl-indent-level: 4
+# End:
diff --git a/Debian/Debhelper/Buildsystem/qmake.pm b/Debian/Debhelper/Buildsystem/qmake.pm
index 91e817f8..21accb75 100644
--- a/Debian/Debhelper/Buildsystem/qmake.pm
+++ b/Debian/Debhelper/Buildsystem/qmake.pm
@@ -9,7 +9,7 @@ package Debian::Debhelper::Buildsystem::qmake;
 use strict;
 use warnings;
 use Debian::Debhelper::Dh_Lib qw(error);
-use base 'Debian::Debhelper::Buildsystem::makefile';
+use parent qw(Debian::Debhelper::Buildsystem::makefile);
 
 our $qmake="qmake";
 
@@ -81,3 +81,9 @@ sub install {
 }
 
 1
+
+# Local Variables:
+# indent-tabs-mode: t
+# tab-width: 4
+# cperl-indent-level: 4
+# End:
diff --git a/Debian/Debhelper/Buildsystem/qmake_qt4.pm b/Debian/Debhelper/Buildsystem/qmake_qt4.pm
index d5bac585..f9c11f83 100644
--- a/Debian/Debhelper/Buildsystem/qmake_qt4.pm
+++ b/Debian/Debhelper/Buildsystem/qmake_qt4.pm
@@ -3,7 +3,7 @@ package Debian::Debhelper::Buildsystem::qmake_qt4;
 use strict;
 use warnings;
 use Debian::Debhelper::Dh_Lib qw(error);
-use base 'Debian::Debhelper::Buildsystem::qmake';
+use parent qw(Debian::Debhelper::Buildsystem::qmake);
 
 sub DESCRIPTION {
 	"qmake for QT 4 (*.pro)";
@@ -16,3 +16,9 @@ sub configure {
 }
 
 1
+
+# Local Variables:
+# indent-tabs-mode: t
+# tab-width: 4
+# cperl-indent-level: 4
+# End:
diff --git a/Debian/Debhelper/Dh_Buildsystems.pm b/Debian/Debhelper/Dh_Buildsystems.pm
index 0a51a4d2..7ea34c84 100644
--- a/Debian/Debhelper/Dh_Buildsystems.pm
+++ b/Debian/Debhelper/Dh_Buildsystems.pm
@@ -226,3 +226,9 @@ sub buildsystems_do {
 }
 
 1
+
+# Local Variables:
+# indent-tabs-mode: t
+# tab-width: 4
+# cperl-indent-level: 4
+# End:
diff --git a/Debian/Debhelper/Dh_Getopt.pm b/Debian/Debhelper/Dh_Getopt.pm
index e4f3e471..c7d9c3cb 100644
--- a/Debian/Debhelper/Dh_Getopt.pm
+++ b/Debian/Debhelper/Dh_Getopt.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 #
 # Debhelper option processing library.
 #
@@ -6,6 +6,7 @@
 
 package Debian::Debhelper::Dh_Getopt;
 use strict;
+use warnings;
 
 use Debian::Debhelper::Dh_Lib;
 use Getopt::Long;
@@ -286,3 +287,9 @@ sub parseopts {
 }
 
 1
+
+# Local Variables:
+# indent-tabs-mode: t
+# tab-width: 4
+# cperl-indent-level: 4
+# End:
diff --git a/Debian/Debhelper/Dh_Lib.pm b/Debian/Debhelper/Dh_Lib.pm
index 0519d20a..f1953675 100644
--- a/Debian/Debhelper/Dh_Lib.pm
+++ b/Debian/Debhelper/Dh_Lib.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 #
 # Library functions for debhelper programs, perl version.
 #
@@ -6,20 +6,25 @@
 
 package Debian::Debhelper::Dh_Lib;
 use strict;
+use warnings;
 
 use Exporter;
 use vars qw(@ISA @EXPORT %dh);
 @ISA=qw(Exporter);
 @EXPORT=qw(&init &doit &doit_noerror &complex_doit &verbose_print &error
+            &nonquiet_print &print_and_doit &print_and_doit_noerror
             &warning &tmpdir &pkgfile &pkgext &pkgfilename &isnative
 	    &autoscript &filearray &filedoublearray
 	    &getpackages &basename &dirname &xargs %dh
 	    &compat &addsubstvar &delsubstvar &excludefile &package_arch
 	    &is_udeb &udeb_filename &debhelper_script_subst &escape_shell
 	    &inhibit_log &load_log &write_log &commit_override_log
-	    &dpkg_architecture_value &sourcepackage
+	    &dpkg_architecture_value &sourcepackage &make_symlink
 	    &is_make_jobserver_unavailable &clean_jobserver_makeflags
-	    &cross_command &set_buildflags &get_buildoption);
+	    &cross_command &set_buildflags &get_buildoption
+	    &install_dh_config_file &error_exitcode &package_multiarch
+	    &install_file &install_prog &install_lib &install_dir
+);
 
 my $max_compat=10;
 
@@ -59,9 +64,11 @@ sub init {
 	}
 	
 	# Check to see if DH_VERBOSE environment variable was set, if so,
-	# make sure verbose is on.
+	# make sure verbose is on. Otherwise, check DH_QUIET.
 	if (defined $ENV{DH_VERBOSE} && $ENV{DH_VERBOSE} ne "") {
 		$dh{VERBOSE}=1;
+	} elsif (defined $ENV{DH_QUIET} && $ENV{DH_QUIET} ne "") {
+		$dh{QUIET}=1;
 	}
 
 	# Check to see if DH_NO_ACT environment variable was set, if so, 
@@ -209,13 +216,13 @@ sub escape_shell {
 # Run a command, and display the command to stdout if verbose mode is on.
 # Throws error if command exits nonzero.
 #
-# All commands that modifiy files in $TMP should be ran via this 
+# All commands that modify files in $TMP should be run via this
 # function.
 #
 # Note that this cannot handle complex commands, especially anything
 # involving redirection. Use complex_doit instead.
 sub doit {
-	doit_noerror(@_) || _error_exitcode(join(" ", @_));
+	doit_noerror(@_) || error_exitcode(join(" ", @_));
 }
 
 sub doit_noerror {
@@ -229,6 +236,21 @@ sub doit_noerror {
 	}
 }
 
+sub print_and_doit {
+	print_and_doit_noerror(@_) || error_exitcode(join(" ", @_));
+}
+
+sub print_and_doit_noerror {
+	nonquiet_print(escape_shell(@_));
+
+	if (! $dh{NO_ACT}) {
+		return (system(@_) == 0)
+	}
+	else {
+		return 1;
+	}
+}
+
 # Run a command and display the command to stdout if verbose mode is on.
 # Use doit() if you can, instead of this function, because this function
 # forks a shell. However, this function can handle more complicated stuff
@@ -238,21 +260,45 @@ sub complex_doit {
 	
 	if (! $dh{NO_ACT}) {
 		# The join makes system get a scalar so it forks off a shell.
-		system(join(" ", @_)) == 0 || _error_exitcode(join(" ", @_))
+		system(join(" ", @_)) == 0 || error_exitcode(join(" ", @_))
 	}			
 }
 
-sub _error_exitcode {
+sub error_exitcode {
 	my $command=shift;
 	if ($? == -1) {
 		error("$command failed to to execute: $!");
 	}
 	elsif ($? & 127) {
 		error("$command died with signal ".($? & 127));
-        }
-	else {
+	}
+	elsif ($?) {
 		error("$command returned exit code ".($? >> 8));
 	}
+	else {
+		warning("This tool claimed that $command have failed, but it");
+		warning("appears to have returned 0.");
+		error("Probably a bug in this tool is hiding the actual problem.");
+	}
+}
+
+# Some shortcut functions for installing files and dirs to always
+# have the same owner and mode
+# install_file - installs a non-executable
+# install_prog - installs an executable
+# install_lib  - installs a shared library (some systems may need x-bit, others don't)
+# install_dir  - installs a directory
+sub install_file {
+	doit('install', '-p', '-m0644', @_);
+}
+sub install_prog {
+	doit('install', '-p', '-m0755', @_);
+}
+sub install_lib {
+	doit('install', '-p', '-m0644', @_);
+}
+sub install_dir {
+	doit('install', '-d', @_);
 }
 
 # Run a command that may have a huge number of arguments, like xargs does.
@@ -301,6 +347,15 @@ sub verbose_print {
 	}
 }
 
+# Print something unless the quiet flag is on
+sub nonquiet_print {
+	my $message=shift;
+
+	if (!$dh{QUIET}) {
+		print "\t$message\n";
+	}
+}
+
 # Output an error message and die (can be caught).
 sub error {
 	my $message=shift;
@@ -771,7 +826,7 @@ sub sourcepackage {
 	while (<CONTROL>) {
 		chomp;
 		s/\s+$//;
-		if (/^Source:\s*(.*)/) {
+		if (/^Source:\s*(.*)/i) {
 			close CONTROL;
 			return $1;
 		}
@@ -789,22 +844,20 @@ sub sourcepackage {
 #
 # As a side effect, populates %package_arches and %package_types
 # with the types of all packages (not only those returned).
-my (%package_types, %package_arches);
+my (%package_types, %package_arches, %package_multiarches);
 sub getpackages {
 	my $type=shift;
 
 	%package_types=();
 	%package_arches=();
+	%package_multiarches=();
 	
 	$type="" if ! defined $type;
 
 	my $package="";
 	my $arch="";
-	my $package_type;
-	my @list=();
-	my %seen;
-	my @profiles=();
-	my $included_in_build_profile;
+	my ($package_type, $multiarch, @list, %seen, @profiles,
+		$included_in_build_profile);
 	if (exists $ENV{'DEB_BUILD_PROFILES'}) {
 		@profiles=split /\s+/, $ENV{'DEB_BUILD_PROFILES'};
 	}
@@ -813,7 +866,7 @@ sub getpackages {
 	while (<CONTROL>) {
 		chomp;
 		s/\s+$//;
-		if (/^Package:\s*(.*)/) {
+		if (/^Package:\s*(.*)/i) {
 			$package=$1;
 			# Detect duplicate package names in the same control file.
 			if (! $seen{$package}) {
@@ -825,16 +878,19 @@ sub getpackages {
 			$package_type="deb";
 			$included_in_build_profile=1;
 		}
-		if (/^Architecture:\s*(.*)/) {
+		if (/^Architecture:\s*(.*)/i) {
 			$arch=$1;
 		}
-		if (/^(?:X[BC]*-)?Package-Type:\s*(.*)/) {
+		if (/^(?:X[BC]*-)?Package-Type:\s*(.*)/i) {
 			$package_type=$1;
 		}
+		if (/^Multi-Arch: \s*(.*)\s*/i) {
+			$multiarch = $1;
+		}
 		# rely on libdpkg-perl providing the parsing functions because
 		# if we work on a package with a Build-Profiles field, then a
 		# high enough version of dpkg-dev is needed anyways
-		if (/^Build-Profiles:\s*(.*)/) {
+		if (/^Build-Profiles:\s*(.*)/i) {
 		        my $build_profiles=$1;
 			eval {
 				require Dpkg::BuildProfiles;
@@ -852,6 +908,7 @@ sub getpackages {
 			if ($package) {
 				$package_types{$package}=$package_type;
 				$package_arches{$package}=$arch;
+				$package_multiarches{$package} = $multiarch;
 			}
 
 			if ($package && $included_in_build_profile &&
@@ -884,6 +941,20 @@ sub package_arch {
 	return $package_arches{$package} eq 'all' ? "all" : buildarch();
 }
 
+# Returns the multiarch value of a package.
+sub package_multiarch {
+	my $package=shift;
+
+	# Test the architecture field instead, as it is common for a
+	# package to not have a multi-arch value.
+	if (! exists $package_arches{$package}) {
+		warning "package $package is not in control info";
+		# The only sane default
+		return 'no';
+	}
+	return $package_multiarches{$package} // 'no';
+}
+
 # Return true if a given package is really a udeb.
 sub is_udeb {
 	my $package=shift;
@@ -895,15 +966,22 @@ sub is_udeb {
 	return $package_types{$package} eq 'udeb';
 }
 
-# Generates the filename that is used for a udeb package.
-sub udeb_filename {
-	my $package=shift;
-	
+sub _xdeb_filename {
+	my ($package, $ext, $actual_name) = @_;
+
 	my $filearch=package_arch($package);
 	isnative($package); # side effect
 	my $version=$dh{VERSION};
 	$version=~s/^[0-9]+://; # strip any epoch
-	return "${package}_${version}_$filearch.udeb";
+	$actual_name = $package if not defined($actual_name);
+	return "${actual_name}_${version}_${filearch}.${ext}";
+}
+
+# Generates the filename that is used for a udeb package.
+sub udeb_filename {
+	my ($package) = @_;
+
+	return _xdeb_filename($package, 'udeb');
 }
 
 # Handles #DEBHELPER# substitution in a script; also can generate a new
@@ -926,14 +1004,105 @@ sub debhelper_script_subst {
 			complex_doit("sed s/#DEBHELPER#// < $file > $tmp/DEBIAN/$script");
 		}
 		doit("chown","0:0","$tmp/DEBIAN/$script");
-		doit("chmod",755,"$tmp/DEBIAN/$script");
+		doit("chmod","0755","$tmp/DEBIAN/$script");
 	}
 	elsif ( -f "debian/$ext$script.debhelper" ) {
 		complex_doit("printf '#!/bin/sh\nset -e\n' > $tmp/DEBIAN/$script");
 		complex_doit("cat debian/$ext$script.debhelper >> $tmp/DEBIAN/$script");
 		doit("chown","0:0","$tmp/DEBIAN/$script");
-		doit("chmod",755,"$tmp/DEBIAN/$script");
+		doit("chmod","0755","$tmp/DEBIAN/$script");
+	}
+}
+
+
+# make_symlink($dest, $src[, $tmp]) creates a symlink from  $dest -> $src.
+# if $tmp is given, $dest will be created within it.
+# Usually $tmp should be the value of tmpdir($package);
+sub make_symlink{
+	my $dest = shift;
+	my $src = _expand_path(shift);
+	my $tmp = shift;
+        $tmp = '' if not defined($tmp);
+	$src=~s:^/::;
+	$dest=~s:^/::;
+
+	if ($src eq $dest) {
+		warning("skipping link from $src to self");
+		return;
+	}
+
+	# Make sure the directory the link will be in exists.
+	my $basedir=dirname("$tmp/$dest");
+	if (! -e $basedir) {
+		install_dir($basedir);
+	}
+
+	# Policy says that if the link is all within one toplevel
+	# directory, it should be relative. If it's between
+	# top level directories, leave it absolute.
+	my @src_dirs=split(m:/+:,$src);
+	my @dest_dirs=split(m:/+:,$dest);
+	if (@src_dirs > 0 && $src_dirs[0] eq $dest_dirs[0]) {
+		# Figure out how much of a path $src and $dest
+		# share in common.
+		my $x;
+		for ($x=0; $x < @src_dirs && $src_dirs[$x] eq $dest_dirs[$x]; $x++) {}
+		# Build up the new src.
+		$src="";
+		for (1..$#dest_dirs - $x) {
+			$src.="../";
+		}
+		for ($x .. $#src_dirs) {
+			$src.=$src_dirs[$_]."/";
+		}
+		if ($x > $#src_dirs && ! length $src) {
+			$src="."; # special case
+		}
+		$src=~s:/$::;
+	}
+	else {
+		# Make sure it's properly absolute.
+		$src="/$src";
+	}
+
+	if (-d "$tmp/$dest" && ! -l "$tmp/$dest") {
+		error("link destination $tmp/$dest is a directory");
 	}
+	doit("rm", "-f", "$tmp/$dest");
+	doit("ln","-sf", $src, "$tmp/$dest");
+}
+
+# _expand_path expands all path "." and ".." components, but doesn't
+# resolve symbolic links.
+sub _expand_path {
+	my $start = @_ ? shift : '.';
+	my @pathname = split(m:/+:,$start);
+	my @respath;
+	for my $entry (@pathname) {
+		if ($entry eq '.' || $entry eq '') {
+			# Do nothing
+		}
+		elsif ($entry eq '..') {
+			if ($#respath == -1) {
+				# Do nothing
+			}
+			else {
+				pop @respath;
+			}
+		}
+		else {
+			push @respath, $entry;
+		}
+	}
+
+	my $result;
+	for my $entry (@respath) {
+		$result .= '/' . $entry;
+	}
+	if (! defined $result) {
+		$result="/"; # special case
+	}
+	return $result;
 }
 
 # Checks if make's jobserver is enabled via MAKEFLAGS, but
@@ -1015,4 +1184,41 @@ sub get_buildoption {
 	}
 }
 
+# install a dh config file (e.g. debian/<pkg>.lintian-overrides) into
+# the package.  Under compat 9+ it may execute the file and use its
+# output instead.
+#
+# install_dh_config_file(SOURCE, TARGET[, MODE])
+sub install_dh_config_file {
+	my ($source, $target, $mode) = @_;
+	$mode = 0644 if not defined($mode);
+
+	if (!compat(8) and -x $source) {
+		my @sstat = stat($source) || error("cannot stat $source: $!");
+		open(my $tfd, '>', $target) || error("cannot open $target: $!");
+		chmod($mode, $tfd) || error("cannot chmod $target: $!");
+		open(my $sfd, '-|', $source) || error("cannot run $source: $!");
+		while (my $line = <$sfd>) {
+			print ${tfd} $line;
+		}
+		if (!close($sfd)) {
+			error("cannot close handle from $source: $!") if $!;
+			error_exitcode($source);
+		}
+		close($tfd) || error("cannot close $target: $!");
+		# Set the mtime (and atime) to ensure reproducibility.
+		utime($sstat[9], $sstat[9], $target);
+	} else {
+		my $str_mode = sprintf('%#4o', $mode);
+		doit('install', '-p', "-m${str_mode}", $source, $target);
+	}
+	return 1;
+}
+
 1
+
+# Local Variables:
+# indent-tabs-mode: t
+# tab-width: 4
+# cperl-indent-level: 4
+# End:
diff --git a/Debian/Debhelper/Sequence/python_support.pm b/Debian/Debhelper/Sequence/python_support.pm
index c93d2126..eaedc22c 100644
--- a/Debian/Debhelper/Sequence/python_support.pm
+++ b/Debian/Debhelper/Sequence/python_support.pm
@@ -13,3 +13,9 @@ if (-x "/usr/bin/dh_pysupport") {
 }
 
 1
+
+# Local Variables:
+# indent-tabs-mode: t
+# tab-width: 4
+# cperl-indent-level: 4
+# End:
diff --git a/Makefile b/Makefile
index 3d2d093a..9c2e9f95 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 # List of files of dh_* commands. Sorted for debhelper man page.
-COMMANDS=$(shell find . -maxdepth 1 -type f -perm /100 -name "dh_*" -printf "%f\n" | sort)
+COMMANDS=$(shell find . -maxdepth 1 -type f -perm /100 -name "dh_*" -printf "%f\n" | LC_ALL=C sort)
 
 # Find deprecated commands by looking at their synopsis.
 DEPRECATED=$(shell egrep -l '^dh_.* - .*deprecated' $(COMMANDS))
@@ -63,7 +63,7 @@ ifneq ($(USE_NLS),no)
 		done; \
 		if [ -e $$dir/debhelper.pod ]; then \
 			cat $$dir/debhelper.pod | \
-				$(MAKEMANLIST) `find $$dir -type f -maxdepth 1 -name "dh_*.pod" | sort` | \
+				$(MAKEMANLIST) `find $$dir -type f -maxdepth 1 -name "dh_*.pod" | LC_ALL=C sort` | \
 				$(POD2MAN) --name="debhelper" --section=7 > debhelper.$$lang.7; \
 		fi; \
 	done
diff --git a/autoscripts/postinst-emacsen b/autoscripts/postinst-emacsen
index 6a46d79f..82ce9576 100644
--- a/autoscripts/postinst-emacsen
+++ b/autoscripts/postinst-emacsen
@@ -1,4 +1,4 @@
-if [ "$1" = "configure" ] && [ -e /var/lib/emacsen-common/state/package/installed/emacsen-common ]
+if [ "$1" = "configure" ] && [ -e /var/lib/emacsen-common/state/package/installed/emacsen-common -a -x /usr/lib/emacsen-common/emacs-package-install ]
 then
 	/usr/lib/emacsen-common/emacs-package-install --postinst #PACKAGE#
 fi
diff --git a/autoscripts/postinst-makeshlibs-c10 b/autoscripts/postinst-makeshlibs-c10
new file mode 100644
index 00000000..bab4455b
--- /dev/null
+++ b/autoscripts/postinst-makeshlibs-c10
@@ -0,0 +1,3 @@
+if [ "$1" = "configure" ]; then
+	ldconfig -X
+fi
diff --git a/autoscripts/postrm-makeshlibs-c10 b/autoscripts/postrm-makeshlibs-c10
new file mode 100644
index 00000000..c81079d0
--- /dev/null
+++ b/autoscripts/postrm-makeshlibs-c10
@@ -0,0 +1,3 @@
+if [ "$1" = "remove" ]; then
+	ldconfig -X
+fi
diff --git a/autoscripts/preinst-emacsen b/autoscripts/preinst-emacsen
index 780fc697..c4285d92 100644
--- a/autoscripts/preinst-emacsen
+++ b/autoscripts/preinst-emacsen
@@ -1,5 +1,5 @@
 if ( [ "$1" = "install" ] || [ "$1" = "upgrade" ] ) \
-	&& [ -e /var/lib/emacsen-common/state/package/installed/emacsen-common ]
+	&& [ -e /var/lib/emacsen-common/state/package/installed/emacsen-common -a -x /usr/lib/emacsen-common/emacs-package-install ]
 then
 	/usr/lib/emacsen-common/emacs-package-install --preinst #PACKAGE#
 fi
diff --git a/autoscripts/prerm-emacsen b/autoscripts/prerm-emacsen
index 31ecfaa4..4c7c2b0b 100644
--- a/autoscripts/prerm-emacsen
+++ b/autoscripts/prerm-emacsen
@@ -1,3 +1,3 @@
-if [ -e /var/lib/emacsen-common/state/package/installed/emacsen-common ] ; then
+if [ -e /var/lib/emacsen-common/state/package/installed/emacsen-common -a -x /usr/lib/emacsen-common/emacs-package-remove ] ; then
 	/usr/lib/emacsen-common/emacs-package-remove --prerm #PACKAGE#
 fi
diff --git a/debhelper.pod b/debhelper.pod
index 659c4a30..1e28e601 100644
--- a/debhelper.pod
+++ b/debhelper.pod
@@ -532,12 +532,18 @@ This compatibility level is still open for development; use with caution.
 
 Changes from v9 are:
 
+=over 8
+
 =item -
 
 B<dh_installinit> will no longer install a file named debian/I<package>
 as an init script.
 
-=over 8
+=item -
+
+B<dh_installdocs> will error out if it detects links created with
+--link-doc between packages of architecture "all" and non-"all" as it
+breaks binNMUs.
 
 =item -
 
@@ -546,6 +552,24 @@ running debhelper commands. This will not affect packages that only build
 with debhelper commands, but it may expose bugs in commands not included in
 debhelper.
 
+=item -
+
+B<dh_makeshlibs> now invokes I<ldconfig -X> instead of just
+I<ldconfig> in its generated maintainer scripts snippets.  The new
+call will only update the ld cache (instead of also updating
+symlinks).
+
+=item -
+
+B<dh_installdeb> no longer installs a maintainer-provided
+debian/I<package>.shlibs file.  This is now done by B<dh_makeshlibs>
+instead.
+
+=item -
+
+B<dh_installwm> refuses to create a broken package if no man page
+can be found (required to register for the x-window-manager alternative).
+
 =back
 
 =back
@@ -647,6 +671,12 @@ F<preinst>, F<postrm>, F<prerm>, and F<config> scripts, etc.
 
 =head1 ENVIRONMENT
 
+The following environment variables can influence the behavior of debhelper.
+It is important to note that these must be actual environment variables in
+order to function properly (not simply F<Makefile> variables). To specify
+them properly in F<debian/rules>, be sure to "B<export>" them. For example,
+"B<export DH_VERBOSE>".
+
 =over 4
 
 =item B<DH_VERBOSE>
@@ -654,6 +684,15 @@ F<preinst>, F<postrm>, F<prerm>, and F<config> scripts, etc.
 Set to B<1> to enable verbose mode. Debhelper will output every command it
 runs. Also enables verbose build logs for some build systems like autoconf.
 
+=item B<DH_QUIET>
+
+Set to B<1> to enable quiet mode. Debhelper will not output commands calling
+the upstream build system nor will dh print which subcommands are called
+and depending on the upstream build system might make that more quiet, too.
+This makes it easier to spot important messages but makes the output quite
+useless as buildd log.
+Ignored if DH_VERBOSE is also set.
+
 =item B<DH_COMPAT>
 
 Temporarily specifies what compatibility level debhelper should run at,
diff --git a/debian/changelog b/debian/changelog
index 2f17a317..0fce6b03 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,275 @@
+debhelper (9.20150629) UNRELEASED; urgency=medium
+
+  * d/changelog: Add missing entry for dh_md5sums/#786695 in
+    the 9.20150628 release.
+  * Makefile: Set LC_ALL=C when sorting.
+  * dh: Avoid passing --parallel to other debhelper commands
+    if it is the only option and "parallel" is not set (or
+    set to 1) in DEB_BUILD_OPTIONS.
+  * dh_strip: Apply patch from Guillem Jover to fix a typo.
+    (Closes: #792207)
+
+ -- Niels Thykier <niels@thykier.net>  Sun, 28 Jun 2015 15:08:19 +0200
+
+debhelper (9.20150628) unstable; urgency=medium
+
+  * Upload to unstable with ddebs support disabled by default.
+
+  [ Niels Thykier ]
+  * Buildsystem.pm: Apply patch from Emmanuel Bourg to
+    provide doit_in_{build,source}dir_noerror methods.
+    (Closes: #785811)
+  * Dh_Lib.pm: Promote error_exitcode to a regular exported
+    subroutine (from an internal one).
+  * dh_compress: Apply patch from Osamu Aoki to avoid compressing
+    ".xhtml" files and to use a POSIX compliant find expression.
+    (Closes: #740405)
+  * dh_makeshlibs: Fix typo in manpage.  Thanks to Jakub Wilk for
+    reporting it.  (Closes: #788473)
+  * dh_auto_test: Run tests by default even during cross-building.
+    (Closes: #726967)
+  * dh_gencontrol: Put ddebs in the "debugsym" section.
+  * dh_strip: Support a new --[no-]ddebs option intended for
+    packages to disable automatic ddebs.
+  * dh_strip: Do not create ddebs for "-dbg" packages.
+  * dh_builddeb/dh_gencontrol: Let dpkg figure out the name
+    of the ddebs itself now that ddebs uses a ".deb"
+    extension.
+  * dh_md5sums: create DEBIAN dir in ddebs before using it.
+    (Closes: #786695)
+
+  [ Thibaut Paumard ]
+  * Bug fix: "dh_usrlocal leaves directories behind", thanks to Andreas
+    Beckmann (Closes: #788098).
+
+ -- Niels Thykier <niels@thykier.net>  Sun, 28 Jun 2015 13:51:48 +0200
+
+debhelper (9.20150519+ddebs) experimental; urgency=medium
+
+  * dh_strip: Add --ddeb-migration option to support migration
+    from a --dbg-package to a automatic ddeb.
+  * Dh_Lib.pm: Add "package_multiarch" function.
+  * d/control: Add versioned Build-Depends on dpkg-dev to support
+    creating ddebs with the ".deb" extension.
+  * Dh_lib.pm: Generate ddebs with the ".deb" extension.
+  * dh_gencontrol: Reduce the "pkg:arch" to "pkg" as APT and dpkg
+    disagree on what satisfies an "pkg:arch" dependency.
+  * dh_strip.1: Document what inhibits ddeb generation.
+  * dh_gencontrol: Only mark a ddeb as Multi-Arch: same if the
+    original deb was Multi-Arch: same.  All other ddebs are now
+    Multi-Arch: no (by omitting the field).
+  * dh_strip: Avoid generating a ddeb if the same name as an
+    explicitly declared package.  Apparently, Ubuntu has been
+    creating some of these manually.
+
+ -- Niels Thykier <niels@thykier.net>  Tue, 19 May 2015 21:56:55 +0200
+
+debhelper (9.20150507) unstable; urgency=medium
+
+  [ Niels Thykier ]
+  * dh_bugfiles: Fix regression in installing the reportbug
+    script correctly.  Thanks to Jakub Wilk for reporting.
+    (Closes: #784648)
+
+  [ Translation updates ]
+  * pt - Thanks to Américo Monteiro.
+    (Closes: #784582)
+
+ -- Niels Thykier <niels@thykier.net>  Thu, 07 May 2015 20:07:49 +0200
+
+debhelper (9.20150502+ddebs) experimental; urgency=medium
+
+  * Add /experimental/ ddebs support *if* the environment
+    variable DH_BUILD_DDEBS is set to 1.
+
+ -- Niels Thykier <niels@thykier.net>  Sat, 02 May 2015 10:35:29 +0200
+
+debhelper (9.20150502) unstable; urgency=medium
+
+  * dh_compress: REVERT change to avoid compressing ".xhtml"
+    files due to #784016.  (Reopens: #740405, Closes: #784016)
+
+ -- Niels Thykier <niels@thykier.net>  Sat, 02 May 2015 10:21:42 +0200
+
+debhelper (9.20150501) unstable; urgency=medium
+
+  [ Niels Thykier ]
+  * dh_strip: Recognise .node as potential ELF binaries that
+    should be stripped like a regular shared library.  Thanks
+    to Paul Tagliamonte for the report.  (Closes: #668852)
+  * dh_shlibdeps: Recognise .node as potential ELF binaries that
+    should be processed like a regular shared library.  Thanks
+    to Paul Tagliamonte for the report.  (Closes: #668851)
+  * Convert package to the 3.0 (native) format, so dpkg-source
+    strips the .git directory by default during build.
+  * Reorder two paragraphs in d/copyright to avoid one of them
+    being completely overwritten by the other.
+  * d/control: Use the canonical URLs for the Vcs-* fields.
+  * dh_makeshlibs: Apply patch from Jérémy Bobbio to ensure
+    stable ordering of generated shlibs files.
+    (Closes: #774100)
+  * dh_icons: Apply patch from Jérémy Bobbio to ensure stable
+    ordering of the icon list inserted into generated maintainer
+    scripts.  (Closes: #774102)
+  * Dh_lib: Add a public "make_symlink" subroutine allowing
+    dh_*-like tools to generate policy compliant symlinks without
+    invoking dh_link.  (Closes: #610173)
+  * dh_compress: Apply patch from Osamu Aoki to avoid compressing
+    ".xhtml" files.  (Closes: #740405)
+  * dh_gconf: Apply patch from Josselin Mouette to avoid
+    dependency on gconf2 for installs of non-schema files.
+    (Closes: #592958)
+  * dh_fixperms: Correct permissions of reportbug files and scripts.
+    Thanks to Fabian Greffrath for the report and a basic patch.
+    (Closes: #459548)
+  * The "ant" build system now loads debian/ant.properties
+    automatically before build and clean (like CDBS).  Thanks to
+    Thomas Koch for the report.  (Closes: #563909)
+  * Dh_lib: Add install_dh_config_file to install a file either by
+    copying the source file or (with an executable file under compat
+    9) execute the file and use its output to generate the
+    destination.
+  * dh_lintian: Under compat 9, the debian/lintian-overrides are now
+    executed if they have the exec-bit set like the debian/install
+    files.  Thanks to Axel Beckert for the report.  (Closes: #698500)
+  * d/rules: Remove makefile target only intended for/used by the
+    previous maintainer.
+  * dh_makeshlibs: In compat 10+, pass "-X" to ldconfig to
+    only  regenerate the cache (instead of also creating missing
+    symlinks).  Thanks to Joss Mouette for the suggestion.
+    (Closes: #549990)
+  * autoscripts/post{inst,rm}-makeshlibs-c10: New files.
+  * dh_strip: Pass the --enable-deterministic-archives option to strip
+    when it is stripping static libraries.  This avoids some
+    unnecessary non-determinism in builds.  Based on patch by
+    Andrew Ayer.
+  * dh_install, dh_installdocs, dh_installexamples and dh_installinfo:
+    Pass --reflink=auto to cp.  On supported filesystems, this provides
+    faster copying.
+  * Make perl tests verbose.  Thanks to gregor herrmann for the patch.
+    (Closes: #714546)
+  * Dh_Lib.pm: Apply patch from Martin Koeppe to provide
+    install_{dir,file,prog,lib} subroutines for installing directories,
+    regular files, scripts/executables and libraries (respectively).
+  * Migrate many "ad-hoc" calls to "install" to the new "install_X"
+    subroutines from Dh_Lib.pm.  Based on patch from Martin Koeppe.
+    (Closes: #438930)
+  * dh_gconf: Apply patch from Martin Koeppe to avoid adding a layer
+    of shell-escaping to a printed command line when the command was
+    in fact run without said layer of shell-escaping.
+  * dh_installdocs: Use ${binary:Version} for generating dependencies
+    with "--link-doc" instead of trying to determine the correct
+    package version.  Thanks to Stephen Kitt for reporting this
+    issue.  (Closes: #747141)
+  * dh_installdocs.1: Document that --link-doc may in some cases
+    require a dir to symlink (or symlink to dir) migration.
+    (Closes: #659044)
+  * dh_usrlocal: Apply patch from Jérémy Bobbio to generate
+    deterministic output.  (Closes: #775020)
+  * dh_makeshlibs: In compat 10, install the maintainer-provided shlibs
+    file (replacing the generated one).  (Closes: #676168)
+  * dh_installdeb: In compat 10, stop installing the maintainer-provided
+    shlibs file as it is now done by dh_makeshlibs instead.
+  * dh_installdocs: Remove remark about dh_installdocs not being
+    idempotent as it no longer adds anything to maintainer scripts.
+  * autoscripts/*-emacsen: Apply patch from Paul Wise to check that
+    emacs-package-{install,remove} is (still) present before invoking
+    it.  (Closes: #736896)
+  * dh_install.1: Document that dh-exec can be used to do renaming
+    and provide a trivial example of how to achieve it.  (Closes: #245554)
+  * dh_makeshlibs: Apply patch from Guillem Jover to stop adding
+    Pre-Depends on multiarch-support.  The transition is far enough that
+    we do not need it any longer.  (Closes: #783898)
+  * dh_gencontrol: Insert an empty misc:Pre-Depends to avoid warnings
+    in packages for using a (now often) non-existing substvars.
+  * d/control: Remove versioned conflicts that are no longer relevant.
+
+  [ Bernhard R. Link ]
+  * Dh_lib: apply patch from Guillem Jover to support case-insensitive
+    control field names. (Closes: #772129)
+  * add DH_QUIET environment variable to make things more silent
+  * dh: don't output commands to run if DH_QUIET is set
+  * buildsystems print commands unless DH_QUIET is set
+    (Closes: #639168, #680687)
+  * autoconf is always passed one of
+     --enable-silent-rules (if DH_QUIET is set) or
+     --disable-silent-rules (otherwise). (Closes: #551463, #680686)
+  * dh_compress: exclude .xz .lzma and .lz files from compression
+    (Closes: #778927)
+  * dh_installwm: call by dh after dh_link (Closes: #781077),
+    error out in compat 10 if no man page found
+
+  [ Jason Pleau ]
+  * dh_installchangelogs: Add CHANGES.md to the list of common changelog
+    filenames (Closes: #779471)
+
+  [ Axel Beckert ]
+  * dh_installchangelogs: Consistent suffix search order (none, ".txt",
+    ".md") for all upstream changelog file names ("changelog", "changes",
+    "history").
+      + Looks for "history.md" now, too.
+      + Makes it easier to add base names or suffixes in the future.
+  * dh_installchangelogs: Also look for changelogs with .rst suffix.
+
+  [ Tianon Gravi ]
+  * debhelper.pod: Clarify "ENVIRONMENT" requirements for Makefile syntax.
+    (Closes: #780133)
+
+  [ Translation updates ]
+  * pt - Thanks to Américo Monteiro.
+    (Closes: #758575)
+
+ -- Niels Thykier <niels@thykier.net>  Fri, 01 May 2015 14:53:16 +0200
+
+debhelper (9.20150101) unstable; urgency=medium
+
+  [ Niels Thykier ]
+  * Revert detection of unsafe binNMUs under compat 9 and
+    earlier.  It had some false-positives.  (Closes: #773965)
+
+  [ Axel Beckert ]
+  * Document that dh_installdocs will error out on --link-doc
+    between arch:all and arch:any packages in man 7 debhelper.
+
+ -- Niels Thykier <niels@thykier.net>  Thu, 01 Jan 2015 17:05:01 +0100
+
+debhelper (9.20141222) unstable; urgency=medium
+
+  * Add missing entry about #747141.
+  * Fix typo in comment in dh_installman.  Thanks to Raphael
+    Geissert for spotting it.  (Closes: #772502)
+
+ -- Niels Thykier <niels@thykier.net>  Mon, 22 Dec 2014 01:02:52 +0100
+
+debhelper (9.20141221) unstable; urgency=medium
+
+  [ Niels Thykier ]
+  * New debhelper maintainers.  (Closes: #768507)
+    - Add Niels Thykier to uploaders.
+  * dh_installdeb: Raise required dpkg version for dir_to_symlink to
+    1.17.13 (see #769843, msg #10).  Thanks to Guillem Jover.
+  * Refuse to build packages using --link-doc between arch:any and
+    arch:all packages (or vice versa) as it results in broken
+    packages.
+    - In compat 9 or less: Only during an actual binNMU.
+    - In compat 10 or newer: Unconditionally.
+    (Closes: #747141)
+
+  [ Bernhard R. Link ]
+    - Add Bernhard Link to uploaders.
+
+  [ Axel Beckert ]
+  * dh_installdeb: Raise required dpkg version for symlink_to_dir to
+    1.17.14. It is needed in case of relative symlinks. (Closes: #770245)
+
+ -- Niels Thykier <niels@thykier.net>  Sun, 21 Dec 2014 21:21:18 +0100
+
+debhelper (9.20141107) unstable; urgency=medium
+
+  * I'm leaving Debian, and Debhelper needs a new maintainer.
+
+ -- Joey Hess <joeyh@debian.org>  Fri, 07 Nov 2014 17:15:10 -0400
+
 debhelper (9.20141022+dyson1) unstable; urgency=medium
 
   * Package for Dyson
diff --git a/debian/control b/debian/control
index d54b9715..8fa120ef 100644
--- a/debian/control
+++ b/debian/control
@@ -2,18 +2,17 @@ Source: debhelper
 Section: devel
 Priority: optional
 Maintainer: Debhelper Maintainers <debhelper-devel@lists.alioth.debian.org>
-Uploaders: Joey Hess <joeyh@debian.org>
-Build-Depends: po4a (>= 0.24)
+Uploaders: Niels Thykier <niels@thykier.net>, Bernhard R. Link <brlink@debian.org>, Tianon Gravi <admwiggin@gmail.com>
+Build-Depends: po4a (>= 0.24), dpkg-dev (>= 1.18.0~)
 Standards-Version: 3.9.6
-Vcs-Git: git://git.debian.org/git/debhelper/debhelper.git
-Vcs-Browser: http://git.debian.org/?p=debhelper/debhelper.git;a=summary
+Vcs-Git: git://anonscm.debian.org/debhelper/debhelper.git
+Vcs-Browser: https://anonscm.debian.org/cgit/debhelper/debhelper.git
 Homepage: http://joeyh.name/code/debhelper/
 
 Package: debhelper
 Architecture: all
 Depends: ${perl:Depends}, ${misc:Depends}, file (>= 3.23), dpkg (>= 1.16.2), dpkg-dev (>= 1.17.0), binutils, po-debconf, man-db (>= 2.5.1-1), libdpkg-perl (>= 1.17.14)
 Suggests: dh-make
-Conflicts: dpkg-cross (<< 1.18), python-support (<< 0.5.3), python-central (<< 0.5.6), automake (<< 1.11.2)
 Multi-Arch: foreign
 Description: helper programs for debian/rules
  A collection of programs that can be used in a debian/rules file to
diff --git a/debian/copyright b/debian/copyright
index 0e79f07a..4b0693bf 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -65,14 +65,14 @@ Files: dh_ucf
 Copyright: 2011 Jeroen Schot <schot@A-Eskwadraat.nl>
 License: GPL-2+
 
-Files: Debian/Debhelper/Buildsystem/qmake.pm
-Copyright: 2010 Kel Modderman
-License: GPL-2+
-
 Files: Debian/Debhelper/Buildsystem* Debian/Debhelper/Dh_Buildsystems.pm
 Copyright: 2008-2009 Modestas Vainius
 License: GPL-2+
 
+Files: Debian/Debhelper/Buildsystem/qmake.pm
+Copyright: 2010 Kel Modderman
+License: GPL-2+
+
 Files: man/po4a/po/fr.po
 Copyright: 2005-2011 Valery Perrin <valery.perrin.debian@free.fr>
 License: GPL-2+
diff --git a/debian/rules b/debian/rules
index faeac03f..d9f87b11 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,7 +8,3 @@
 
 %:
 	./run dh $@
-
-# Not intended for use by anyone except the author.
-announcedir:
-	@echo ${HOME}/src/joeywiki/code/debhelper/news
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 00000000..89ae9db8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (native)
diff --git a/debian/source/local-options b/debian/source/local-options
new file mode 100644
index 00000000..edbbfb5b
--- /dev/null
+++ b/debian/source/local-options
@@ -0,0 +1,2 @@
+tar-ignore
+tar-ignore=debhelper/.idea
diff --git a/dh b/dh
index a39745f6..394366b0 100755
--- a/dh
+++ b/dh
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 
 =head1 NAME
 
@@ -7,6 +7,7 @@ dh - debhelper command sequencer
 =cut
 
 use strict;
+use warnings;
 use Debian::Debhelper::Dh_Lib;
 
 =head1 SYNOPSIS
@@ -378,7 +379,7 @@ my @i = qw{
 	dh_installlogrotate
 	dh_installpam
 	dh_installppp
-	dh_installwm
+	dh_installudev
 	dh_installgsettings
 	dh_bugfiles
 	dh_ucf
@@ -389,6 +390,7 @@ my @i = qw{
 	dh_usrlocal
 
 	dh_link
+	dh_installwm
 	dh_installxfonts
 	dh_compress
 	dh_fixperms
@@ -576,6 +578,14 @@ while (@ARGV_orig) {
 		next;
 	}
 	elsif ($opt=~/^-/) {
+		if (not @options and $opt eq '--parallel') {
+			# Having an non-empty "@options" hurts performance quite a
+			# bit.  At the same time, we want to promote the use of
+			# --parallel, so "tweak" the options a bit if there is no
+			# reason to include it.
+			my $max_parallel = get_buildoption('parallel') // 1;
+			next if $max_parallel == 1;
+		}
 		push @options, "-O".$opt;
 		$user_specified_options=1
 			unless $opt =~ /^--(parallel|buildsystem|sourcedirectory|builddirectory|)/;
@@ -715,7 +725,9 @@ sub run {
 
 	# 3 space indent lines the command being run up under the
 	# sequence name after "dh ".
-	print "   ".escape_shell($command, @options)."\n";
+	if (!$dh{QUIET}) {
+		print "   ".escape_shell($command, @options)."\n";
+	}
 
 	return if $dh{NO_ACT};
 			
@@ -982,3 +994,9 @@ This program is a part of debhelper.
 Joey Hess <joeyh@debian.org>
 
 =cut
+
+# Local Variables:
+# indent-tabs-mode: t
+# tab-width: 4
+# cperl-indent-level: 4
+# End:
diff --git a/dh_auto_build b/dh_auto_build
index bbb5e851..f041e345 100755
--- a/dh_auto_build
+++ b/dh_auto_build
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 
 =head1 NAME
 
@@ -7,6 +7,7 @@ dh_auto_build - automatically builds a package
 =cut
 
 use strict;
+use warnings;
 use Debian::Debhelper::Dh_Buildsystems;
 
 =head1 SYNOPSIS
@@ -55,3 +56,9 @@ This program is a part of debhelper.
 Joey Hess <joeyh@debian.org>
 
 =cut
+
+# Local Variables:
+# indent-tabs-mode: t
+# tab-width: 4
+# cperl-indent-level: 4
+# End:
diff --git a/dh_auto_clean b/dh_auto_clean
index 3abb5f3e..7d239455 100755
--- a/dh_auto_clean
+++ b/dh_auto_clean
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 
 =head1 NAME
 
@@ -7,6 +7,7 @@ dh_auto_clean - automatically cleans up after a build
 =cut
 
 use strict;
+use warnings;
 use Debian::Debhelper::Dh_Lib;
 use Debian::Debhelper::Dh_Buildsystems;
 
@@ -58,3 +59,9 @@ This program is a part of debhelper.
 Joey Hess <joeyh@debian.org>
 
 =cut
+
+# Local Variables:
+# indent-tabs-mode: t
+# tab-width: 4
+# cperl-indent-level: 4
+# End:
diff --git a/dh_auto_configure b/dh_auto_configure
index e1ca7af2..33dc1fb7 100755
--- a/dh_auto_configure
+++ b/dh_auto_configure
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 
 =head1 NAME
 
@@ -7,6 +7,7 @@ dh_auto_configure - automatically configure a package prior to building
 =cut
 
 use strict;
+use warnings;
 use Debian::Debhelper::Dh_Buildsystems;
 
 =head1 SYNOPSIS
@@ -60,3 +61,9 @@ This program is a part of debhelper.
 Joey Hess <joeyh@debian.org>
 
 =cut
+
+# Local Variables:
+# indent-tabs-mode: t
+# tab-width: 4
+# cperl-indent-level: 4
+# End:
diff --git a/dh_auto_install b/dh_auto_install
index ef46a3c5..9baab661 100755
--- a/dh_auto_install
+++ b/dh_auto_install
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 
 =head1 NAME
 
@@ -7,6 +7,7 @@ dh_auto_install - automatically runs make install or similar
 =cut
 
 use strict;
+use warnings;
 use Debian::Debhelper::Dh_Lib;
 use Debian::Debhelper::Dh_Buildsystems;
 use File::Spec;
@@ -83,7 +84,7 @@ $destdir = File::Spec->rel2abs($destdir, cwd());
 foreach my $package (@{$dh{DOPACKAGES}}) {
 	my $tmp=tmpdir($package);
 	if (! -e $tmp) {
-		doit("install","-d",$tmp);
+		install_dir($tmp);
 	}
 }
 
@@ -100,3 +101,9 @@ This program is a part of debhelper.
 Joey Hess <joeyh@debian.org>
 
 =cut
+
+# Local Variables:
+# indent-tabs-mode: t
+# tab-width: 4
+# cperl-indent-level: 4
+# End:
diff --git a/dh_auto_test b/dh_auto_test
index 01dc5df5..13dad9a0 100755
--- a/dh_auto_test
+++ b/dh_auto_test
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 
 =head1 NAME
 
@@ -7,6 +7,7 @@ dh_auto_test - automatically runs a package's test suites
 =cut
 
 use strict;
+use warnings;
 use Debian::Debhelper::Dh_Lib;
 use Debian::Debhelper::Dh_Buildsystems;
 
@@ -52,8 +53,7 @@ compiled.
 
 =cut
 
-if (get_buildoption("nocheck")
-    || (dpkg_architecture_value("DEB_HOST_GNU_TYPE") ne dpkg_architecture_value("DEB_BUILD_GNU_TYPE"))) {
+if (get_buildoption("nocheck")) {
 	exit 0;
 }
 
@@ -71,3 +71,9 @@ This program is a part of debhelper.
 Joey Hess <joeyh@debian.org>
 
 =cut
+
+# Local Variables:
+# indent-tabs-mode: t
+# tab-width: 4
+# cperl-indent-level: 4
+# End:
diff --git a/dh_bugfiles b/dh_bugfiles
index 83428f51..2fe9a11e 100755
--- a/dh_bugfiles
+++ b/dh_bugfiles
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 
 =head1 NAME
 
@@ -7,6 +7,7 @@ dh_bugfiles - install bug reporting customization files into package build direc
 =cut
 
 use strict;
+use warnings;
 use Debian::Debhelper::Dh_Lib;
 
 =head1 SYNOPSIS
@@ -77,7 +78,8 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 	next if is_udeb($package);
 
 	my $tmp=tmpdir($package);
-	my $dir="$tmp/usr/share/bug/$package";
+	my $p_dir="${tmp}/usr/share/bug";
+	my $dir="${p_dir}/$package";
 	
 	# Gather information which bug files are available for the
 	# package in question
@@ -95,20 +97,25 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 	# If there is only a bug script to install, install it as
 	# usr/share/bug/$package (unless this path is a directory)
 	if (! -d $dir && scalar(keys(%bugfiles)) == 1 && exists $bugfiles{script}) {
-		doit("install","-D","-p","-m755",$bugfiles{script},$dir);
+		install_dir($p_dir);
+		install_prog($bugfiles{script}, $dir);
 	}
 	elsif (scalar(keys(%bugfiles)) > 0) {
 		if (-f $dir) {
 			# Move usr/share/bug/$package to usr/share/bug/$package/script
 			doit("mv", $dir, "${dir}.tmp");
-			doit("install","-d",$dir);
+			install_dir($dir);
 			doit("mv", "${dir}.tmp", "$dir/script");
 		}
 		elsif (! -d $dir) {
-			doit("install","-d",$dir);
+			install_dir($dir);
 		}
 		while (my ($type, $srcfile) = each(%bugfiles)) {
-			doit("install","-p","-m644",$srcfile, "$dir/$type");
+			if ($type eq 'script') {
+				install_prog($srcfile, "$dir/$type");
+			} else {
+				install_file($srcfile, "$dir/$type");
+			}
 		}
 	}
 	
@@ -134,3 +141,15 @@ This program is a part of debhelper.
 Modestas Vainius <modestas@vainius.eu>
 
 =cut
+
+# Local Variables:
+# indent-tabs-mode: t
+# tab-width: 4
+# cperl-indent-level: 4
+# End:
+
+# Local Variables:
+# indent-tabs-mode: t
+# tab-width: 4
+# cperl-indent-level: 4
+# End:
diff --git a/dh_builddeb b/dh_builddeb
index bf9fc27d..e36f0a3b 100755
--- a/dh_builddeb
+++ b/dh_builddeb
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 
 =head1 NAME
 
@@ -7,6 +7,7 @@ dh_builddeb - build Debian binary packages
 =cut
 
 use strict;
+use warnings;
 use Debian::Debhelper::Dh_Lib;
 
 =head1 SYNOPSIS
@@ -16,7 +17,8 @@ B<dh_builddeb> [S<I<debhelper options>>] [B<--destdir=>I<directory>] [B<--filena
 =head1 DESCRIPTION
 
 B<dh_builddeb> simply calls L<dpkg-deb(1)> to build a Debian package or
-packages.
+packages.  It will also build packages for ddebs when L<dh_strip(1)>
+and L<dh_gencontrol(1)> have prepared them.
 
 It supports building multiple binary packages in parallel, when enabled by
 DEB_BUILD_OPTIONS.
@@ -80,6 +82,17 @@ sub reap {
 	}
 }
 
+sub default_compressor_args {
+	my ($default_comp, @args) = @_;
+
+	for my $arg (@args) {
+		# Explicit compressor arg given
+		return @args if $arg =~ m/^-Z/;
+	}
+
+	return (@{$default_comp}, @args);
+}
+
 foreach my $package (@{$dh{DOPACKAGES}}) {
 	my $pid=fork();
 	if (! defined $pid) {
@@ -93,6 +106,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 
 	# child
 	my $tmp=tmpdir($package);
+	my $ddeb_tmpdir = "debian/.debhelper/${package}/ddeb-root";
 	if (exists $ENV{DH_ALWAYS_EXCLUDE} && length $ENV{DH_ALWAYS_EXCLUDE}) {
 		if (! compat(5)) {
 			complex_doit("find $tmp $dh{EXCLUDE_FIND} | xargs rm -rf");
@@ -104,6 +118,23 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 				foreach split(":", $ENV{DH_ALWAYS_EXCLUDE});
 		}
 	}
+	if ( -d $ddeb_tmpdir) {
+		my $ddeb_control = "${ddeb_tmpdir}/DEBIAN/control";
+		# Only build the ddeb if it has a control file.  People might
+		# have skipped dh_gencontrol.
+		if ( -f $ddeb_control ) {
+			# XXX: Should we blindly overrule the maintainer here?  It
+			# is not apparent that their explicit -z was intended for
+			# the ddeb.
+			my @args = default_compressor_args(["-z1", "-Zxz", "-Sextreme"],
+											   @{$dh{U_PARAMS}});
+			doit("dpkg-deb", @args,
+				 "--build", $ddeb_tmpdir, $dh{DESTDIR});
+		} else {
+			warning("Not building ddeb for ${package} as it has no control file");
+			warning("Please use dh_gencontrol to avoid this issue");
+		}
+	}
 	if (! is_udeb($package)) {
 		doit("dpkg-deb", @{$dh{U_PARAMS}}, "--build", $tmp, $dh{DESTDIR}.$dh{FILENAME});
 	}
@@ -132,3 +163,9 @@ This program is a part of debhelper.
 Joey Hess <joeyh@debian.org>
 
 =cut
+
+# Local Variables:
+# indent-tabs-mode: t
+# tab-width: 4
+# cperl-indent-level: 4
+# End:
diff --git a/dh_clean b/dh_clean
index 85f87f21..acb23dba 100755
--- a/dh_clean
+++ b/dh_clean
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 
 =head1 NAME
 
@@ -7,6 +7,7 @@ dh_clean - clean up package build directories
 =cut
 
 use strict;
+use warnings;
 use Debian::Debhelper::Dh_Lib;
 
 =head1 SYNOPSIS
@@ -92,6 +93,9 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 		unless excludefile($tmp);
 }
 
+# Remove internal state data
+doit('rm', '-rf', 'debian/.debhelper/');
+
 # Remove all debhelper logs.
 if (! $dh{D_FLAG} && ! $dh{K_FLAG}) {
 	complex_doit("rm","-f","debian/*.debhelper.log");
@@ -155,3 +159,9 @@ This program is a part of debhelper.
 Joey Hess <joeyh@debian.org>
 
 =cut
+
+# Local Variables:
+# indent-tabs-mode: t
+# tab-width: 4
+# cperl-indent-level: 4
+# End:
diff --git a/dh_compress b/dh_compress
index e908dd82..1b33ac9a 100755
--- a/dh_compress
+++ b/dh_compress
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 
 =head1 NAME
 
@@ -7,6 +7,7 @@ dh_compress - compress files and fix symlinks in package build directories
 =cut
 
 use strict;
+use warnings;
 use Cwd;
 use Debian::Debhelper::Dh_Lib;
 
@@ -112,8 +113,9 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 				2>/dev/null || true;
 			find usr/share/doc \\
 				\\( -type d -name _sources -prune -false \\) -o \\
-				-type f \\( -size +4k -or -name "changelog*" -or -name "NEWS*" \\) \\
-				\\( -name changelog.html -or ! -iname "*.htm*" \\) \\
+				-type f \\( -size +4k -o -name "changelog*" -o -name "NEWS*" \\) \\
+				\\( -name changelog.html -o ! -iname "*.htm*" \\) \\
+				! -iname "*.xhtml" \\
 				! -iname "*.gif" ! -iname "*.png" ! -iname "*.jpg" \\
 				! -iname "*.jpeg" ! -iname "*.gz" ! -iname "*.taz" \\
 				! -iname "*.tgz" ! -iname "*.z" ! -iname "*.bz2" \\
@@ -121,6 +123,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 				! -iname "*.epub" ! -iname "*.jar" ! -iname "*.zip" \\
 				! -iname "*.odg" ! -iname "*.odp" ! -iname "*.odt" \\
 				! -iname ".htaccess" ! -iname "*.css" \\
+				! -iname "*.xz" ! -iname "*.lz" ! -iname "*.lzma" \\
 				! -iname "*.svg" ! -iname "*.svgz" ! -iname "*.js" \\
 				! -name "index.sgml" ! -name "objects.inv" ! -name "*.map" \\
 				! -name "copyright" 2>/dev/null || true;
@@ -218,3 +221,9 @@ This program is a part of debhelper.
 Joey Hess <joeyh@debian.org>
 
 =cut
+
+# Local Variables:
+# indent-tabs-mode: t
+# tab-width: 4
+# cperl-indent-level: 4
+# End:
diff --git a/dh_desktop b/dh_desktop
index 075597fb..7495eefc 100755
--- a/dh_desktop
+++ b/dh_desktop
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 
 =head1 NAME
 
@@ -7,6 +7,7 @@ dh_desktop - deprecated no-op
 =cut
 
 use strict;
+use warnings;
 use Debian::Debhelper::Dh_Lib;
 
 =head1 SYNOPSIS
@@ -39,3 +40,9 @@ This program is a part of debhelper.
 Ross Burton <ross@burtonini.com>
 
 =cut
+
+# Local Variables:
+# indent-tabs-mode: t
+# tab-width: 4
+# cperl-indent-level: 4
+# End:
diff --git a/dh_fixperms b/dh_fixperms
index 809f2c31..a7bdc0e0 100755
--- a/dh_fixperms
+++ b/dh_fixperms
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 
 =head1 NAME
 
@@ -7,6 +7,7 @@ dh_fixperms - fix permissions of files in package build directories
 =cut
 
 use strict;
+use warnings;
 use Config;
 use Debian::Debhelper::Dh_Lib;
 
@@ -65,32 +66,32 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 	# Fix up permissions in usr/share/doc, setting everything to not
 	# executable by default, but leave examples directories alone.
 	complex_doit("find $tmp/usr/share/doc -type f $find_options ! -regex '$tmp/usr/share/doc/[^/]*/examples/.*' -print0 2>/dev/null",
-		"| xargs -0r chmod 644");
+		"| xargs -0r chmod 0644");
 	complex_doit("find $tmp/usr/share/doc -type d $find_options -print0 2>/dev/null",
-		"| xargs -0r chmod 755");
+		"| xargs -0r chmod 0755");
 
 	# Executable man pages are a bad thing..
 	complex_doit("find $tmp/usr/share/man $tmp/usr/man/ $tmp/usr/X11*/man/ -type f",
-		"$find_options -print0 2>/dev/null | xargs -0r chmod 644");
+		"$find_options -print0 2>/dev/null | xargs -0r chmod 0644");
 
 	# ..and so are executable shared and static libraries 
 	# (and .la files from libtool) ..
 	complex_doit("find $tmp -perm -5 -type f",
 		"\\( -name '*.so.*' -or -name '*.so' -or -name '*.la' -or -name '*.a' \\) $find_options -print0",
-		"2>/dev/null | xargs -0r chmod 644");
+		"2>/dev/null | xargs -0r chmod 0644");
 	
 	# ..and header files ..
 	complex_doit("find $tmp/usr/include -type f $find_options -print0",
-		"2>/dev/null | xargs -0r chmod 644");
+		"2>/dev/null | xargs -0r chmod 0644");
 	
 	# ..and desktop files ..
 	complex_doit("find $tmp/usr/share/applications -type f $find_options -print0",
-		"2>/dev/null | xargs -0r chmod 644");
+		"2>/dev/null | xargs -0r chmod 0644");
 
 	# ..and OCaml native-code shared objects ..
 	complex_doit("find $tmp -perm -5 -type f",
 		"\\( -name '*.cmxs' \\) $find_options -print0",
-		"2>/dev/null | xargs -0r chmod 644");
+		"2>/dev/null | xargs -0r chmod 0644");
 	
 	# .. and perl modules.
 	complex_doit("find $tmp/$vendorarch $tmp/$vendorlib -type f",
@@ -113,18 +114,29 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 		"-name '*.ali' $find_options -print0",
 		"2>/dev/null | xargs -0r chmod uga-w");
 
+	if ( -d "$tmp/usr/share/bug/$package") {
+		complex_doit("find $tmp/usr/share/bug/$package -type f",
+			"! -name 'script' $find_options -print0",
+			"2>/dev/null | xargs -0r chmod 644");
+		if ( -f "$tmp/usr/share/bug/$package/script" ) {
+			doit('chmod', '0755', "$tmp/usr/share/bug/$package/script");
+		}
+	} elsif ( -f "$tmp/usr/share/bug/$package" ) {
+		doit('chmod', '0755', "$tmp/usr/share/bug/$package");
+	}
+
 	# Lintian overrides should never be executable, too.
 	if (-d "$tmp/usr/share/lintian") {
 		complex_doit("find $tmp/usr/share/lintian/overrides",
 			"-type f $find_options -print0",
-			"2>/dev/null | xargs -0r chmod 644");
+			"2>/dev/null | xargs -0r chmod 0644");
 	}
 
-	# Files in $tmp/etc/sudoers.d/ must be mode 440.
+	# Files in $tmp/etc/sudoers.d/ must be mode 0440.
 	if (-d "$tmp/etc/sudoers.d") {
 		complex_doit("find $tmp/etc/sudoers.d",
 			"-type f ! -perm 440 $find_options -print0",
-			"2>/dev/null | xargs -0r chmod 440");
+			"2>/dev/null | xargs -0r chmod 0440");
 	}
 
     # SMF methods should be executable.
@@ -146,3 +158,9 @@ This program is a part of debhelper.
 Joey Hess <joeyh@debian.org>
 
 =cut
+
+# Local Variables:
+# indent-tabs-mode: t
+# tab-width: 4
+# cperl-indent-level: 4
+# End:
diff --git a/dh_gconf b/dh_gconf
index 48b05ba2..d401c3ef 100755
--- a/dh_gconf
+++ b/dh_gconf
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 
 =head1 NAME
 
@@ -7,6 +7,7 @@ dh_gconf - install GConf defaults files and register schemas
 =cut
 
 use strict;
+use warnings;
 use Debian::Debhelper::Dh_Lib;
 
 =head1 SYNOPSIS
@@ -63,20 +64,16 @@ if (defined $dh{PRIORITY}) {
 foreach my $package (@{$dh{DOPACKAGES}}) {
 	my $tmp=tmpdir($package);
 	
-	my $gconf_dep = 0;
 	my $mandatory = pkgfile($package, "gconf-mandatory");
 	if ($mandatory ne '') {
-		doit("mkdir","-p","$tmp/usr/share/gconf/mandatory");
-		doit("install","-p","-m644",$mandatory,"$tmp/usr/share/gconf/mandatory/${priority}_$package");
-		addsubstvar($package, "misc:Depends", "gconf2 (>= 2.28.1-2)");
-		$gconf_dep = 1;
+		install_dir("$tmp/usr/share/gconf/mandatory");
+		install_file($mandatory,
+					 "$tmp/usr/share/gconf/mandatory/${priority}_$package");
 	}
 	my $defaults = pkgfile($package,"gconf-defaults");
 	if ($defaults ne '') {
 		doit("mkdir","-p","$tmp/usr/share/gconf/defaults");
-		doit("install","-p","-m644",$defaults,"$tmp/usr/share/gconf/defaults/${priority}_$package");
-		addsubstvar($package, "misc:Depends", "gconf2 (>= 2.28.1-2)") unless $gconf_dep;
-		$gconf_dep = 1;
+		install_file($defaults, "$tmp/usr/share/gconf/defaults/${priority}_$package");
 	}
 
 	my $old_schemas_dir = "$tmp/etc/gconf/schemas";
@@ -84,16 +81,16 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 
 	# Migrate schemas from /etc/gconf/schemas to /usr/share/gconf/schemas
 	if (-d $old_schemas_dir) {
-		doit("mkdir -p $new_schemas_dir") unless -d $new_schemas_dir;
-		doit("mv $old_schemas_dir/*.schemas $new_schemas_dir/");
-		doit("rmdir -p --ignore-fail-on-non-empty $old_schemas_dir");
+		doit("mkdir","-p",$new_schemas_dir) unless -d $new_schemas_dir;
+		complex_doit("mv $old_schemas_dir/*.schemas $new_schemas_dir/");
+		doit("rmdir","-p","--ignore-fail-on-non-empty",$old_schemas_dir);
 	}
 
 	if (-d "$new_schemas_dir") {
 		# Get a list of the schemas
 		my $schemas = `find $new_schemas_dir -type f -name \\*.schemas -printf '%P '`;
 		if ($schemas ne '') {
-			addsubstvar($package, "misc:Depends", "gconf2 (>= 2.28.1-2)") unless $gconf_dep;
+			addsubstvar($package, "misc:Depends", "gconf2 (>= 2.28.1-2)");
 		}
 	}
 }
@@ -110,3 +107,9 @@ Ross Burton <ross@burtonini.com>
 Josselin Mouette <joss@debian.org>
 
 =cut
+
+# Local Variables:
+# indent-tabs-mode: t
+# tab-width: 4
+# cperl-indent-level: 4
+# End:
diff --git a/dh_gencontrol b/dh_gencontrol
index 41e09cbe..f5944805 100755
--- a/dh_gencontrol
+++ b/dh_gencontrol
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 
 =head1 NAME
 
@@ -7,6 +7,7 @@ dh_gencontrol - generate and install control file
 =cut
 
 use strict;
+use warnings;
 use Debian::Debhelper::Dh_Lib;
 
 =head1 SYNOPSIS
@@ -19,9 +20,16 @@ B<dh_gencontrol> is a debhelper program that is responsible for generating
 control files, and installing them into the I<DEBIAN> directory with the
 proper permissions.
 
-This program is merely a wrapper around L<dpkg-gencontrol(1)>, which calls
-it once for each package being acted on, and passes in some additional
-useful flags.
+This program is merely a wrapper around L<dpkg-gencontrol(1)>, which
+calls it once for each package being acted on (plus related ddebs),
+and passes in some additional useful flags.
+
+B<Note> that if you use B<dh_gencontrol>, you must also use
+L<dh_builddeb(1)> to build the packages.  Otherwise, your build may
+fail to build as B<dh_gencontrol> (via L<dpkg-gencontrol(1)>) declares
+which packages are built.  As debhelper automatically generates ddebs,
+it some times adds additional packages, which will be built by L<dh_builddeb(1)>.
+
 
 =head1 OPTIONS
 
@@ -44,9 +52,14 @@ init(options => {
 	"dpkg-gencontrol-params=s", => \$dh{U_PARAMS},
 });
 
+
+my $src_pkg;
+
 foreach my $package (@{$dh{DOPACKAGES}}) {
 	my $tmp=tmpdir($package);
 	my $ext=pkgext($package);
+	my $ddeb_info_dir = "debian/.debhelper/${package}";
+	my $ddeb_tmp = "${ddeb_info_dir}/ddeb-root";
 
 	my $substvars="debian/${ext}substvars";
 	
@@ -56,25 +69,83 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 	}
 
 	if ( ! -d "$tmp/DEBIAN" ) {
-		doit("install","-o",0,"-g",0,"-d","$tmp/DEBIAN");
+		install_dir("$tmp/DEBIAN");
 	}
 
 	# avoid gratuitous warning
 	if (! -e $substvars || system("grep -q '^misc:Depends=' $substvars") != 0) {
 		complex_doit("echo misc:Depends= >> $substvars");
 	}
+	# avoid (another) gratuitous warning
+	if (! -e $substvars || system("grep -q '^misc:Pre-Depends=' $substvars") != 0) {
+		complex_doit("echo misc:Pre-Depends= >> $substvars");
+	}
 	
+
+	if ( -d $ddeb_tmp) {
+		my $multiarch = package_multiarch($package);
+		my $replaces = read_ddeb_migration($ddeb_info_dir);
+		$src_pkg = sourcepackage() if not defined($src_pkg);
+
+		# Remove and override more or less every standard field.
+		my @ddeb_options = (qw(
+			-UPre-Depends -URecommends -USuggests -UEnhances -UProvides -UEssential
+			-UConflicts -DPriority=extra -DSection=debugsym
+			),
+			 "-DPackage=${package}-dbgsym",
+			 "-DDepends=${package} (= \${binary:Version})",
+			 "-DDescription=Debug symbols for ${package}",
+			 "-DSource=${src_pkg}",
+		);
+		# Disable multi-arch unless the original package is an
+		# multi-arch: same package.  In all other cases, we do not
+		# need a multi-arch value.
+		if ($multiarch ne 'same') {
+			push(@ddeb_options, '-UMulti-Arch');
+		}
+		# If the ddeb is replacing an existing -dbg package, then
+		# declare the necessary Breaks + Replaces.  Otherwise, clear
+		# the fields.
+		if ($replaces) {
+			push(@ddeb_options, "-DReplaces=${replaces}",
+				 "-DBreaks=${replaces}");
+		} else {
+			push(@ddeb_options, '-UReplaces', '-UBreaks');
+		}
+		if ( ! -d "${ddeb_tmp}/DEBIAN" ) {
+			install_dir("${ddeb_tmp}/DEBIAN");
+		}
+		doit("dpkg-gencontrol", "-p${package}", "-l$changelog", "-T$substvars",
+			"-P${ddeb_tmp}",@{$dh{U_PARAMS}}, @ddeb_options);
+
+		doit("chmod","0644","${ddeb_tmp}/DEBIAN/control");
+		doit("chown","0:0","${ddeb_tmp}/DEBIAN/control");
+	}
+
 	# Generate and install control file.
-	doit("dpkg-gencontrol", "-p$package", "-l$changelog", "-T$substvars", 
+	doit("dpkg-gencontrol", "-p$package", "-l$changelog", "-T$substvars",
 		"-P$tmp",@{$dh{U_PARAMS}});
 
 	# This chmod is only necessary if the user sets the umask to
 	# something odd.
-	doit("chmod","644","$tmp/DEBIAN/control");
+	doit("chmod","0644","$tmp/DEBIAN/control");
 	
 	doit("chown","0:0","$tmp/DEBIAN/control");
 }
 
+sub read_ddeb_migration {
+	my ($ddeb_info_dir) = @_;
+	my $ddeb_migration = "${ddeb_info_dir}/ddeb-migration";
+	my $result;
+	if (-f $ddeb_migration) {
+		open(my $fd, '<', $ddeb_migration)
+			or error("open $ddeb_migration failed: $!");
+		chomp($result = <$fd>);
+		close($fd);
+	}
+	return $result;
+}
+
 =head1 SEE ALSO
 
 L<debhelper(7)>
@@ -86,3 +157,9 @@ This program is a part of debhelper.
 Joey Hess <joeyh@debian.org>
 
 =cut
+
+# Local Variables:
+# indent-tabs-mode: t
+# tab-width: 4
+# cperl-indent-level: 4
+# End:
diff --git a/dh_icons b/dh_icons
index 916f1885..f2b6d7a4 100755
--- a/dh_icons
+++ b/dh_icons
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 
 =head1 NAME
 
@@ -7,6 +7,7 @@ dh_icons - Update caches of Freedesktop icons
 =cut
 
 use strict;
+use warnings;
 use File::Find;
 use Debian::Debhelper::Dh_Lib;
 
@@ -61,7 +62,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 			push @dirlist, "$baseicondir/$subdir" if $needs_cache;
 		}
 		if (@dirlist and ! $dh{NOSCRIPTS}) {
-			my $list=join(" ", @dirlist);
+			my $list=join(" ", sort @dirlist);
 			autoscript($package,"postinst","postinst-icons","s%#DIRLIST#%$list%");
 			autoscript($package,"postrm","postrm-icons","s%#DIRLIST#%$list%");
 		}
@@ -81,3 +82,9 @@ Jordi Mallach <jordi@debian.org>
 Josselin Mouette <joss@debian.org>
 
 =cut
+
+# Local Variables:
+# indent-tabs-mode: t
+# tab-width: 4
+# cperl-indent-level: 4
+# End:
diff --git a/dh_install b/dh_install
index 28a76efd..7f8391e7 100755
--- a/dh_install
+++ b/dh_install
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 
 =head1 NAME
 
@@ -7,6 +7,7 @@ dh_install - install files into package build directories
 =cut
 
 use strict;
+use warnings;
 use File::Find;
 use Debian::Debhelper::Dh_Lib;
 
@@ -192,10 +193,10 @@ foreach my $package (getpackages()) {
 				$dest=dirname("/".$dest);
 				$tmpdest=1;
 			}
-			
+
 			# Make sure the destination directory exists.
 			if (! -e "$tmp/$dest") {
-				doit("install","-d","$tmp/$dest");
+				install_dir("$tmp/$dest");
 			}
 			
 			if (-d $src && $exclude) {
@@ -203,13 +204,15 @@ foreach my $package (getpackages()) {
 				my $dir = ($basename eq '.') ? $src : "$src/..";
 				my $pwd=`pwd`;
 				chomp $pwd;
-				complex_doit("cd '$dir' && find '$basename' $exclude \\( -type f -or -type l \\) -print0 | xargs -0 -I {} cp --parents -dp {} $pwd/$tmp/$dest/");
+				complex_doit("cd '$dir' && " .
+							 "find '$basename' $exclude \\( -type f -or -type l \\) -print0 | xargs -0 -I {} cp --reflink=auto --parents -dp {} $pwd/$tmp/$dest/");
 				# cp is annoying so I need a separate pass
 				# just for empty directories
-				complex_doit("cd '$dir' && find '$basename' $exclude \\( -type d -and -empty \\) -print0 | xargs -0 -I {} cp --parents -a {} $pwd/$tmp/$dest/");
+				complex_doit("cd '$dir' && " .
+							 "find '$basename' $exclude \\( -type d -and -empty \\) -print0 | xargs -0 -I {} cp --reflink=auto --parents -a {} $pwd/$tmp/$dest/");
 			}
 			else {
-				doit("cp", "-a", $src, "$tmp/$dest/");
+				doit("cp", '--reflink=auto', "-a", $src, "$tmp/$dest/");
 			}
 
 			if ($tmpdest) {
@@ -256,6 +259,25 @@ if ($dh{LIST_MISSING} || $dh{FAIL_MISSING}) {
 B<dh_install> cannot rename files or directories, it can only install them
 with the names they already have into wherever you want in the package
 build tree.
+
+However, renaming can be achieved by using B<dh-exec> with compatibility level 9 or
+later.  An example debian/I<package>.install file using B<dh-exec>
+could look like:
+
+ #!/usr/bin/dh-exec
+ debian/default.conf => /etc/my-package/start.conf
+
+Please remember the following three things:
+
+=over 4
+
+=item * The package must be using compatibility level 9 or later (see L<debhelper(7)>)
+
+=item * The package will need a build-dependency on dh-exec.
+
+=item * The install file must be marked as executable.
+
+=back
   
 =head1 SEE ALSO
 
@@ -268,3 +290,9 @@ This program is a part of debhelper.
 Joey Hess <joeyh@debian.org>
 
 =cut
+
+# Local Variables:
+# indent-tabs-mode: t
+# tab-width: 4
+# cperl-indent-level: 4
+# End:
diff --git a/dh_installcatalogs b/dh_installcatalogs
index f65ab7cb..d33ad9e0 100755
--- a/dh_installcatalogs
+++ b/dh_installcatalogs
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 
 =head1 NAME
 
@@ -7,6 +7,7 @@ dh_installcatalogs - install and register SGML Catalogs
 =cut
 
 use strict;
+use warnings;
 use Debian::Debhelper::Dh_Lib;
 
 my $sgmlbasever = "1.26+nmu2";
@@ -83,11 +84,11 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 			$fulldest =~ s|//|/|g; # beautification
 	
 			if (! -d dirname($fulldest)) {
-				doit("install","-d","-m755",$tmpdir."/".dirname($dest));
+				install_dir($tmpdir."/".dirname($dest));
 			}
 
-			doit("install","-p","-m644",$source,$fulldest);
-	
+			install_file($source,$fulldest);
+
 			push(@sgmlinstalled,$dest);
 		}
 	}
@@ -95,7 +96,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 		addsubstvar($package, "misc:Depends", "sgml-base", ">= $sgmlbasever");
 
 		if (! -d "$tmpdir/etc/sgml") {
-			doit("install","-d","-m755","$tmpdir/etc/sgml");
+			install_dir("$tmpdir/etc/sgml");
 		}
 
 		my $centralcat = "/etc/sgml/$package.cat";
@@ -130,3 +131,9 @@ F</usr/share/doc/sgml-base-doc/>
 Adam Di Carlo <aph@debian.org>
 
 =cut
+
+# Local Variables:
+# indent-tabs-mode: t
+# tab-width: 4
+# cperl-indent-level: 4
+# End:
diff --git a/dh_installchangelogs b/dh_installchangelogs
index edd7f9f3..b372d9b5 100755
--- a/dh_installchangelogs
+++ b/dh_installchangelogs
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 
 =head1 NAME
 
@@ -7,6 +7,7 @@ dh_installchangelogs - install changelogs into package build directories
 =cut
 
 use strict;
+use warnings;
 use Debian::Debhelper::Dh_Lib;
 
 =head1 SYNOPSIS
@@ -142,14 +143,16 @@ if (! defined $upstream) {
 	if (! isnative($dh{MAINPACKAGE}) && !compat(6)) {
 		foreach my $dir (qw{. doc docs}) {
 			my @files=sort glob("$dir/*");
-			foreach my $name (qw{changelog changes changelog.txt changes.txt history history.txt changelog.md}) {
-				my @matches=grep {
-					lc basename($_) eq $name && -s $_ && ! excludefile($_)
-				} @files;
-				if (@matches) {
-					$upstream=shift @matches;
-					$upstream_text=$upstream;
-					last;
+			foreach my $suffix ('', qw(.txt .md .rst)) {
+				foreach my $name (qw{changelog changes history}) {
+					my @matches=grep {
+						lc basename($_) eq "$name$suffix" && -s $_ && ! excludefile($_)
+					} @files;
+					if (@matches) {
+						$upstream=shift @matches;
+						$upstream_text=$upstream;
+						last;
+					}
 				}
 			}
 		}
@@ -197,32 +200,29 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 	}
 
 	if (! -d "$tmp/usr/share/doc/$package") {
-		doit("install","-d","$tmp/usr/share/doc/$package");
+		install_dir("$tmp/usr/share/doc/$package");
 	}
 
 	if (! $dh{NO_ACT}) {
 		if (! install_binNMU_changelog($package, $changelog, $changelog_name)) {
-			doit("install","-o",0,"-g",0,"-p","-m644",$changelog,
-				"$tmp/usr/share/doc/$package/$changelog_name");
+			install_file($changelog,
+						 "$tmp/usr/share/doc/$package/$changelog_name");
 		}
 	}
 
 	if (-e $news) {
-		doit("install","-o",0,"-g",0,"-p","-m644",$news,
-			"$tmp/usr/share/doc/$package/$news_name");
+		install_file($news, "$tmp/usr/share/doc/$package/$news_name");
 	}
 
 	if (defined $upstream) {
 		my $link_to;
 		my $base="$tmp/usr/share/doc/$package";
 		if (defined $upstream_text) {
-			doit("install","-o",0,"-g",0,"-p","-m644",
-				$upstream_text,"$base/changelog");
+			install_file($upstream_text, "$base/changelog");
 			$link_to='changelog';
 		}
 		if (defined $upstream_html) {
-			doit("install","-o",0,"-g",0,"-p","-m644",
-				$upstream_html,"$base/changelog.html");
+			install_file($upstream_html,"$base/changelog.html");
 			$link_to='changelog.html';
 			if (! defined $upstream_text) {
 				complex_doit("echo 'See changelog.html.gz' > $base/changelog");
@@ -249,3 +249,9 @@ This program is a part of debhelper.
 Joey Hess <joeyh@debian.org>
 
 =cut
+
+# Local Variables:
+# indent-tabs-mode: t
+# tab-width: 4
+# cperl-indent-level: 4
+# End:
diff --git a/dh_installcron b/dh_installcron
index 5e5851c1..f91ef15f 100755
--- a/dh_installcron
+++ b/dh_installcron
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 
 =head1 NAME
 
@@ -7,6 +7,7 @@ dh_installcron - install cron scripts into etc/cron.*
 =cut
 
 use strict;
+use warnings;
 use Debian::Debhelper::Dh_Lib;
 
 =head1 SYNOPSIS
@@ -61,18 +62,18 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 		my $cron=pkgfile($package,"cron.$type");
 		if ($cron) {
 			if (! -d "$tmp/etc/cron.$type") {
-				doit("install","-o",0,"-g",0,"-d","$tmp/etc/cron.$type");
+				install_dir("$tmp/etc/cron.$type");
 			}
-			doit("install",$cron,"$tmp/etc/cron.$type/".pkgfilename($package));
+			install_prog($cron,"$tmp/etc/cron.$type/".pkgfilename($package));
 		}
 	}
 	# Seperate because this needs to be mode 644.
 	my $cron=pkgfile($package,"cron.d");
 	if ($cron) {
 		if (! -d "$tmp/etc/cron.d") {
-			doit("install","-o",0,"-g",0,"-d","$tmp/etc/cron.d");
-		}	
-		doit("install","-m",644,$cron,"$tmp/etc/cron.d/".pkgfilename($package));
+			install_dir("$tmp/etc/cron.d");
+		}
+		install_file($cron,"$tmp/etc/cron.d/".pkgfilename($package));
 	}
 }
 
@@ -87,3 +88,9 @@ This program is a part of debhelper.
 Joey Hess <joeyh@debian.org>
 
 =cut
+
+# Local Variables:
+# indent-tabs-mode: t
+# tab-width: 4
+# cperl-indent-level: 4
+# End:
diff --git a/dh_installdeb b/dh_installdeb
index 3fc802c8..5d16921b 100755
--- a/dh_installdeb
+++ b/dh_installdeb
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 
 =head1 NAME
 
@@ -7,6 +7,7 @@ dh_installdeb - install files into the DEBIAN directory
 =cut
 
 use strict;
+use warnings;
 use Debian::Debhelper::Dh_Lib;
 
 =head1 SYNOPSIS
@@ -42,6 +43,9 @@ shell script snippets generated by other debhelper commands.
 
 These control files are installed into the F<DEBIAN> directory.
 
+Note that I<package>.shlibs is only installed in compat level 9 and
+earlier.  In compat 10, please use L<dh_makeshlibs(1)>.
+
 =item I<package>.conffiles
 
 This control file will be installed into the F<DEBIAN> directory.
@@ -69,15 +73,15 @@ init();
 my %maintscript_predeps = (
 	"rm_conffile" => "",
 	"mv_conffile" => "",
-	"symlink_to_dir" => "1.17.5",
-	"dir_to_symlink" => "1.17.5",
+	"symlink_to_dir" => "1.17.14",
+	"dir_to_symlink" => "1.17.13",
 );
 
 foreach my $package (@{$dh{DOPACKAGES}}) {
 	my $tmp=tmpdir($package);
 
 	if (! -d "$tmp/DEBIAN") {
-		doit("install","-o",0,"-g",0,"-d","$tmp/DEBIAN");
+		install_dir("$tmp/DEBIAN");
 	}
 
 	if (is_udeb($package)) {
@@ -86,8 +90,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 		foreach my $script (qw{postinst menutest isinstallable}) {
 			my $f=pkgfile($package,$script);
 			if ($f) {
-				doit("install", "-o", 0, "-g", 0, "-m", 755, 
-				     $f, "$tmp/DEBIAN/$script");
+				install_prog($f, "$tmp/DEBIAN/$script");
 			}
 		}
 
@@ -118,10 +121,13 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 	}
 
 	# Install non-executable files
-	foreach my $file (qw{shlibs conffiles triggers}) {
+	my @non_exec_files = (qw{conffiles triggers});
+	# In compat 10, we let dh_makeshlibs handle "shlibs".
+	push(@non_exec_files, 'shlibs') if compat(9);
+	foreach my $file (@non_exec_files) {
 		my $f=pkgfile($package,$file);
 		if ($f) {
-			doit("install","-o",0,"-g",0,"-m",644,"-p",$f,"$tmp/DEBIAN/$file");
+			install_file($f, "$tmp/DEBIAN/$file");
 		}
 	}
 
@@ -131,10 +137,10 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 		complex_doit("find $tmp/etc -type f -printf '/etc/%P\n' | LC_ALL=C sort >> $tmp/DEBIAN/conffiles");
 		# Anything found?
 		if (-z "$tmp/DEBIAN/conffiles") {
-			doit("rm", "-f", "$tmp/DEBIAN/conffiles");
+			doit("rm","-f","$tmp/DEBIAN/conffiles");
 		}
 		else {
-			doit("chmod", 644, "$tmp/DEBIAN/conffiles");
+			doit("chmod","0644","$tmp/DEBIAN/conffiles");
 		}
 	}
 }
@@ -150,3 +156,9 @@ This program is a part of debhelper.
 Joey Hess <joeyh@debian.org>
 
 =cut
+
+# Local Variables:
+# indent-tabs-mode: t
+# tab-width: 4
+# cperl-indent-level: 4
+# End:
diff --git a/dh_installdebconf b/dh_installdebconf
index 3eac7c99..686c7bca 100755
--- a/dh_installdebconf
+++ b/dh_installdebconf
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 
 =head1 NAME
 
@@ -7,6 +7,7 @@ dh_installdebconf - install files used by debconf in package build directories
 =cut
 
 use strict;
+use warnings;
 use Debian::Debhelper::Dh_Lib;
 
 =head1 SYNOPSIS
@@ -89,7 +90,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 	my $templates=pkgfile($package,"templates");
 
 	if (! -d "$tmp/DEBIAN") {
-		doit("install","-o",0,"-g",0,"-d","$tmp/DEBIAN");
+		install_dir("$tmp/DEBIAN");
 	}
 
 	if (! is_udeb($package)) {
@@ -103,13 +104,12 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 		}
 
 		umask(0022); # since I do a redirect below
-		
+
 		if (-d "debian/po") {
 			complex_doit("po2debconf @extraparams $templates > $tmp/DEBIAN/templates");
 		}
 		else {
-			doit("install", "-o", 0, "-g", 0, "-m", 644, "-p",
-			     $templates, "$tmp/DEBIAN/templates");
+			install_file($templates,"$tmp/DEBIAN/templates");
 		}
 	}
 
@@ -136,3 +136,9 @@ This program is a part of debhelper.
 Joey Hess <joeyh@debian.org>
 
 =cut
+
+# Local Variables:
+# indent-tabs-mode: t
+# tab-width: 4
+# cperl-indent-level: 4
+# End:
diff --git a/dh_installdirs b/dh_installdirs
index fe5683d6..6797458f 100755
--- a/dh_installdirs
+++ b/dh_installdirs
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 
 =head1 NAME
 
@@ -7,6 +7,7 @@ dh_installdirs - create subdirectories in package build directories
 =cut
 
 use strict;
+use warnings;
 use Debian::Debhelper::Dh_Lib;
 
 =head1 SYNOPSIS
@@ -55,7 +56,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 	my $file=pkgfile($package,"dirs");
 
 	if (! -e $tmp) {
-		doit("install","-d",$tmp);
+		install_dir($tmp);
 	}
 
 	my @dirs;
@@ -81,7 +82,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 			  } @dirs;
 
 		# Create dirs.
-		doit("install","-d",@dirs);
+		install_dir(@dirs);
 	}
 }
 
@@ -96,3 +97,9 @@ This program is a part of debhelper.
 Joey Hess <joeyh@debian.org>
 
 =cut
+
+# Local Variables:
+# indent-tabs-mode: t
+# tab-width: 4
+# cperl-indent-level: 4
+# End:
diff --git a/dh_installdocs b/dh_installdocs
index 3eefcdfa..45b53385 100755
--- a/dh_installdocs
+++ b/dh_installdocs
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 
 =head1 NAME
 
@@ -7,6 +7,7 @@ dh_installdocs - install documentation into package build directories
 =cut
 
 use strict;
+use warnings;
 use Debian::Debhelper::Dh_Lib;
 
 =head1 SYNOPSIS
@@ -100,6 +101,16 @@ not be installed.
 is to make the documentation directory of a package be a dangling symlink,
 before calling B<dh_installdocs>.)
 
+B<CAVEAT>: If a previous version of the package was built without this
+option and is now built with it (or vice-versa), it requries a "dir to
+symlink" (or "symlink to dir") migration.  Since debhelper has no
+knowledge of previous versions, you have to enable this migration
+itself.
+
+This can be done by providing a "debian/I<package>.maintscript" file
+and using L<dh_installdeb(1)> to provide the relevant maintainer
+script snippets.
+
 =item I<file> ...
 
 Install these files as documentation into the first package acted on. (Or
@@ -124,10 +135,6 @@ Note that B<dh_installdocs> will happily copy entire directory hierarchies if
 you ask it to (similar to B<cp -a>). If it is asked to install a
 directory, it will install the complete contents of the directory.
 
-Note that this command is not idempotent. L<dh_prep(1)> should be called
-between invocations of this command. Otherwise, it may cause multiple
-instances of the same text to be added to maintainer scripts.
-
 =cut
 
 my %docdir_created;
@@ -149,7 +156,7 @@ sub ensure_docdir {
 
 	# If this is a symlink, leave it alone.
 	if (! -d $target && ! -l $target) {
-		doit("install","-g",0,"-o",0,"-d",$target);
+		install_dir($target);
 	}
 	$docdir_created{$package}=1;
 }
@@ -158,6 +165,8 @@ init(options => {
 	"link-doc=s" => \$dh{LINK_DOC},
 });
 
+my $called_getpackages = 0;
+
 foreach my $package (@{$dh{DOPACKAGES}}) {
 	next if is_udeb($package);
 	
@@ -166,22 +175,28 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 	my $link_doc=($dh{LINK_DOC} && $dh{LINK_DOC} ne $package);
 
 	if ($link_doc) {
+		getpackages('both') unless $called_getpackages++;
+
+		if (package_arch($package) ne package_arch($dh{LINK_DOC})) {
+			if (compat(9)) {
+				warning("WARNING: --link-doc between architecture all and not all packages breaks binNMUs");
+			} else {
+				error("--link-doc not allowed between ${package} and $dh{LINK_DOC} (one is arch:all and the other not)");
+			}
+		}
 		# Make sure that the parent directory exists.
 		if (! -d "$tmp/usr/share/doc" && ! -l "$tmp/usr/share/doc") {
-			doit("install","-g",0,"-o",0,"-d","$tmp/usr/share/doc");
+			install_dir("$tmp/usr/share/doc");
 		}
 		# Create symlink to another documentation directory if
 		# necessary.
 		if (! -d "$tmp/usr/share/doc/$package" &&
 		    ! -l "$tmp/usr/share/doc/$package") {
 			doit("ln", "-sf", $dh{LINK_DOC}, "$tmp/usr/share/doc/$package");
-			# Call isnative because it sets $dh{VERSION}
-			# as a side effect.
-			isnative($dh{LINK_DOC});
 			# Policy says that if you make your documentation
 			# directory a symlink, then you have to depend on
 			# the target.
-			addsubstvar($package, "misc:Depends", "$dh{LINK_DOC} (= $dh{VERSION})");
+			addsubstvar($package, 'misc:Depends', "$dh{LINK_DOC} (= \${binary:Version})");
 		}
 	}
 	else {
@@ -217,10 +232,11 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 				my $pwd=`pwd`;
 				chomp $pwd;
 				my $docdir = "$pwd/$tmp/usr/share/doc/$package";
-				complex_doit("cd '$dir' && find '$basename' \\( -type f -or -type l \\)$exclude -print0 | xargs -0 -I {} cp --parents -dp {} $docdir");
+				complex_doit("cd '$dir' && find '$basename' \\( -type f -or -type l \\)$exclude -print0 | xargs -0 -I {} cp --reflink=auto --parents -dp {} $docdir");
 			}
 			else {
-				doit("cp", "-a", $doc, "$tmp/usr/share/doc/$package");
+				doit("cp", '--reflink=auto', "-a", $doc,
+					 "$tmp/usr/share/doc/$package");
 			}
 		}
 		doit("chown","-R","0:0","$tmp/usr/share/doc");
@@ -235,19 +251,18 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 	}
 	if (! $link_doc && $readme_debian && ! excludefile($readme_debian)) {
 		ensure_docdir($package);
-		doit("install","-g",0,"-o",0,"-m","644","-p","$readme_debian",
-			"$tmp/usr/share/doc/$package/README.Debian");
+		install_file($readme_debian,
+					 "$tmp/usr/share/doc/$package/README.Debian");
 	}
 
 	my $todo=pkgfile($package,'TODO');
 	if (! $link_doc && $todo && ! excludefile($todo)) {
 		ensure_docdir($package);
 		if (isnative($package)) {
-			doit("install","-g",0,"-o",0,"-m","644","-p",$todo,
-				"$tmp/usr/share/doc/$package/TODO");
+			install_file($todo, "$tmp/usr/share/doc/$package/TODO");
 		}
 		else {
-			doit("install","-g",0,"-o",0,"-m","644","-p",$todo,
+			install_file($todo,
 				"$tmp/usr/share/doc/$package/TODO.Debian");
 		}
 	}
@@ -265,7 +280,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 		}
 		if ($copyright && ! excludefile($copyright)) {
 			ensure_docdir($package);
-			doit("install","-g",0,"-o",0,"-m","644","-p",$copyright,
+			install_file($copyright,
 				"$tmp/usr/share/doc/$package/copyright");
 		}
 	}
@@ -304,7 +319,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 	
 	if (%doc_ids) {
 		if (! -d "$tmp/usr/share/doc-base/") {
-			doit("install","-g",0,"-o",0,"-d","$tmp/usr/share/doc-base/");
+			install_dir("$tmp/usr/share/doc-base/");
 		}
 	}
 	# check for duplicate document ids
@@ -324,12 +339,12 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 			my $fn_no_docbase = $fn;
 			$fn_no_docbase =~ s/\.doc-base(?:\.(.*))?/
 			    if (defined $1 and length $1) {"-$1"} else {''}/xe;
-			doit("install","-g",0,"-o",0,"-m644","-p","debian/$fn",
-			     "$tmp/usr/share/doc-base/$fn_no_docbase");
+			install_file("debian/$fn",
+						 "$tmp/usr/share/doc-base/$fn_no_docbase");
 		}
 		else {
-			doit("install","-g",0,"-o",0,"-m644","-p","debian/$fn",
-			     "$tmp/usr/share/doc-base/$doc_ids{$fn}");
+			install_file("debian/$fn",
+						 "$tmp/usr/share/doc-base/$doc_ids{$fn}");
 		}
 	}
 }
@@ -345,3 +360,9 @@ This program is a part of debhelper.
 Joey Hess <joeyh@debian.org>
 
 =cut
+
+# Local Variables:
+# indent-tabs-mode: t
+# tab-width: 4
+# cperl-indent-level: 4
+# End:
diff --git a/dh_installemacsen b/dh_installemacsen
index b2ee1426..b56fb8b7 100755
--- a/dh_installemacsen
+++ b/dh_installemacsen
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 
 =head1 NAME
 
@@ -7,6 +7,7 @@ dh_installemacsen - register an Emacs add on package
 =cut
 
 use strict;
+use warnings;
 use Debian::Debhelper::Dh_Lib;
 
 =head1 SYNOPSIS
@@ -100,30 +101,31 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 
 	if ($emacsen_compat ne '') {
 		if (! -d "$tmp/usr/lib/emacsen-common/packages/compat") {
-			doit("install","-d","$tmp/usr/lib/emacsen-common/packages/compat");
+			install_dir("$tmp/usr/lib/emacsen-common/packages/compat");
 		}
-		doit("install","-m0644",$emacsen_compat,"$tmp/usr/lib/emacsen-common/packages/compat/$package");
+		install_file($emacsen_compat,
+					 "$tmp/usr/lib/emacsen-common/packages/compat/$package");
 	}
 
 	if ($emacsen_install ne '') {
 		if (! -d "$tmp/usr/lib/emacsen-common/packages/install") {
-			doit("install","-d","$tmp/usr/lib/emacsen-common/packages/install");
+			install_dir("$tmp/usr/lib/emacsen-common/packages/install");
 		}
-		doit("install","-m0755",$emacsen_install,"$tmp/usr/lib/emacsen-common/packages/install/$package");
+		install_prog($emacsen_install,"$tmp/usr/lib/emacsen-common/packages/install/$package");
 	}
 
 	if ($emacsen_remove ne '') {
 		if (! -d "$tmp/usr/lib/emacsen-common/packages/remove") {
-			doit("install","-d","$tmp/usr/lib/emacsen-common/packages/remove");
+			install_dir("$tmp/usr/lib/emacsen-common/packages/remove");
 		}
-		doit("install","-m0755","$emacsen_remove","$tmp/usr/lib/emacsen-common/packages/remove/$package");
+		install_prog("$emacsen_remove","$tmp/usr/lib/emacsen-common/packages/remove/$package");
 	}
-	
+
 	if ($emacsen_startup ne '') {
 		if (! -d "$tmp/etc/$dh{FLAVOR}/site-start.d/") {
-			doit("install","-d","$tmp/etc/$dh{FLAVOR}/site-start.d/");
+			install_dir("$tmp/etc/$dh{FLAVOR}/site-start.d/");
 		}
-		doit("install","-m0644",$emacsen_startup,"$tmp/etc/$dh{FLAVOR}/site-start.d/$dh{PRIORITY}$package.el");
+		install_file($emacsen_startup,"$tmp/etc/$dh{FLAVOR}/site-start.d/$dh{PRIORITY}$package.el");
 	}
 
 	if ($emacsen_install ne '' || $emacsen_remove ne '') {
@@ -150,3 +152,9 @@ This program is a part of debhelper.
 Joey Hess <joeyh@debian.org>
 
 =cut
+
+# Local Variables:
+# indent-tabs-mode: t
+# tab-width: 4
+# cperl-indent-level: 4
+# End:
diff --git a/dh_installexamples b/dh_installexamples
index 448678ad..c39e8996 100755
--- a/dh_installexamples
+++ b/dh_installexamples
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 
 =head1 NAME
 
@@ -7,6 +7,7 @@ dh_installexamples - install example files into package build directories
 =cut
 
 use strict;
+use warnings;
 use Debian::Debhelper::Dh_Lib;
 
 =head1 SYNOPSIS
@@ -80,7 +81,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 	
 	if (@examples) {
 		if (! -d "$tmp/usr/share/doc/$package/examples") {
-			doit("install","-d","$tmp/usr/share/doc/$package/examples");
+			install_dir("$tmp/usr/share/doc/$package/examples");
 		}
 		
 		my $exclude = '';
@@ -96,10 +97,11 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 				my $pwd=`pwd`;
 				chomp $pwd;
 				my $exclude2 = '-type f'.$exclude;
-				complex_doit("cd '$dir' && find '$basename' -type f$exclude -exec cp --parents -dp {} $pwd/$tmp/usr/share/doc/$package/examples \\;");
+				complex_doit("cd '$dir' && find '$basename' -type f$exclude -exec cp --reflink=auto --parents -dp {} $pwd/$tmp/usr/share/doc/$package/examples \\;");
 			}
 			else {
-				doit("cp", "-a", $example, "$tmp/usr/share/doc/$package/examples");
+				doit("cp", '--reflink=auto', "-a", $example,
+					 "$tmp/usr/share/doc/$package/examples");
 			}
 		}
 	}
@@ -116,3 +118,9 @@ This program is a part of debhelper.
 Joey Hess <joeyh@debian.org>
 
 =cut
+
+# Local Variables:
+# indent-tabs-mode: t
+# tab-width: 4
+# cperl-indent-level: 4
+# End:
diff --git a/dh_installgsettings b/dh_installgsettings
index dac471d5..fcf4470e 100755
--- a/dh_installgsettings
+++ b/dh_installgsettings
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 
 =head1 NAME
 
@@ -7,6 +7,7 @@ dh_installgsettings - install GSettings overrides and set dependencies
 =cut
 
 use strict;
+use warnings;
 use Debian::Debhelper::Dh_Lib;
 
 =head1 SYNOPSIS
@@ -68,8 +69,9 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 
 	my $override = pkgfile($package,"gsettings-override");
 	if ($override ne '') {
-		doit("mkdir","-p",$gsettings_schemas_dir);
-		doit("install","-p","-m644",$override,"$gsettings_schemas_dir/${priority}_$package.gschema.override");
+		install_dir($gsettings_schemas_dir);
+		install_file($override,
+					 "$gsettings_schemas_dir/${priority}_$package.gschema.override");
 	}
 
 	if (-d "$gsettings_schemas_dir") {
@@ -96,3 +98,9 @@ Josselin Mouette <joss@debian.org>
 
 =cut
 
+
+# Local Variables:
+# indent-tabs-mode: t
+# tab-width: 4
+# cperl-indent-level: 4
+# End:
diff --git a/dh_installifupdown b/dh_installifupdown
index e612e780..a9fc2543 100755
--- a/dh_installifupdown
+++ b/dh_installifupdown
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 
 =head1 NAME
 
@@ -7,6 +7,7 @@ dh_installifupdown - install if-up and if-down hooks
 =cut
 
 use strict;
+use warnings;
 use Debian::Debhelper::Dh_Lib;
 exit 0;
 
@@ -59,14 +60,14 @@ init();
 
 foreach my $package (@{$dh{DOPACKAGES}}) {
 	my $tmp=tmpdir($package);
-	
+
 	foreach my $script (qw(pre-up up down post-down)) {
 		my $file=pkgfile($package, "if-$script");
 		if ($file ne '') {
 			if (! -d "$tmp/etc/network/if-$script.d") {
-				doit("install","-d","$tmp/etc/network/if-$script.d");
+				install_dir("$tmp/etc/network/if-$script.d");
 			}
-			doit("install","-p","-m755",$file,"$tmp/etc/network/if-$script.d/".pkgfilename($package));
+			install_prog($file,"$tmp/etc/network/if-$script.d/".pkgfilename($package));
 		}
 	}
 }
@@ -82,3 +83,9 @@ This program is a part of debhelper.
 Joey Hess <joeyh@debian.org>
 
 =cut
+
+# Local Variables:
+# indent-tabs-mode: t
+# tab-width: 4
+# cperl-indent-level: 4
+# End:
diff --git a/dh_installinfo b/dh_installinfo
index 2c3d9e9a..d12b0c0d 100755
--- a/dh_installinfo
+++ b/dh_installinfo
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 
 =head1 NAME
 
@@ -7,6 +7,7 @@ dh_installinfo - install info files
 =cut
 
 use strict;
+use warnings;
 use Debian::Debhelper::Dh_Lib;
 
 =head1 SYNOPSIS
@@ -66,9 +67,9 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 
 	if (@info) {
 		if ( ! -d "$tmp/usr/share/info") {
-			doit("install","-d","$tmp/usr/share/info");
+			install_dir("$tmp/usr/share/info");
 		}
-		doit("cp",@info,"$tmp/usr/share/info");
+		doit("cp", '--reflink=auto', @info, "$tmp/usr/share/info");
 		doit("chmod","-R", "go=rX","$tmp/usr/share/info/");
 		doit("chmod","-R", "u+rw","$tmp/usr/share/info/");
 	}
@@ -85,3 +86,9 @@ This program is a part of debhelper.
 Joey Hess <joeyh@debian.org>
 
 =cut
+
+# Local Variables:
+# indent-tabs-mode: t
+# tab-width: 4
+# cperl-indent-level: 4
+# End:
diff --git a/dh_installinit b/dh_installinit
index 287d1c99..96911529 100755
--- a/dh_installinit
+++ b/dh_installinit
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 
 =head1 NAME
 
@@ -7,6 +7,7 @@ dh_installinit - install service init files into package build directories
 =cut
 
 use strict;
+use warnings;
 use Debian::Debhelper::Dh_Lib;
 use File::Find;
 
@@ -202,38 +203,38 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 	my $service=pkgfile($package,"service");
 	if ($service ne '' && ! $dh{ONLYSCRIPTS}) {
 		my $path="$tmp/lib/systemd/system";
-		if (! -d "$path") {
-			doit("install","-d","$path");
+		if (! -d $path) {
+			install_dir($path);
 		}
 
-		doit("install","-p","-m644",$service,"$path/$script.service");
+		install_file($service, "$path/$script.service");
 	}
 
 	my $tmpfile=pkgfile($package,"tmpfile");
 	if ($tmpfile ne '' && ! $dh{ONLYSCRIPTS}) {
 		my $path="$tmp/usr/lib/tmpfiles.d";
-		if (! -d "$path") {
-			doit("install","-d","$path");
+		if (! -d $path) {
+			install_dir($path);
 		}
 
-		doit("install","-p","-m644",$tmpfile,"$path/$script.conf");
+		install_file($tmpfile, "$path/$script.conf");
 	}
 
 	my $job=pkgfile($package,"upstart");
 	if ($job ne '' && ! $dh{ONLYSCRIPTS}) {
 		if (! -d "$tmp/etc/init") {
-			doit("install","-d","$tmp/etc/init");
+			install_dir("$tmp/etc/init");
 		}
 		
-		doit("install","-p","-m644",$job,"$tmp/etc/init/$jobfile.conf");
+		install_file($job, "$tmp/etc/init/$jobfile.conf");
 	}
 
 	my $default=pkgfile($package,'default');
 	if ($default ne '' && ! $dh{ONLYSCRIPTS}) {
 		if (! -d "$tmp/etc/default") {
-			doit("install","-d","$tmp/etc/default");
+			install_dir("$tmp/etc/default");
 		}
-		doit("install","-p","-m644",$default,"$tmp/etc/default/$script");
+		install_file($default, "$tmp/etc/default/$script");
 	}
 
 	my $init=pkgfile($package,$scriptsrc) || pkgfile($package,"init") ||
@@ -241,10 +242,10 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 
 	if ($init ne '' && ! $dh{ONLYSCRIPTS}) {
 		if (! -d "$tmp/etc/init.d") {
-			doit("install","-d","$tmp/etc/init.d");
+			install_dir("$tmp/etc/init.d");
 		}
 		
-		doit("install","-p","-m755",$init,"$tmp/etc/init.d/$script");
+		install_prog($init,"$tmp/etc/init.d/$script");
 	}
 
 	if ($dh{INIT_SCRIPT} && $job ne '' && $init ne '') {
@@ -341,3 +342,9 @@ Steve Langasek <steve.langasek@canonical.com>
 Michael Stapelberg <stapelberg@debian.org>
 
 =cut
+
+# Local Variables:
+# indent-tabs-mode: t
+# tab-width: 4
+# cperl-indent-level: 4
+# End:
diff --git a/dh_installlogcheck b/dh_installlogcheck
index 0821f1d5..72c92a38 100755
--- a/dh_installlogcheck
+++ b/dh_installlogcheck
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 
 =head1 NAME
 
@@ -7,6 +7,7 @@ dh_installlogcheck - install logcheck rulefiles into etc/logcheck/
 =cut
 
 use strict;
+use warnings;
 use Debian::Debhelper::Dh_Lib;
 
 =head1 SYNOPSIS
@@ -68,11 +69,11 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 		my $logcheck=pkgfile($package,"logcheck.$typenod");
 		if ($logcheck) {
 			if (! -d "$tmp/etc/logcheck/$type") {
-				doit("install","-o",0,"-g",0,"-d","$tmp/etc/logcheck/$type");
+				install_dir("$tmp/etc/logcheck/$type");
 			}
 			my $packagenodot=pkgfilename($package); # run-parts..
 			$packagenodot=~s/\./_/g;
-			doit("install","-m","0644",$logcheck,"$tmp/etc/logcheck/$type/$packagenodot");
+			install_file($logcheck, "$tmp/etc/logcheck/$type/$packagenodot");
 		}
 	}
 }
@@ -88,3 +89,9 @@ This program is a part of debhelper.
 Jon Middleton <jjm@debian.org>
 
 =cut
+
+# Local Variables:
+# indent-tabs-mode: t
+# tab-width: 4
+# cperl-indent-level: 4
+# End:
diff --git a/dh_installlogrotate b/dh_installlogrotate
index da14688c..9d7d554c 100755
--- a/dh_installlogrotate
+++ b/dh_installlogrotate
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 
 =head1 NAME
 
@@ -7,6 +7,7 @@ dh_installlogrotate - install logrotate config files
 =cut
 
 use strict;
+use warnings;
 use Debian::Debhelper::Dh_Lib;
 
 =head1 SYNOPSIS
@@ -43,9 +44,9 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 
 	if ($file) {
 		if (! -d "$tmp/etc/logrotate.d") {
-			doit("install","-o",0,"-g",0,"-d","$tmp/etc/logrotate.d");
+			install_dir("$tmp/etc/logrotate.d");
 		}
-		doit("install","-m",644,$file,"$tmp/etc/logrotate.d/".pkgfilename($package));
+		install_file($file,"$tmp/etc/logrotate.d/".pkgfilename($package));
 	}
 }
 
@@ -60,3 +61,9 @@ This program is a part of debhelper.
 Joey Hess <joeyh@debian.org>
 
 =cut
+
+# Local Variables:
+# indent-tabs-mode: t
+# tab-width: 4
+# cperl-indent-level: 4
+# End:
diff --git a/dh_installman b/dh_installman
index 858605b2..135181a4 100755
--- a/dh_installman
+++ b/dh_installman
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 
 =head1 NAME
 
@@ -7,6 +7,7 @@ dh_installman - install man pages into package build directories
 =cut
 
 use strict;
+use warnings;
 use File::Find;
 use Debian::Debhelper::Dh_Lib;
 
@@ -177,13 +178,13 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 		next if compat(5) && -e $instpage;
 
 		if (! -d $destdir) {
-			doit "install","-d",$destdir;
+			install_dir($destdir);
 		}
 		if ($gz) {
 			complex_doit "zcat \Q$page\E > \Q$instpage\E";
 		}
 		else {
-			doit "install","-p","-m644",$page,$instpage;
+			install_file($page, $instpage);
 		}
 	}
 
@@ -219,7 +220,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 
 # Check if a file is a .so man page, for use by File::Find.
 sub find_so_man {
-	# The -s test is becuase a .so file tends to be small. We don't want
+	# The -s test is because a .so file tends to be small. We don't want
 	# to open every man page. 1024 is arbitrary.
 	if (! -f $_ || -s $_ > 1024 || -s == 0) {
 		return;
@@ -271,3 +272,9 @@ This program is a part of debhelper.
 Joey Hess <joeyh@debian.org>
 
 =cut
+
+# Local Variables:
+# indent-tabs-mode: t
+# tab-width: 4
+# cperl-indent-level: 4
+# End:
diff --git a/dh_installmanpages b/dh_installmanpages
index cc6a6f6f..ade16047 100755
--- a/dh_installmanpages
+++ b/dh_installmanpages
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 
 =head1 NAME
 
@@ -7,6 +7,7 @@ dh_installmanpages - old-style man page installer (deprecated)
 =cut
 
 use strict;
+use warnings;
 use File::Find;
 use Debian::Debhelper::Dh_Lib;
 
@@ -168,18 +169,18 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 				$destdir="$tmp/usr/$extdir/man/$langcode/man$section/";
 				$instname=~s/\.$langcode\./\./;
 			}
-			
+
 			$destdir=~tr:/:/:s; # just for looks
-			
+
 			if (! -e "$destdir/$basename" && !-l "$destdir/$basename") {
 				if (! -d $destdir) {
-					doit "install","-d",$destdir;
+					install_dir($destdir);
 				}
-				doit "install","-p","-m644",$page,$destdir.$instname;
+				install_file($page,$destdir.$instname);
 			}
 		}
 	}
-	
+
 	# Now the .so conversion.
 	@sofiles=@sodests=();
 	foreach my $dir (qw{usr/share/man}) {
@@ -205,3 +206,9 @@ This program is a part of debhelper.
 Joey Hess <joeyh@debian.org>
 
 =cut
+
+# Local Variables:
+# indent-tabs-mode: t
+# tab-width: 4
+# cperl-indent-level: 4
+# End:
diff --git a/dh_installmenu b/dh_installmenu
index f5eae5db..3c1d84da 100755
--- a/dh_installmenu
+++ b/dh_installmenu
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 
 =head1 NAME
 
@@ -7,6 +7,7 @@ dh_installmenu - install Debian menu files into package build directories
 =cut
 
 use strict;
+use warnings;
 use Debian::Debhelper::Dh_Lib;
 
 =head1 SYNOPSIS
@@ -61,10 +62,10 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 	
 	if ($menu ne '') {
 		if (! -d "$tmp/usr/share/menu") {
-			doit("install","-d","$tmp/usr/share/menu");
+			install_dir("$tmp/usr/share/menu");
 		}
-		doit("install","-p","-m644",$menu,"$tmp/usr/share/menu/$package");
-		
+		install_file($menu,"$tmp/usr/share/menu/$package");
+
 		# Add the scripts if a menu-method file doesn't exist.
 		# The scripts for menu-method handle everything these do, too.
 		if ($menu_method eq "" && ! $dh{NOSCRIPTS}) {
@@ -75,9 +76,9 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 
 	if ($menu_method ne '') {
 		if (!-d "$tmp/etc/menu-methods") {
-			doit("install","-d","$tmp/etc/menu-methods");
+			install_dir("$tmp/etc/menu-methods");
 		}
-		doit("install","-p","-m644",$menu_method,"$tmp/etc/menu-methods/$package");
+		install_file($menu_method,"$tmp/etc/menu-methods/$package");
 
 		if (! $dh{NOSCRIPTS}) {
 			autoscript($package,"postinst","postinst-menu-method","s/#PACKAGE#/$package/");
@@ -99,3 +100,9 @@ This program is a part of debhelper.
 Joey Hess <joeyh@debian.org>
 
 =cut
+
+# Local Variables:
+# indent-tabs-mode: t
+# tab-width: 4
+# cperl-indent-level: 4
+# End:
diff --git a/dh_installmime b/dh_installmime
index 3360250f..0b394ad0 100755
--- a/dh_installmime
+++ b/dh_installmime
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 
 =head1 NAME
 
@@ -7,6 +7,7 @@ dh_installmime - install mime files into package build directories
 =cut
 
 use strict;
+use warnings;
 use Debian::Debhelper::Dh_Lib;
 
 =head1 SYNOPSIS
@@ -46,17 +47,18 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 	my $mime=pkgfile($package,"mime");
 	if ($mime ne '') {
 		if (! -d "$tmp/usr/lib/mime/packages") {
-			doit("install","-d","$tmp/usr/lib/mime/packages");
+			install_dir("$tmp/usr/lib/mime/packages");
 		}
-		doit("install","-p","-m644",$mime,"$tmp/usr/lib/mime/packages/$package");
+		install_file($mime, "$tmp/usr/lib/mime/packages/$package");
 	}
 	
 	my $sharedmimeinfo=pkgfile($package,"sharedmimeinfo");
 	if ($sharedmimeinfo ne '') {
 		if (! -d "$tmp/usr/share/mime/packages") {
-			doit("install", "-d", "$tmp/usr/share/mime/packages");
+			install_dir("$tmp/usr/share/mime/packages");
 		}
-		doit("install", "-p", "-m644", $sharedmimeinfo, "$tmp/usr/share/mime/packages/$package.xml");
+		install_file($sharedmimeinfo,
+					 "$tmp/usr/share/mime/packages/$package.xml");
 	}
 }
 
@@ -71,3 +73,9 @@ This program is a part of debhelper.
 Joey Hess <joeyh@debian.org>
 
 =cut
+
+# Local Variables:
+# indent-tabs-mode: t
+# tab-width: 4
+# cperl-indent-level: 4
+# End:
diff --git a/dh_installmodules b/dh_installmodules
index 5eecb12c..b2ac1efe 100755
--- a/dh_installmodules
+++ b/dh_installmodules
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 
 =head1 NAME
 
@@ -7,6 +7,7 @@ dh_installmodules - register kernel modules
 =cut
 
 use strict;
+use warnings;
 use Debian::Debhelper::Dh_Lib;
 use File::Find;
 
@@ -95,16 +96,16 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 	my $modprobe_file=pkgfile($package,"modprobe");
 
 	if (! -e $tmp) {
-		doit("install","-d",$tmp);
+		install_dir($tmp);
 	}
 
 	if ($modprobe_file) {
 		if (! -e "$tmp/etc/modprobe.d") {
-			doit("install","-d","$tmp/etc/modprobe.d");
+			install_dir("$tmp/etc/modprobe.d");
 		}
 		my $old="/etc/modprobe.d/".pkgfilename($package);
 		my $new=$old.".conf";
-		doit("install","-m","0644",$modprobe_file,"$tmp/$new");
+		install_file($modprobe_file, "$tmp/$new");
 		autoscript($package,"preinst","preinst-moveconffile","s!#OLD#!$old!g;s!#PACKAGE#!$package!g");
 		autoscript($package,"postinst","postinst-moveconffile","s!#OLD#!$old!g;s!#NEW#!$new!g");
 	}
@@ -128,3 +129,9 @@ This program is a part of debhelper.
 Joey Hess <joeyh@debian.org>
 
 =cut
+
+# Local Variables:
+# indent-tabs-mode: t
+# tab-width: 4
+# cperl-indent-level: 4
+# End:
diff --git a/dh_installpam b/dh_installpam
index 80748818..2f73241e 100755
--- a/dh_installpam
+++ b/dh_installpam
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 
 =head1 NAME
 
@@ -7,6 +7,7 @@ dh_installpam - install pam support files
 =cut
 
 use strict;
+use warnings;
 use Debian::Debhelper::Dh_Lib;
 
 =head1 SYNOPSIS
@@ -49,12 +50,12 @@ init();
 foreach my $package (@{$dh{DOPACKAGES}}) {
 	my $tmp=tmpdir($package);
 	my $pam=pkgfile($package,"pam");
-	
+
 	if ($pam ne '') {
 		if (! -d "$tmp/etc/pam.d") {
-			doit("install","-d","$tmp/etc/pam.d");
+			install_dir("$tmp/etc/pam.d");
 		}
-		doit("install","-p","-m644",$pam,"$tmp/etc/pam.d/".pkgfilename($package));
+		install_file($pam,"$tmp/etc/pam.d/".pkgfilename($package));
 	}
 }
 
@@ -69,3 +70,9 @@ This program is a part of debhelper.
 Joey Hess <joeyh@debian.org>
 
 =cut
+
+# Local Variables:
+# indent-tabs-mode: t
+# tab-width: 4
+# cperl-indent-level: 4
+# End:
diff --git a/dh_installppp b/dh_installppp
index dad24cd7..342591ae 100755
--- a/dh_installppp
+++ b/dh_installppp
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 
 =head1 NAME
 
@@ -7,6 +7,7 @@ dh_installppp - install ppp ip-up and ip-down files
 =cut
 
 use strict;
+use warnings;
 use Debian::Debhelper::Dh_Lib;
 
 =head1 SYNOPSIS
@@ -57,9 +58,9 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 		my $file=pkgfile($package, "ppp.ip-$script");
 		if ($file ne '') {
 			if (! -d "$tmp/etc/ppp/ip-$script.d") {
-				doit("install","-d","$tmp/etc/ppp/ip-$script.d");
+				install_dir("$tmp/etc/ppp/ip-$script.d");
 			}
-			doit("install","-p","-m755",$file,"$tmp/etc/ppp/ip-$script.d/".pkgfilename($package));
+			install_prog($file,"$tmp/etc/ppp/ip-$script.d/".pkgfilename($package));
 		}
 	}
 }
@@ -75,3 +76,9 @@ This program is a part of debhelper.
 Joey Hess <joeyh@debian.org>
 
 =cut
+
+# Local Variables:
+# indent-tabs-mode: t
+# tab-width: 4
+# cperl-indent-level: 4
+# End:
diff --git a/dh_installudev b/dh_installudev
index 4a9d4988..863f344c 100755
--- a/dh_installudev
+++ b/dh_installudev
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 
 =head1 NAME
 
@@ -7,6 +7,7 @@ dh_installudev - install udev rules files
 =cut
 
 use strict;
+use warnings;
 use Debian::Debhelper::Dh_Lib;
 use File::Find;
 
@@ -103,10 +104,10 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 
 	if ($rules_file) {
 		if (! -e "$tmp/lib/udev/rules.d") {
-			doit("install","-d","$tmp/lib/udev/rules.d");
+			install_dir("$tmp/lib/udev/rules.d");
 		}
 		my $rule="/lib/udev/rules.d/$dh{PRIORITY}$filename";
-		doit("install","-m","0644",$rules_file,$tmp.$rule);
+		install_file($rules_file, "${tmp}${rule}");
 		if (! $dh{NOSCRIPTS}) {
 			# Remove old rule from /etc, unless it's modified,
 			# in which case we rename it to match the new
@@ -130,3 +131,9 @@ This program is a part of debhelper.
 Joey Hess <joeyh@debian.org>
 
 =cut
+
+# Local Variables:
+# indent-tabs-mode: t
+# tab-width: 4
+# cperl-indent-level: 4
+# End:
diff --git a/dh_installwm b/dh_installwm
index c3190e0b..a72e3c73 100755
--- a/dh_installwm
+++ b/dh_installwm
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 
 =head1 NAME
 
@@ -7,6 +7,7 @@ dh_installwm - register a window manager
 =cut
 
 use strict;
+use warnings;
 use Debian::Debhelper::Dh_Lib;
 
 =head1 SYNOPSIS
@@ -102,6 +103,10 @@ WM:		foreach my $wm (@wm) {
 					}
 				}
 			}
+			if (! compat(9)) {
+				error("no manpage found (creating an x-window-manager alternative requires a slave symlink for the manpage)");
+			}
+			# Reaching this code means a broken package will be produced.
 			autoscript($package,"postinst","postinst-wm-noman","s:#WM#:$wm:;s/#PRIORITY#/$dh{PRIORITY}/",);
 		}
 	}
@@ -118,3 +123,9 @@ This program is a part of debhelper.
 Joey Hess <joeyh@debian.org>
 
 =cut
+
+# Local Variables:
+# indent-tabs-mode: t
+# tab-width: 4
+# cperl-indent-level: 4
+# End:
diff --git a/dh_installxfonts b/dh_installxfonts
index c8ee5b34..bf48aafe 100755
--- a/dh_installxfonts
+++ b/dh_installxfonts
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 
 =head1 NAME
 
@@ -7,6 +7,7 @@ dh_installxfonts - register X fonts
 =cut
 
 use strict;
+use warnings;
 use Debian::Debhelper::Dh_Lib;
 
 =head1 SYNOPSIS
@@ -97,3 +98,9 @@ This program is a part of debhelper.
 Joey Hess <joeyh@debian.org>
 
 =cut
+
+# Local Variables:
+# indent-tabs-mode: t
+# tab-width: 4
+# cperl-indent-level: 4
+# End:
diff --git a/dh_link b/dh_link
index db4aea81..f4ed64db 100755
--- a/dh_link
+++ b/dh_link
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 
 =head1 NAME
 
@@ -7,6 +7,7 @@ dh_link - create symlinks in package build directories
 =cut
 
 use strict;
+use warnings;
 use File::Find;
 use Debian::Debhelper::Dh_Lib;
 
@@ -86,42 +87,6 @@ the F<foo.1>
 
 =cut
 
-# This expand_path expands all path "." and ".." components, but doesn't
-# resolve symbolic links.
-sub expand_path {
-	my $start = @_ ? shift : '.';
-	my @pathname = split(m:/+:,$start);
-
-	my $entry;
-	my @respath;
-	foreach $entry (@pathname) {
-		if ($entry eq '.' || $entry eq '') {
-			# Do nothing
-		}
-		elsif ($entry eq '..') {
-			if ($#respath == -1) {
-				# Do nothing
-			}
-			else {
-				pop @respath;
-			}
-		}
-		else {
-			push @respath, $entry;
-		}
-	}
-
-	my $result;
-	foreach $entry (@respath) {
-		$result .= '/' . $entry;
-	}
-	if (! defined $result) {
-		$result="/"; # special case
-	}
-	return $result;
-}
-
-
 init();
 
 foreach my $package (@{$dh{DOPACKAGES}}) {
@@ -173,55 +138,8 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 	
 	while (@links) {
 		my $dest=pop @links;
-		my $src=expand_path(pop @links);
-
-		$src=~s:^/::;
-		$dest=~s:^/::;
-		
-		if ($src eq $dest) {
-			warning("skipping link from $src to self");
-			next;
-		}
-
-		# Make sure the directory the link will be in exists.
-		my $basedir=dirname("$tmp/$dest");
-		if (! -e $basedir) {
-			doit("install","-d",$basedir);
-		}
-		
-		# Policy says that if the link is all within one toplevel
-		# directory, it should be relative. If it's between
-		# top level directories, leave it absolute.
-		my @src_dirs=split(m:/+:,$src);
-		my @dest_dirs=split(m:/+:,$dest);
-		if (@src_dirs > 0 && $src_dirs[0] eq $dest_dirs[0]) {
-		    	# Figure out how much of a path $src and $dest
-			# share in common.
-			my $x;
-			for ($x=0; $x < @src_dirs && $src_dirs[$x] eq $dest_dirs[$x]; $x++) {}
-			# Build up the new src.
-			$src="";
-			for (1..$#dest_dirs - $x) {
-				$src.="../";
-			}
-			for ($x .. $#src_dirs) {
-				$src.=$src_dirs[$_]."/";
-			}
-			if ($x > $#src_dirs && ! length $src) {
-				$src.="."; # special case
-			}
-			$src=~s:/$::;
-		}
-		else {
-			# Make sure it's properly absolute.
-			$src="/$src";
-		}
-
-		if (-d "$tmp/$dest" && ! -l "$tmp/$dest") {
-			error("link destination $tmp/$dest is a directory");
-		}
-		doit("rm", "-f", "$tmp/$dest");
-		doit("ln","-sf", $src, "$tmp/$dest");
+		my $src=pop @links;
+		make_symlink($dest, $src, $tmp);
 	}
 }
 
@@ -236,3 +154,9 @@ This program is a part of debhelper.
 Joey Hess <joeyh@debian.org>
 
 =cut
+
+# Local Variables:
+# indent-tabs-mode: t
+# tab-width: 4
+# cperl-indent-level: 4
+# End:
diff --git a/dh_lintian b/dh_lintian
index 6e6ace0e..ffb16f65 100755
--- a/dh_lintian
+++ b/dh_lintian
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 
 =head1 NAME
 
@@ -7,6 +7,7 @@ dh_lintian - install lintian override files into package build directories
 =cut
 
 use strict;
+use warnings;
 use Debian::Debhelper::Dh_Lib;
 
 =head1 SYNOPSIS
@@ -49,10 +50,10 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 	my $overrides=pkgfile($package,"lintian-overrides");
 
 	if ($overrides ne '') {
-		if (! -d "$or_dir") {
-			 doit("install","-d","$or_dir");
+		if (! -d $or_dir) {
+			 install_dir($or_dir);
 		}
-		doit("install","-p","-m644",$overrides,"$or_dir/$package");
+		install_dh_config_file($overrides, "$or_dir/$package");
 	}
 }
 
@@ -69,3 +70,9 @@ L<lintian(1)>
 Steve Robbins <smr@debian.org>
 
 =cut
+
+# Local Variables:
+# indent-tabs-mode: t
+# tab-width: 4
+# cperl-indent-level: 4
+# End:
diff --git a/dh_listpackages b/dh_listpackages
index 109301b9..6da8b5af 100755
--- a/dh_listpackages
+++ b/dh_listpackages
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 
 =head1 NAME
 
@@ -7,6 +7,7 @@ dh_listpackages - list binary packages debhelper will act on
 =cut
 
 use strict;
+use warnings;
 use Debian::Debhelper::Dh_Lib;
 
 =head1 SYNOPSIS
@@ -38,3 +39,9 @@ This program is a part of debhelper.
 Joey Hess <joeyh@debian.org>
 
 =cut
+
+# Local Variables:
+# indent-tabs-mode: t
+# tab-width: 4
+# cperl-indent-level: 4
+# End:
diff --git a/dh_makeshlibs b/dh_makeshlibs
index 7aa52e49..e567f8ef 100755
--- a/dh_makeshlibs
+++ b/dh_makeshlibs
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 
 =head1 NAME
 
@@ -7,6 +7,7 @@ dh_makeshlibs - automatically create shlibs file and call dpkg-gensymbols
 =cut
 
 use strict;
+use warnings;
 use Debian::Debhelper::Dh_Lib;
 
 =head1 SYNOPSIS
@@ -21,15 +22,19 @@ libraries, and generates a shlibs file for the libraries it finds.
 It also adds a call to ldconfig in the F<postinst> and F<postrm> scripts (in
 v3 mode and above only) to any packages in which it finds shared libraries.
 
-Packages that support multiarch are detected, and
-a Pre-Dependency on multiarch-support is set in ${misc:Pre-Depends} ;
-you should make sure to put that token into an appropriate place in your
-debian/control file for packages supporting multiarch.
-
 =head1 FILES
 
 =over 4
 
+=item debian/I<package>.shlibs
+
+Installs this file, if present, into the package as DEBIAN/shlibs.  If
+omitted, debhelper will generate a shlibs file automatically if it
+detects any libraries.
+
+Note in compat levels 9 and earlier, this file was installed by
+L<dh_installdeb(1)> rather than B<dh_makeshlibs>.
+
 =item debian/I<package>.symbols
 
 =item debian/I<package>.symbols.I<arch>
@@ -127,7 +132,6 @@ init(options => {
 });
 
 my $objdump=cross_command("objdump");
-my $multiarch=dpkg_architecture_value("DEB_HOST_MULTIARCH");
 
 my $ok=1;
 
@@ -138,7 +142,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 
 	my %seen;
 	my $need_ldconfig = 0;
-	my $is_multiarch = 0;
+	my $shlibs_file = pkgfile($package, 'shlibs');
 
 	doit("rm", "-f", "$tmp/DEBIAN/shlibs");
 
@@ -153,13 +157,10 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 	if (defined($dh{EXCLUDE_FIND}) && $dh{EXCLUDE_FIND} ne '') {
 		$exclude="! \\( $dh{EXCLUDE_FIND} \\) ";
 	}
-	open (FIND, "find $tmp -type f \\( -name '*.so' -or -name '*.so.*' \\) $exclude |");
+	open (FIND, "find $tmp -type f \\( -name '*.so' -or -name '*.so.*' \\) $exclude | LC_ALL=C sort |");
 	while (<FIND>) {
 		my ($library, $major);
 		push @lib_files, $_;
-		if (defined $multiarch && $multiarch ne '' && m,/$multiarch/,) {
-			$is_multiarch=1;
-		}
 		my $ret=`$objdump -p $_`;
 		if ($ret=~m/\s+SONAME\s+(.+)\.so\.(.+)/) {
 			# proper soname format
@@ -177,10 +178,17 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 		}
 		
 		if (! -d "$tmp/DEBIAN") {
-			doit("install","-d","$tmp/DEBIAN");
+			install_dir("$tmp/DEBIAN");
 		}
 		my $deps=$package;
 		if ($dh{V_FLAG_SET}) {
+			if ($shlibs_file) {
+				warning("The provided ${shlibs_file} file overwrites -V");
+				# Clear the flag to avoid duplicate warnings.  Note
+				# we can safely fallthrough as the result will be
+				# replaced regardless.
+				$dh{V_FLAG_SET} = 0;
+			}
 			if ($dh{V_FLAG} ne '') {
 				$deps=$dh{V_FLAG};
 			}	
@@ -224,12 +232,24 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 
 	# New as of dh_v3.
 	if (! compat(2) && ! $dh{NOSCRIPTS} && $need_ldconfig) {
-		autoscript($package,"postinst","postinst-makeshlibs");
-		autoscript($package,"postrm","postrm-makeshlibs");
+		if (compat(9)) {
+			autoscript($package,"postinst","postinst-makeshlibs");
+			autoscript($package,"postrm","postrm-makeshlibs");
+		} else {
+			autoscript($package,"postinst","postinst-makeshlibs-c10");
+			autoscript($package,"postrm","postrm-makeshlibs-c10");
+		}
+	}
+
+	if ($shlibs_file) {
+		if (! -d "$tmp/DEBIAN") {
+			install_dir("$tmp/DEBIAN");
+		}
+		install_file($shlibs_file, "$tmp/DEBIAN/shlibs");
 	}
 
 	if (-e "$tmp/DEBIAN/shlibs") {
-		doit("chmod",644,"$tmp/DEBIAN/shlibs");
+		doit("chmod","0644","$tmp/DEBIAN/shlibs");
 		doit("chown","0:0","$tmp/DEBIAN/shlibs");
 	}
 
@@ -252,9 +272,6 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 			doit("rm", "-f", "$tmp/DEBIAN/symbols");
 		}
 	}
-	if ($is_multiarch) {
-		addsubstvar($package, "misc:Pre-Depends", "multiarch-support");
-	}
 }
 
 unless ($ok) {
@@ -272,3 +289,9 @@ This program is a part of debhelper.
 Joey Hess <joeyh@debian.org>
 
 =cut
+
+# Local Variables:
+# indent-tabs-mode: t
+# tab-width: 4
+# cperl-indent-level: 4
+# End:
diff --git a/dh_md5sums b/dh_md5sums
index 4a1264be..9c925744 100755
--- a/dh_md5sums
+++ b/dh_md5sums
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 
 =head1 NAME
 
@@ -7,6 +7,7 @@ dh_md5sums - generate DEBIAN/md5sums file
 =cut
 
 use strict;
+use warnings;
 use Cwd;
 use Debian::Debhelper::Dh_Lib;
 
@@ -50,11 +51,12 @@ init(options => {
 
 foreach my $package (@{$dh{DOPACKAGES}}) {
 	next if is_udeb($package);
-	
+
+	my $ddeb_tmp = "debian/.debhelper/${package}/ddeb-root";
 	my $tmp=tmpdir($package);
 
 	if (! -d "$tmp/DEBIAN") {
-		doit("install","-d","$tmp/DEBIAN");
+		install_dir("$tmp/DEBIAN");
 	}
 
 	# Check if we should exclude conffiles.
@@ -82,8 +84,24 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 		doit("rm","-f","$tmp/DEBIAN/md5sums");
 	}
 	else {
-		doit("chmod",644,"$tmp/DEBIAN/md5sums");
-		doit("chown","0:0","$tmp/DEBIAN/md5sums");
+		doit("chmod", "0644", "$tmp/DEBIAN/md5sums");
+		doit("chown", "0:0", "$tmp/DEBIAN/md5sums");
+	}
+	if ( -d $ddeb_tmp) {
+		if (! -d "${ddeb_tmp}/DEBIAN") {
+			install_dir("${ddeb_tmp}/DEBIAN");
+		}
+
+		$find = "find . -type f ! -regex './DEBIAN/.*' -printf '%P\\0'";
+		complex_doit("(cd $ddeb_tmp >/dev/null ; $find | LC_ALL=C sort -z | xargs -r0 md5sum > DEBIAN/md5sums) >/dev/null");
+		# If the file's empty, no reason to waste inodes on it.
+		if (-z "${ddeb_tmp}/DEBIAN/md5sums") {
+			doit('rm', '-f', "${ddeb_tmp}/DEBIAN/md5sums");
+		}
+		else {
+			doit('chmod', '0644', "${ddeb_tmp}/DEBIAN/md5sums");
+			doit('chown', '0:0', "${ddeb_tmp}/DEBIAN/md5sums");
+		}
 	}
 }
 
@@ -98,3 +116,9 @@ This program is a part of debhelper.
 Joey Hess <joeyh@debian.org>
 
 =cut
+
+# Local Variables:
+# indent-tabs-mode: t
+# tab-width: 4
+# cperl-indent-level: 4
+# End:
diff --git a/dh_movefiles b/dh_movefiles
index 6e481930..547991c6 100755
--- a/dh_movefiles
+++ b/dh_movefiles
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 
 =head1 NAME
 
@@ -7,6 +7,7 @@ dh_movefiles - move files out of debian/tmp into subpackages
 =cut
 
 use strict;
+use warnings;
 use Debian::Debhelper::Dh_Lib;
 
 =head1 SYNOPSIS
@@ -128,7 +129,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 
 	if (@tomove) {
 		if (! -d $tmp) {
-			doit("install","-d",$tmp);
+			install_dir($tmp);
 		}
 
 		doit("rm","-f","debian/movelist");
@@ -178,3 +179,9 @@ This program is a part of debhelper.
 Joey Hess <joeyh@debian.org>
 
 =cut
+
+# Local Variables:
+# indent-tabs-mode: t
+# tab-width: 4
+# cperl-indent-level: 4
+# End:
diff --git a/dh_perl b/dh_perl
index dcdf589b..a2306890 100755
--- a/dh_perl
+++ b/dh_perl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 
 =head1 NAME
 
@@ -7,6 +7,7 @@ dh_perl - calculates Perl dependencies and cleans up after MakeMaker
 =cut
 
 use strict;
+use warnings;
 use Config;
 use File::Find;
 use Debian::Debhelper::Dh_Lib;
@@ -160,3 +161,9 @@ This program is a part of debhelper.
 Brendan O'Dea <bod@debian.org>
 
 =cut
+
+# Local Variables:
+# indent-tabs-mode: t
+# tab-width: 4
+# cperl-indent-level: 4
+# End:
diff --git a/dh_prep b/dh_prep
index 33a6fa6a..5ec7fae9 100755
--- a/dh_prep
+++ b/dh_prep
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 
 =head1 NAME
 
@@ -7,6 +7,7 @@ dh_prep - perform cleanups in preparation for building a binary package
 =cut
 
 use strict;
+use warnings;
 use Debian::Debhelper::Dh_Lib;
 
 =head1 SYNOPSIS
@@ -68,3 +69,9 @@ This program is a part of debhelper.
 Joey Hess <joeyh@debian.org>
 
 =cut
+
+# Local Variables:
+# indent-tabs-mode: t
+# tab-width: 4
+# cperl-indent-level: 4
+# End:
diff --git a/dh_scrollkeeper b/dh_scrollkeeper
index fb04e6ef..7badbd85 100755
--- a/dh_scrollkeeper
+++ b/dh_scrollkeeper
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 
 =head1 NAME
 
@@ -7,6 +7,7 @@ dh_scrollkeeper - deprecated no-op
 =cut
 
 use strict;
+use warnings;
 use Debian::Debhelper::Dh_Lib;
 
 =head1 SYNOPSIS
@@ -36,3 +37,9 @@ This program is a part of debhelper.
 Ross Burton <ross@burtonini.com>
 
 =cut
+
+# Local Variables:
+# indent-tabs-mode: t
+# tab-width: 4
+# cperl-indent-level: 4
+# End:
diff --git a/dh_shlibdeps b/dh_shlibdeps
index b42c84a3..c47bd15b 100755
--- a/dh_shlibdeps
+++ b/dh_shlibdeps
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 
 =head1 NAME
 
@@ -7,6 +7,7 @@ dh_shlibdeps - calculate shared library dependencies
 =cut
 
 use strict;
+use warnings;
 use Cwd;
 use Debian::Debhelper::Dh_Lib;
 
@@ -105,7 +106,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 
 	# dpkg-shlibdeps expects this directory to exist
 	if (! -d "$tmp/DEBIAN") {
-		doit("install","-o",0,"-g",0,"-d","$tmp/DEBIAN");
+		install_dir("$tmp/DEBIAN");
 	}
 
 	my @filelist;
@@ -117,7 +118,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 	if (defined($dh{EXCLUDE_FIND}) && $dh{EXCLUDE_FIND} ne '') {
 		$find_options="! \\( $dh{EXCLUDE_FIND} \\)";
 	}
-	foreach my $file (split(/\n/,`find $tmp -type f \\( -perm /111 -or -name "*.so*" -or -name "*.cmxs" \\) $find_options -print`)) {
+	foreach my $file (split(/\n/,`find $tmp -type f \\( -perm /111 -or -name "*.so*" -or -name "*.cmxs" -or -name "*.node" \\) $find_options -print`)) {
 		# Prune directories that contain separated debug symbols.
 		next if $file=~m!^\Q$tmp\E/usr/lib/debug/(lib|lib64|usr|bin|sbin|opt|dev|emul)/!;
 		# TODO this is slow, optimize. Ie, file can run once on
@@ -160,3 +161,9 @@ This program is a part of debhelper.
 Joey Hess <joeyh@debian.org>
 
 =cut
+
+# Local Variables:
+# indent-tabs-mode: t
+# tab-width: 4
+# cperl-indent-level: 4
+# End:
diff --git a/dh_strip b/dh_strip
index 516b6f28..ea863008 100755
--- a/dh_strip
+++ b/dh_strip
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 
 =head1 NAME
 
@@ -7,6 +7,7 @@ dh_strip - strip executables, shared libraries, and some static libraries
 =cut
 
 use strict;
+use warnings;
 use File::Find;
 use Debian::Debhelper::Dh_Lib;
 
@@ -44,6 +45,13 @@ things to exclude.
 
 =item B<--dbg-package=>I<package>
 
+B<This option is a now special purpose option that you normally do not
+need>.  In most cases, there should be little reason to use this
+option for new source packages as debhelper generates automatic debug
+packages ("ddebs").  B<If you have a manual --dbg-package> that you
+want to migrate to the automatic ddeb, please see the
+B<--ddeb-migration> option.
+
 Causes B<dh_strip> to save debug symbols stripped from the packages it acts on
 as independent files in the package build directory of the specified debugging
 package.
@@ -57,19 +65,51 @@ package to put symbols in, it specifies a package (or packages) which
 should have separated debug symbols, and the separated symbols are placed
 in packages with B<-dbg> added to their name.
 
+This option implies B<--no-ddebs> and I<cannot> be used with B<--ddeb>
+or B<--ddeb-migration>.
+
 =item B<-k>, B<--keep-debug>
 
 Debug symbols will be retained, but split into an independent
 file in F<usr/lib/debug/> in the package build directory. B<--dbg-package>
 is easier to use than this option, but this option is more flexible.
 
+This option implies B<--no-ddebs> and I<cannot> be used with
+B<--ddebs>.
+
+=item B<--ddeb-migration=>I<package-relation>
+
+This option is used to migrate from a manual "-dbg" package (created
+with B<--dbg-package>) to the automatic "ddebs".  The value of this
+option should describe a valid B<Replaces>- and B<Breaks>-relation,
+which will be added to the ddebs to avoid file conflicts with the (now
+obsolete) -dbg package.
+
+This option implies B<--ddebs> and I<cannot> be used with
+B<--keep-debug>, B<--dbg-package> or B<--no-ddebs>.
+
+Examples:
+
+  dh_strip --ddeb-migration='libfoo-dbg (<< 2.1-3~)'
+
+  dh_strip --ddeb-migration='libfoo-tools-dbg (<< 2.1-3~), libfoo2-dbg (<< 2.1-3~)'
+
+=item B<--ddebs>, B<--no-ddebs>
+
+Control whether B<dh_strip> should be creating ddebs when possible.
+By default, B<dh_strip> will attempt to build ddebs and this option is
+primarily useful for disabling this.
+
 =back
 
 =head1 NOTES
 
 If the B<DEB_BUILD_OPTIONS> environment variable contains B<nostrip>, nothing
 will be stripped, in accordance with Debian policy (section 10.1
-"Binaries").
+"Binaries").  This will also inhibit the creation of automatic "ddebs".
+
+The creation of automatic "ddebs" can also be prevented by adding
+B<noddebs> to the B<DEB_BUILD_OPTIONS> environment variable.
 
 =head1 CONFORMS TO
 
@@ -78,9 +118,35 @@ Debian policy, version 3.0.1
 =cut
 
 init(options => {
-	"keep-debug" => \$dh{K_FLAG},
+	"keep-debug"       => \$dh{K_FLAG},
+	'ddeb-migration=s' => \$dh{MIGRATE_DDEB},
+	'ddebs!'           => \$dh{ENABLE_DDEBS},
 });
 
+if ($dh{K_FLAG} and $dh{MIGRATE_DDEB}) {
+	error("--keep-debug and --ddeb-migration are mutually exclusive");
+}
+if ($dh{DEBUGPACKAGES} and $dh{MIGRATE_DDEB}) {
+	error("--dbg-package and --ddeb-migration are mutually exclusive");
+}
+
+if ($dh{ENABLE_DDEBS} and $dh{ENABLE_DDEBS} ne 'auto') {
+	if ($dh{K_FLAG}) {
+		error("--keep-debug and explicit --ddebs are mutually exclusive");
+	}
+	if ($dh{DEBUGPACKAGES}) {
+		error("--dbg-package and explicit --ddebs are mutually exclusive");
+	}
+}
+
+$dh{ENABLE_DDEBS} = 1 if not defined($dh{ENABLE_DDEBS});
+
+if ($dh{MIGRATE_DDEB} and not $dh{ENABLE_DDEBS}) {
+	error("--ddeb-migration and --no-ddebs are mutually exclusive");
+}
+
+$dh{ENABLE_DDEBS} = 0 if not $ENV{'DH_BUILD_DDEBS'};
+
 # This variable can be used to turn off stripping (see Policy).
 if (get_buildoption('nostrip')) {
 	exit;
@@ -88,6 +154,7 @@ if (get_buildoption('nostrip')) {
 
 my $objcopy = cross_command("objcopy");
 my $strip = cross_command("strip");
+$dh{ENABLE_DDEBS} = 0 if get_buildoption('noddebs');
 
 # I could just use `file $_[0]`, but this is safer
 sub get_file_type {
@@ -118,8 +185,9 @@ sub testfile {
 	return if $fn=~m/debug\/.*\.so/;
 
 	# Does its filename look like a shared library?
-	# (*.cmxs are OCaml native code shared libraries)
-	if (m/.*\.(so.*?|cmxs$)/) {
+	#  - *.cmxs are OCaml native code shared libraries
+        #  - *.node are also native ELF binaries (for node-js)
+	if (m/.*\.(?:so.*?|cmxs|node)$/) {
 		# Ok, do the expensive test.
 		my $type=get_file_type($_);
 		if ($type=~m/.*ELF.*shared.*/) {
@@ -141,7 +209,7 @@ sub testfile {
 	
 	# Is it a static library, and not a debug library?
 	if (m/lib.*\.a$/ && ! m/.*_g\.a$/) {
-		# Is it a binary file, or something else (maybe a liner
+		# Is it a binary file, or something else (maybe a linker
 		# script on Hurd, for example? I don't use file, because
 		# file returns a variety of things on static libraries.
 		if (-B $_) {
@@ -152,26 +220,28 @@ sub testfile {
 }
 
 sub make_debug {
-	my $file=shift;
-	my $tmp=shift;
-	my $desttmp=shift;
-	
+	my ($file, $tmp, $desttmp, $use_build_id) = @_;
+
 	# Don't try to copy debug symbols out if the file is already
 	# stripped.
 	return unless get_file_type($file) =~ /not stripped/;
 
 	my ($base_file)=$file=~/^\Q$tmp\E(.*)/;
 	my $debug_path;
-	if (! compat(8) && 
+	if ($use_build_id &&
 	    `LC_ALL=C readelf -n $file`=~ /^\s+Build ID: ([0-9a-f]{2})([0-9a-f]+)$/m) {
 		$debug_path=$desttmp."/usr/lib/debug/.build-id/$1/$2.debug"
 	}
+	elsif ($use_build_id > 1) {
+		# For ddebs, we need build-id (else it will not be co-installable).
+		return;
+	}
 	else {
 		$debug_path=$desttmp."/usr/lib/debug/".$base_file;
 	}
 	my $debug_dir=dirname($debug_path);
 	if (! -d $debug_dir) {
-		doit("install", "-d", $debug_dir);
+		install_dir($debug_dir);
 	}
 	if (compat(8)) {
 		doit($objcopy, "--only-keep-debug", $file, $debug_path);
@@ -180,7 +250,7 @@ sub make_debug {
 		doit($objcopy, "--only-keep-debug", "--compress-debug-sections", $file, $debug_path);
 	}
 	# No reason for this to be executable.
-	doit("chmod", 644, $debug_path);
+	doit("chmod", "0644", $debug_path);
 	return $debug_path;
 }
 
@@ -190,19 +260,22 @@ sub attach_debug {
 	doit($objcopy, "--add-gnu-debuglink", $debug_path, $file);
 }
 
+my %all_packages = map { $_ => 1 } getpackages();
+
 foreach my $package (@{$dh{DOPACKAGES}}) {
 	my $tmp=tmpdir($package);
 
 	# Support for keeping the debugging symbols in a detached file.
 	my $keep_debug=$dh{K_FLAG};
 	my $debugtmp=$tmp;
+	my $use_build_id = compat(8) ? 0 : 1;
 	if (! compat(4)) {
 		if (ref $dh{DEBUGPACKAGES}) {
 			$keep_debug=1;
 			# Note that it's only an array for the v4 stuff;
 			# for v5 only one value is used.
 			my $debugpackage=@{$dh{DEBUGPACKAGES}}[0];
-			if (! grep { $_ eq $debugpackage } getpackages()) {
+			if (!$all_packages{$debugpackage}) {
 				error("debug package $debugpackage is not listed in the control file");
 			}
 			$debugtmp=tmpdir($debugpackage);
@@ -214,12 +287,20 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 			$debugtmp=tmpdir($package."-dbg");
 		}
 	}
-	
+	if ($dh{ENABLE_DDEBS} and not $keep_debug and package_arch($package) ne 'all') {
+		# Avoid creating a ddeb that would clash with a registered package
+		# or looks like a manual -dbg package.
+		if (!$all_packages{"${package}-dbgsym"} or $package =~ m/-dbg$/) {
+			$debugtmp = "debian/.debhelper/${package}/ddeb-root";
+			$keep_debug = 1;
+			$use_build_id = 2;
+		}
+	}
 	@shared_libs=@executables=@static_libs=();
 	find(\&testfile,$tmp);
 
 	foreach (@shared_libs) {
-		my $debug_path = make_debug($_, $tmp, $debugtmp) if $keep_debug;
+		my $debug_path = make_debug($_, $tmp, $debugtmp, $use_build_id) if $keep_debug;
 		# Note that all calls to strip on shared libs
 		# *must* include the --strip-unneeded.
 		doit($strip,"--remove-section=.comment",
@@ -228,14 +309,37 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 	}
 	
 	foreach (@executables) {
-		my $debug_path = make_debug($_, $tmp, $debugtmp) if $keep_debug;
+		my $debug_path = make_debug($_, $tmp, $debugtmp, $use_build_id) if $keep_debug;
 		doit($strip,"--remove-section=.comment",
 			"--remove-section=.note",$_);
  		attach_debug($_, $debug_path) if defined $debug_path;
 	}
 
-	foreach (@static_libs) {
-		doit($strip,"--strip-debug",$_);
+	if (@static_libs) {
+		my $strip_help = qx{$strip 2>&1};
+		my @opts = ('--strip-debug');
+		if (index($strip_help, '--enable-deterministic-archives') > -1) {
+			# NB: The short variant (-D) is broken in Jessie
+			# (binutils/2.25-3)
+			push(@opts, '--enable-deterministic-archives');
+		}
+		foreach (@static_libs) {
+			doit($strip, @opts, $_);
+		}
+	}
+	if ($use_build_id > 1 and -d $debugtmp) {
+		my $ddeb_docdir = "${debugtmp}/usr/share/doc";
+		my $doc_symlink = "${ddeb_docdir}/${package}-dbgsym";
+		if ( not -l $doc_symlink and not -e $doc_symlink ) {
+			install_dir($ddeb_docdir) if not -d $ddeb_docdir;
+			doit('ln', '-s', $package, $doc_symlink);
+		}
+		if ($dh{MIGRATE_DDEB}) {
+			my $path = "debian/.debhelper/${package}/ddeb-migration";
+			open(my $fd, '>', $path) or error("open $path failed: $!");
+			print {$fd} "$dh{MIGRATE_DDEB}\n";
+			close($fd) or error("close $path failed: $!");
+		}
 	}
 }
 
@@ -250,3 +354,9 @@ This program is a part of debhelper.
 Joey Hess <joeyh@debian.org>
 
 =cut
+
+# Local Variables:
+# indent-tabs-mode: t
+# tab-width: 4
+# cperl-indent-level: 4
+# End:
diff --git a/dh_suidregister b/dh_suidregister
index 893eb3dd..020e9a0e 100755
--- a/dh_suidregister
+++ b/dh_suidregister
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 
 =head1 NAME
 
@@ -31,6 +31,7 @@ program from your rules file.
 =cut
 
 use strict;
+use warnings;
 use Debian::Debhelper::Dh_Lib;
 init();
 
@@ -125,3 +126,9 @@ This program is a part of debhelper.
 Joey Hess <joeyh@debian.org>
 
 =cut
+
+# Local Variables:
+# indent-tabs-mode: t
+# tab-width: 4
+# cperl-indent-level: 4
+# End:
diff --git a/dh_testdir b/dh_testdir
index d7e945b9..ed576e27 100755
--- a/dh_testdir
+++ b/dh_testdir
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 
 =head1 NAME
 
@@ -7,6 +7,7 @@ dh_testdir - test directory before building Debian package
 =cut
 
 use strict;
+use warnings;
 use Debian::Debhelper::Dh_Lib;
 
 =head1 SYNOPSIS
@@ -61,3 +62,9 @@ This program is a part of debhelper.
 Joey Hess <joeyh@debian.org>
 
 =cut
+
+# Local Variables:
+# indent-tabs-mode: t
+# tab-width: 4
+# cperl-indent-level: 4
+# End:
diff --git a/dh_testroot b/dh_testroot
index c010dd50..6b2c7382 100755
--- a/dh_testroot
+++ b/dh_testroot
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 
 =head1 NAME
 
@@ -17,6 +17,7 @@ L<fakeroot(1)>
 =cut
 
 use strict;
+use warnings;
 use Debian::Debhelper::Dh_Lib;
 inhibit_log();
 
@@ -35,3 +36,9 @@ This program is a part of debhelper.
 Joey Hess <joeyh@debian.org>
 
 =cut
+
+# Local Variables:
+# indent-tabs-mode: t
+# tab-width: 4
+# cperl-indent-level: 4
+# End:
diff --git a/dh_ucf b/dh_ucf
index 98fc4ae9..409e9503 100755
--- a/dh_ucf
+++ b/dh_ucf
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 
 =head1 NAME
 
@@ -7,6 +7,7 @@ dh_ucf - register configuration files with ucf
 =cut
 
 use strict;
+use warnings;
 use Debian::Debhelper::Dh_Lib;
 
 =head1 SYNOPSIS
@@ -94,3 +95,9 @@ Joey Hess <joeyh@debian.org>
 Jeroen Schot <schot@a-eskwadraat.nl>
 
 =cut
+
+# Local Variables:
+# indent-tabs-mode: t
+# tab-width: 4
+# cperl-indent-level: 4
+# End:
diff --git a/dh_undocumented b/dh_undocumented
index 03a4ea7e..101596e4 100755
--- a/dh_undocumented
+++ b/dh_undocumented
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 
 =head1 NAME
 
@@ -7,6 +7,7 @@ dh_undocumented - undocumented.7 symlink program (deprecated no-op)
 =cut
 
 use strict;
+use warnings;
 use Debian::Debhelper::Dh_Lib;
 
 =head1 SYNOPSIS
@@ -36,3 +37,9 @@ This program is a part of debhelper.
 Joey Hess <joeyh@debian.org>
 
 =cut
+
+# Local Variables:
+# indent-tabs-mode: t
+# tab-width: 4
+# cperl-indent-level: 4
+# End:
diff --git a/dh_usrlocal b/dh_usrlocal
index 4ccc601b..b21d11f3 100755
--- a/dh_usrlocal
+++ b/dh_usrlocal
@@ -101,9 +101,9 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 		my $ebs = $bs x 2; # Escape the backslash from the shell
 		# This constructs the body of a 'sed' c\ expression which
 		# is parsed by the shell in double-quotes
-		my $dirs = join("$ebs\n", @dirs);
+		my $dirs = join("$ebs\n", sort @dirs);
 		pop @justdirs; # don't remove directories directly in /usr/local
-		my $justdirs = join("$ebs\n", @justdirs);
+		my $justdirs = join("$ebs\n", reverse sort @justdirs);
 		if (! $dh{NOSCRIPTS}) { 
 			autoscript($package,"postinst", "postinst-usrlocal",
 				   "/#DIRS#/ c${ebs}\n${dirs}");
@@ -124,3 +124,9 @@ This program is a part of debhelper.
 Andrew Stribblehill <ads@debian.org>
 
 =cut
+
+# Local Variables:
+# indent-tabs-mode: t
+# tab-width: 4
+# cperl-indent-level: 4
+# End:
diff --git a/doc/PROGRAMMING b/doc/PROGRAMMING
index e7b6e355..701af6b8 100644
--- a/doc/PROGRAMMING
+++ b/doc/PROGRAMMING
@@ -18,6 +18,11 @@ output the commands, you should indent them with 1 tab). This is so we don't
 have a lot of noise output when all the debhelper commands in a debian/rules
 are run, so the important stuff is clearly visible.
 
+An exception to above rule are dh_auto_* commands and dh itself. They will
+also print the commands interacting with the upstream build system and which
+of the simple debhelper programms are called. (i.e. print what a traditional
+non-dh(1) using debian/rules would print but nothing else).
+
 Debhelper programs should accept all options listed in the "SHARED
 DEBHELPER OPTIONS" section of debhelper(7), including any long forms of
 these options, like --verbose . If necessary, the options may be ignored.
@@ -38,9 +43,10 @@ The autoscript() function (see below) is one easy way to do this.
 dh_installdeb is an exception, it will run after the other commands and
 merge these modifications into the actual postinst scripts.
 
-In general, files named debian/*.debhelper are internal to debhelper, and
-their existence or use should not be relied on by external programs such as
-the build process of a package. These files will be deleted by dh_clean.
+In general, files named debian/*.debhelper and all content in
+debian/.debhelper are internal to debhelper, and their existence or
+use should not be relied on by external programs such as the build
+process of a package. These files will be deleted by dh_clean.
 
 Debhelper programs should default to doing exactly what policy says to do.
 
@@ -152,6 +158,9 @@ doit(@command)
 	if $dh{VERBOSE} is set, it will also output the command to stdout. You
 	should use this function for almost all commands your program performs
 	that manipulate files in the package build directories.
+print_and_doit(@command)
+        Like doit but will print unless $dh{QUIET} is set. See "Standardization"
+        above for when this is allowed to be called.
 complex_doit($command)
 	Pass this function a string that is a shell command, it will run it
 	similarly to how doit() does. You can pass more complicated commands 
@@ -159,9 +168,18 @@ complex_doit($command)
 	have to worry about things like escaping shell metacharacters.
 verbose_print($message)
 	Pass this command a string, and it will echo it if $dh{VERBOSE} is set.
+nonquiet_print($message)
+	Pass this command a string, and it will echo it unless $dh{QUIET} is set.
+	See "Standardization" above for when this is allowed to be called.
 error($errormsg)
 	Pass this command a string, it will output it to standard error and
 	exit.
+error_exitcode($cmd)
+	Pass this subroutine a string (representing a command line), it will
+	output a message describing that the command failed to standard error
+	and exit.  Note that this relies on the value of $? to produce a
+	meaningful error message.  Even if $? is 0, this /will/ still terminate
+	the program (although with a rather unhelpful message).
 warning($message)
 	Pass this command a string, and it will output it to standard error
 	as a warning message.
@@ -263,6 +281,30 @@ load_log($package, $hashref)
 write_log($cmd, $package ...)
 	Writes the log files for the specified package(s), adding
 	the cmd to the end.
+make_symlink($src, $dest, $tmp)
+	Creates a Policy compliant sytem link called $dest pointing to
+	$src. If $tmp is given, then $tmp will be prefixed to $dest when
+	creating the actual symlink.
+install_dh_config_file($src, $dest[, $mode])
+	Installs $src into $dest with $mode (defaults to 0644).  If
+	compat is 9 (or later) and $src is executable, $src will be
+	executed instead and its output will be used to generate the
+	$dest file.
+install_dir($dir)
+	Create the directory denoted by the path $dir and all parent
+	entries as well (as needed).
+install_file($src, $dest)
+	Installs $src into $dest with mode 0644.  The parent dir of
+	$dest must exist (can be created with install_dir).
+	This is intended for installing regular non-executable files.
+install_prog($src, $dest)
+	Installs $src into $dest with mode 0755.  The parent dir of
+	$dest must exist (can be created with install_dir).
+	This is intended for installing scripts or binaries.
+install_lib($src, $dest)
+	Installs a library at the path $src into $dest.  The parent
+	dir of $dest must exist (can be created with install_dir).
+	This is intended for installing libraries.
 
 Sequence Addons:
 ---------------
diff --git a/man/po4a/po/de.po b/man/po4a/po/de.po
index f87693d4..73162b86 100644
--- a/man/po4a/po/de.po
+++ b/man/po4a/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debhelper 9.20131227\n"
 "Report-Msgid-Bugs-To: debhelper@packages.debian.org\n"
-"POT-Creation-Date: 2014-10-03 15:16-0400\n"
+"POT-Creation-Date: 2015-06-28 11:53+0000\n"
 "PO-Revision-Date: 2012-10-22 22:47+0100\n"
 "Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -526,7 +526,7 @@ msgstr "verändert keine F<postinst>-, F<postrm>- etc. Skripte"
 
 #. type: =item
 #: debhelper.pod:185 dh_compress:52 dh_install:81 dh_installchangelogs:71
-#: dh_installdocs:80 dh_installexamples:41 dh_link:62 dh_makeshlibs:81
+#: dh_installdocs:80 dh_installexamples:41 dh_link:62 dh_makeshlibs:85
 #: dh_md5sums:37 dh_shlibdeps:30 dh_strip:39
 msgid "B<-X>I<item>, B<--exclude=>I<item>"
 msgstr "B<-X>I<Element>, B<--exclude=>I<Element>"
@@ -871,7 +871,8 @@ msgstr "Dieser Modus funktioniert wie v2 mit den folgenden Zusätzen:"
 #: debhelper.pod:453 debhelper.pod:461 debhelper.pod:466 debhelper.pod:480
 #: debhelper.pod:485 debhelper.pod:492 debhelper.pod:497 debhelper.pod:502
 #: debhelper.pod:506 debhelper.pod:512 debhelper.pod:517 debhelper.pod:522
-#: debhelper.pod:535 debhelper.pod:542
+#: debhelper.pod:537 debhelper.pod:542 debhelper.pod:548 debhelper.pod:555
+#: debhelper.pod:562 debhelper.pod:568
 msgid "-"
 msgstr "-"
 
@@ -1253,7 +1254,7 @@ msgid "Changes from v9 are:"
 msgstr "Änderungen gegenüber v9 sind:"
 
 #. type: textblock
-#: debhelper.pod:537
+#: debhelper.pod:539
 msgid ""
 "B<dh_installinit> will no longer install a file named debian/I<package> as "
 "an init script."
@@ -1264,6 +1265,14 @@ msgstr ""
 #. type: textblock
 #: debhelper.pod:544
 msgid ""
+"B<dh_installdocs> will error out if it detects links created with --link-doc "
+"between packages of architecture \"all\" and non-\"all\" as it breaks "
+"binNMUs."
+msgstr ""
+
+#. type: textblock
+#: debhelper.pod:550
+msgid ""
 "B<dh> no longer creates the package build directory when skipping running "
 "debhelper commands. This will not affect packages that only build with "
 "debhelper commands, but it may expose bugs in commands not included in "
@@ -1274,21 +1283,49 @@ msgstr ""
 "Debhelper-Befehlen bauen, keine Auswirkungen haben, es könnte aber Fehler in "
 "Befehlen offenlegen, die nicht in Debhelper enthalten sind."
 
+#. type: textblock
+#: debhelper.pod:557
+msgid ""
+"B<dh_makeshlibs> now invokes I<ldconfig -X> instead of just I<ldconfig> in "
+"its generated maintainer scripts snippets.  The new call will only update "
+"the ld cache (instead of also updating symlinks)."
+msgstr ""
+
+#. type: textblock
+#: debhelper.pod:564
+#, fuzzy
+#| msgid ""
+#| "B<dh_installinit> will no longer install a file named debian/I<package> "
+#| "as an init script."
+msgid ""
+"B<dh_installdeb> no longer installs a maintainer-provided debian/I<package>."
+"shlibs file.  This is now done by B<dh_makeshlibs> instead."
+msgstr ""
+"B<dh_installinit> wird nicht mehr eine Datei namens debian/I<Paket> als Init-"
+"Skript installieren."
+
+#. type: textblock
+#: debhelper.pod:570
+msgid ""
+"B<dh_installwm> refuses to create a broken package if no man page can be "
+"found (required to register for the x-window-manager alternative)."
+msgstr ""
+
 #. type: =head1
-#: debhelper.pod:553 dh_auto_test:45 dh_installcatalogs:59 dh_installdocs:121
+#: debhelper.pod:577 dh_auto_test:45 dh_installcatalogs:59 dh_installdocs:131
 #: dh_installemacsen:72 dh_installexamples:53 dh_installinit:140
 #: dh_installman:82 dh_installmodules:54 dh_installudev:55 dh_installwm:54
-#: dh_installxfonts:37 dh_movefiles:64 dh_strip:68 dh_usrlocal:49
+#: dh_installxfonts:37 dh_movefiles:64 dh_strip:104 dh_usrlocal:49
 msgid "NOTES"
 msgstr "ANMERKUNGEN"
 
 #. type: =head2
-#: debhelper.pod:555
+#: debhelper.pod:579
 msgid "Multiple binary package support"
 msgstr "Unterstützung mehrerer Binärpakete"
 
 #. type: textblock
-#: debhelper.pod:557
+#: debhelper.pod:581
 msgid ""
 "If your source package generates more than one binary package, debhelper "
 "programs will default to acting on all binary packages when run. If your "
@@ -1307,7 +1344,7 @@ msgstr ""
 "Ziel »binary-indep«."
 
 #. type: textblock
-#: debhelper.pod:565
+#: debhelper.pod:589
 #, fuzzy
 #| msgid ""
 #| "To facilitate this, as well as give you more control over which packages "
@@ -1330,7 +1367,7 @@ msgstr ""
 "sind."
 
 #. type: textblock
-#: debhelper.pod:571
+#: debhelper.pod:595
 msgid ""
 "First, any package whose B<Architecture> field in B<debian/control> does not "
 "match the build architecture will be excluded (L<Debian Policy, section "
@@ -1338,7 +1375,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: debhelper.pod:575
+#: debhelper.pod:599
 msgid ""
 "Also, some additional packages may be excluded based on the contents of the "
 "B<DEB_BUILD_PROFILES> environment variable and B<Build-Profiles> fields in "
@@ -1347,12 +1384,12 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: debhelper.pod:580
+#: debhelper.pod:604
 msgid "Automatic generation of Debian install scripts"
 msgstr "Automatisches Erzeugen von Debian-Installationsskripten"
 
 #. type: textblock
-#: debhelper.pod:582
+#: debhelper.pod:606
 msgid ""
 "Some debhelper commands will automatically generate parts of Debian "
 "maintainer scripts. If you want these automatically generated things "
@@ -1369,7 +1406,7 @@ msgstr ""
 "erzeugten Kode ersetzt."
 
 #. type: textblock
-#: debhelper.pod:589
+#: debhelper.pod:613
 msgid ""
 "If a script does not exist at all and debhelper needs to add something to "
 "it, then debhelper will create the complete script."
@@ -1378,7 +1415,7 @@ msgstr ""
 "hinzufügen muss, dann wird Debhelper das komplette Skript erstellen."
 
 #. type: textblock
-#: debhelper.pod:592
+#: debhelper.pod:616
 msgid ""
 "All debhelper commands that automatically generate code in this way let it "
 "be disabled by the -n parameter (see above)."
@@ -1387,7 +1424,7 @@ msgstr ""
 "dies durch den Parameter -n deaktiviert (siehe oben)."
 
 #. type: textblock
-#: debhelper.pod:595
+#: debhelper.pod:619
 msgid ""
 "Note that the inserted code will be shell code, so you cannot directly use "
 "it in a Perl script. If you would like to embed it into a Perl script, here "
@@ -1401,7 +1438,7 @@ msgstr ""
 "etc. gesetzt sind):"
 
 #. type: verbatim
-#: debhelper.pod:600
+#: debhelper.pod:624
 #, no-wrap
 msgid ""
 "  my $temp=\"set -e\\nset -- @ARGV\\n\" . << 'EOF';\n"
@@ -1419,12 +1456,12 @@ msgstr ""
 "\n"
 
 #. type: =head2
-#: debhelper.pod:606
+#: debhelper.pod:630
 msgid "Automatic generation of miscellaneous dependencies."
 msgstr "Automatisches Erzeugen verschiedener Abhängigkeiten"
 
 #. type: textblock
-#: debhelper.pod:608
+#: debhelper.pod:632
 msgid ""
 "Some debhelper commands may make the generated package need to depend on "
 "some other packages. For example, if you use L<dh_installdebconf(1)>, your "
@@ -1444,7 +1481,7 @@ msgstr ""
 "bietet, sie zu automatisieren."
 
 #. type: textblock
-#: debhelper.pod:616
+#: debhelper.pod:640
 msgid ""
 "All commands of this type, besides documenting what dependencies may be "
 "needed on their man pages, will automatically generate a substvar called B<"
@@ -1458,7 +1495,7 @@ msgstr ""
 "Debhelper findet, dass Sie sie benötigen."
 
 #. type: textblock
-#: debhelper.pod:621
+#: debhelper.pod:645
 msgid ""
 "This is entirely independent of the standard B<${shlibs:Depends}> generated "
 "by L<dh_makeshlibs(1)>, and the B<${perl:Depends}> generated by "
@@ -1472,12 +1509,12 @@ msgstr ""
 "entspricht."
 
 #. type: =head2
-#: debhelper.pod:626
+#: debhelper.pod:650
 msgid "Package build directories"
 msgstr "Paketbauverzeichnisse"
 
 #. type: textblock
-#: debhelper.pod:628
+#: debhelper.pod:652
 msgid ""
 "By default, all debhelper programs assume that the temporary directory used "
 "for assembling the tree of files in a package is debian/I<package>."
@@ -1487,7 +1524,7 @@ msgstr ""
 "debian/I<Paket> ist."
 
 #. type: textblock
-#: debhelper.pod:631
+#: debhelper.pod:655
 msgid ""
 "Sometimes, you might want to use some other temporary directory. This is "
 "supported by the B<-P> flag. For example, \"B<dh_installdocs -Pdebian/tmp>"
@@ -1507,13 +1544,13 @@ msgstr ""
 "Debhelper-Programm auswirkt."
 
 #. type: =head2
-#: debhelper.pod:639
+#: debhelper.pod:663
 msgid "udebs"
 msgstr "Udebs"
 
 # FIXME : an udeb
 #. type: textblock
-#: debhelper.pod:641
+#: debhelper.pod:665
 msgid ""
 "Debhelper includes support for udebs. To create a udeb with debhelper, add "
 "\"B<Package-Type: udeb>\" to the package's stanza in F<debian/control>.  "
@@ -1531,17 +1568,27 @@ msgstr ""
 "übersprungen werden."
 
 #. type: =head1
-#: debhelper.pod:648
+#: debhelper.pod:672
 msgid "ENVIRONMENT"
 msgstr "UMGEBUNGSVARIABLEN"
 
+#. type: textblock
+#: debhelper.pod:674
+msgid ""
+"The following environment variables can influence the behavior of "
+"debhelper.  It is important to note that these must be actual environment "
+"variables in order to function properly (not simply F<Makefile> variables). "
+"To specify them properly in F<debian/rules>, be sure to \"B<export>\" them. "
+"For example, \"B<export DH_VERBOSE>\"."
+msgstr ""
+
 #. type: =item
-#: debhelper.pod:652
+#: debhelper.pod:682
 msgid "B<DH_VERBOSE>"
 msgstr "B<DH_VERBOSE>"
 
 #. type: textblock
-#: debhelper.pod:654
+#: debhelper.pod:684
 #, fuzzy
 #| msgid ""
 #| "Set to B<1> to enable verbose mode. Debhelper will output every command "
@@ -1555,12 +1602,29 @@ msgstr ""
 "Bausystem verändert."
 
 #. type: =item
-#: debhelper.pod:657
+#: debhelper.pod:687
+#, fuzzy
+#| msgid "B<DH_COMPAT>"
+msgid "B<DH_QUIET>"
+msgstr "B<DH_COMPAT>"
+
+#. type: textblock
+#: debhelper.pod:689
+msgid ""
+"Set to B<1> to enable quiet mode. Debhelper will not output commands calling "
+"the upstream build system nor will dh print which subcommands are called and "
+"depending on the upstream build system might make that more quiet, too.  "
+"This makes it easier to spot important messages but makes the output quite "
+"useless as buildd log.  Ignored if DH_VERBOSE is also set."
+msgstr ""
+
+#. type: =item
+#: debhelper.pod:696
 msgid "B<DH_COMPAT>"
 msgstr "B<DH_COMPAT>"
 
 #. type: textblock
-#: debhelper.pod:659
+#: debhelper.pod:698
 msgid ""
 "Temporarily specifies what compatibility level debhelper should run at, "
 "overriding any value in F<debian/compat>."
@@ -1569,22 +1633,22 @@ msgstr ""
 "werden sollte und setzt dabei jeden Wert in F<debian/compat> außer Kraft."
 
 #. type: =item
-#: debhelper.pod:662
+#: debhelper.pod:701
 msgid "B<DH_NO_ACT>"
 msgstr "B<DH_NO_ACT>"
 
 #. type: textblock
-#: debhelper.pod:664
+#: debhelper.pod:703
 msgid "Set to B<1> to enable no-act mode."
 msgstr "auf B<1> gesetzt, um Modus ohne Aktion zu aktivieren."
 
 #. type: =item
-#: debhelper.pod:666
+#: debhelper.pod:705
 msgid "B<DH_OPTIONS>"
 msgstr "B<DH_OPTIONS>"
 
 #. type: textblock
-#: debhelper.pod:668
+#: debhelper.pod:707
 msgid ""
 "Anything in this variable will be prepended to the command line arguments of "
 "all debhelper commands."
@@ -1593,7 +1657,7 @@ msgstr ""
 "Befehle vorangestellt."
 
 #. type: textblock
-#: debhelper.pod:671
+#: debhelper.pod:710
 msgid ""
 "When using L<dh(1)>, it can be passed options that will be passed on to each "
 "debhelper command, which is generally better than using DH_OPTIONS."
@@ -1603,12 +1667,12 @@ msgstr ""
 "DH_OPTIONS zu verwenden."
 
 #. type: =item
-#: debhelper.pod:674
+#: debhelper.pod:713
 msgid "B<DH_ALWAYS_EXCLUDE>"
 msgstr "B<DH_ALWAYS_EXCLUDE>"
 
 #. type: textblock
-#: debhelper.pod:676
+#: debhelper.pod:715
 msgid ""
 "If set, this adds the value the variable is set to to the B<-X> options of "
 "all commands that support the B<-X> option. Moreover, B<dh_builddeb> will "
@@ -1620,7 +1684,7 @@ msgstr ""
 "entspricht, B<rm -rf> ausführen."
 
 #. type: textblock
-#: debhelper.pod:680
+#: debhelper.pod:719
 msgid ""
 "This can be useful if you are doing a build from a CVS source tree, in which "
 "case setting B<DH_ALWAYS_EXCLUDE=CVS> will prevent any CVS directories from "
@@ -1638,7 +1702,7 @@ msgstr ""
 "ist, wo auch immer Ihr Paket gebaut wird."
 
 #. type: textblock
-#: debhelper.pod:687
+#: debhelper.pod:726
 msgid ""
 "Multiple things to exclude can be separated with colons, as in "
 "B<DH_ALWAYS_EXCLUDE=CVS:.svn>"
@@ -1647,81 +1711,81 @@ msgstr ""
 "getrennt werden, wie in B<DH_ALWAYS_EXCLUDE=CVS:.svn>."
 
 #. type: =head1
-#: debhelper.pod:692 dh:972 dh_auto_build:47 dh_auto_clean:50
-#: dh_auto_configure:52 dh_auto_install:92 dh_auto_test:63 dh_bugfiles:124
-#: dh_builddeb:124 dh_clean:147 dh_compress:210 dh_desktop:31 dh_fixperms:131
-#: dh_gconf:101 dh_gencontrol:78 dh_icons:71 dh_install:260
-#: dh_installcatalogs:122 dh_installchangelogs:241 dh_installcron:79
-#: dh_installdeb:142 dh_installdebconf:128 dh_installdirs:88
-#: dh_installdocs:337 dh_installemacsen:141 dh_installexamples:108
+#: debhelper.pod:731 dh:974 dh_auto_build:47 dh_auto_clean:50
+#: dh_auto_configure:52 dh_auto_install:92 dh_auto_test:62 dh_bugfiles:130
+#: dh_builddeb:154 dh_clean:150 dh_compress:212 dh_desktop:31 dh_fixperms:142
+#: dh_gconf:97 dh_gencontrol:148 dh_icons:71 dh_install:281
+#: dh_installcatalogs:122 dh_installchangelogs:240 dh_installcron:79
+#: dh_installdeb:147 dh_installdebconf:127 dh_installdirs:88
+#: dh_installdocs:351 dh_installemacsen:142 dh_installexamples:109
 #: dh_installifupdown:71 dh_installinfo:77 dh_installinit:324
 #: dh_installlogcheck:80 dh_installlogrotate:52 dh_installman:263
-#: dh_installmanpages:197 dh_installmenu:89 dh_installmime:63
+#: dh_installmanpages:197 dh_installmenu:89 dh_installmime:64
 #: dh_installmodules:115 dh_installpam:61 dh_installppp:67 dh_installudev:117
-#: dh_installwm:110 dh_installxfonts:89 dh_link:228 dh_lintian:59
-#: dh_listpackages:30 dh_makeshlibs:264 dh_md5sums:90 dh_movefiles:170
-#: dh_perl:152 dh_prep:60 dh_scrollkeeper:28 dh_shlibdeps:152 dh_strip:242
+#: dh_installwm:114 dh_installxfonts:89 dh_link:145 dh_lintian:59
+#: dh_listpackages:30 dh_makeshlibs:280 dh_md5sums:107 dh_movefiles:170
+#: dh_perl:152 dh_prep:60 dh_scrollkeeper:28 dh_shlibdeps:152 dh_strip:345
 #: dh_suidregister:117 dh_testdir:53 dh_testroot:27 dh_undocumented:28
 #: dh_usrlocal:116
 msgid "SEE ALSO"
 msgstr "SIEHE AUCH"
 
 #. type: =item
-#: debhelper.pod:696
+#: debhelper.pod:735
 msgid "F</usr/share/doc/debhelper/examples/>"
 msgstr "F</usr/share/doc/debhelper/examples/>"
 
 #. type: textblock
-#: debhelper.pod:698
+#: debhelper.pod:737
 msgid "A set of example F<debian/rules> files that use debhelper."
 msgstr ""
 "eine Zusammenstellung von F<debian/rules>-Beispieldateien, die Debhelper "
 "benutzen"
 
 #. type: =item
-#: debhelper.pod:700
+#: debhelper.pod:739
 #, fuzzy
 #| msgid "L<http://kitenet.net/~joey/code/debhelper/>"
 msgid "L<http://joeyh.name/code/debhelper/>"
 msgstr "L<http://kitenet.net/~joey/code/debhelper/>"
 
 #. type: textblock
-#: debhelper.pod:702
+#: debhelper.pod:741
 msgid "Debhelper web site."
 msgstr "Debhelper-Website"
 
 #. type: =head1
-#: debhelper.pod:706 dh:978 dh_auto_build:53 dh_auto_clean:56
-#: dh_auto_configure:58 dh_auto_install:98 dh_auto_test:69 dh_bugfiles:132
-#: dh_builddeb:130 dh_clean:153 dh_compress:216 dh_desktop:37 dh_fixperms:137
-#: dh_gconf:107 dh_gencontrol:84 dh_icons:77 dh_install:266
-#: dh_installcatalogs:128 dh_installchangelogs:247 dh_installcron:85
-#: dh_installdeb:148 dh_installdebconf:134 dh_installdirs:94
-#: dh_installdocs:343 dh_installemacsen:148 dh_installexamples:114
+#: debhelper.pod:745 dh:980 dh_auto_build:53 dh_auto_clean:56
+#: dh_auto_configure:58 dh_auto_install:98 dh_auto_test:68 dh_bugfiles:138
+#: dh_builddeb:160 dh_clean:156 dh_compress:218 dh_desktop:37 dh_fixperms:148
+#: dh_gconf:103 dh_gencontrol:154 dh_icons:77 dh_install:287
+#: dh_installcatalogs:128 dh_installchangelogs:246 dh_installcron:85
+#: dh_installdeb:153 dh_installdebconf:133 dh_installdirs:94
+#: dh_installdocs:357 dh_installemacsen:149 dh_installexamples:115
 #: dh_installifupdown:77 dh_installinfo:83 dh_installlogcheck:86
 #: dh_installlogrotate:58 dh_installman:269 dh_installmanpages:203
-#: dh_installmenu:97 dh_installmime:69 dh_installmodules:121 dh_installpam:67
-#: dh_installppp:73 dh_installudev:123 dh_installwm:116 dh_installxfonts:95
-#: dh_link:234 dh_lintian:67 dh_listpackages:36 dh_makeshlibs:270
-#: dh_md5sums:96 dh_movefiles:176 dh_perl:158 dh_prep:66 dh_scrollkeeper:34
-#: dh_shlibdeps:158 dh_strip:248 dh_suidregister:123 dh_testdir:59
+#: dh_installmenu:97 dh_installmime:70 dh_installmodules:121 dh_installpam:67
+#: dh_installppp:73 dh_installudev:123 dh_installwm:120 dh_installxfonts:95
+#: dh_link:151 dh_lintian:67 dh_listpackages:36 dh_makeshlibs:286
+#: dh_md5sums:113 dh_movefiles:176 dh_perl:158 dh_prep:66 dh_scrollkeeper:34
+#: dh_shlibdeps:158 dh_strip:351 dh_suidregister:123 dh_testdir:59
 #: dh_testroot:33 dh_undocumented:34 dh_usrlocal:122
 msgid "AUTHOR"
 msgstr "AUTOR"
 
 #. type: textblock
-#: debhelper.pod:708 dh:980 dh_auto_build:55 dh_auto_clean:58
-#: dh_auto_configure:60 dh_auto_install:100 dh_auto_test:71 dh_builddeb:132
-#: dh_clean:155 dh_compress:218 dh_fixperms:139 dh_gencontrol:86
-#: dh_install:268 dh_installchangelogs:249 dh_installcron:87 dh_installdeb:150
-#: dh_installdebconf:136 dh_installdirs:96 dh_installdocs:345
-#: dh_installemacsen:150 dh_installexamples:116 dh_installifupdown:79
+#: debhelper.pod:747 dh:982 dh_auto_build:55 dh_auto_clean:58
+#: dh_auto_configure:60 dh_auto_install:100 dh_auto_test:70 dh_builddeb:162
+#: dh_clean:158 dh_compress:220 dh_fixperms:150 dh_gencontrol:156
+#: dh_install:289 dh_installchangelogs:248 dh_installcron:87 dh_installdeb:155
+#: dh_installdebconf:135 dh_installdirs:96 dh_installdocs:359
+#: dh_installemacsen:151 dh_installexamples:117 dh_installifupdown:79
 #: dh_installinfo:85 dh_installinit:332 dh_installlogrotate:60
 #: dh_installman:271 dh_installmanpages:205 dh_installmenu:99
-#: dh_installmime:71 dh_installmodules:123 dh_installpam:69 dh_installppp:75
-#: dh_installudev:125 dh_installwm:118 dh_installxfonts:97 dh_link:236
-#: dh_listpackages:38 dh_makeshlibs:272 dh_md5sums:98 dh_movefiles:178
-#: dh_prep:68 dh_shlibdeps:160 dh_strip:250 dh_suidregister:125 dh_testdir:61
+#: dh_installmime:72 dh_installmodules:123 dh_installpam:69 dh_installppp:75
+#: dh_installudev:125 dh_installwm:122 dh_installxfonts:97 dh_link:153
+#: dh_listpackages:38 dh_makeshlibs:288 dh_md5sums:115 dh_movefiles:178
+#: dh_prep:68 dh_shlibdeps:160 dh_strip:353 dh_suidregister:125 dh_testdir:61
 #: dh_testroot:35 dh_undocumented:36
 msgid "Joey Hess <joeyh@debian.org>"
 msgstr "Joey Hess <joeyh@debian.org>"
@@ -1801,15 +1865,15 @@ msgstr ""
 
 #. type: =head1
 #: dh:41 dh_auto_build:28 dh_auto_clean:30 dh_auto_configure:31
-#: dh_auto_install:43 dh_auto_test:31 dh_bugfiles:50 dh_builddeb:24
-#: dh_clean:41 dh_compress:48 dh_fixperms:32 dh_gconf:39 dh_gencontrol:26
+#: dh_auto_install:43 dh_auto_test:31 dh_bugfiles:50 dh_builddeb:25
+#: dh_clean:41 dh_compress:48 dh_fixperms:32 dh_gconf:39 dh_gencontrol:33
 #: dh_icons:30 dh_install:59 dh_installcatalogs:49 dh_installchangelogs:59
 #: dh_installcron:40 dh_installdebconf:61 dh_installdirs:31 dh_installdocs:71
 #: dh_installemacsen:53 dh_installexamples:32 dh_installifupdown:39
 #: dh_installinfo:31 dh_installinit:59 dh_installlogcheck:42
 #: dh_installlogrotate:22 dh_installman:61 dh_installmanpages:40
 #: dh_installmenu:41 dh_installmodules:38 dh_installpam:31 dh_installppp:35
-#: dh_installudev:35 dh_installwm:34 dh_link:53 dh_makeshlibs:43 dh_md5sums:28
+#: dh_installudev:35 dh_installwm:34 dh_link:53 dh_makeshlibs:47 dh_md5sums:28
 #: dh_movefiles:38 dh_perl:31 dh_prep:26 dh_shlibdeps:26 dh_strip:35
 #: dh_testdir:23 dh_usrlocal:39
 msgid "OPTIONS"
@@ -1888,7 +1952,7 @@ msgstr ""
 "oder B<-N> sowie spezialisiertere Optionen zu setzen."
 
 #. type: =head1
-#: dh:77 dh_installdocs:110 dh_link:75 dh_makeshlibs:97 dh_shlibdeps:70
+#: dh:77 dh_installdocs:120 dh_link:75 dh_makeshlibs:101 dh_shlibdeps:70
 msgid "EXAMPLES"
 msgstr "BEISPIELE"
 
@@ -2436,36 +2500,36 @@ msgstr ""
 "der letzte in der Sequenz benutzt."
 
 #. type: textblock
-#: dh:974 dh_auto_build:49 dh_auto_clean:52 dh_auto_configure:54
-#: dh_auto_install:94 dh_auto_test:65 dh_builddeb:126 dh_clean:149
-#: dh_compress:212 dh_fixperms:133 dh_gconf:103 dh_gencontrol:80
-#: dh_install:262 dh_installcatalogs:124 dh_installchangelogs:243
-#: dh_installcron:81 dh_installdeb:144 dh_installdebconf:130 dh_installdirs:90
-#: dh_installdocs:339 dh_installexamples:110 dh_installifupdown:73
+#: dh:976 dh_auto_build:49 dh_auto_clean:52 dh_auto_configure:54
+#: dh_auto_install:94 dh_auto_test:64 dh_builddeb:156 dh_clean:152
+#: dh_compress:214 dh_fixperms:144 dh_gconf:99 dh_gencontrol:150
+#: dh_install:283 dh_installcatalogs:124 dh_installchangelogs:242
+#: dh_installcron:81 dh_installdeb:149 dh_installdebconf:129 dh_installdirs:90
+#: dh_installdocs:353 dh_installexamples:111 dh_installifupdown:73
 #: dh_installinfo:79 dh_installinit:326 dh_installlogcheck:82
 #: dh_installlogrotate:54 dh_installman:265 dh_installmanpages:199
-#: dh_installmime:65 dh_installmodules:117 dh_installpam:63 dh_installppp:69
-#: dh_installudev:119 dh_installwm:112 dh_installxfonts:91 dh_link:230
-#: dh_listpackages:32 dh_makeshlibs:266 dh_md5sums:92 dh_movefiles:172
-#: dh_perl:154 dh_prep:62 dh_strip:244 dh_suidregister:119 dh_testdir:55
+#: dh_installmime:66 dh_installmodules:117 dh_installpam:63 dh_installppp:69
+#: dh_installudev:119 dh_installwm:116 dh_installxfonts:91 dh_link:147
+#: dh_listpackages:32 dh_makeshlibs:282 dh_md5sums:109 dh_movefiles:172
+#: dh_perl:154 dh_prep:62 dh_strip:347 dh_suidregister:119 dh_testdir:55
 #: dh_testroot:29 dh_undocumented:30 dh_usrlocal:118
 msgid "L<debhelper(7)>"
 msgstr "L<debhelper(7)>"
 
 #. type: textblock
-#: dh:976 dh_auto_build:51 dh_auto_clean:54 dh_auto_configure:56
-#: dh_auto_install:96 dh_auto_test:67 dh_bugfiles:130 dh_builddeb:128
-#: dh_clean:151 dh_compress:214 dh_desktop:35 dh_fixperms:135 dh_gconf:105
-#: dh_gencontrol:82 dh_icons:75 dh_install:264 dh_installchangelogs:245
-#: dh_installcron:83 dh_installdeb:146 dh_installdebconf:132 dh_installdirs:92
-#: dh_installdocs:341 dh_installemacsen:146 dh_installexamples:112
+#: dh:978 dh_auto_build:51 dh_auto_clean:54 dh_auto_configure:56
+#: dh_auto_install:96 dh_auto_test:66 dh_bugfiles:136 dh_builddeb:158
+#: dh_clean:154 dh_compress:216 dh_desktop:35 dh_fixperms:146 dh_gconf:101
+#: dh_gencontrol:152 dh_icons:75 dh_install:285 dh_installchangelogs:244
+#: dh_installcron:83 dh_installdeb:151 dh_installdebconf:131 dh_installdirs:92
+#: dh_installdocs:355 dh_installemacsen:147 dh_installexamples:113
 #: dh_installifupdown:75 dh_installinfo:81 dh_installinit:328
 #: dh_installlogrotate:56 dh_installman:267 dh_installmanpages:201
-#: dh_installmenu:95 dh_installmime:67 dh_installmodules:119 dh_installpam:65
-#: dh_installppp:71 dh_installudev:121 dh_installwm:114 dh_installxfonts:93
-#: dh_link:232 dh_lintian:63 dh_listpackages:34 dh_makeshlibs:268
-#: dh_md5sums:94 dh_movefiles:174 dh_perl:156 dh_prep:64 dh_scrollkeeper:32
-#: dh_shlibdeps:156 dh_strip:246 dh_suidregister:121 dh_testdir:57
+#: dh_installmenu:95 dh_installmime:68 dh_installmodules:119 dh_installpam:65
+#: dh_installppp:71 dh_installudev:121 dh_installwm:118 dh_installxfonts:93
+#: dh_link:149 dh_lintian:63 dh_listpackages:34 dh_makeshlibs:284
+#: dh_md5sums:111 dh_movefiles:174 dh_perl:156 dh_prep:64 dh_scrollkeeper:32
+#: dh_shlibdeps:156 dh_strip:349 dh_suidregister:121 dh_testdir:57
 #: dh_testroot:31 dh_undocumented:32 dh_usrlocal:120
 msgid "This program is a part of debhelper."
 msgstr "Dieses Programm ist Teil von Debhelper."
@@ -2524,8 +2588,8 @@ msgstr ""
 
 #. type: =item
 #: dh_auto_build:35 dh_auto_clean:37 dh_auto_configure:38 dh_auto_install:56
-#: dh_auto_test:38 dh_builddeb:38 dh_gencontrol:30 dh_installdebconf:69
-#: dh_installinit:105 dh_makeshlibs:91 dh_shlibdeps:37
+#: dh_auto_test:38 dh_builddeb:39 dh_gencontrol:37 dh_installdebconf:69
+#: dh_installinit:105 dh_makeshlibs:95 dh_shlibdeps:37
 msgid "B<--> I<params>"
 msgstr "B<--> I<Parameter>"
 
@@ -2736,7 +2800,7 @@ msgstr ""
 "und »make install« nur manuell auszuführen."
 
 #. type: =item
-#: dh_auto_install:50 dh_builddeb:28
+#: dh_auto_install:50 dh_builddeb:29
 msgid "B<--destdir=>I<directory>"
 msgstr "B<--destdir=>I<Verzeichnis>"
 
@@ -2867,7 +2931,7 @@ msgstr ""
 #: dh_installinfo:21 dh_installinit:27 dh_installlogcheck:21 dh_installman:51
 #: dh_installmenu:25 dh_installmime:21 dh_installmodules:28 dh_installpam:21
 #: dh_installppp:21 dh_installudev:25 dh_installwm:24 dh_link:41 dh_lintian:21
-#: dh_makeshlibs:29 dh_movefiles:26
+#: dh_makeshlibs:24 dh_movefiles:26
 msgid "FILES"
 msgstr "DATEIEN"
 
@@ -2942,17 +3006,17 @@ msgstr ""
 "installiert."
 
 #. type: textblock
-#: dh_bugfiles:126
+#: dh_bugfiles:132
 msgid "F</usr/share/doc/reportbug/README.developers.gz>"
 msgstr "F</usr/share/doc/reportbug/README.developers.gz>"
 
 #. type: textblock
-#: dh_bugfiles:128 dh_lintian:61
+#: dh_bugfiles:134 dh_lintian:61
 msgid "L<debhelper(1)>"
 msgstr "L<debhelper(1)>"
 
 #. type: textblock
-#: dh_bugfiles:134
+#: dh_bugfiles:140
 msgid "Modestas Vainius <modestas@vainius.eu>"
 msgstr "Modestas Vainius <modestas@vainius.eu>"
 
@@ -2972,15 +3036,20 @@ msgstr ""
 
 #. type: textblock
 #: dh_builddeb:18
+#, fuzzy
+#| msgid ""
+#| "B<dh_builddeb> simply calls L<dpkg-deb(1)> to build a Debian package or "
+#| "packages."
 msgid ""
 "B<dh_builddeb> simply calls L<dpkg-deb(1)> to build a Debian package or "
-"packages."
+"packages.  It will also build packages for ddebs when L<dh_strip(1)> and "
+"L<dh_gencontrol(1)> have prepared them."
 msgstr ""
 "B<dh_builddeb> ruft einfach L<dpkg-deb(1)> auf, um ein oder mehrere Debian-"
 "Pakete zu bauen."
 
 #. type: textblock
-#: dh_builddeb:21
+#: dh_builddeb:22
 msgid ""
 "It supports building multiple binary packages in parallel, when enabled by "
 "DEB_BUILD_OPTIONS."
@@ -2989,7 +3058,7 @@ msgstr ""
 "DEB_BUILD_OPTIONS aktiviert wurde."
 
 #. type: textblock
-#: dh_builddeb:30
+#: dh_builddeb:31
 msgid ""
 "Use this if you want the generated F<.deb> files to be put in a directory "
 "other than the default of \"F<..>\"."
@@ -2998,12 +3067,12 @@ msgstr ""
 "Verzeichnis als dem vorgegebenen »F<..>« ablegen."
 
 #. type: =item
-#: dh_builddeb:33
+#: dh_builddeb:34
 msgid "B<--filename=>I<name>"
 msgstr "B<--filename=>I<Name>"
 
 #. type: textblock
-#: dh_builddeb:35
+#: dh_builddeb:36
 msgid ""
 "Use this if you want to force the generated .deb file to have a particular "
 "file name. Does not work well if more than one .deb is generated!"
@@ -3013,19 +3082,19 @@ msgstr ""
 "deb erzeugt wird."
 
 #. type: textblock
-#: dh_builddeb:40
+#: dh_builddeb:41
 msgid "Pass I<params> to L<dpkg-deb(1)> when it is used to build the package."
 msgstr ""
 "I<Parameter> wird an L<dpkg-deb(1)> übergeben, wenn es zum Bauen des Pakets "
 "benutzt wird."
 
 #. type: =item
-#: dh_builddeb:43
+#: dh_builddeb:44
 msgid "B<-u>I<params>"
 msgstr "B<-u>I<Parameter>"
 
 #. type: textblock
-#: dh_builddeb:45
+#: dh_builddeb:46
 msgid ""
 "This is another way to pass I<params> to L<dpkg-deb(1)>.  It is deprecated; "
 "use B<--> instead."
@@ -3135,7 +3204,7 @@ msgstr ""
 "ausgeschlossen werden sollen."
 
 #. type: =item
-#: dh_clean:60 dh_compress:64 dh_installdocs:103 dh_installexamples:46
+#: dh_clean:60 dh_compress:64 dh_installdocs:113 dh_installexamples:46
 #: dh_installinfo:40 dh_installmanpages:44 dh_movefiles:55 dh_testdir:27
 msgid "I<file> ..."
 msgstr "<I<Datei> …"
@@ -3250,7 +3319,7 @@ msgstr ""
 "fügt diese Dateien zu der Liste der Dateien hinzu, die komprimiert werden"
 
 #. type: =head1
-#: dh_compress:70 dh_perl:61 dh_strip:74 dh_usrlocal:55
+#: dh_compress:70 dh_perl:61 dh_strip:113 dh_usrlocal:55
 msgid "CONFORMS TO"
 msgstr "KONFORM ZU"
 
@@ -3436,7 +3505,7 @@ msgstr ""
 "spezifische Pakete (B<90>) verwandt werden."
 
 #. type: textblock
-#: dh_gconf:109
+#: dh_gconf:105
 msgid "Ross Burton <ross@burtonini.com> Josselin Mouette <joss@debian.org>"
 msgstr "Ross Burton <ross@burtonini.com>, Josselin Mouette <joss@debian.org>"
 
@@ -3463,27 +3532,42 @@ msgstr ""
 
 #. type: textblock
 #: dh_gencontrol:22
+#, fuzzy
+#| msgid ""
+#| "This program is merely a wrapper around L<dpkg-gencontrol(1)>, which "
+#| "calls it once for each package being acted on, and passes in some "
+#| "additional useful flags."
 msgid ""
 "This program is merely a wrapper around L<dpkg-gencontrol(1)>, which calls "
-"it once for each package being acted on, and passes in some additional "
-"useful flags."
+"it once for each package being acted on (plus related ddebs), and passes in "
+"some additional useful flags."
 msgstr ""
 "Dieses Programm ist bloß ein Wrapper um L<dpkg-gencontrol(1)>, das es einmal "
 "für jedes Paket, auf das es sich auswirkt, aufruft und einige zusätzliche "
 "nützliche Schalter übergibt."
 
 #. type: textblock
-#: dh_gencontrol:32
+#: dh_gencontrol:26
+msgid ""
+"B<Note> that if you use B<dh_gencontrol>, you must also use "
+"L<dh_builddeb(1)> to build the packages.  Otherwise, your build may fail to "
+"build as B<dh_gencontrol> (via L<dpkg-gencontrol(1)>) declares which "
+"packages are built.  As debhelper automatically generates ddebs, it some "
+"times adds additional packages, which will be built by L<dh_builddeb(1)>."
+msgstr ""
+
+#. type: textblock
+#: dh_gencontrol:39
 msgid "Pass I<params> to L<dpkg-gencontrol(1)>."
 msgstr "übergibt I<Parameter> an L<dpkg-gencontrol(1)>"
 
 #. type: =item
-#: dh_gencontrol:34
+#: dh_gencontrol:41
 msgid "B<-u>I<params>, B<--dpkg-gencontrol-params=>I<params>"
 msgstr "B<-u>I<Parameter>, B<--dpkg-gencontrol-params=>I<Parameter>"
 
 #. type: textblock
-#: dh_gencontrol:36
+#: dh_gencontrol:43
 msgid ""
 "This is another way to pass I<params> to L<dpkg-gencontrol(1)>.  It is "
 "deprecated; use B<--> instead."
@@ -3533,7 +3617,7 @@ msgstr ""
 #. type: =item
 #: dh_icons:34 dh_installcatalogs:53 dh_installdebconf:65 dh_installemacsen:57
 #: dh_installinit:63 dh_installmenu:45 dh_installmodules:42 dh_installudev:49
-#: dh_installwm:44 dh_makeshlibs:77 dh_usrlocal:43
+#: dh_installwm:44 dh_makeshlibs:81 dh_usrlocal:43
 msgid "B<-n>, B<--noscripts>"
 msgstr "B<-n>, B<--noscripts>"
 
@@ -3797,23 +3881,68 @@ msgstr ""
 "installiert, auf das sich F<dh_install> auswirkt."
 
 #. type: =head1
-#: dh_install:254
+#: dh_install:256
 msgid "LIMITATIONS"
 msgstr "EINSCHRÄNKUNGEN"
 
+#. type: textblock
+#: dh_install:258
+#, fuzzy
+#| msgid ""
+#| "B<dh_install> cannot rename files or directories, it can only install "
+#| "them\n"
+#| "with the names they already have into wherever you want in the package\n"
+#| "build tree.\n"
+#| "  \n"
+msgid ""
+"B<dh_install> cannot rename files or directories, it can only install them "
+"with the names they already have into wherever you want in the package build "
+"tree."
+msgstr ""
+"B<dh_install> kann keine Dateien oder Verzeichnisse umbenennen, es kann sie "
+"nur\n"
+"mit den Namen, die sie bereits haben, im Paketbauverzeichnisbaum dorthin\n"
+"installieren, wo Sie es wünschen.\n"
+"  \n"
+
+#. type: textblock
+#: dh_install:262
+msgid ""
+"However, renaming can be achieved by using B<dh-exec> with compatibility "
+"level 9 or later.  An example debian/I<package>.install file using B<dh-"
+"exec> could look like:"
+msgstr ""
+
 #. type: verbatim
-#: dh_install:256
+#: dh_install:266
 #, no-wrap
 msgid ""
-"B<dh_install> cannot rename files or directories, it can only install them\n"
-"with the names they already have into wherever you want in the package\n"
-"build tree.\n"
-"  \n"
+" #!/usr/bin/dh-exec\n"
+" debian/default.conf => /etc/my-package/start.conf\n"
+"\n"
+msgstr ""
+
+#. type: textblock
+#: dh_install:269
+msgid "Please remember the following three things:"
+msgstr ""
+
+#. type: =item
+#: dh_install:273
+msgid ""
+"* The package must be using compatibility level 9 or later (see "
+"L<debhelper(7)>)"
+msgstr ""
+
+#. type: =item
+#: dh_install:275
+msgid "* The package will need a build-dependency on dh-exec."
+msgstr ""
+
+#. type: =item
+#: dh_install:277
+msgid "* The install file must be marked as executable."
 msgstr ""
-"B<dh_install> kann keine Dateien oder Verzeichnisse umbenennen, es kann sie nur\n"
-"mit den Namen, die sie bereits haben, im Paketbauverzeichnisbaum dorthin\n"
-"installieren, wo Sie es wünschen.\n"
-"  \n"
 
 #. type: textblock
 #: dh_installcatalogs:5
@@ -3894,9 +4023,8 @@ msgid "Do not modify F<postinst>/F<postrm>/F<prerm> scripts."
 msgstr "ändert keine F<postinst>-/F<postrm>/F<prerm>-Skripte."
 
 #. type: textblock
-#: dh_installcatalogs:61 dh_installdocs:127 dh_installemacsen:74
-#: dh_installinit:142 dh_installmodules:56 dh_installudev:57 dh_installwm:56
-#: dh_usrlocal:51
+#: dh_installcatalogs:61 dh_installemacsen:74 dh_installinit:142
+#: dh_installmodules:56 dh_installudev:57 dh_installwm:56 dh_usrlocal:51
 msgid ""
 "Note that this command is not idempotent. L<dh_prep(1)> should be called "
 "between invocations of this command. Otherwise, it may cause multiple "
@@ -4207,18 +4335,25 @@ msgstr "I<Paket>.shlibs"
 msgid "These control files are installed into the F<DEBIAN> directory."
 msgstr "Diese Steuerdateien sind im Verzeichnis F<DEBIAN> installiert."
 
-#. type: =item
+#. type: textblock
 #: dh_installdeb:45
+msgid ""
+"Note that I<package>.shlibs is only installed in compat level 9 and "
+"earlier.  In compat 10, please use L<dh_makeshlibs(1)>."
+msgstr ""
+
+#. type: =item
+#: dh_installdeb:48
 msgid "I<package>.conffiles"
 msgstr "I<Paket>.conffiles"
 
 #. type: textblock
-#: dh_installdeb:47
+#: dh_installdeb:50
 msgid "This control file will be installed into the F<DEBIAN> directory."
 msgstr "Diese Steuerdatei wird in das Verzeichnis F<DEBIAN> installiert."
 
 #. type: textblock
-#: dh_installdeb:49
+#: dh_installdeb:52
 msgid ""
 "In v3 compatibility mode and higher, all files in the F<etc/> directory in a "
 "package will automatically be flagged as conffiles by this program, so there "
@@ -4229,12 +4364,12 @@ msgstr ""
 "markiert, daher ist es nicht nötig, sie manuell aufzuführen."
 
 #. type: =item
-#: dh_installdeb:53
+#: dh_installdeb:56
 msgid "I<package>.maintscript"
 msgstr "I<Paket>.maintscript"
 
 #. type: textblock
-#: dh_installdeb:55
+#: dh_installdeb:58
 msgid ""
 "Lines in this file correspond to L<dpkg-maintscript-helper(1)> commands and "
 "parameters.  Any shell metacharacters will be escaped, so arbitrary shell "
@@ -4643,7 +4778,23 @@ msgstr ""
 "symbolischen Verweis zu erstellen, bevor B<dh_installdocs> aufgerufen wird.)"
 
 #. type: textblock
-#: dh_installdocs:105
+#: dh_installdocs:103
+msgid ""
+"B<CAVEAT>: If a previous version of the package was built without this "
+"option and is now built with it (or vice-versa), it requries a \"dir to "
+"symlink\" (or \"symlink to dir\") migration.  Since debhelper has no "
+"knowledge of previous versions, you have to enable this migration itself."
+msgstr ""
+
+#. type: textblock
+#: dh_installdocs:109
+msgid ""
+"This can be done by providing a \"debian/I<package>.maintscript\" file and "
+"using L<dh_installdeb(1)> to provide the relevant maintainer script snippets."
+msgstr ""
+
+#. type: textblock
+#: dh_installdocs:115
 msgid ""
 "Install these files as documentation into the first package acted on. (Or in "
 "all packages if B<-A> is specified)."
@@ -4652,12 +4803,12 @@ msgstr ""
 "sich auswirkt (oder in allen Paketen, falls B<-A> angegeben wurde)."
 
 #. type: textblock
-#: dh_installdocs:112
+#: dh_installdocs:122
 msgid "This is an example of a F<debian/package.docs> file:"
 msgstr "Dies ist ein Beispiel einer F<debian/Paket.docs>-Datei:"
 
 #. type: verbatim
-#: dh_installdocs:114
+#: dh_installdocs:124
 #, no-wrap
 msgid ""
 "  README\n"
@@ -4677,7 +4828,7 @@ msgstr ""
 "\n"
 
 #. type: textblock
-#: dh_installdocs:123
+#: dh_installdocs:133
 msgid ""
 "Note that B<dh_installdocs> will happily copy entire directory hierarchies "
 "if you ask it to (similar to B<cp -a>). If it is asked to install a "
@@ -4814,7 +4965,7 @@ msgstr ""
 "wird. Vorgabe ist B<emacs>, Alternativen umfassen B<xemacs> und B<emacs20>."
 
 #. type: textblock
-#: dh_installemacsen:143
+#: dh_installemacsen:144
 msgid "L<debhelper(7)> L</usr/share/doc/emacsen-common/debian-emacs-policy.gz>"
 msgstr ""
 "L<debhelper(7)> L</usr/share/doc/emacsen-common/debian-emacs-policy.gz>"
@@ -5732,7 +5883,7 @@ msgstr ""
 "Paketbauverzeichnis."
 
 #. type: textblock
-#: dh_installmenu:47 dh_makeshlibs:79
+#: dh_installmenu:47 dh_makeshlibs:83
 msgid "Do not modify F<postinst>/F<postrm> scripts."
 msgstr "ändert keine F<postinst>-/F<postrm>-Skripte."
 
@@ -6445,32 +6596,40 @@ msgstr ""
 "dem es gemeinsam benutzte Bibliotheken findet, einen Aufruf von Ldconfig "
 "hinzu (nur im Modus v3 und darüber)."
 
+#. type: =item
+#: dh_makeshlibs:28
+#, fuzzy
+#| msgid "debian/I<package>.links"
+msgid "debian/I<package>.shlibs"
+msgstr "debian/I<Paket>.links"
+
 #. type: textblock
-#: dh_makeshlibs:24
+#: dh_makeshlibs:30
 msgid ""
-"Packages that support multiarch are detected, and a Pre-Dependency on "
-"multiarch-support is set in ${misc:Pre-Depends} ; you should make sure to "
-"put that token into an appropriate place in your debian/control file for "
-"packages supporting multiarch."
+"Installs this file, if present, into the package as DEBIAN/shlibs.  If "
+"omitted, debhelper will generate a shlibs file automatically if it detects "
+"any libraries."
+msgstr ""
+
+#. type: textblock
+#: dh_makeshlibs:34
+msgid ""
+"Note in compat levels 9 and earlier, this file was installed by "
+"L<dh_installdeb(1)> rather than B<dh_makeshlibs>."
 msgstr ""
-"Pakete, die Multiarch unterstützen, werden entdeckt und eine Vorabhängigkeit "
-"(»Pre-Dependency«) zur Multiarch-Unterstützung wird in ${misc:Pre-Depends} "
-"gesetzt; Sie sollten sicherstellen, dass diese Markierung an eine geeignete "
-"Stelle in Ihrer debian/control-Datei für Pakete abgelegt wird, die Multiarch "
-"unterstützen."
 
 #. type: =item
-#: dh_makeshlibs:33
+#: dh_makeshlibs:37
 msgid "debian/I<package>.symbols"
 msgstr "debian/I<Paket>.symbols"
 
 #. type: =item
-#: dh_makeshlibs:35
+#: dh_makeshlibs:39
 msgid "debian/I<package>.symbols.I<arch>"
 msgstr "debian/I<Paket>.symbols.I<Architektur>"
 
 #. type: textblock
-#: dh_makeshlibs:37
+#: dh_makeshlibs:41
 msgid ""
 "These symbols files, if present, are passed to L<dpkg-gensymbols(1)> to be "
 "processed and installed. Use the I<arch> specific names if you need to "
@@ -6482,12 +6641,12 @@ msgstr ""
 "Symbole für unterschiedliche Architekturen bereitstellen müssen."
 
 #. type: =item
-#: dh_makeshlibs:47
+#: dh_makeshlibs:51
 msgid "B<-m>I<major>, B<--major=>I<major>"
 msgstr "B<-m>I<Hauptnummer>, B<--major=>I<Hauptnummer>"
 
 #. type: textblock
-#: dh_makeshlibs:49
+#: dh_makeshlibs:53
 msgid ""
 "Instead of trying to guess the major number of the library with objdump, use "
 "the major number specified after the -m parameter. This is much less useful "
@@ -6501,17 +6660,17 @@ msgstr ""
 "verwenden."
 
 #. type: =item
-#: dh_makeshlibs:54
+#: dh_makeshlibs:58
 msgid "B<-V>, B<-V>I<dependencies>"
 msgstr "B<-V>, B<-V>I<Abhängigkeiten>"
 
 #. type: =item
-#: dh_makeshlibs:56
+#: dh_makeshlibs:60
 msgid "B<--version-info>, B<--version-info=>I<dependencies>"
 msgstr "B<--version-info>, B<--version-info=>I<Abhängigkeiten>"
 
 #. type: textblock
-#: dh_makeshlibs:58
+#: dh_makeshlibs:62
 msgid ""
 "By default, the shlibs file generated by this program does not make packages "
 "depend on any particular version of the package containing the shared "
@@ -6537,7 +6696,7 @@ msgstr ""
 "anzugeben (stellen Sie sicher, dass der Paketname enthalten ist)."
 
 #. type: textblock
-#: dh_makeshlibs:69
+#: dh_makeshlibs:73
 msgid ""
 "Beware of using B<-V> without any parameters; this is a conservative setting "
 "that always ensures that other packages' shared library dependencies are at "
@@ -6556,7 +6715,7 @@ msgstr ""
 "herauskommen könnten und es so schwieriger wird, ein Upgrade durchzuführen."
 
 #. type: textblock
-#: dh_makeshlibs:83
+#: dh_makeshlibs:87
 msgid ""
 "Exclude files that contain I<item> anywhere in their filename or directory "
 "from being treated as shared libraries."
@@ -6565,12 +6724,12 @@ msgstr ""
 "I<Element> enthalten, als Bibliotheken betrachtet zu werden."
 
 #. type: =item
-#: dh_makeshlibs:86
+#: dh_makeshlibs:90
 msgid "B<--add-udeb=>I<udeb>"
 msgstr "B<--add-udeb=>I<Udeb>"
 
 #. type: textblock
-#: dh_makeshlibs:88
+#: dh_makeshlibs:92
 msgid ""
 "Create an additional line for udebs in the shlibs file and use I<udeb> as "
 "the package name for udebs to depend on instead of the regular library "
@@ -6581,17 +6740,17 @@ msgstr ""
 "Bibliothekpakets."
 
 #. type: textblock
-#: dh_makeshlibs:93
+#: dh_makeshlibs:97
 msgid "Pass I<params> to L<dpkg-gensymbols(1)>."
 msgstr "übergibt I<Parameter> an L<dpkg-gensymbols(1)>."
 
 #. type: =item
-#: dh_makeshlibs:101
+#: dh_makeshlibs:105
 msgid "B<dh_makeshlibs>"
 msgstr "B<dh_makeshlibs>"
 
 #. type: verbatim
-#: dh_makeshlibs:103
+#: dh_makeshlibs:107
 #, no-wrap
 msgid ""
 "Assuming this is a package named F<libfoobar1>, generates a shlibs file that\n"
@@ -6605,12 +6764,12 @@ msgstr ""
 "\n"
 
 #. type: =item
-#: dh_makeshlibs:107
+#: dh_makeshlibs:111
 msgid "B<dh_makeshlibs -V>"
 msgstr "B<dh_makeshlibs -V>"
 
 #. type: verbatim
-#: dh_makeshlibs:109
+#: dh_makeshlibs:113
 #, no-wrap
 msgid ""
 "Assuming the current version of the package is 1.1-3, generates a shlibs\n"
@@ -6624,12 +6783,12 @@ msgstr ""
 "\n"
 
 #. type: =item
-#: dh_makeshlibs:113
+#: dh_makeshlibs:117
 msgid "B<dh_makeshlibs -V 'libfoobar1 (E<gt>= 1.0)'>"
 msgstr "B<dh_makeshlibs -V 'libfoobar1 (E<gt>= 1.0)'>"
 
 #. type: verbatim
-#: dh_makeshlibs:115
+#: dh_makeshlibs:119
 #, no-wrap
 msgid ""
 "Generates a shlibs file that looks something like:\n"
@@ -7289,6 +7448,16 @@ msgstr "B<--dbg-package=>I<Paket>"
 #. type: textblock
 #: dh_strip:47
 msgid ""
+"B<This option is a now special purpose option that you normally do not "
+"need>.  In most cases, there should be little reason to use this option for "
+"new source packages as debhelper generates automatic debug packages (\"ddebs"
+"\").  B<If you have a manual --dbg-package> that you want to migrate to the "
+"automatic ddeb, please see the B<--ddeb-migration> option."
+msgstr ""
+
+#. type: textblock
+#: dh_strip:54
+msgid ""
 "Causes B<dh_strip> to save debug symbols stripped from the packages it acts "
 "on as independent files in the package build directory of the specified "
 "debugging package."
@@ -7298,7 +7467,7 @@ msgstr ""
 "Paketen, mit denen es arbeitet, entfernt wurden."
 
 #. type: textblock
-#: dh_strip:51
+#: dh_strip:58
 msgid ""
 "For example, if your packages are libfoo and foo and you want to include a "
 "I<foo-dbg> package with debugging symbols, use B<dh_strip --dbg-"
@@ -7309,7 +7478,7 @@ msgstr ""
 "package=>I<foo-dbg>."
 
 #. type: textblock
-#: dh_strip:54
+#: dh_strip:61
 msgid ""
 "Note that this option behaves significantly different in debhelper "
 "compatibility levels 4 and below. Instead of specifying the name of a debug "
@@ -7324,13 +7493,20 @@ msgstr ""
 "getrennten Symbole werden in Pakete platziert, deren Name ein B<-dbg> "
 "hinzugefügt wurde."
 
+#. type: textblock
+#: dh_strip:67
+msgid ""
+"This option implies B<--no-ddebs> and I<cannot> be used with B<--ddeb> or "
+"B<--ddeb-migration>."
+msgstr ""
+
 #. type: =item
-#: dh_strip:60
+#: dh_strip:70
 msgid "B<-k>, B<--keep-debug>"
 msgstr "B<-k>, B<--keep-debug>"
 
 #. type: textblock
-#: dh_strip:62
+#: dh_strip:72
 msgid ""
 "Debug symbols will be retained, but split into an independent file in F<usr/"
 "lib/debug/> in the package build directory. B<--dbg-package> is easier to "
@@ -7341,18 +7517,96 @@ msgstr ""
 "einfacher als diese Option zu benutzen, aber diese Option ist flexibler."
 
 #. type: textblock
-#: dh_strip:70
+#: dh_strip:76
+msgid ""
+"This option implies B<--no-ddebs> and I<cannot> be used with B<--ddebs>."
+msgstr ""
+
+#. type: =item
+#: dh_strip:79
+#, fuzzy
+#| msgid "B<--dbg-package=>I<package>"
+msgid "B<--ddeb-migration=>I<package-relation>"
+msgstr "B<--dbg-package=>I<Paket>"
+
+#. type: textblock
+#: dh_strip:81
+msgid ""
+"This option is used to migrate from a manual \"-dbg\" package (created with "
+"B<--dbg-package>) to the automatic \"ddebs\".  The value of this option "
+"should describe a valid B<Replaces>- and B<Breaks>-relation, which will be "
+"added to the ddebs to avoid file conflicts with the (now obsolete) -dbg "
+"package."
+msgstr ""
+
+#. type: textblock
+#: dh_strip:87
+msgid ""
+"This option implies B<--ddebs> and I<cannot> be used with B<--keep-debug>, "
+"B<--dbg-package> or B<--no-ddebs>."
+msgstr ""
+
+#. type: textblock
+#: dh_strip:90
+msgid "Examples:"
+msgstr ""
+
+#. type: verbatim
+#: dh_strip:92
+#, no-wrap
+msgid ""
+"  dh_strip --ddeb-migration='libfoo-dbg (<< 2.1-3~)'\n"
+"\n"
+msgstr ""
+
+#. type: verbatim
+#: dh_strip:94
+#, no-wrap
+msgid ""
+"  dh_strip --ddeb-migration='libfoo-tools-dbg (<< 2.1-3~), libfoo2-dbg (<< 2.1-3~)'\n"
+"\n"
+msgstr ""
+
+#. type: =item
+#: dh_strip:96
+#, fuzzy
+#| msgid "B<-i>, B<--indep>"
+msgid "B<--ddebs>, B<--no-ddebs>"
+msgstr "B<-i>, B<--indep>"
+
+#. type: textblock
+#: dh_strip:98
+msgid ""
+"Control whether B<dh_strip> should be creating ddebs when possible.  By "
+"default, B<dh_strip> will attempt to build ddebs and this option is "
+"primarily useful for disabling this."
+msgstr ""
+
+#. type: textblock
+#: dh_strip:106
+#, fuzzy
+#| msgid ""
+#| "If the B<DEB_BUILD_OPTIONS> environment variable contains B<nostrip>, "
+#| "nothing will be stripped, in accordance with Debian policy (section 10.1 "
+#| "\"Binaries\")."
 msgid ""
 "If the B<DEB_BUILD_OPTIONS> environment variable contains B<nostrip>, "
 "nothing will be stripped, in accordance with Debian policy (section 10.1 "
-"\"Binaries\")."
+"\"Binaries\").  This will also inhibit the creation of automatic \"ddebs\"."
 msgstr ""
 "Falls die Umgebungsvariable B<DEB_BUILD_OPTIONS> B<nostrip> enthält, werden "
 "getreu der Debian-Richlinie (Abschnitt 10.1. »Binaries«) keine Symbole "
 "entfernt."
 
 #. type: textblock
-#: dh_strip:76
+#: dh_strip:110
+msgid ""
+"The creation of automatic \"ddebs\" can also be prevented by adding "
+"B<noddebs> to the B<DEB_BUILD_OPTIONS> environment variable."
+msgstr ""
+
+#. type: textblock
+#: dh_strip:115
 msgid "Debian policy, version 3.0.1"
 msgstr "Debian-Richlinie, Version 3.0.1"
 
@@ -7556,6 +7810,18 @@ msgstr "Debian-Richtlinie, Version 2.2"
 msgid "Andrew Stribblehill <ads@debian.org>"
 msgstr "Andrew Stribblehill <ads@debian.org>"
 
+#~ msgid ""
+#~ "Packages that support multiarch are detected, and a Pre-Dependency on "
+#~ "multiarch-support is set in ${misc:Pre-Depends} ; you should make sure to "
+#~ "put that token into an appropriate place in your debian/control file for "
+#~ "packages supporting multiarch."
+#~ msgstr ""
+#~ "Pakete, die Multiarch unterstützen, werden entdeckt und eine "
+#~ "Vorabhängigkeit (»Pre-Dependency«) zur Multiarch-Unterstützung wird in "
+#~ "${misc:Pre-Depends} gesetzt; Sie sollten sicherstellen, dass diese "
+#~ "Markierung an eine geeignete Stelle in Ihrer debian/control-Datei für "
+#~ "Pakete abgelegt wird, die Multiarch unterstützen."
+
 #~ msgid "Sets the priority string of the F<rules.d> symlink. Default is 60."
 #~ msgstr ""
 #~ "setzt die Prioritätszeichenkette des symbolischen F<rules.d>-Verweises. "
diff --git a/man/po4a/po/debhelper.pot b/man/po4a/po/debhelper.pot
index 9a11ced7..359df41e 100644
--- a/man/po4a/po/debhelper.pot
+++ b/man/po4a/po/debhelper.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-10-03 15:16-0400\n"
+"POT-Creation-Date: 2015-06-28 11:53+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -374,7 +374,7 @@ msgid "Do not modify F<postinst>, F<postrm>, etc. scripts."
 msgstr ""
 
 #. type: =item
-#: debhelper.pod:185 dh_compress:52 dh_install:81 dh_installchangelogs:71 dh_installdocs:80 dh_installexamples:41 dh_link:62 dh_makeshlibs:81 dh_md5sums:37 dh_shlibdeps:30 dh_strip:39
+#: debhelper.pod:185 dh_compress:52 dh_install:81 dh_installchangelogs:71 dh_installdocs:80 dh_installexamples:41 dh_link:62 dh_makeshlibs:85 dh_md5sums:37 dh_shlibdeps:30 dh_strip:39
 msgid "B<-X>I<item>, B<--exclude=>I<item>"
 msgstr ""
 
@@ -624,7 +624,7 @@ msgid "This mode works like v2, with the following additions:"
 msgstr ""
 
 #. type: =item
-#: debhelper.pod:314 debhelper.pod:319 debhelper.pod:323 debhelper.pod:337 debhelper.pod:342 debhelper.pod:347 debhelper.pod:352 debhelper.pod:366 debhelper.pod:370 debhelper.pod:375 debhelper.pod:379 debhelper.pod:391 debhelper.pod:396 debhelper.pod:402 debhelper.pod:408 debhelper.pod:421 debhelper.pod:428 debhelper.pod:432 debhelper.pod:436 debhelper.pod:449 debhelper.pod:453 debhelper.pod:461 debhelper.pod:466 debhelper.pod:480 debhelper.pod:485 debhelper.pod:492 debhelper.pod:497 debhelper.pod:502 debhelper.pod:506 debhelper.pod:512 debhelper.pod:517 debhelper.pod:522 debhelper.pod:535 debhelper.pod:542
+#: debhelper.pod:314 debhelper.pod:319 debhelper.pod:323 debhelper.pod:337 debhelper.pod:342 debhelper.pod:347 debhelper.pod:352 debhelper.pod:366 debhelper.pod:370 debhelper.pod:375 debhelper.pod:379 debhelper.pod:391 debhelper.pod:396 debhelper.pod:402 debhelper.pod:408 debhelper.pod:421 debhelper.pod:428 debhelper.pod:432 debhelper.pod:436 debhelper.pod:449 debhelper.pod:453 debhelper.pod:461 debhelper.pod:466 debhelper.pod:480 debhelper.pod:485 debhelper.pod:492 debhelper.pod:497 debhelper.pod:502 debhelper.pod:506 debhelper.pod:512 debhelper.pod:517 debhelper.pod:522 debhelper.pod:537 debhelper.pod:542 debhelper.pod:548 debhelper.pod:555 debhelper.pod:562 debhelper.pod:568
 msgid "-"
 msgstr ""
 
@@ -929,7 +929,7 @@ msgid "Changes from v9 are:"
 msgstr ""
 
 #. type: textblock
-#: debhelper.pod:537
+#: debhelper.pod:539
 msgid ""
 "B<dh_installinit> will no longer install a file named debian/I<package> as "
 "an init script."
@@ -938,24 +938,55 @@ msgstr ""
 #. type: textblock
 #: debhelper.pod:544
 msgid ""
+"B<dh_installdocs> will error out if it detects links created with --link-doc "
+"between packages of architecture \"all\" and non-\"all\" as it breaks "
+"binNMUs."
+msgstr ""
+
+#. type: textblock
+#: debhelper.pod:550
+msgid ""
 "B<dh> no longer creates the package build directory when skipping running "
 "debhelper commands. This will not affect packages that only build with "
 "debhelper commands, but it may expose bugs in commands not included in "
 "debhelper."
 msgstr ""
 
+#. type: textblock
+#: debhelper.pod:557
+msgid ""
+"B<dh_makeshlibs> now invokes I<ldconfig -X> instead of just I<ldconfig> in "
+"its generated maintainer scripts snippets.  The new call will only update "
+"the ld cache (instead of also updating symlinks)."
+msgstr ""
+
+#. type: textblock
+#: debhelper.pod:564
+msgid ""
+"B<dh_installdeb> no longer installs a maintainer-provided "
+"debian/I<package>.shlibs file.  This is now done by B<dh_makeshlibs> "
+"instead."
+msgstr ""
+
+#. type: textblock
+#: debhelper.pod:570
+msgid ""
+"B<dh_installwm> refuses to create a broken package if no man page can be "
+"found (required to register for the x-window-manager alternative)."
+msgstr ""
+
 #. type: =head1
-#: debhelper.pod:553 dh_auto_test:45 dh_installcatalogs:59 dh_installdocs:121 dh_installemacsen:72 dh_installexamples:53 dh_installinit:140 dh_installman:82 dh_installmodules:54 dh_installudev:55 dh_installwm:54 dh_installxfonts:37 dh_movefiles:64 dh_strip:68 dh_usrlocal:49
+#: debhelper.pod:577 dh_auto_test:45 dh_installcatalogs:59 dh_installdocs:131 dh_installemacsen:72 dh_installexamples:53 dh_installinit:140 dh_installman:82 dh_installmodules:54 dh_installudev:55 dh_installwm:54 dh_installxfonts:37 dh_movefiles:64 dh_strip:104 dh_usrlocal:49
 msgid "NOTES"
 msgstr ""
 
 #. type: =head2
-#: debhelper.pod:555
+#: debhelper.pod:579
 msgid "Multiple binary package support"
 msgstr ""
 
 #. type: textblock
-#: debhelper.pod:557
+#: debhelper.pod:581
 msgid ""
 "If your source package generates more than one binary package, debhelper "
 "programs will default to acting on all binary packages when run. If your "
@@ -967,7 +998,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: debhelper.pod:565
+#: debhelper.pod:589
 msgid ""
 "To facilitate this, as well as give you more control over which packages are "
 "acted on by debhelper programs, all debhelper programs accept the B<-a>, "
@@ -977,7 +1008,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: debhelper.pod:571
+#: debhelper.pod:595
 msgid ""
 "First, any package whose B<Architecture> field in B<debian/control> does not "
 "match the build architecture will be excluded (L<Debian Policy, section "
@@ -985,7 +1016,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: debhelper.pod:575
+#: debhelper.pod:599
 msgid ""
 "Also, some additional packages may be excluded based on the contents of the "
 "B<DEB_BUILD_PROFILES> environment variable and B<Build-Profiles> fields in "
@@ -994,12 +1025,12 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: debhelper.pod:580
+#: debhelper.pod:604
 msgid "Automatic generation of Debian install scripts"
 msgstr ""
 
 #. type: textblock
-#: debhelper.pod:582
+#: debhelper.pod:606
 msgid ""
 "Some debhelper commands will automatically generate parts of Debian "
 "maintainer scripts. If you want these automatically generated things "
@@ -1010,21 +1041,21 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: debhelper.pod:589
+#: debhelper.pod:613
 msgid ""
 "If a script does not exist at all and debhelper needs to add something to "
 "it, then debhelper will create the complete script."
 msgstr ""
 
 #. type: textblock
-#: debhelper.pod:592
+#: debhelper.pod:616
 msgid ""
 "All debhelper commands that automatically generate code in this way let it "
 "be disabled by the -n parameter (see above)."
 msgstr ""
 
 #. type: textblock
-#: debhelper.pod:595
+#: debhelper.pod:619
 msgid ""
 "Note that the inserted code will be shell code, so you cannot directly use "
 "it in a Perl script. If you would like to embed it into a Perl script, here "
@@ -1033,7 +1064,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: debhelper.pod:600
+#: debhelper.pod:624
 #, no-wrap
 msgid ""
 "  my $temp=\"set -e\\nset -- @ARGV\\n\" . << 'EOF';\n"
@@ -1045,12 +1076,12 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: debhelper.pod:606
+#: debhelper.pod:630
 msgid "Automatic generation of miscellaneous dependencies."
 msgstr ""
 
 #. type: textblock
-#: debhelper.pod:608
+#: debhelper.pod:632
 msgid ""
 "Some debhelper commands may make the generated package need to depend on "
 "some other packages. For example, if you use L<dh_installdebconf(1)>, your "
@@ -1062,7 +1093,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: debhelper.pod:616
+#: debhelper.pod:640
 msgid ""
 "All commands of this type, besides documenting what dependencies may be "
 "needed on their man pages, will automatically generate a substvar called "
@@ -1071,7 +1102,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: debhelper.pod:621
+#: debhelper.pod:645
 msgid ""
 "This is entirely independent of the standard B<${shlibs:Depends}> generated "
 "by L<dh_makeshlibs(1)>, and the B<${perl:Depends}> generated by "
@@ -1080,19 +1111,19 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: debhelper.pod:626
+#: debhelper.pod:650
 msgid "Package build directories"
 msgstr ""
 
 #. type: textblock
-#: debhelper.pod:628
+#: debhelper.pod:652
 msgid ""
 "By default, all debhelper programs assume that the temporary directory used "
 "for assembling the tree of files in a package is debian/I<package>."
 msgstr ""
 
 #. type: textblock
-#: debhelper.pod:631
+#: debhelper.pod:655
 msgid ""
 "Sometimes, you might want to use some other temporary directory. This is "
 "supported by the B<-P> flag. For example, \"B<dh_installdocs "
@@ -1104,12 +1135,12 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: debhelper.pod:639
+#: debhelper.pod:663
 msgid "udebs"
 msgstr ""
 
 #. type: textblock
-#: debhelper.pod:641
+#: debhelper.pod:665
 msgid ""
 "Debhelper includes support for udebs. To create a udeb with debhelper, add "
 "\"B<Package-Type: udeb>\" to the package's stanza in F<debian/control>.  "
@@ -1120,70 +1151,95 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: debhelper.pod:648
+#: debhelper.pod:672
 msgid "ENVIRONMENT"
 msgstr ""
 
+#. type: textblock
+#: debhelper.pod:674
+msgid ""
+"The following environment variables can influence the behavior of "
+"debhelper.  It is important to note that these must be actual environment "
+"variables in order to function properly (not simply F<Makefile> "
+"variables). To specify them properly in F<debian/rules>, be sure to "
+"\"B<export>\" them. For example, \"B<export DH_VERBOSE>\"."
+msgstr ""
+
 #. type: =item
-#: debhelper.pod:652
+#: debhelper.pod:682
 msgid "B<DH_VERBOSE>"
 msgstr ""
 
 #. type: textblock
-#: debhelper.pod:654
+#: debhelper.pod:684
 msgid ""
 "Set to B<1> to enable verbose mode. Debhelper will output every command it "
 "runs. Also enables verbose build logs for some build systems like autoconf."
 msgstr ""
 
 #. type: =item
-#: debhelper.pod:657
+#: debhelper.pod:687
+msgid "B<DH_QUIET>"
+msgstr ""
+
+#. type: textblock
+#: debhelper.pod:689
+msgid ""
+"Set to B<1> to enable quiet mode. Debhelper will not output commands calling "
+"the upstream build system nor will dh print which subcommands are called and "
+"depending on the upstream build system might make that more quiet, too.  "
+"This makes it easier to spot important messages but makes the output quite "
+"useless as buildd log.  Ignored if DH_VERBOSE is also set."
+msgstr ""
+
+#. type: =item
+#: debhelper.pod:696
 msgid "B<DH_COMPAT>"
 msgstr ""
 
 #. type: textblock
-#: debhelper.pod:659
+#: debhelper.pod:698
 msgid ""
 "Temporarily specifies what compatibility level debhelper should run at, "
 "overriding any value in F<debian/compat>."
 msgstr ""
 
 #. type: =item
-#: debhelper.pod:662
+#: debhelper.pod:701
 msgid "B<DH_NO_ACT>"
 msgstr ""
 
 #. type: textblock
-#: debhelper.pod:664
+#: debhelper.pod:703
 msgid "Set to B<1> to enable no-act mode."
 msgstr ""
 
 #. type: =item
-#: debhelper.pod:666
+#: debhelper.pod:705
 msgid "B<DH_OPTIONS>"
 msgstr ""
 
 #. type: textblock
-#: debhelper.pod:668
+#: debhelper.pod:707
 msgid ""
 "Anything in this variable will be prepended to the command line arguments of "
 "all debhelper commands."
 msgstr ""
 
 #. type: textblock
-#: debhelper.pod:671
+#: debhelper.pod:710
 msgid ""
 "When using L<dh(1)>, it can be passed options that will be passed on to each "
 "debhelper command, which is generally better than using DH_OPTIONS."
 msgstr ""
 
 #. type: =item
-#: debhelper.pod:674
+#: debhelper.pod:713
 msgid "B<DH_ALWAYS_EXCLUDE>"
 msgstr ""
 
 #. type: textblock
-#: debhelper.pod:676
+#: debhelper.pod:715
 msgid ""
 "If set, this adds the value the variable is set to to the B<-X> options of "
 "all commands that support the B<-X> option. Moreover, B<dh_builddeb> will "
@@ -1191,7 +1247,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: debhelper.pod:680
+#: debhelper.pod:719
 msgid ""
 "This can be useful if you are doing a build from a CVS source tree, in which "
 "case setting B<DH_ALWAYS_EXCLUDE=CVS> will prevent any CVS directories from "
@@ -1202,44 +1258,44 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: debhelper.pod:687
+#: debhelper.pod:726
 msgid ""
 "Multiple things to exclude can be separated with colons, as in "
 "B<DH_ALWAYS_EXCLUDE=CVS:.svn>"
 msgstr ""
 
 #. type: =head1
-#: debhelper.pod:692 dh:972 dh_auto_build:47 dh_auto_clean:50 dh_auto_configure:52 dh_auto_install:92 dh_auto_test:63 dh_bugfiles:124 dh_builddeb:124 dh_clean:147 dh_compress:210 dh_desktop:31 dh_fixperms:131 dh_gconf:101 dh_gencontrol:78 dh_icons:71 dh_install:260 dh_installcatalogs:122 dh_installchangelogs:241 dh_installcron:79 dh_installdeb:142 dh_installdebconf:128 dh_installdirs:88 dh_installdocs:337 dh_installemacsen:141 dh_installexamples:108 dh_installifupdown:71 dh_installinfo:77 dh_installinit:324 dh_installlogcheck:80 dh_installlogrotate:52 dh_installman:263 dh_installmanpages:197 dh_installmenu:89 dh_installmime:63 dh_installmodules:115 dh_installpam:61 dh_installppp:67 dh_installudev:117 dh_installwm:110 dh_installxfonts:89 dh_link:228 dh_lintian:59 dh_listpackages:30 dh_makeshlibs:264 dh_md5sums:90 dh_movefiles:170 dh_perl:152 dh_prep:60 dh_scrollkeeper:28 dh_shlibdeps:152 dh_strip:242 dh_suidregister:117 dh_testdir:53 dh_testroot:27 dh_undocumented:28 dh_usrlocal:116
+#: debhelper.pod:731 dh:974 dh_auto_build:47 dh_auto_clean:50 dh_auto_configure:52 dh_auto_install:92 dh_auto_test:62 dh_bugfiles:130 dh_builddeb:154 dh_clean:150 dh_compress:212 dh_desktop:31 dh_fixperms:142 dh_gconf:97 dh_gencontrol:148 dh_icons:71 dh_install:281 dh_installcatalogs:122 dh_installchangelogs:240 dh_installcron:79 dh_installdeb:147 dh_installdebconf:127 dh_installdirs:88 dh_installdocs:351 dh_installemacsen:142 dh_installexamples:109 dh_installifupdown:71 dh_installinfo:77 dh_installinit:324 dh_installlogcheck:80 dh_installlogrotate:52 dh_installman:263 dh_installmanpages:197 dh_installmenu:89 dh_installmime:64 dh_installmodules:115 dh_installpam:61 dh_installppp:67 dh_installudev:117 dh_installwm:114 dh_installxfonts:89 dh_link:145 dh_lintian:59 dh_listpackages:30 dh_makeshlibs:280 dh_md5sums:107 dh_movefiles:170 dh_perl:152 dh_prep:60 dh_scrollkeeper:28 dh_shlibdeps:152 dh_strip:345 dh_suidregister:117 dh_testdir:53 dh_testroot:27 dh_undocumented:28 dh_usrlocal:116
 msgid "SEE ALSO"
 msgstr ""
 
 #. type: =item
-#: debhelper.pod:696
+#: debhelper.pod:735
 msgid "F</usr/share/doc/debhelper/examples/>"
 msgstr ""
 
 #. type: textblock
-#: debhelper.pod:698
+#: debhelper.pod:737
 msgid "A set of example F<debian/rules> files that use debhelper."
 msgstr ""
 
 #. type: =item
-#: debhelper.pod:700
+#: debhelper.pod:739
 msgid "L<http://joeyh.name/code/debhelper/>"
 msgstr ""
 
 #. type: textblock
-#: debhelper.pod:702
+#: debhelper.pod:741
 msgid "Debhelper web site."
 msgstr ""
 
 #. type: =head1
-#: debhelper.pod:706 dh:978 dh_auto_build:53 dh_auto_clean:56 dh_auto_configure:58 dh_auto_install:98 dh_auto_test:69 dh_bugfiles:132 dh_builddeb:130 dh_clean:153 dh_compress:216 dh_desktop:37 dh_fixperms:137 dh_gconf:107 dh_gencontrol:84 dh_icons:77 dh_install:266 dh_installcatalogs:128 dh_installchangelogs:247 dh_installcron:85 dh_installdeb:148 dh_installdebconf:134 dh_installdirs:94 dh_installdocs:343 dh_installemacsen:148 dh_installexamples:114 dh_installifupdown:77 dh_installinfo:83 dh_installlogcheck:86 dh_installlogrotate:58 dh_installman:269 dh_installmanpages:203 dh_installmenu:97 dh_installmime:69 dh_installmodules:121 dh_installpam:67 dh_installppp:73 dh_installudev:123 dh_installwm:116 dh_installxfonts:95 dh_link:234 dh_lintian:67 dh_listpackages:36 dh_makeshlibs:270 dh_md5sums:96 dh_movefiles:176 dh_perl:158 dh_prep:66 dh_scrollkeeper:34 dh_shlibdeps:158 dh_strip:248 dh_suidregister:123 dh_testdir:59 dh_testroot:33 dh_undocumented:34 dh_usrlocal:122
+#: debhelper.pod:745 dh:980 dh_auto_build:53 dh_auto_clean:56 dh_auto_configure:58 dh_auto_install:98 dh_auto_test:68 dh_bugfiles:138 dh_builddeb:160 dh_clean:156 dh_compress:218 dh_desktop:37 dh_fixperms:148 dh_gconf:103 dh_gencontrol:154 dh_icons:77 dh_install:287 dh_installcatalogs:128 dh_installchangelogs:246 dh_installcron:85 dh_installdeb:153 dh_installdebconf:133 dh_installdirs:94 dh_installdocs:357 dh_installemacsen:149 dh_installexamples:115 dh_installifupdown:77 dh_installinfo:83 dh_installlogcheck:86 dh_installlogrotate:58 dh_installman:269 dh_installmanpages:203 dh_installmenu:97 dh_installmime:70 dh_installmodules:121 dh_installpam:67 dh_installppp:73 dh_installudev:123 dh_installwm:120 dh_installxfonts:95 dh_link:151 dh_lintian:67 dh_listpackages:36 dh_makeshlibs:286 dh_md5sums:113 dh_movefiles:176 dh_perl:158 dh_prep:66 dh_scrollkeeper:34 dh_shlibdeps:158 dh_strip:351 dh_suidregister:123 dh_testdir:59 dh_testroot:33 dh_undocumented:34 dh_usrlocal:122
 msgid "AUTHOR"
 msgstr ""
 
 #. type: textblock
-#: debhelper.pod:708 dh:980 dh_auto_build:55 dh_auto_clean:58 dh_auto_configure:60 dh_auto_install:100 dh_auto_test:71 dh_builddeb:132 dh_clean:155 dh_compress:218 dh_fixperms:139 dh_gencontrol:86 dh_install:268 dh_installchangelogs:249 dh_installcron:87 dh_installdeb:150 dh_installdebconf:136 dh_installdirs:96 dh_installdocs:345 dh_installemacsen:150 dh_installexamples:116 dh_installifupdown:79 dh_installinfo:85 dh_installinit:332 dh_installlogrotate:60 dh_installman:271 dh_installmanpages:205 dh_installmenu:99 dh_installmime:71 dh_installmodules:123 dh_installpam:69 dh_installppp:75 dh_installudev:125 dh_installwm:118 dh_installxfonts:97 dh_link:236 dh_listpackages:38 dh_makeshlibs:272 dh_md5sums:98 dh_movefiles:178 dh_prep:68 dh_shlibdeps:160 dh_strip:250 dh_suidregister:125 dh_testdir:61 dh_testroot:35 dh_undocumented:36
+#: debhelper.pod:747 dh:982 dh_auto_build:55 dh_auto_clean:58 dh_auto_configure:60 dh_auto_install:100 dh_auto_test:70 dh_builddeb:162 dh_clean:158 dh_compress:220 dh_fixperms:150 dh_gencontrol:156 dh_install:289 dh_installchangelogs:248 dh_installcron:87 dh_installdeb:155 dh_installdebconf:135 dh_installdirs:96 dh_installdocs:359 dh_installemacsen:151 dh_installexamples:117 dh_installifupdown:79 dh_installinfo:85 dh_installinit:332 dh_installlogrotate:60 dh_installman:271 dh_installmanpages:205 dh_installmenu:99 dh_installmime:72 dh_installmodules:123 dh_installpam:69 dh_installppp:75 dh_installudev:125 dh_installwm:122 dh_installxfonts:97 dh_link:153 dh_listpackages:38 dh_makeshlibs:288 dh_md5sums:115 dh_movefiles:178 dh_prep:68 dh_shlibdeps:160 dh_strip:353 dh_suidregister:125 dh_testdir:61 dh_testroot:35 dh_undocumented:36
 msgid "Joey Hess <joeyh@debian.org>"
 msgstr ""
 
@@ -1297,7 +1353,7 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: dh:41 dh_auto_build:28 dh_auto_clean:30 dh_auto_configure:31 dh_auto_install:43 dh_auto_test:31 dh_bugfiles:50 dh_builddeb:24 dh_clean:41 dh_compress:48 dh_fixperms:32 dh_gconf:39 dh_gencontrol:26 dh_icons:30 dh_install:59 dh_installcatalogs:49 dh_installchangelogs:59 dh_installcron:40 dh_installdebconf:61 dh_installdirs:31 dh_installdocs:71 dh_installemacsen:53 dh_installexamples:32 dh_installifupdown:39 dh_installinfo:31 dh_installinit:59 dh_installlogcheck:42 dh_installlogrotate:22 dh_installman:61 dh_installmanpages:40 dh_installmenu:41 dh_installmodules:38 dh_installpam:31 dh_installppp:35 dh_installudev:35 dh_installwm:34 dh_link:53 dh_makeshlibs:43 dh_md5sums:28 dh_movefiles:38 dh_perl:31 dh_prep:26 dh_shlibdeps:26 dh_strip:35 dh_testdir:23 dh_usrlocal:39
+#: dh:41 dh_auto_build:28 dh_auto_clean:30 dh_auto_configure:31 dh_auto_install:43 dh_auto_test:31 dh_bugfiles:50 dh_builddeb:25 dh_clean:41 dh_compress:48 dh_fixperms:32 dh_gconf:39 dh_gencontrol:33 dh_icons:30 dh_install:59 dh_installcatalogs:49 dh_installchangelogs:59 dh_installcron:40 dh_installdebconf:61 dh_installdirs:31 dh_installdocs:71 dh_installemacsen:53 dh_installexamples:32 dh_installifupdown:39 dh_installinfo:31 dh_installinit:59 dh_installlogcheck:42 dh_installlogrotate:22 dh_installman:61 dh_installmanpages:40 dh_installmenu:41 dh_installmodules:38 dh_installpam:31 dh_installppp:35 dh_installudev:35 dh_installwm:34 dh_link:53 dh_makeshlibs:47 dh_md5sums:28 dh_movefiles:38 dh_perl:31 dh_prep:26 dh_shlibdeps:26 dh_strip:35 dh_testdir:23 dh_usrlocal:39
 msgid "OPTIONS"
 msgstr ""
 
@@ -1356,7 +1412,7 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: dh:77 dh_installdocs:110 dh_link:75 dh_makeshlibs:97 dh_shlibdeps:70
+#: dh:77 dh_installdocs:120 dh_link:75 dh_makeshlibs:101 dh_shlibdeps:70
 msgid "EXAMPLES"
 msgstr ""
 
@@ -1763,12 +1819,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: dh:974 dh_auto_build:49 dh_auto_clean:52 dh_auto_configure:54 dh_auto_install:94 dh_auto_test:65 dh_builddeb:126 dh_clean:149 dh_compress:212 dh_fixperms:133 dh_gconf:103 dh_gencontrol:80 dh_install:262 dh_installcatalogs:124 dh_installchangelogs:243 dh_installcron:81 dh_installdeb:144 dh_installdebconf:130 dh_installdirs:90 dh_installdocs:339 dh_installexamples:110 dh_installifupdown:73 dh_installinfo:79 dh_installinit:326 dh_installlogcheck:82 dh_installlogrotate:54 dh_installman:265 dh_installmanpages:199 dh_installmime:65 dh_installmodules:117 dh_installpam:63 dh_installppp:69 dh_installudev:119 dh_installwm:112 dh_installxfonts:91 dh_link:230 dh_listpackages:32 dh_makeshlibs:266 dh_md5sums:92 dh_movefiles:172 dh_perl:154 dh_prep:62 dh_strip:244 dh_suidregister:119 dh_testdir:55 dh_testroot:29 dh_undocumented:30 dh_usrlocal:118
+#: dh:976 dh_auto_build:49 dh_auto_clean:52 dh_auto_configure:54 dh_auto_install:94 dh_auto_test:64 dh_builddeb:156 dh_clean:152 dh_compress:214 dh_fixperms:144 dh_gconf:99 dh_gencontrol:150 dh_install:283 dh_installcatalogs:124 dh_installchangelogs:242 dh_installcron:81 dh_installdeb:149 dh_installdebconf:129 dh_installdirs:90 dh_installdocs:353 dh_installexamples:111 dh_installifupdown:73 dh_installinfo:79 dh_installinit:326 dh_installlogcheck:82 dh_installlogrotate:54 dh_installman:265 dh_installmanpages:199 dh_installmime:66 dh_installmodules:117 dh_installpam:63 dh_installppp:69 dh_installudev:119 dh_installwm:116 dh_installxfonts:91 dh_link:147 dh_listpackages:32 dh_makeshlibs:282 dh_md5sums:109 dh_movefiles:172 dh_perl:154 dh_prep:62 dh_strip:347 dh_suidregister:119 dh_testdir:55 dh_testroot:29 dh_undocumented:30 dh_usrlocal:118
 msgid "L<debhelper(7)>"
 msgstr ""
 
 #. type: textblock
-#: dh:976 dh_auto_build:51 dh_auto_clean:54 dh_auto_configure:56 dh_auto_install:96 dh_auto_test:67 dh_bugfiles:130 dh_builddeb:128 dh_clean:151 dh_compress:214 dh_desktop:35 dh_fixperms:135 dh_gconf:105 dh_gencontrol:82 dh_icons:75 dh_install:264 dh_installchangelogs:245 dh_installcron:83 dh_installdeb:146 dh_installdebconf:132 dh_installdirs:92 dh_installdocs:341 dh_installemacsen:146 dh_installexamples:112 dh_installifupdown:75 dh_installinfo:81 dh_installinit:328 dh_installlogrotate:56 dh_installman:267 dh_installmanpages:201 dh_installmenu:95 dh_installmime:67 dh_installmodules:119 dh_installpam:65 dh_installppp:71 dh_installudev:121 dh_installwm:114 dh_installxfonts:93 dh_link:232 dh_lintian:63 dh_listpackages:34 dh_makeshlibs:268 dh_md5sums:94 dh_movefiles:174 dh_perl:156 dh_prep:64 dh_scrollkeeper:32 dh_shlibdeps:156 dh_strip:246 dh_suidregister:121 dh_testdir:57 dh_testroot:31 dh_undocumented:32 dh_usrlocal:120
+#: dh:978 dh_auto_build:51 dh_auto_clean:54 dh_auto_configure:56 dh_auto_install:96 dh_auto_test:66 dh_bugfiles:136 dh_builddeb:158 dh_clean:154 dh_compress:216 dh_desktop:35 dh_fixperms:146 dh_gconf:101 dh_gencontrol:152 dh_icons:75 dh_install:285 dh_installchangelogs:244 dh_installcron:83 dh_installdeb:151 dh_installdebconf:131 dh_installdirs:92 dh_installdocs:355 dh_installemacsen:147 dh_installexamples:113 dh_installifupdown:75 dh_installinfo:81 dh_installinit:328 dh_installlogrotate:56 dh_installman:267 dh_installmanpages:201 dh_installmenu:95 dh_installmime:68 dh_installmodules:119 dh_installpam:65 dh_installppp:71 dh_installudev:121 dh_installwm:118 dh_installxfonts:93 dh_link:149 dh_lintian:63 dh_listpackages:34 dh_makeshlibs:284 dh_md5sums:111 dh_movefiles:174 dh_perl:156 dh_prep:64 dh_scrollkeeper:32 dh_shlibdeps:156 dh_strip:349 dh_suidregister:121 dh_testdir:57 dh_testroot:31 dh_undocumented:32 dh_usrlocal:120
 msgid "This program is a part of debhelper."
 msgstr ""
 
@@ -1810,7 +1866,7 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: dh_auto_build:35 dh_auto_clean:37 dh_auto_configure:38 dh_auto_install:56 dh_auto_test:38 dh_builddeb:38 dh_gencontrol:30 dh_installdebconf:69 dh_installinit:105 dh_makeshlibs:91 dh_shlibdeps:37
+#: dh_auto_build:35 dh_auto_clean:37 dh_auto_configure:38 dh_auto_install:56 dh_auto_test:38 dh_builddeb:39 dh_gencontrol:37 dh_installdebconf:69 dh_installinit:105 dh_makeshlibs:95 dh_shlibdeps:37
 msgid "B<--> I<params>"
 msgstr ""
 
@@ -1960,7 +2016,7 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: dh_auto_install:50 dh_builddeb:28
+#: dh_auto_install:50 dh_builddeb:29
 msgid "B<--destdir=>I<directory>"
 msgstr ""
 
@@ -2053,7 +2109,7 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: dh_bugfiles:22 dh_clean:31 dh_compress:31 dh_gconf:23 dh_install:38 dh_installcatalogs:35 dh_installchangelogs:35 dh_installcron:21 dh_installdeb:22 dh_installdebconf:34 dh_installdirs:21 dh_installdocs:21 dh_installemacsen:27 dh_installexamples:22 dh_installifupdown:22 dh_installinfo:21 dh_installinit:27 dh_installlogcheck:21 dh_installman:51 dh_installmenu:25 dh_installmime:21 dh_installmodules:28 dh_installpam:21 dh_installppp:21 dh_installudev:25 dh_installwm:24 dh_link:41 dh_lintian:21 dh_makeshlibs:29 dh_movefiles:26
+#: dh_bugfiles:22 dh_clean:31 dh_compress:31 dh_gconf:23 dh_install:38 dh_installcatalogs:35 dh_installchangelogs:35 dh_installcron:21 dh_installdeb:22 dh_installdebconf:34 dh_installdirs:21 dh_installdocs:21 dh_installemacsen:27 dh_installexamples:22 dh_installifupdown:22 dh_installinfo:21 dh_installinit:27 dh_installlogcheck:21 dh_installman:51 dh_installmenu:25 dh_installmime:21 dh_installmodules:28 dh_installpam:21 dh_installppp:21 dh_installudev:25 dh_installwm:24 dh_link:41 dh_lintian:21 dh_makeshlibs:24 dh_movefiles:26
 msgid "FILES"
 msgstr ""
 
@@ -2109,17 +2165,17 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: dh_bugfiles:126
+#: dh_bugfiles:132
 msgid "F</usr/share/doc/reportbug/README.developers.gz>"
 msgstr ""
 
 #. type: textblock
-#: dh_bugfiles:128 dh_lintian:61
+#: dh_bugfiles:134 dh_lintian:61
 msgid "L<debhelper(1)>"
 msgstr ""
 
 #. type: textblock
-#: dh_bugfiles:134
+#: dh_bugfiles:140
 msgid "Modestas Vainius <modestas@vainius.eu>"
 msgstr ""
 
@@ -2139,47 +2195,48 @@ msgstr ""
 #: dh_builddeb:18
 msgid ""
 "B<dh_builddeb> simply calls L<dpkg-deb(1)> to build a Debian package or "
-"packages."
+"packages.  It will also build packages for ddebs when L<dh_strip(1)> and "
+"L<dh_gencontrol(1)> have prepared them."
 msgstr ""
 
 #. type: textblock
-#: dh_builddeb:21
+#: dh_builddeb:22
 msgid ""
 "It supports building multiple binary packages in parallel, when enabled by "
 "DEB_BUILD_OPTIONS."
 msgstr ""
 
 #. type: textblock
-#: dh_builddeb:30
+#: dh_builddeb:31
 msgid ""
 "Use this if you want the generated F<.deb> files to be put in a directory "
 "other than the default of \"F<..>\"."
 msgstr ""
 
 #. type: =item
-#: dh_builddeb:33
+#: dh_builddeb:34
 msgid "B<--filename=>I<name>"
 msgstr ""
 
 #. type: textblock
-#: dh_builddeb:35
+#: dh_builddeb:36
 msgid ""
 "Use this if you want to force the generated .deb file to have a particular "
 "file name. Does not work well if more than one .deb is generated!"
 msgstr ""
 
 #. type: textblock
-#: dh_builddeb:40
+#: dh_builddeb:41
 msgid "Pass I<params> to L<dpkg-deb(1)> when it is used to build the package."
 msgstr ""
 
 #. type: =item
-#: dh_builddeb:43
+#: dh_builddeb:44
 msgid "B<-u>I<params>"
 msgstr ""
 
 #. type: textblock
-#: dh_builddeb:45
+#: dh_builddeb:46
 msgid ""
 "This is another way to pass I<params> to L<dpkg-deb(1)>.  It is deprecated; "
 "use B<--> instead."
@@ -2274,7 +2331,7 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: dh_clean:60 dh_compress:64 dh_installdocs:103 dh_installexamples:46 dh_installinfo:40 dh_installmanpages:44 dh_movefiles:55 dh_testdir:27
+#: dh_clean:60 dh_compress:64 dh_installdocs:113 dh_installexamples:46 dh_installinfo:40 dh_installmanpages:44 dh_movefiles:55 dh_testdir:27
 msgid "I<file> ..."
 msgstr ""
 
@@ -2359,7 +2416,7 @@ msgid "Add these files to the list of files to compress."
 msgstr ""
 
 #. type: =head1
-#: dh_compress:70 dh_perl:61 dh_strip:74 dh_usrlocal:55
+#: dh_compress:70 dh_perl:61 dh_strip:113 dh_usrlocal:55
 msgid "CONFORMS TO"
 msgstr ""
 
@@ -2509,7 +2566,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: dh_gconf:109
+#: dh_gconf:105
 msgid "Ross Burton <ross@burtonini.com> Josselin Mouette <joss@debian.org>"
 msgstr ""
 
@@ -2535,22 +2592,32 @@ msgstr ""
 #: dh_gencontrol:22
 msgid ""
 "This program is merely a wrapper around L<dpkg-gencontrol(1)>, which calls "
-"it once for each package being acted on, and passes in some additional "
-"useful flags."
+"it once for each package being acted on (plus related ddebs), and passes in "
+"some additional useful flags."
+msgstr ""
+
+#. type: textblock
+#: dh_gencontrol:26
+msgid ""
+"B<Note> that if you use B<dh_gencontrol>, you must also use "
+"L<dh_builddeb(1)> to build the packages.  Otherwise, your build may fail to "
+"build as B<dh_gencontrol> (via L<dpkg-gencontrol(1)>) declares which "
+"packages are built.  As debhelper automatically generates ddebs, it some "
+"times adds additional packages, which will be built by L<dh_builddeb(1)>."
 msgstr ""
 
 #. type: textblock
-#: dh_gencontrol:32
+#: dh_gencontrol:39
 msgid "Pass I<params> to L<dpkg-gencontrol(1)>."
 msgstr ""
 
 #. type: =item
-#: dh_gencontrol:34
+#: dh_gencontrol:41
 msgid "B<-u>I<params>, B<--dpkg-gencontrol-params=>I<params>"
 msgstr ""
 
 #. type: textblock
-#: dh_gencontrol:36
+#: dh_gencontrol:43
 msgid ""
 "This is another way to pass I<params> to L<dpkg-gencontrol(1)>.  It is "
 "deprecated; use B<--> instead."
@@ -2586,7 +2653,7 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: dh_icons:34 dh_installcatalogs:53 dh_installdebconf:65 dh_installemacsen:57 dh_installinit:63 dh_installmenu:45 dh_installmodules:42 dh_installudev:49 dh_installwm:44 dh_makeshlibs:77 dh_usrlocal:43
+#: dh_icons:34 dh_installcatalogs:53 dh_installdebconf:65 dh_installemacsen:57 dh_installinit:63 dh_installmenu:45 dh_installmodules:42 dh_installudev:49 dh_installwm:44 dh_makeshlibs:81 dh_usrlocal:43
 msgid "B<-n>, B<--noscripts>"
 msgstr ""
 
@@ -2775,18 +2842,55 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: dh_install:254
+#: dh_install:256
 msgid "LIMITATIONS"
 msgstr ""
 
+#. type: textblock
+#: dh_install:258
+msgid ""
+"B<dh_install> cannot rename files or directories, it can only install them "
+"with the names they already have into wherever you want in the package build "
+"tree."
+msgstr ""
+
+#. type: textblock
+#: dh_install:262
+msgid ""
+"However, renaming can be achieved by using B<dh-exec> with compatibility "
+"level 9 or later.  An example debian/I<package>.install file using "
+"B<dh-exec> could look like:"
+msgstr ""
+
 #. type: verbatim
-#: dh_install:256
+#: dh_install:266
 #, no-wrap
 msgid ""
-"B<dh_install> cannot rename files or directories, it can only install them\n"
-"with the names they already have into wherever you want in the package\n"
-"build tree.\n"
-"  \n"
+" #!/usr/bin/dh-exec\n"
+" debian/default.conf => /etc/my-package/start.conf\n"
+"\n"
+msgstr ""
+
+#. type: textblock
+#: dh_install:269
+msgid "Please remember the following three things:"
+msgstr ""
+
+#. type: =item
+#: dh_install:273
+msgid ""
+"* The package must be using compatibility level 9 or later (see "
+"L<debhelper(7)>)"
+msgstr ""
+
+#. type: =item
+#: dh_install:275
+msgid "* The package will need a build-dependency on dh-exec."
+msgstr ""
+
+#. type: =item
+#: dh_install:277
+msgid "* The install file must be marked as executable."
 msgstr ""
 
 #. type: textblock
@@ -2851,7 +2955,7 @@ msgid "Do not modify F<postinst>/F<postrm>/F<prerm> scripts."
 msgstr ""
 
 #. type: textblock
-#: dh_installcatalogs:61 dh_installdocs:127 dh_installemacsen:74 dh_installinit:142 dh_installmodules:56 dh_installudev:57 dh_installwm:56 dh_usrlocal:51
+#: dh_installcatalogs:61 dh_installemacsen:74 dh_installinit:142 dh_installmodules:56 dh_installudev:57 dh_installwm:56 dh_usrlocal:51
 msgid ""
 "Note that this command is not idempotent. L<dh_prep(1)> should be called "
 "between invocations of this command. Otherwise, it may cause multiple "
@@ -3109,18 +3213,25 @@ msgstr ""
 msgid "These control files are installed into the F<DEBIAN> directory."
 msgstr ""
 
-#. type: =item
+#. type: textblock
 #: dh_installdeb:45
+msgid ""
+"Note that I<package>.shlibs is only installed in compat level 9 and "
+"earlier.  In compat 10, please use L<dh_makeshlibs(1)>."
+msgstr ""
+
+#. type: =item
+#: dh_installdeb:48
 msgid "I<package>.conffiles"
 msgstr ""
 
 #. type: textblock
-#: dh_installdeb:47
+#: dh_installdeb:50
 msgid "This control file will be installed into the F<DEBIAN> directory."
 msgstr ""
 
 #. type: textblock
-#: dh_installdeb:49
+#: dh_installdeb:52
 msgid ""
 "In v3 compatibility mode and higher, all files in the F<etc/> directory in a "
 "package will automatically be flagged as conffiles by this program, so there "
@@ -3128,12 +3239,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: dh_installdeb:53
+#: dh_installdeb:56
 msgid "I<package>.maintscript"
 msgstr ""
 
 #. type: textblock
-#: dh_installdeb:55
+#: dh_installdeb:58
 msgid ""
 "Lines in this file correspond to L<dpkg-maintscript-helper(1)> commands and "
 "parameters.  Any shell metacharacters will be escaped, so arbitrary shell "
@@ -3454,19 +3565,36 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: dh_installdocs:105
+#: dh_installdocs:103
+msgid ""
+"B<CAVEAT>: If a previous version of the package was built without this "
+"option and is now built with it (or vice-versa), it requries a \"dir to "
+"symlink\" (or \"symlink to dir\") migration.  Since debhelper has no "
+"knowledge of previous versions, you have to enable this migration itself."
+msgstr ""
+
+#. type: textblock
+#: dh_installdocs:109
+msgid ""
+"This can be done by providing a \"debian/I<package>.maintscript\" file and "
+"using L<dh_installdeb(1)> to provide the relevant maintainer script "
+"snippets."
+msgstr ""
+
+#. type: textblock
+#: dh_installdocs:115
 msgid ""
 "Install these files as documentation into the first package acted on. (Or in "
 "all packages if B<-A> is specified)."
 msgstr ""
 
 #. type: textblock
-#: dh_installdocs:112
+#: dh_installdocs:122
 msgid "This is an example of a F<debian/package.docs> file:"
 msgstr ""
 
 #. type: verbatim
-#: dh_installdocs:114
+#: dh_installdocs:124
 #, no-wrap
 msgid ""
 "  README\n"
@@ -3479,7 +3607,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: dh_installdocs:123
+#: dh_installdocs:133
 msgid ""
 "Note that B<dh_installdocs> will happily copy entire directory hierarchies "
 "if you ask it to (similar to B<cp -a>). If it is asked to install a "
@@ -3591,7 +3719,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: dh_installemacsen:143
+#: dh_installemacsen:144
 msgid "L<debhelper(7)> L</usr/share/doc/emacsen-common/debian-emacs-policy.gz>"
 msgstr ""
 
@@ -4313,7 +4441,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: dh_installmenu:47 dh_makeshlibs:79
+#: dh_installmenu:47 dh_makeshlibs:83
 msgid "Do not modify F<postinst>/F<postrm> scripts."
 msgstr ""
 
@@ -4888,27 +5016,38 @@ msgid ""
 "v3 mode and above only) to any packages in which it finds shared libraries."
 msgstr ""
 
+#. type: =item
+#: dh_makeshlibs:28
+msgid "debian/I<package>.shlibs"
+msgstr ""
+
+#. type: textblock
+#: dh_makeshlibs:30
+msgid ""
+"Installs this file, if present, into the package as DEBIAN/shlibs.  If "
+"omitted, debhelper will generate a shlibs file automatically if it detects "
+"any libraries."
+msgstr ""
+
 #. type: textblock
-#: dh_makeshlibs:24
+#: dh_makeshlibs:34
 msgid ""
-"Packages that support multiarch are detected, and a Pre-Dependency on "
-"multiarch-support is set in ${misc:Pre-Depends} ; you should make sure to "
-"put that token into an appropriate place in your debian/control file for "
-"packages supporting multiarch."
+"Note in compat levels 9 and earlier, this file was installed by "
+"L<dh_installdeb(1)> rather than B<dh_makeshlibs>."
 msgstr ""
 
 #. type: =item
-#: dh_makeshlibs:33
+#: dh_makeshlibs:37
 msgid "debian/I<package>.symbols"
 msgstr ""
 
 #. type: =item
-#: dh_makeshlibs:35
+#: dh_makeshlibs:39
 msgid "debian/I<package>.symbols.I<arch>"
 msgstr ""
 
 #. type: textblock
-#: dh_makeshlibs:37
+#: dh_makeshlibs:41
 msgid ""
 "These symbols files, if present, are passed to L<dpkg-gensymbols(1)> to be "
 "processed and installed. Use the I<arch> specific names if you need to "
@@ -4916,12 +5055,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: dh_makeshlibs:47
+#: dh_makeshlibs:51
 msgid "B<-m>I<major>, B<--major=>I<major>"
 msgstr ""
 
 #. type: textblock
-#: dh_makeshlibs:49
+#: dh_makeshlibs:53
 msgid ""
 "Instead of trying to guess the major number of the library with objdump, use "
 "the major number specified after the -m parameter. This is much less useful "
@@ -4930,17 +5069,17 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: dh_makeshlibs:54
+#: dh_makeshlibs:58
 msgid "B<-V>, B<-V>I<dependencies>"
 msgstr ""
 
 #. type: =item
-#: dh_makeshlibs:56
+#: dh_makeshlibs:60
 msgid "B<--version-info>, B<--version-info=>I<dependencies>"
 msgstr ""
 
 #. type: textblock
-#: dh_makeshlibs:58
+#: dh_makeshlibs:62
 msgid ""
 "By default, the shlibs file generated by this program does not make packages "
 "depend on any particular version of the package containing the shared "
@@ -4955,7 +5094,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: dh_makeshlibs:69
+#: dh_makeshlibs:73
 msgid ""
 "Beware of using B<-V> without any parameters; this is a conservative setting "
 "that always ensures that other packages' shared library dependencies are at "
@@ -4966,19 +5105,19 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: dh_makeshlibs:83
+#: dh_makeshlibs:87
 msgid ""
 "Exclude files that contain I<item> anywhere in their filename or directory "
 "from being treated as shared libraries."
 msgstr ""
 
 #. type: =item
-#: dh_makeshlibs:86
+#: dh_makeshlibs:90
 msgid "B<--add-udeb=>I<udeb>"
 msgstr ""
 
 #. type: textblock
-#: dh_makeshlibs:88
+#: dh_makeshlibs:92
 msgid ""
 "Create an additional line for udebs in the shlibs file and use I<udeb> as "
 "the package name for udebs to depend on instead of the regular library "
@@ -4986,17 +5125,17 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: dh_makeshlibs:93
+#: dh_makeshlibs:97
 msgid "Pass I<params> to L<dpkg-gensymbols(1)>."
 msgstr ""
 
 #. type: =item
-#: dh_makeshlibs:101
+#: dh_makeshlibs:105
 msgid "B<dh_makeshlibs>"
 msgstr ""
 
 #. type: verbatim
-#: dh_makeshlibs:103
+#: dh_makeshlibs:107
 #, no-wrap
 msgid ""
 "Assuming this is a package named F<libfoobar1>, generates a shlibs file "
@@ -5007,12 +5146,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: dh_makeshlibs:107
+#: dh_makeshlibs:111
 msgid "B<dh_makeshlibs -V>"
 msgstr ""
 
 #. type: verbatim
-#: dh_makeshlibs:109
+#: dh_makeshlibs:113
 #, no-wrap
 msgid ""
 "Assuming the current version of the package is 1.1-3, generates a shlibs\n"
@@ -5022,12 +5161,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: dh_makeshlibs:113
+#: dh_makeshlibs:117
 msgid "B<dh_makeshlibs -V 'libfoobar1 (E<gt>= 1.0)'>"
 msgstr ""
 
 #. type: verbatim
-#: dh_makeshlibs:115
+#: dh_makeshlibs:119
 #, no-wrap
 msgid ""
 "Generates a shlibs file that looks something like:\n"
@@ -5520,13 +5659,23 @@ msgstr ""
 #. type: textblock
 #: dh_strip:47
 msgid ""
+"B<This option is a now special purpose option that you normally do not "
+"need>.  In most cases, there should be little reason to use this option for "
+"new source packages as debhelper generates automatic debug packages "
+"(\"ddebs\").  B<If you have a manual --dbg-package> that you want to migrate "
+"to the automatic ddeb, please see the B<--ddeb-migration> option."
+msgstr ""
+
+#. type: textblock
+#: dh_strip:54
+msgid ""
 "Causes B<dh_strip> to save debug symbols stripped from the packages it acts "
 "on as independent files in the package build directory of the specified "
 "debugging package."
 msgstr ""
 
 #. type: textblock
-#: dh_strip:51
+#: dh_strip:58
 msgid ""
 "For example, if your packages are libfoo and foo and you want to include a "
 "I<foo-dbg> package with debugging symbols, use B<dh_strip "
@@ -5534,7 +5683,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: dh_strip:54
+#: dh_strip:61
 msgid ""
 "Note that this option behaves significantly different in debhelper "
 "compatibility levels 4 and below. Instead of specifying the name of a debug "
@@ -5543,13 +5692,20 @@ msgid ""
 "packages with B<-dbg> added to their name."
 msgstr ""
 
+#. type: textblock
+#: dh_strip:67
+msgid ""
+"This option implies B<--no-ddebs> and I<cannot> be used with B<--ddeb> or "
+"B<--ddeb-migration>."
+msgstr ""
+
 #. type: =item
-#: dh_strip:60
+#: dh_strip:70
 msgid "B<-k>, B<--keep-debug>"
 msgstr ""
 
 #. type: textblock
-#: dh_strip:62
+#: dh_strip:72
 msgid ""
 "Debug symbols will be retained, but split into an independent file in "
 "F<usr/lib/debug/> in the package build directory. B<--dbg-package> is easier "
@@ -5557,15 +5713,84 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: dh_strip:70
+#: dh_strip:76
+msgid "This option implies B<--no-ddebs> and I<cannot> be used with B<--ddebs>."
+msgstr ""
+
+#. type: =item
+#: dh_strip:79
+msgid "B<--ddeb-migration=>I<package-relation>"
+msgstr ""
+
+#. type: textblock
+#: dh_strip:81
+msgid ""
+"This option is used to migrate from a manual \"-dbg\" package (created with "
+"B<--dbg-package>) to the automatic \"ddebs\".  The value of this option "
+"should describe a valid B<Replaces>- and B<Breaks>-relation, which will be "
+"added to the ddebs to avoid file conflicts with the (now obsolete) -dbg "
+"package."
+msgstr ""
+
+#. type: textblock
+#: dh_strip:87
+msgid ""
+"This option implies B<--ddebs> and I<cannot> be used with B<--keep-debug>, "
+"B<--dbg-package> or B<--no-ddebs>."
+msgstr ""
+
+#. type: textblock
+#: dh_strip:90
+msgid "Examples:"
+msgstr ""
+
+#. type: verbatim
+#: dh_strip:92
+#, no-wrap
+msgid ""
+"  dh_strip --ddeb-migration='libfoo-dbg (<< 2.1-3~)'\n"
+"\n"
+msgstr ""
+
+#. type: verbatim
+#: dh_strip:94
+#, no-wrap
+msgid ""
+"  dh_strip --ddeb-migration='libfoo-tools-dbg (<< 2.1-3~), libfoo2-dbg (<< "
+"2.1-3~)'\n"
+"\n"
+msgstr ""
+
+#. type: =item
+#: dh_strip:96
+msgid "B<--ddebs>, B<--no-ddebs>"
+msgstr ""
+
+#. type: textblock
+#: dh_strip:98
+msgid ""
+"Control whether B<dh_strip> should be creating ddebs when possible.  By "
+"default, B<dh_strip> will attempt to build ddebs and this option is "
+"primarily useful for disabling this."
+msgstr ""
+
+#. type: textblock
+#: dh_strip:106
 msgid ""
 "If the B<DEB_BUILD_OPTIONS> environment variable contains B<nostrip>, "
 "nothing will be stripped, in accordance with Debian policy (section 10.1 "
-"\"Binaries\")."
+"\"Binaries\").  This will also inhibit the creation of automatic \"ddebs\"."
 msgstr ""
 
 #. type: textblock
-#: dh_strip:76
+#: dh_strip:110
+msgid ""
+"The creation of automatic \"ddebs\" can also be prevented by adding "
+"B<noddebs> to the B<DEB_BUILD_OPTIONS> environment variable."
+msgstr ""
+
+#. type: textblock
+#: dh_strip:115
 msgid "Debian policy, version 3.0.1"
 msgstr ""
 
diff --git a/man/po4a/po/es.po b/man/po4a/po/es.po
index bf07836a..d3657df0 100644
--- a/man/po4a/po/es.po
+++ b/man/po4a/po/es.po
@@ -31,7 +31,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debhelper 9.20120609\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-03 15:16-0400\n"
+"POT-Creation-Date: 2015-06-28 11:53+0000\n"
 "PO-Revision-Date: 2012-08-20 11:17+0200\n"
 "Last-Translator: Omar Campagne <ocampagne@gmail.com>\n"
 "Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -593,7 +593,7 @@ msgstr "No modifica los scripts F<postinst>, F<postrm>, etc."
 # type: =item
 #. type: =item
 #: debhelper.pod:185 dh_compress:52 dh_install:81 dh_installchangelogs:71
-#: dh_installdocs:80 dh_installexamples:41 dh_link:62 dh_makeshlibs:81
+#: dh_installdocs:80 dh_installexamples:41 dh_link:62 dh_makeshlibs:85
 #: dh_md5sums:37 dh_shlibdeps:30 dh_strip:39
 msgid "B<-X>I<item>, B<--exclude=>I<item>"
 msgstr "B<-X>I<elemento>, B<--exclude=>I<elemento>"
@@ -956,7 +956,8 @@ msgstr "Este modo funciona como v2, con los siguientes añadidos:"
 #: debhelper.pod:453 debhelper.pod:461 debhelper.pod:466 debhelper.pod:480
 #: debhelper.pod:485 debhelper.pod:492 debhelper.pod:497 debhelper.pod:502
 #: debhelper.pod:506 debhelper.pod:512 debhelper.pod:517 debhelper.pod:522
-#: debhelper.pod:535 debhelper.pod:542
+#: debhelper.pod:537 debhelper.pod:542 debhelper.pod:548 debhelper.pod:555
+#: debhelper.pod:562 debhelper.pod:568
 msgid "-"
 msgstr "-"
 
@@ -1356,7 +1357,7 @@ msgid "Changes from v9 are:"
 msgstr "Los cambios desde el nivel v9 son:"
 
 #. type: textblock
-#: debhelper.pod:537
+#: debhelper.pod:539
 msgid ""
 "B<dh_installinit> will no longer install a file named debian/I<package> as "
 "an init script."
@@ -1365,30 +1366,60 @@ msgstr ""
 #. type: textblock
 #: debhelper.pod:544
 msgid ""
+"B<dh_installdocs> will error out if it detects links created with --link-doc "
+"between packages of architecture \"all\" and non-\"all\" as it breaks "
+"binNMUs."
+msgstr ""
+
+#. type: textblock
+#: debhelper.pod:550
+msgid ""
 "B<dh> no longer creates the package build directory when skipping running "
 "debhelper commands. This will not affect packages that only build with "
 "debhelper commands, but it may expose bugs in commands not included in "
 "debhelper."
 msgstr ""
 
+#. type: textblock
+#: debhelper.pod:557
+msgid ""
+"B<dh_makeshlibs> now invokes I<ldconfig -X> instead of just I<ldconfig> in "
+"its generated maintainer scripts snippets.  The new call will only update "
+"the ld cache (instead of also updating symlinks)."
+msgstr ""
+
+#. type: textblock
+#: debhelper.pod:564
+msgid ""
+"B<dh_installdeb> no longer installs a maintainer-provided debian/I<package>."
+"shlibs file.  This is now done by B<dh_makeshlibs> instead."
+msgstr ""
+
+#. type: textblock
+#: debhelper.pod:570
+msgid ""
+"B<dh_installwm> refuses to create a broken package if no man page can be "
+"found (required to register for the x-window-manager alternative)."
+msgstr ""
+
 # type: =head1
 #. type: =head1
-#: debhelper.pod:553 dh_auto_test:45 dh_installcatalogs:59 dh_installdocs:121
+#: debhelper.pod:577 dh_auto_test:45 dh_installcatalogs:59 dh_installdocs:131
 #: dh_installemacsen:72 dh_installexamples:53 dh_installinit:140
 #: dh_installman:82 dh_installmodules:54 dh_installudev:55 dh_installwm:54
-#: dh_installxfonts:37 dh_movefiles:64 dh_strip:68 dh_usrlocal:49
+#: dh_installxfonts:37 dh_movefiles:64 dh_strip:104 dh_usrlocal:49
 msgid "NOTES"
 msgstr "NOTAS"
 
 # type: =head2
 #. type: =head2
-#: debhelper.pod:555
+#: debhelper.pod:579
 msgid "Multiple binary package support"
 msgstr "Compatibilidad con varios paquetes binarios"
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:557
+#: debhelper.pod:581
 msgid ""
 "If your source package generates more than one binary package, debhelper "
 "programs will default to acting on all binary packages when run. If your "
@@ -1409,7 +1440,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:565
+#: debhelper.pod:589
 #, fuzzy
 #| msgid ""
 #| "To facilitate this, as well as give you more control over which packages "
@@ -1431,7 +1462,7 @@ msgstr ""
 "los paquetes listados en el fichero de control."
 
 #. type: textblock
-#: debhelper.pod:571
+#: debhelper.pod:595
 msgid ""
 "First, any package whose B<Architecture> field in B<debian/control> does not "
 "match the build architecture will be excluded (L<Debian Policy, section "
@@ -1439,7 +1470,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: debhelper.pod:575
+#: debhelper.pod:599
 msgid ""
 "Also, some additional packages may be excluded based on the contents of the "
 "B<DEB_BUILD_PROFILES> environment variable and B<Build-Profiles> fields in "
@@ -1449,13 +1480,13 @@ msgstr ""
 
 # type: =head2
 #. type: =head2
-#: debhelper.pod:580
+#: debhelper.pod:604
 msgid "Automatic generation of Debian install scripts"
 msgstr "Generación automática de los scripts de instalación de Debian"
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:582
+#: debhelper.pod:606
 msgid ""
 "Some debhelper commands will automatically generate parts of Debian "
 "maintainer scripts. If you want these automatically generated things "
@@ -1473,7 +1504,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:589
+#: debhelper.pod:613
 msgid ""
 "If a script does not exist at all and debhelper needs to add something to "
 "it, then debhelper will create the complete script."
@@ -1483,7 +1514,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:592
+#: debhelper.pod:616
 msgid ""
 "All debhelper commands that automatically generate code in this way let it "
 "be disabled by the -n parameter (see above)."
@@ -1493,7 +1524,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:595
+#: debhelper.pod:619
 msgid ""
 "Note that the inserted code will be shell code, so you cannot directly use "
 "it in a Perl script. If you would like to embed it into a Perl script, here "
@@ -1507,7 +1538,7 @@ msgstr ""
 
 # type: verbatim
 #. type: verbatim
-#: debhelper.pod:600
+#: debhelper.pod:624
 #, no-wrap
 msgid ""
 "  my $temp=\"set -e\\nset -- @ARGV\\n\" . << 'EOF';\n"
@@ -1526,12 +1557,12 @@ msgstr ""
 
 # type: =head2
 #. type: =head2
-#: debhelper.pod:606
+#: debhelper.pod:630
 msgid "Automatic generation of miscellaneous dependencies."
 msgstr "Generación automática de diversas dependencias."
 
 #. type: textblock
-#: debhelper.pod:608
+#: debhelper.pod:632
 msgid ""
 "Some debhelper commands may make the generated package need to depend on "
 "some other packages. For example, if you use L<dh_installdebconf(1)>, your "
@@ -1551,7 +1582,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:616
+#: debhelper.pod:640
 msgid ""
 "All commands of this type, besides documenting what dependencies may be "
 "needed on their man pages, will automatically generate a substvar called B<"
@@ -1566,7 +1597,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:621
+#: debhelper.pod:645
 msgid ""
 "This is entirely independent of the standard B<${shlibs:Depends}> generated "
 "by L<dh_makeshlibs(1)>, and the B<${perl:Depends}> generated by "
@@ -1580,13 +1611,13 @@ msgstr ""
 
 # type: =head2
 #. type: =head2
-#: debhelper.pod:626
+#: debhelper.pod:650
 msgid "Package build directories"
 msgstr "Directorios de construcción del paquete"
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:628
+#: debhelper.pod:652
 msgid ""
 "By default, all debhelper programs assume that the temporary directory used "
 "for assembling the tree of files in a package is debian/I<package>."
@@ -1597,7 +1628,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:631
+#: debhelper.pod:655
 msgid ""
 "Sometimes, you might want to use some other temporary directory. This is "
 "supported by the B<-P> flag. For example, \"B<dh_installdocs -Pdebian/tmp>"
@@ -1617,13 +1648,13 @@ msgstr ""
 
 # type: =head2
 #. type: =head2
-#: debhelper.pod:639
+#: debhelper.pod:663
 msgid "udebs"
 msgstr "udebs"
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:641
+#: debhelper.pod:665
 msgid ""
 "Debhelper includes support for udebs. To create a udeb with debhelper, add "
 "\"B<Package-Type: udeb>\" to the package's stanza in F<debian/control>.  "
@@ -1642,19 +1673,29 @@ msgstr ""
 
 # type: =head1
 #. type: =head1
-#: debhelper.pod:648
+#: debhelper.pod:672
 msgid "ENVIRONMENT"
 msgstr "ENTORNO"
 
+#. type: textblock
+#: debhelper.pod:674
+msgid ""
+"The following environment variables can influence the behavior of "
+"debhelper.  It is important to note that these must be actual environment "
+"variables in order to function properly (not simply F<Makefile> variables). "
+"To specify them properly in F<debian/rules>, be sure to \"B<export>\" them. "
+"For example, \"B<export DH_VERBOSE>\"."
+msgstr ""
+
 # type: =item
 #. type: =item
-#: debhelper.pod:652
+#: debhelper.pod:682
 msgid "B<DH_VERBOSE>"
 msgstr "B<DH_VERBOSE>"
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:654
+#: debhelper.pod:684
 #, fuzzy
 #| msgid ""
 #| "Set to B<1> to enable verbose mode. Debhelper will output every command "
@@ -1669,13 +1710,31 @@ msgstr ""
 
 # type: =item
 #. type: =item
-#: debhelper.pod:657
+#: debhelper.pod:687
+#, fuzzy
+#| msgid "B<DH_COMPAT>"
+msgid "B<DH_QUIET>"
+msgstr "B<DH_COMPAT>"
+
+#. type: textblock
+#: debhelper.pod:689
+msgid ""
+"Set to B<1> to enable quiet mode. Debhelper will not output commands calling "
+"the upstream build system nor will dh print which subcommands are called and "
+"depending on the upstream build system might make that more quiet, too.  "
+"This makes it easier to spot important messages but makes the output quite "
+"useless as buildd log.  Ignored if DH_VERBOSE is also set."
+msgstr ""
+
+# type: =item
+#. type: =item
+#: debhelper.pod:696
 msgid "B<DH_COMPAT>"
 msgstr "B<DH_COMPAT>"
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:659
+#: debhelper.pod:698
 msgid ""
 "Temporarily specifies what compatibility level debhelper should run at, "
 "overriding any value in F<debian/compat>."
@@ -1685,25 +1744,25 @@ msgstr ""
 
 # type: =item
 #. type: =item
-#: debhelper.pod:662
+#: debhelper.pod:701
 msgid "B<DH_NO_ACT>"
 msgstr "B<DH_NO_ACT>"
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:664
+#: debhelper.pod:703
 msgid "Set to B<1> to enable no-act mode."
 msgstr "Defina como B<1> para habilitar el modo no-act."
 
 # type: =item
 #. type: =item
-#: debhelper.pod:666
+#: debhelper.pod:705
 msgid "B<DH_OPTIONS>"
 msgstr "B<DH_OPTIONS>"
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:668
+#: debhelper.pod:707
 msgid ""
 "Anything in this variable will be prepended to the command line arguments of "
 "all debhelper commands."
@@ -1712,7 +1771,7 @@ msgstr ""
 "de órdenes de todas las órdenes de debhelper."
 
 #. type: textblock
-#: debhelper.pod:671
+#: debhelper.pod:710
 msgid ""
 "When using L<dh(1)>, it can be passed options that will be passed on to each "
 "debhelper command, which is generally better than using DH_OPTIONS."
@@ -1722,13 +1781,13 @@ msgstr ""
 
 # type: =item
 #. type: =item
-#: debhelper.pod:674
+#: debhelper.pod:713
 msgid "B<DH_ALWAYS_EXCLUDE>"
 msgstr "B<DH_ALWAYS_EXCLUDE>"
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:676
+#: debhelper.pod:715
 msgid ""
 "If set, this adds the value the variable is set to to the B<-X> options of "
 "all commands that support the B<-X> option. Moreover, B<dh_builddeb> will "
@@ -1740,7 +1799,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:680
+#: debhelper.pod:719
 msgid ""
 "This can be useful if you are doing a build from a CVS source tree, in which "
 "case setting B<DH_ALWAYS_EXCLUDE=CVS> will prevent any CVS directories from "
@@ -1758,7 +1817,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:687
+#: debhelper.pod:726
 msgid ""
 "Multiple things to exclude can be separated with colons, as in "
 "B<DH_ALWAYS_EXCLUDE=CVS:.svn>"
@@ -1768,20 +1827,20 @@ msgstr ""
 
 # type: =head1
 #. type: =head1
-#: debhelper.pod:692 dh:972 dh_auto_build:47 dh_auto_clean:50
-#: dh_auto_configure:52 dh_auto_install:92 dh_auto_test:63 dh_bugfiles:124
-#: dh_builddeb:124 dh_clean:147 dh_compress:210 dh_desktop:31 dh_fixperms:131
-#: dh_gconf:101 dh_gencontrol:78 dh_icons:71 dh_install:260
-#: dh_installcatalogs:122 dh_installchangelogs:241 dh_installcron:79
-#: dh_installdeb:142 dh_installdebconf:128 dh_installdirs:88
-#: dh_installdocs:337 dh_installemacsen:141 dh_installexamples:108
+#: debhelper.pod:731 dh:974 dh_auto_build:47 dh_auto_clean:50
+#: dh_auto_configure:52 dh_auto_install:92 dh_auto_test:62 dh_bugfiles:130
+#: dh_builddeb:154 dh_clean:150 dh_compress:212 dh_desktop:31 dh_fixperms:142
+#: dh_gconf:97 dh_gencontrol:148 dh_icons:71 dh_install:281
+#: dh_installcatalogs:122 dh_installchangelogs:240 dh_installcron:79
+#: dh_installdeb:147 dh_installdebconf:127 dh_installdirs:88
+#: dh_installdocs:351 dh_installemacsen:142 dh_installexamples:109
 #: dh_installifupdown:71 dh_installinfo:77 dh_installinit:324
 #: dh_installlogcheck:80 dh_installlogrotate:52 dh_installman:263
-#: dh_installmanpages:197 dh_installmenu:89 dh_installmime:63
+#: dh_installmanpages:197 dh_installmenu:89 dh_installmime:64
 #: dh_installmodules:115 dh_installpam:61 dh_installppp:67 dh_installudev:117
-#: dh_installwm:110 dh_installxfonts:89 dh_link:228 dh_lintian:59
-#: dh_listpackages:30 dh_makeshlibs:264 dh_md5sums:90 dh_movefiles:170
-#: dh_perl:152 dh_prep:60 dh_scrollkeeper:28 dh_shlibdeps:152 dh_strip:242
+#: dh_installwm:114 dh_installxfonts:89 dh_link:145 dh_lintian:59
+#: dh_listpackages:30 dh_makeshlibs:280 dh_md5sums:107 dh_movefiles:170
+#: dh_perl:152 dh_prep:60 dh_scrollkeeper:28 dh_shlibdeps:152 dh_strip:345
 #: dh_suidregister:117 dh_testdir:53 dh_testroot:27 dh_undocumented:28
 #: dh_usrlocal:116
 msgid "SEE ALSO"
@@ -1789,19 +1848,19 @@ msgstr "VÉASE TAMBIÉN"
 
 # type: =item
 #. type: =item
-#: debhelper.pod:696
+#: debhelper.pod:735
 msgid "F</usr/share/doc/debhelper/examples/>"
 msgstr "F</usr/share/doc/debhelper/examples/>"
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:698
+#: debhelper.pod:737
 msgid "A set of example F<debian/rules> files that use debhelper."
 msgstr "Varios ficheros de ejemplo F<debian/rules> que utilizan debhelper."
 
 # type: =item
 #. type: =item
-#: debhelper.pod:700
+#: debhelper.pod:739
 #, fuzzy
 #| msgid "L<http://kitenet.net/~joey/code/debhelper/>"
 msgid "L<http://joeyh.name/code/debhelper/>"
@@ -1809,44 +1868,44 @@ msgstr "L<http://kitenet.net/~joey/code/debhelper/>"
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:702
+#: debhelper.pod:741
 msgid "Debhelper web site."
 msgstr "Sitio web de Debhelper."
 
 # type: =head1
 #. type: =head1
-#: debhelper.pod:706 dh:978 dh_auto_build:53 dh_auto_clean:56
-#: dh_auto_configure:58 dh_auto_install:98 dh_auto_test:69 dh_bugfiles:132
-#: dh_builddeb:130 dh_clean:153 dh_compress:216 dh_desktop:37 dh_fixperms:137
-#: dh_gconf:107 dh_gencontrol:84 dh_icons:77 dh_install:266
-#: dh_installcatalogs:128 dh_installchangelogs:247 dh_installcron:85
-#: dh_installdeb:148 dh_installdebconf:134 dh_installdirs:94
-#: dh_installdocs:343 dh_installemacsen:148 dh_installexamples:114
+#: debhelper.pod:745 dh:980 dh_auto_build:53 dh_auto_clean:56
+#: dh_auto_configure:58 dh_auto_install:98 dh_auto_test:68 dh_bugfiles:138
+#: dh_builddeb:160 dh_clean:156 dh_compress:218 dh_desktop:37 dh_fixperms:148
+#: dh_gconf:103 dh_gencontrol:154 dh_icons:77 dh_install:287
+#: dh_installcatalogs:128 dh_installchangelogs:246 dh_installcron:85
+#: dh_installdeb:153 dh_installdebconf:133 dh_installdirs:94
+#: dh_installdocs:357 dh_installemacsen:149 dh_installexamples:115
 #: dh_installifupdown:77 dh_installinfo:83 dh_installlogcheck:86
 #: dh_installlogrotate:58 dh_installman:269 dh_installmanpages:203
-#: dh_installmenu:97 dh_installmime:69 dh_installmodules:121 dh_installpam:67
-#: dh_installppp:73 dh_installudev:123 dh_installwm:116 dh_installxfonts:95
-#: dh_link:234 dh_lintian:67 dh_listpackages:36 dh_makeshlibs:270
-#: dh_md5sums:96 dh_movefiles:176 dh_perl:158 dh_prep:66 dh_scrollkeeper:34
-#: dh_shlibdeps:158 dh_strip:248 dh_suidregister:123 dh_testdir:59
+#: dh_installmenu:97 dh_installmime:70 dh_installmodules:121 dh_installpam:67
+#: dh_installppp:73 dh_installudev:123 dh_installwm:120 dh_installxfonts:95
+#: dh_link:151 dh_lintian:67 dh_listpackages:36 dh_makeshlibs:286
+#: dh_md5sums:113 dh_movefiles:176 dh_perl:158 dh_prep:66 dh_scrollkeeper:34
+#: dh_shlibdeps:158 dh_strip:351 dh_suidregister:123 dh_testdir:59
 #: dh_testroot:33 dh_undocumented:34 dh_usrlocal:122
 msgid "AUTHOR"
 msgstr "AUTOR"
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:708 dh:980 dh_auto_build:55 dh_auto_clean:58
-#: dh_auto_configure:60 dh_auto_install:100 dh_auto_test:71 dh_builddeb:132
-#: dh_clean:155 dh_compress:218 dh_fixperms:139 dh_gencontrol:86
-#: dh_install:268 dh_installchangelogs:249 dh_installcron:87 dh_installdeb:150
-#: dh_installdebconf:136 dh_installdirs:96 dh_installdocs:345
-#: dh_installemacsen:150 dh_installexamples:116 dh_installifupdown:79
+#: debhelper.pod:747 dh:982 dh_auto_build:55 dh_auto_clean:58
+#: dh_auto_configure:60 dh_auto_install:100 dh_auto_test:70 dh_builddeb:162
+#: dh_clean:158 dh_compress:220 dh_fixperms:150 dh_gencontrol:156
+#: dh_install:289 dh_installchangelogs:248 dh_installcron:87 dh_installdeb:155
+#: dh_installdebconf:135 dh_installdirs:96 dh_installdocs:359
+#: dh_installemacsen:151 dh_installexamples:117 dh_installifupdown:79
 #: dh_installinfo:85 dh_installinit:332 dh_installlogrotate:60
 #: dh_installman:271 dh_installmanpages:205 dh_installmenu:99
-#: dh_installmime:71 dh_installmodules:123 dh_installpam:69 dh_installppp:75
-#: dh_installudev:125 dh_installwm:118 dh_installxfonts:97 dh_link:236
-#: dh_listpackages:38 dh_makeshlibs:272 dh_md5sums:98 dh_movefiles:178
-#: dh_prep:68 dh_shlibdeps:160 dh_strip:250 dh_suidregister:125 dh_testdir:61
+#: dh_installmime:72 dh_installmodules:123 dh_installpam:69 dh_installppp:75
+#: dh_installudev:125 dh_installwm:122 dh_installxfonts:97 dh_link:153
+#: dh_listpackages:38 dh_makeshlibs:288 dh_md5sums:115 dh_movefiles:178
+#: dh_prep:68 dh_shlibdeps:160 dh_strip:353 dh_suidregister:125 dh_testdir:61
 #: dh_testroot:35 dh_undocumented:36
 msgid "Joey Hess <joeyh@debian.org>"
 msgstr "Joey Hess <joeyh@debian.org>"
@@ -1937,15 +1996,15 @@ msgstr ""
 # type: =head1
 #. type: =head1
 #: dh:41 dh_auto_build:28 dh_auto_clean:30 dh_auto_configure:31
-#: dh_auto_install:43 dh_auto_test:31 dh_bugfiles:50 dh_builddeb:24
-#: dh_clean:41 dh_compress:48 dh_fixperms:32 dh_gconf:39 dh_gencontrol:26
+#: dh_auto_install:43 dh_auto_test:31 dh_bugfiles:50 dh_builddeb:25
+#: dh_clean:41 dh_compress:48 dh_fixperms:32 dh_gconf:39 dh_gencontrol:33
 #: dh_icons:30 dh_install:59 dh_installcatalogs:49 dh_installchangelogs:59
 #: dh_installcron:40 dh_installdebconf:61 dh_installdirs:31 dh_installdocs:71
 #: dh_installemacsen:53 dh_installexamples:32 dh_installifupdown:39
 #: dh_installinfo:31 dh_installinit:59 dh_installlogcheck:42
 #: dh_installlogrotate:22 dh_installman:61 dh_installmanpages:40
 #: dh_installmenu:41 dh_installmodules:38 dh_installpam:31 dh_installppp:35
-#: dh_installudev:35 dh_installwm:34 dh_link:53 dh_makeshlibs:43 dh_md5sums:28
+#: dh_installudev:35 dh_installwm:34 dh_link:53 dh_makeshlibs:47 dh_md5sums:28
 #: dh_movefiles:38 dh_perl:31 dh_prep:26 dh_shlibdeps:26 dh_strip:35
 #: dh_testdir:23 dh_usrlocal:39
 msgid "OPTIONS"
@@ -2023,7 +2082,7 @@ msgstr ""
 
 # type: =head1
 #. type: =head1
-#: dh:77 dh_installdocs:110 dh_link:75 dh_makeshlibs:97 dh_shlibdeps:70
+#: dh:77 dh_installdocs:120 dh_link:75 dh_makeshlibs:101 dh_shlibdeps:70
 msgid "EXAMPLES"
 msgstr "EJEMPLOS"
 
@@ -2574,37 +2633,37 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
-#: dh:974 dh_auto_build:49 dh_auto_clean:52 dh_auto_configure:54
-#: dh_auto_install:94 dh_auto_test:65 dh_builddeb:126 dh_clean:149
-#: dh_compress:212 dh_fixperms:133 dh_gconf:103 dh_gencontrol:80
-#: dh_install:262 dh_installcatalogs:124 dh_installchangelogs:243
-#: dh_installcron:81 dh_installdeb:144 dh_installdebconf:130 dh_installdirs:90
-#: dh_installdocs:339 dh_installexamples:110 dh_installifupdown:73
+#: dh:976 dh_auto_build:49 dh_auto_clean:52 dh_auto_configure:54
+#: dh_auto_install:94 dh_auto_test:64 dh_builddeb:156 dh_clean:152
+#: dh_compress:214 dh_fixperms:144 dh_gconf:99 dh_gencontrol:150
+#: dh_install:283 dh_installcatalogs:124 dh_installchangelogs:242
+#: dh_installcron:81 dh_installdeb:149 dh_installdebconf:129 dh_installdirs:90
+#: dh_installdocs:353 dh_installexamples:111 dh_installifupdown:73
 #: dh_installinfo:79 dh_installinit:326 dh_installlogcheck:82
 #: dh_installlogrotate:54 dh_installman:265 dh_installmanpages:199
-#: dh_installmime:65 dh_installmodules:117 dh_installpam:63 dh_installppp:69
-#: dh_installudev:119 dh_installwm:112 dh_installxfonts:91 dh_link:230
-#: dh_listpackages:32 dh_makeshlibs:266 dh_md5sums:92 dh_movefiles:172
-#: dh_perl:154 dh_prep:62 dh_strip:244 dh_suidregister:119 dh_testdir:55
+#: dh_installmime:66 dh_installmodules:117 dh_installpam:63 dh_installppp:69
+#: dh_installudev:119 dh_installwm:116 dh_installxfonts:91 dh_link:147
+#: dh_listpackages:32 dh_makeshlibs:282 dh_md5sums:109 dh_movefiles:172
+#: dh_perl:154 dh_prep:62 dh_strip:347 dh_suidregister:119 dh_testdir:55
 #: dh_testroot:29 dh_undocumented:30 dh_usrlocal:118
 msgid "L<debhelper(7)>"
 msgstr "L<debhelper(7)>"
 
 # type: textblock
 #. type: textblock
-#: dh:976 dh_auto_build:51 dh_auto_clean:54 dh_auto_configure:56
-#: dh_auto_install:96 dh_auto_test:67 dh_bugfiles:130 dh_builddeb:128
-#: dh_clean:151 dh_compress:214 dh_desktop:35 dh_fixperms:135 dh_gconf:105
-#: dh_gencontrol:82 dh_icons:75 dh_install:264 dh_installchangelogs:245
-#: dh_installcron:83 dh_installdeb:146 dh_installdebconf:132 dh_installdirs:92
-#: dh_installdocs:341 dh_installemacsen:146 dh_installexamples:112
+#: dh:978 dh_auto_build:51 dh_auto_clean:54 dh_auto_configure:56
+#: dh_auto_install:96 dh_auto_test:66 dh_bugfiles:136 dh_builddeb:158
+#: dh_clean:154 dh_compress:216 dh_desktop:35 dh_fixperms:146 dh_gconf:101
+#: dh_gencontrol:152 dh_icons:75 dh_install:285 dh_installchangelogs:244
+#: dh_installcron:83 dh_installdeb:151 dh_installdebconf:131 dh_installdirs:92
+#: dh_installdocs:355 dh_installemacsen:147 dh_installexamples:113
 #: dh_installifupdown:75 dh_installinfo:81 dh_installinit:328
 #: dh_installlogrotate:56 dh_installman:267 dh_installmanpages:201
-#: dh_installmenu:95 dh_installmime:67 dh_installmodules:119 dh_installpam:65
-#: dh_installppp:71 dh_installudev:121 dh_installwm:114 dh_installxfonts:93
-#: dh_link:232 dh_lintian:63 dh_listpackages:34 dh_makeshlibs:268
-#: dh_md5sums:94 dh_movefiles:174 dh_perl:156 dh_prep:64 dh_scrollkeeper:32
-#: dh_shlibdeps:156 dh_strip:246 dh_suidregister:121 dh_testdir:57
+#: dh_installmenu:95 dh_installmime:68 dh_installmodules:119 dh_installpam:65
+#: dh_installppp:71 dh_installudev:121 dh_installwm:118 dh_installxfonts:93
+#: dh_link:149 dh_lintian:63 dh_listpackages:34 dh_makeshlibs:284
+#: dh_md5sums:111 dh_movefiles:174 dh_perl:156 dh_prep:64 dh_scrollkeeper:32
+#: dh_shlibdeps:156 dh_strip:349 dh_suidregister:121 dh_testdir:57
 #: dh_testroot:31 dh_undocumented:32 dh_usrlocal:120
 msgid "This program is a part of debhelper."
 msgstr "Este programa es parte de debhelper."
@@ -2665,8 +2724,8 @@ msgstr ""
 # type: =item
 #. type: =item
 #: dh_auto_build:35 dh_auto_clean:37 dh_auto_configure:38 dh_auto_install:56
-#: dh_auto_test:38 dh_builddeb:38 dh_gencontrol:30 dh_installdebconf:69
-#: dh_installinit:105 dh_makeshlibs:91 dh_shlibdeps:37
+#: dh_auto_test:38 dh_builddeb:39 dh_gencontrol:37 dh_installdebconf:69
+#: dh_installinit:105 dh_makeshlibs:95 dh_shlibdeps:37
 msgid "B<--> I<params>"
 msgstr "B<--> I<parámetros>"
 
@@ -2878,7 +2937,7 @@ msgstr ""
 
 # type: =item
 #. type: =item
-#: dh_auto_install:50 dh_builddeb:28
+#: dh_auto_install:50 dh_builddeb:29
 msgid "B<--destdir=>I<directory>"
 msgstr "B<--destdir=>I<directorio>"
 
@@ -3012,7 +3071,7 @@ msgstr ""
 #: dh_installinfo:21 dh_installinit:27 dh_installlogcheck:21 dh_installman:51
 #: dh_installmenu:25 dh_installmime:21 dh_installmodules:28 dh_installpam:21
 #: dh_installppp:21 dh_installudev:25 dh_installwm:24 dh_link:41 dh_lintian:21
-#: dh_makeshlibs:29 dh_movefiles:26
+#: dh_makeshlibs:24 dh_movefiles:26
 msgid "FILES"
 msgstr "FICHEROS"
 
@@ -3087,18 +3146,18 @@ msgstr ""
 
 # type: =item
 #. type: textblock
-#: dh_bugfiles:126
+#: dh_bugfiles:132
 msgid "F</usr/share/doc/reportbug/README.developers.gz>"
 msgstr "F</usr/share/doc/reportbug/README.developers.gz>"
 
 # type: textblock
 #. type: textblock
-#: dh_bugfiles:128 dh_lintian:61
+#: dh_bugfiles:134 dh_lintian:61
 msgid "L<debhelper(1)>"
 msgstr "L<debhelper(1)>"
 
 #. type: textblock
-#: dh_bugfiles:134
+#: dh_bugfiles:140
 msgid "Modestas Vainius <modestas@vainius.eu>"
 msgstr "Modestas Vainius <modestas@vainius.eu>"
 
@@ -3121,15 +3180,20 @@ msgstr ""
 # type: textblock
 #. type: textblock
 #: dh_builddeb:18
+#, fuzzy
+#| msgid ""
+#| "B<dh_builddeb> simply calls L<dpkg-deb(1)> to build a Debian package or "
+#| "packages."
 msgid ""
 "B<dh_builddeb> simply calls L<dpkg-deb(1)> to build a Debian package or "
-"packages."
+"packages.  It will also build packages for ddebs when L<dh_strip(1)> and "
+"L<dh_gencontrol(1)> have prepared them."
 msgstr ""
 "B<dh_builddeb> simplemente invoca L<dpkg-deb(1)> para construir uno o varios "
 "paquetes de Debian."
 
 #. type: textblock
-#: dh_builddeb:21
+#: dh_builddeb:22
 msgid ""
 "It supports building multiple binary packages in parallel, when enabled by "
 "DEB_BUILD_OPTIONS."
@@ -3139,7 +3203,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
-#: dh_builddeb:30
+#: dh_builddeb:31
 msgid ""
 "Use this if you want the generated F<.deb> files to be put in a directory "
 "other than the default of \"F<..>\"."
@@ -3149,13 +3213,13 @@ msgstr ""
 
 # type: =item
 #. type: =item
-#: dh_builddeb:33
+#: dh_builddeb:34
 msgid "B<--filename=>I<name>"
 msgstr "B<--filename=>I<nombre>"
 
 # type: textblock
 #. type: textblock
-#: dh_builddeb:35
+#: dh_builddeb:36
 msgid ""
 "Use this if you want to force the generated .deb file to have a particular "
 "file name. Does not work well if more than one .deb is generated!"
@@ -3165,19 +3229,19 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
-#: dh_builddeb:40
+#: dh_builddeb:41
 msgid "Pass I<params> to L<dpkg-deb(1)> when it is used to build the package."
 msgstr ""
 "Introduce los I<parámetros> a L<dpkg-deb(1)> cuando se construye el paquete."
 
 # type: =item
 #. type: =item
-#: dh_builddeb:43
+#: dh_builddeb:44
 msgid "B<-u>I<params>"
 msgstr "B<-u>I<parámetros>"
 
 #. type: textblock
-#: dh_builddeb:45
+#: dh_builddeb:46
 msgid ""
 "This is another way to pass I<params> to L<dpkg-deb(1)>.  It is deprecated; "
 "use B<--> instead."
@@ -3305,7 +3369,7 @@ msgstr ""
 
 # type: =item
 #. type: =item
-#: dh_clean:60 dh_compress:64 dh_installdocs:103 dh_installexamples:46
+#: dh_clean:60 dh_compress:64 dh_installdocs:113 dh_installexamples:46
 #: dh_installinfo:40 dh_installmanpages:44 dh_movefiles:55 dh_testdir:27
 msgid "I<file> ..."
 msgstr "I<fichero> ..."
@@ -3429,7 +3493,7 @@ msgstr "Añade estos ficheros a la lista de ficheros a comprimir."
 
 # type: =head1
 #. type: =head1
-#: dh_compress:70 dh_perl:61 dh_strip:74 dh_usrlocal:55
+#: dh_compress:70 dh_perl:61 dh_strip:113 dh_usrlocal:55
 msgid "CONFORMS TO"
 msgstr "CONFORME A"
 
@@ -3636,7 +3700,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
-#: dh_gconf:109
+#: dh_gconf:105
 msgid "Ross Burton <ross@burtonini.com> Josselin Mouette <joss@debian.org>"
 msgstr "Ross Burton <ross@burtonini.com> Josselin Mouette <joss@debian.org>"
 
@@ -3667,29 +3731,44 @@ msgstr ""
 # type: textblock
 #. type: textblock
 #: dh_gencontrol:22
+#, fuzzy
+#| msgid ""
+#| "This program is merely a wrapper around L<dpkg-gencontrol(1)>, which "
+#| "calls it once for each package being acted on, and passes in some "
+#| "additional useful flags."
 msgid ""
 "This program is merely a wrapper around L<dpkg-gencontrol(1)>, which calls "
-"it once for each package being acted on, and passes in some additional "
-"useful flags."
+"it once for each package being acted on (plus related ddebs), and passes in "
+"some additional useful flags."
 msgstr ""
 "El programa es simplemente una interfaz para L<dpkg-gencontrol(1)>, al que "
 "invoca una vez por cada paquete sobre el que actúa, introduciendo algunas "
 "opciones adicionales útiles."
 
+#. type: textblock
+#: dh_gencontrol:26
+msgid ""
+"B<Note> that if you use B<dh_gencontrol>, you must also use "
+"L<dh_builddeb(1)> to build the packages.  Otherwise, your build may fail to "
+"build as B<dh_gencontrol> (via L<dpkg-gencontrol(1)>) declares which "
+"packages are built.  As debhelper automatically generates ddebs, it some "
+"times adds additional packages, which will be built by L<dh_builddeb(1)>."
+msgstr ""
+
 # type: textblock
 #. type: textblock
-#: dh_gencontrol:32
+#: dh_gencontrol:39
 msgid "Pass I<params> to L<dpkg-gencontrol(1)>."
 msgstr "Introduce los I<parámetros> a L<dpkg-gencontrol(1)>."
 
 # type: =item
 #. type: =item
-#: dh_gencontrol:34
+#: dh_gencontrol:41
 msgid "B<-u>I<params>, B<--dpkg-gencontrol-params=>I<params>"
 msgstr "B<-u>I<parámetros>, B<--dpkg-gencontrol-params=>I<parámetros>"
 
 #. type: textblock
-#: dh_gencontrol:36
+#: dh_gencontrol:43
 msgid ""
 "This is another way to pass I<params> to L<dpkg-gencontrol(1)>.  It is "
 "deprecated; use B<--> instead."
@@ -3757,7 +3836,7 @@ msgstr ""
 #. type: =item
 #: dh_icons:34 dh_installcatalogs:53 dh_installdebconf:65 dh_installemacsen:57
 #: dh_installinit:63 dh_installmenu:45 dh_installmodules:42 dh_installudev:49
-#: dh_installwm:44 dh_makeshlibs:77 dh_usrlocal:43
+#: dh_installwm:44 dh_makeshlibs:81 dh_usrlocal:43
 msgid "B<-n>, B<--noscripts>"
 msgstr "B<-n>, B<--noscripts>"
 
@@ -4042,25 +4121,69 @@ msgstr ""
 
 # type: =head1
 #. type: =head1
-#: dh_install:254
+#: dh_install:256
 msgid "LIMITATIONS"
 msgstr "LIMITACIONES"
 
 # type: verbatim
-#. type: verbatim
-#: dh_install:256
-#, no-wrap
+#. type: textblock
+#: dh_install:258
+#, fuzzy
+#| msgid ""
+#| "B<dh_install> cannot rename files or directories, it can only install "
+#| "them\n"
+#| "with the names they already have into wherever you want in the package\n"
+#| "build tree.\n"
+#| "  \n"
 msgid ""
-"B<dh_install> cannot rename files or directories, it can only install them\n"
-"with the names they already have into wherever you want in the package\n"
-"build tree.\n"
-"  \n"
+"B<dh_install> cannot rename files or directories, it can only install them "
+"with the names they already have into wherever you want in the package build "
+"tree."
 msgstr ""
 "B<dh_install> no puede renombrar ficheros o directorios, sólo puede\n"
 "instalarlos con los nombres que ya tengan en el lugar que desee en el árbol\n"
 "de construcción del paquete.\n"
 "  \n"
 
+#. type: textblock
+#: dh_install:262
+msgid ""
+"However, renaming can be achieved by using B<dh-exec> with compatibility "
+"level 9 or later.  An example debian/I<package>.install file using B<dh-"
+"exec> could look like:"
+msgstr ""
+
+#. type: verbatim
+#: dh_install:266
+#, no-wrap
+msgid ""
+" #!/usr/bin/dh-exec\n"
+" debian/default.conf => /etc/my-package/start.conf\n"
+"\n"
+msgstr ""
+
+#. type: textblock
+#: dh_install:269
+msgid "Please remember the following three things:"
+msgstr ""
+
+#. type: =item
+#: dh_install:273
+msgid ""
+"* The package must be using compatibility level 9 or later (see "
+"L<debhelper(7)>)"
+msgstr ""
+
+#. type: =item
+#: dh_install:275
+msgid "* The package will need a build-dependency on dh-exec."
+msgstr ""
+
+#. type: =item
+#: dh_install:277
+msgid "* The install file must be marked as executable."
+msgstr ""
+
 # type: textblock
 #. type: textblock
 #: dh_installcatalogs:5
@@ -4150,9 +4273,8 @@ msgstr "No modifica los scripts F<postinst>/F<postrm>/F<prerm>."
 
 # type: textblock
 #. type: textblock
-#: dh_installcatalogs:61 dh_installdocs:127 dh_installemacsen:74
-#: dh_installinit:142 dh_installmodules:56 dh_installudev:57 dh_installwm:56
-#: dh_usrlocal:51
+#: dh_installcatalogs:61 dh_installemacsen:74 dh_installinit:142
+#: dh_installmodules:56 dh_installudev:57 dh_installwm:56 dh_usrlocal:51
 msgid ""
 "Note that this command is not idempotent. L<dh_prep(1)> should be called "
 "between invocations of this command. Otherwise, it may cause multiple "
@@ -4484,20 +4606,27 @@ msgstr "I<paquete>.shlibs"
 msgid "These control files are installed into the F<DEBIAN> directory."
 msgstr "Estos ficheros de control se instalan en el directorio F<DEBIAN>."
 
-#. type: =item
+#. type: textblock
 #: dh_installdeb:45
+msgid ""
+"Note that I<package>.shlibs is only installed in compat level 9 and "
+"earlier.  In compat 10, please use L<dh_makeshlibs(1)>."
+msgstr ""
+
+#. type: =item
+#: dh_installdeb:48
 msgid "I<package>.conffiles"
 msgstr "I<paquete>.conffiles"
 
 # type: textblock
 #. type: textblock
-#: dh_installdeb:47
+#: dh_installdeb:50
 msgid "This control file will be installed into the F<DEBIAN> directory."
 msgstr "Este fichero de control se instalan en el directorio F<DEBIAN>."
 
 # type: textblock
 #. type: textblock
-#: dh_installdeb:49
+#: dh_installdeb:52
 msgid ""
 "In v3 compatibility mode and higher, all files in the F<etc/> directory in a "
 "package will automatically be flagged as conffiles by this program, so there "
@@ -4508,12 +4637,12 @@ msgstr ""
 "por este programa, así que no hay necesidad de listarlos aquí manualmente."
 
 #. type: =item
-#: dh_installdeb:53
+#: dh_installdeb:56
 msgid "I<package>.maintscript"
 msgstr "I<paquete>.maintscript"
 
 #. type: textblock
-#: dh_installdeb:55
+#: dh_installdeb:58
 msgid ""
 "Lines in this file correspond to L<dpkg-maintscript-helper(1)> commands and "
 "parameters.  Any shell metacharacters will be escaped, so arbitrary shell "
@@ -4945,9 +5074,25 @@ msgstr ""
 "(Otro método, aún permitido, es hacer del directorio de documentación un "
 "enlace simbólico colgante, «dangling», antes de invocar B<dh_installdocs>.)"
 
+#. type: textblock
+#: dh_installdocs:103
+msgid ""
+"B<CAVEAT>: If a previous version of the package was built without this "
+"option and is now built with it (or vice-versa), it requries a \"dir to "
+"symlink\" (or \"symlink to dir\") migration.  Since debhelper has no "
+"knowledge of previous versions, you have to enable this migration itself."
+msgstr ""
+
+#. type: textblock
+#: dh_installdocs:109
+msgid ""
+"This can be done by providing a \"debian/I<package>.maintscript\" file and "
+"using L<dh_installdeb(1)> to provide the relevant maintainer script snippets."
+msgstr ""
+
 # type: textblock
 #. type: textblock
-#: dh_installdocs:105
+#: dh_installdocs:115
 msgid ""
 "Install these files as documentation into the first package acted on. (Or in "
 "all packages if B<-A> is specified)."
@@ -4957,14 +5102,14 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
-#: dh_installdocs:112
+#: dh_installdocs:122
 msgid "This is an example of a F<debian/package.docs> file:"
 msgstr ""
 "A continuación se muestra un ejemplo de un fichero F<debian/paquete.docs>:"
 
 # type: verbatim
 #. type: verbatim
-#: dh_installdocs:114
+#: dh_installdocs:124
 #, no-wrap
 msgid ""
 "  README\n"
@@ -4985,7 +5130,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
-#: dh_installdocs:123
+#: dh_installdocs:133
 msgid ""
 "Note that B<dh_installdocs> will happily copy entire directory hierarchies "
 "if you ask it to (similar to B<cp -a>). If it is asked to install a "
@@ -5145,7 +5290,7 @@ msgstr ""
 "omisión es B<emacs>, las alternativas son B<xemacs> y B<emacs20>."
 
 #. type: textblock
-#: dh_installemacsen:143
+#: dh_installemacsen:144
 msgid "L<debhelper(7)> L</usr/share/doc/emacsen-common/debian-emacs-policy.gz>"
 msgstr ""
 
@@ -6178,7 +6323,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
-#: dh_installmenu:47 dh_makeshlibs:79
+#: dh_installmenu:47 dh_makeshlibs:83
 msgid "Do not modify F<postinst>/F<postrm> scripts."
 msgstr "No modifica los scripts F<postinst>/F<postrm>."
 
@@ -6993,31 +7138,40 @@ msgstr ""
 "F<postrm> (sólo en el modo v3 y superiores) de cualquier paquete en el que "
 "encuentra bibliotecas compartidas."
 
+#. type: =item
+#: dh_makeshlibs:28
+#, fuzzy
+#| msgid "debian/I<package>.links"
+msgid "debian/I<package>.shlibs"
+msgstr "debian/I<paquete>.links"
+
+#. type: textblock
+#: dh_makeshlibs:30
+msgid ""
+"Installs this file, if present, into the package as DEBIAN/shlibs.  If "
+"omitted, debhelper will generate a shlibs file automatically if it detects "
+"any libraries."
+msgstr ""
+
 #. type: textblock
-#: dh_makeshlibs:24
+#: dh_makeshlibs:34
 msgid ""
-"Packages that support multiarch are detected, and a Pre-Dependency on "
-"multiarch-support is set in ${misc:Pre-Depends} ; you should make sure to "
-"put that token into an appropriate place in your debian/control file for "
-"packages supporting multiarch."
+"Note in compat levels 9 and earlier, this file was installed by "
+"L<dh_installdeb(1)> rather than B<dh_makeshlibs>."
 msgstr ""
-"Se detectan los paquetes que permiten multiarquitectura, y se define una "
-"predependencia sobre multiarch-support en ${misc:Pre-Depends}; debería "
-"asegurar que inserta ese comodín en el lugar apropiado dentro del fichero "
-"«debian/control» para aquellos paquetes que utilizan multiarquitectura."
 
 #. type: =item
-#: dh_makeshlibs:33
+#: dh_makeshlibs:37
 msgid "debian/I<package>.symbols"
 msgstr "debian/I<paquete>.symbols"
 
 #. type: =item
-#: dh_makeshlibs:35
+#: dh_makeshlibs:39
 msgid "debian/I<package>.symbols.I<arch>"
 msgstr "debian/I<paquete>.symbols.I<arquitectura>"
 
 #. type: textblock
-#: dh_makeshlibs:37
+#: dh_makeshlibs:41
 msgid ""
 "These symbols files, if present, are passed to L<dpkg-gensymbols(1)> to be "
 "processed and installed. Use the I<arch> specific names if you need to "
@@ -7030,13 +7184,13 @@ msgstr ""
 
 # type: =item
 #. type: =item
-#: dh_makeshlibs:47
+#: dh_makeshlibs:51
 msgid "B<-m>I<major>, B<--major=>I<major>"
 msgstr "B<-m>I<mayor>, B<--major=>I<mayor>"
 
 # type: textblock
 #. type: textblock
-#: dh_makeshlibs:49
+#: dh_makeshlibs:53
 msgid ""
 "Instead of trying to guess the major number of the library with objdump, use "
 "the major number specified after the -m parameter. This is much less useful "
@@ -7051,18 +7205,18 @@ msgstr ""
 
 # type: =item
 #. type: =item
-#: dh_makeshlibs:54
+#: dh_makeshlibs:58
 msgid "B<-V>, B<-V>I<dependencies>"
 msgstr "B<-V>, B<-V>I<dependencias>"
 
 # type: =item
 #. type: =item
-#: dh_makeshlibs:56
+#: dh_makeshlibs:60
 msgid "B<--version-info>, B<--version-info=>I<dependencies>"
 msgstr "B<--version-info>, B<--version-info=>I<dependencias>"
 
 #. type: textblock
-#: dh_makeshlibs:58
+#: dh_makeshlibs:62
 msgid ""
 "By default, the shlibs file generated by this program does not make packages "
 "depend on any particular version of the package containing the shared "
@@ -7090,7 +7244,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
-#: dh_makeshlibs:69
+#: dh_makeshlibs:73
 msgid ""
 "Beware of using B<-V> without any parameters; this is a conservative setting "
 "that always ensures that other packages' shared library dependencies are at "
@@ -7110,7 +7264,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
-#: dh_makeshlibs:83
+#: dh_makeshlibs:87
 msgid ""
 "Exclude files that contain I<item> anywhere in their filename or directory "
 "from being treated as shared libraries."
@@ -7120,13 +7274,13 @@ msgstr ""
 
 # type: =item
 #. type: =item
-#: dh_makeshlibs:86
+#: dh_makeshlibs:90
 msgid "B<--add-udeb=>I<udeb>"
 msgstr "B<--add-udeb=>I<udeb>"
 
 # type: textblock
 #. type: textblock
-#: dh_makeshlibs:88
+#: dh_makeshlibs:92
 msgid ""
 "Create an additional line for udebs in the shlibs file and use I<udeb> as "
 "the package name for udebs to depend on instead of the regular library "
@@ -7138,19 +7292,19 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
-#: dh_makeshlibs:93
+#: dh_makeshlibs:97
 msgid "Pass I<params> to L<dpkg-gensymbols(1)>."
 msgstr "Introduce los I<parámetros> a L<dpkg-gensymbols(1)>."
 
 # type: =item
 #. type: =item
-#: dh_makeshlibs:101
+#: dh_makeshlibs:105
 msgid "B<dh_makeshlibs>"
 msgstr "B<dh_makeshlibs>"
 
 # type: verbatim
 #. type: verbatim
-#: dh_makeshlibs:103
+#: dh_makeshlibs:107
 #, no-wrap
 msgid ""
 "Assuming this is a package named F<libfoobar1>, generates a shlibs file that\n"
@@ -7165,13 +7319,13 @@ msgstr ""
 
 # type: =item
 #. type: =item
-#: dh_makeshlibs:107
+#: dh_makeshlibs:111
 msgid "B<dh_makeshlibs -V>"
 msgstr "B<dh_makeshlibs -V>"
 
 # type: verbatim
 #. type: verbatim
-#: dh_makeshlibs:109
+#: dh_makeshlibs:113
 #, no-wrap
 msgid ""
 "Assuming the current version of the package is 1.1-3, generates a shlibs\n"
@@ -7186,13 +7340,13 @@ msgstr ""
 
 # type: =item
 #. type: =item
-#: dh_makeshlibs:113
+#: dh_makeshlibs:117
 msgid "B<dh_makeshlibs -V 'libfoobar1 (E<gt>= 1.0)'>"
 msgstr "B<dh_makeshlibs -V 'libfoobar1 (E<gt>= 1.0)'>"
 
 # type: verbatim
 #. type: verbatim
-#: dh_makeshlibs:115
+#: dh_makeshlibs:119
 #, no-wrap
 msgid ""
 "Generates a shlibs file that looks something like:\n"
@@ -7911,10 +8065,20 @@ msgstr ""
 msgid "B<--dbg-package=>I<package>"
 msgstr "B<--dbg-package=>I<paquete>"
 
-# type: textblock
 #. type: textblock
 #: dh_strip:47
 msgid ""
+"B<This option is a now special purpose option that you normally do not "
+"need>.  In most cases, there should be little reason to use this option for "
+"new source packages as debhelper generates automatic debug packages (\"ddebs"
+"\").  B<If you have a manual --dbg-package> that you want to migrate to the "
+"automatic ddeb, please see the B<--ddeb-migration> option."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: dh_strip:54
+msgid ""
 "Causes B<dh_strip> to save debug symbols stripped from the packages it acts "
 "on as independent files in the package build directory of the specified "
 "debugging package."
@@ -7926,7 +8090,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
-#: dh_strip:51
+#: dh_strip:58
 msgid ""
 "For example, if your packages are libfoo and foo and you want to include a "
 "I<foo-dbg> package with debugging symbols, use B<dh_strip --dbg-"
@@ -7938,7 +8102,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
-#: dh_strip:54
+#: dh_strip:61
 msgid ""
 "Note that this option behaves significantly different in debhelper "
 "compatibility levels 4 and below. Instead of specifying the name of a debug "
@@ -7953,15 +8117,22 @@ msgstr ""
 "depuración separados, y los símbolos separados se colocan en paquetes "
 "añadiendo B<-dbg> al final de su nombre."
 
+#. type: textblock
+#: dh_strip:67
+msgid ""
+"This option implies B<--no-ddebs> and I<cannot> be used with B<--ddeb> or "
+"B<--ddeb-migration>."
+msgstr ""
+
 # type: =item
 #. type: =item
-#: dh_strip:60
+#: dh_strip:70
 msgid "B<-k>, B<--keep-debug>"
 msgstr "B<-k>, B<--keep-debug>"
 
 # type: textblock
 #. type: textblock
-#: dh_strip:62
+#: dh_strip:72
 msgid ""
 "Debug symbols will be retained, but split into an independent file in F<usr/"
 "lib/debug/> in the package build directory. B<--dbg-package> is easier to "
@@ -7972,20 +8143,100 @@ msgstr ""
 "paquete. B<--dbg-package> es más fácil de utilizar que esta opción, pero "
 "esta opción es más flexible."
 
+#. type: textblock
+#: dh_strip:76
+msgid ""
+"This option implies B<--no-ddebs> and I<cannot> be used with B<--ddebs>."
+msgstr ""
+
+# type: =item
+#. type: =item
+#: dh_strip:79
+#, fuzzy
+#| msgid "B<--dbg-package=>I<package>"
+msgid "B<--ddeb-migration=>I<package-relation>"
+msgstr "B<--dbg-package=>I<paquete>"
+
+#. type: textblock
+#: dh_strip:81
+msgid ""
+"This option is used to migrate from a manual \"-dbg\" package (created with "
+"B<--dbg-package>) to the automatic \"ddebs\".  The value of this option "
+"should describe a valid B<Replaces>- and B<Breaks>-relation, which will be "
+"added to the ddebs to avoid file conflicts with the (now obsolete) -dbg "
+"package."
+msgstr ""
+
+#. type: textblock
+#: dh_strip:87
+msgid ""
+"This option implies B<--ddebs> and I<cannot> be used with B<--keep-debug>, "
+"B<--dbg-package> or B<--no-ddebs>."
+msgstr ""
+
+#. type: textblock
+#: dh_strip:90
+msgid "Examples:"
+msgstr ""
+
+#. type: verbatim
+#: dh_strip:92
+#, no-wrap
+msgid ""
+"  dh_strip --ddeb-migration='libfoo-dbg (<< 2.1-3~)'\n"
+"\n"
+msgstr ""
+
+#. type: verbatim
+#: dh_strip:94
+#, no-wrap
+msgid ""
+"  dh_strip --ddeb-migration='libfoo-tools-dbg (<< 2.1-3~), libfoo2-dbg (<< 2.1-3~)'\n"
+"\n"
+msgstr ""
+
+# type: =item
+#. type: =item
+#: dh_strip:96
+#, fuzzy
+#| msgid "B<-i>, B<--indep>"
+msgid "B<--ddebs>, B<--no-ddebs>"
+msgstr "B<-i>, B<--indep>"
+
+#. type: textblock
+#: dh_strip:98
+msgid ""
+"Control whether B<dh_strip> should be creating ddebs when possible.  By "
+"default, B<dh_strip> will attempt to build ddebs and this option is "
+"primarily useful for disabling this."
+msgstr ""
+
 # type: textblock
 #. type: textblock
-#: dh_strip:70
+#: dh_strip:106
+#, fuzzy
+#| msgid ""
+#| "If the B<DEB_BUILD_OPTIONS> environment variable contains B<nostrip>, "
+#| "nothing will be stripped, in accordance with Debian policy (section 10.1 "
+#| "\"Binaries\")."
 msgid ""
 "If the B<DEB_BUILD_OPTIONS> environment variable contains B<nostrip>, "
 "nothing will be stripped, in accordance with Debian policy (section 10.1 "
-"\"Binaries\")."
+"\"Binaries\").  This will also inhibit the creation of automatic \"ddebs\"."
 msgstr ""
 "Si la variable de entorno B<DEB_BUILD_OPTIONS> contiene B<nostrip>, no se "
 "eliminará nada, conforme a las normas de Debian (sección 10.1 «Binarios»)."
 
+#. type: textblock
+#: dh_strip:110
+msgid ""
+"The creation of automatic \"ddebs\" can also be prevented by adding "
+"B<noddebs> to the B<DEB_BUILD_OPTIONS> environment variable."
+msgstr ""
+
 # type: textblock
 #. type: textblock
-#: dh_strip:76
+#: dh_strip:115
 msgid "Debian policy, version 3.0.1"
 msgstr "Normas de Debian, versión 3.0.1"
 
@@ -8212,6 +8463,17 @@ msgstr "Normas de Debian, versión 2.2"
 msgid "Andrew Stribblehill <ads@debian.org>"
 msgstr "Andrew Stribblehill <ads@debian.org>"
 
+#~ msgid ""
+#~ "Packages that support multiarch are detected, and a Pre-Dependency on "
+#~ "multiarch-support is set in ${misc:Pre-Depends} ; you should make sure to "
+#~ "put that token into an appropriate place in your debian/control file for "
+#~ "packages supporting multiarch."
+#~ msgstr ""
+#~ "Se detectan los paquetes que permiten multiarquitectura, y se define una "
+#~ "predependencia sobre multiarch-support en ${misc:Pre-Depends}; debería "
+#~ "asegurar que inserta ese comodín en el lugar apropiado dentro del fichero "
+#~ "«debian/control» para aquellos paquetes que utilizan multiarquitectura."
+
 # type: textblock
 #~ msgid "Sets the priority string of the F<rules.d> symlink. Default is 60."
 #~ msgstr ""
diff --git a/man/po4a/po/fr.po b/man/po4a/po/fr.po
index 62b4460a..5aff2428 100644
--- a/man/po4a/po/fr.po
+++ b/man/po4a/po/fr.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debhelper manpages\n"
-"POT-Creation-Date: 2014-10-03 15:16-0400\n"
+"POT-Creation-Date: 2015-06-28 11:53+0000\n"
 "PO-Revision-Date: 2012-11-03 11:13-0400\n"
 "Last-Translator: Valery Perrin <valery.perrin.debian@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -576,7 +576,7 @@ msgstr ""
 # type: =item
 #. type: =item
 #: debhelper.pod:185 dh_compress:52 dh_install:81 dh_installchangelogs:71
-#: dh_installdocs:80 dh_installexamples:41 dh_link:62 dh_makeshlibs:81
+#: dh_installdocs:80 dh_installexamples:41 dh_link:62 dh_makeshlibs:85
 #: dh_md5sums:37 dh_shlibdeps:30 dh_strip:39
 msgid "B<-X>I<item>, B<--exclude=>I<item>"
 msgstr "B<-X>I<élément>, B<--exclude=>I<élément>"
@@ -940,7 +940,8 @@ msgstr "Ce mode fonctionne comme v2 mais avec les ajouts suivants :"
 #: debhelper.pod:453 debhelper.pod:461 debhelper.pod:466 debhelper.pod:480
 #: debhelper.pod:485 debhelper.pod:492 debhelper.pod:497 debhelper.pod:502
 #: debhelper.pod:506 debhelper.pod:512 debhelper.pod:517 debhelper.pod:522
-#: debhelper.pod:535 debhelper.pod:542
+#: debhelper.pod:537 debhelper.pod:542 debhelper.pod:548 debhelper.pod:555
+#: debhelper.pod:562 debhelper.pod:568
 msgid "-"
 msgstr "-"
 
@@ -1353,7 +1354,7 @@ msgid "Changes from v9 are:"
 msgstr "Les changements par rapport à la version 9 sont :"
 
 #. type: textblock
-#: debhelper.pod:537
+#: debhelper.pod:539
 msgid ""
 "B<dh_installinit> will no longer install a file named debian/I<package> as "
 "an init script."
@@ -1362,30 +1363,60 @@ msgstr ""
 #. type: textblock
 #: debhelper.pod:544
 msgid ""
+"B<dh_installdocs> will error out if it detects links created with --link-doc "
+"between packages of architecture \"all\" and non-\"all\" as it breaks "
+"binNMUs."
+msgstr ""
+
+#. type: textblock
+#: debhelper.pod:550
+msgid ""
 "B<dh> no longer creates the package build directory when skipping running "
 "debhelper commands. This will not affect packages that only build with "
 "debhelper commands, but it may expose bugs in commands not included in "
 "debhelper."
 msgstr ""
 
+#. type: textblock
+#: debhelper.pod:557
+msgid ""
+"B<dh_makeshlibs> now invokes I<ldconfig -X> instead of just I<ldconfig> in "
+"its generated maintainer scripts snippets.  The new call will only update "
+"the ld cache (instead of also updating symlinks)."
+msgstr ""
+
+#. type: textblock
+#: debhelper.pod:564
+msgid ""
+"B<dh_installdeb> no longer installs a maintainer-provided debian/I<package>."
+"shlibs file.  This is now done by B<dh_makeshlibs> instead."
+msgstr ""
+
+#. type: textblock
+#: debhelper.pod:570
+msgid ""
+"B<dh_installwm> refuses to create a broken package if no man page can be "
+"found (required to register for the x-window-manager alternative)."
+msgstr ""
+
 # type: =head1
 #. type: =head1
-#: debhelper.pod:553 dh_auto_test:45 dh_installcatalogs:59 dh_installdocs:121
+#: debhelper.pod:577 dh_auto_test:45 dh_installcatalogs:59 dh_installdocs:131
 #: dh_installemacsen:72 dh_installexamples:53 dh_installinit:140
 #: dh_installman:82 dh_installmodules:54 dh_installudev:55 dh_installwm:54
-#: dh_installxfonts:37 dh_movefiles:64 dh_strip:68 dh_usrlocal:49
+#: dh_installxfonts:37 dh_movefiles:64 dh_strip:104 dh_usrlocal:49
 msgid "NOTES"
 msgstr "REMARQUES"
 
 # type: =head2
 #. type: =head2
-#: debhelper.pod:555
+#: debhelper.pod:579
 msgid "Multiple binary package support"
 msgstr "Prise en charge de plusieurs paquets binaires"
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:557
+#: debhelper.pod:581
 msgid ""
 "If your source package generates more than one binary package, debhelper "
 "programs will default to acting on all binary packages when run. If your "
@@ -1405,7 +1436,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:565
+#: debhelper.pod:589
 #, fuzzy
 #| msgid ""
 #| "To facilitate this, as well as give you more control over which packages "
@@ -1427,7 +1458,7 @@ msgstr ""
 "paquets énumérés dans le fichier de contrôle."
 
 #. type: textblock
-#: debhelper.pod:571
+#: debhelper.pod:595
 msgid ""
 "First, any package whose B<Architecture> field in B<debian/control> does not "
 "match the build architecture will be excluded (L<Debian Policy, section "
@@ -1435,7 +1466,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: debhelper.pod:575
+#: debhelper.pod:599
 msgid ""
 "Also, some additional packages may be excluded based on the contents of the "
 "B<DEB_BUILD_PROFILES> environment variable and B<Build-Profiles> fields in "
@@ -1445,13 +1476,13 @@ msgstr ""
 
 # type: =head2
 #. type: =head2
-#: debhelper.pod:580
+#: debhelper.pod:604
 msgid "Automatic generation of Debian install scripts"
 msgstr "Génération automatique des scripts Debian de maintenance du paquet"
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:582
+#: debhelper.pod:606
 msgid ""
 "Some debhelper commands will automatically generate parts of Debian "
 "maintainer scripts. If you want these automatically generated things "
@@ -1469,7 +1500,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:589
+#: debhelper.pod:613
 msgid ""
 "If a script does not exist at all and debhelper needs to add something to "
 "it, then debhelper will create the complete script."
@@ -1479,7 +1510,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:592
+#: debhelper.pod:616
 msgid ""
 "All debhelper commands that automatically generate code in this way let it "
 "be disabled by the -n parameter (see above)."
@@ -1490,7 +1521,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:595
+#: debhelper.pod:619
 msgid ""
 "Note that the inserted code will be shell code, so you cannot directly use "
 "it in a Perl script. If you would like to embed it into a Perl script, here "
@@ -1505,7 +1536,7 @@ msgstr ""
 
 # type: verbatim
 #. type: verbatim
-#: debhelper.pod:600
+#: debhelper.pod:624
 #, no-wrap
 msgid ""
 "  my $temp=\"set -e\\nset -- @ARGV\\n\" . << 'EOF';\n"
@@ -1524,13 +1555,13 @@ msgstr ""
 
 # type: =head2
 #. type: =head2
-#: debhelper.pod:606
+#: debhelper.pod:630
 msgid "Automatic generation of miscellaneous dependencies."
 msgstr "Génération automatique des diverses dépendances."
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:608
+#: debhelper.pod:632
 msgid ""
 "Some debhelper commands may make the generated package need to depend on "
 "some other packages. For example, if you use L<dh_installdebconf(1)>, your "
@@ -1550,7 +1581,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:616
+#: debhelper.pod:640
 msgid ""
 "All commands of this type, besides documenting what dependencies may be "
 "needed on their man pages, will automatically generate a substvar called B<"
@@ -1565,7 +1596,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:621
+#: debhelper.pod:645
 msgid ""
 "This is entirely independent of the standard B<${shlibs:Depends}> generated "
 "by L<dh_makeshlibs(1)>, and the B<${perl:Depends}> generated by "
@@ -1579,13 +1610,13 @@ msgstr ""
 
 # type: =head2
 #. type: =head2
-#: debhelper.pod:626
+#: debhelper.pod:650
 msgid "Package build directories"
 msgstr "Répertoires de construction du paquet"
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:628
+#: debhelper.pod:652
 msgid ""
 "By default, all debhelper programs assume that the temporary directory used "
 "for assembling the tree of files in a package is debian/I<package>."
@@ -1596,7 +1627,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:631
+#: debhelper.pod:655
 msgid ""
 "Sometimes, you might want to use some other temporary directory. This is "
 "supported by the B<-P> flag. For example, \"B<dh_installdocs -Pdebian/tmp>"
@@ -1616,13 +1647,13 @@ msgstr ""
 
 # type: =head2
 #. type: =head2
-#: debhelper.pod:639
+#: debhelper.pod:663
 msgid "udebs"
 msgstr "udebs"
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:641
+#: debhelper.pod:665
 msgid ""
 "Debhelper includes support for udebs. To create a udeb with debhelper, add "
 "\"B<Package-Type: udeb>\" to the package's stanza in F<debian/control>.  "
@@ -1641,19 +1672,29 @@ msgstr ""
 
 # type: =head1
 #. type: =head1
-#: debhelper.pod:648
+#: debhelper.pod:672
 msgid "ENVIRONMENT"
 msgstr "VARIABLES D'ENVIRONNEMENT"
 
+#. type: textblock
+#: debhelper.pod:674
+msgid ""
+"The following environment variables can influence the behavior of "
+"debhelper.  It is important to note that these must be actual environment "
+"variables in order to function properly (not simply F<Makefile> variables). "
+"To specify them properly in F<debian/rules>, be sure to \"B<export>\" them. "
+"For example, \"B<export DH_VERBOSE>\"."
+msgstr ""
+
 # type: =item
 #. type: =item
-#: debhelper.pod:652
+#: debhelper.pod:682
 msgid "B<DH_VERBOSE>"
 msgstr "B<DH_VERBOSE>"
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:654
+#: debhelper.pod:684
 #, fuzzy
 #| msgid ""
 #| "Set to B<1> to enable verbose mode. Debhelper will output every command "
@@ -1667,13 +1708,31 @@ msgstr ""
 
 # type: =item
 #. type: =item
-#: debhelper.pod:657
+#: debhelper.pod:687
+#, fuzzy
+#| msgid "B<DH_COMPAT>"
+msgid "B<DH_QUIET>"
+msgstr "B<DH_COMPAT>"
+
+#. type: textblock
+#: debhelper.pod:689
+msgid ""
+"Set to B<1> to enable quiet mode. Debhelper will not output commands calling "
+"the upstream build system nor will dh print which subcommands are called and "
+"depending on the upstream build system might make that more quiet, too.  "
+"This makes it easier to spot important messages but makes the output quite "
+"useless as buildd log.  Ignored if DH_VERBOSE is also set."
+msgstr ""
+
+# type: =item
+#. type: =item
+#: debhelper.pod:696
 msgid "B<DH_COMPAT>"
 msgstr "B<DH_COMPAT>"
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:659
+#: debhelper.pod:698
 msgid ""
 "Temporarily specifies what compatibility level debhelper should run at, "
 "overriding any value in F<debian/compat>."
@@ -1683,25 +1742,25 @@ msgstr ""
 
 # type: =item
 #. type: =item
-#: debhelper.pod:662
+#: debhelper.pod:701
 msgid "B<DH_NO_ACT>"
 msgstr "B<DH_NO_ACT>"
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:664
+#: debhelper.pod:703
 msgid "Set to B<1> to enable no-act mode."
 msgstr "Mettre cette variable à B<1> pour activer le mode simulation (no-act)."
 
 # type: =item
 #. type: =item
-#: debhelper.pod:666
+#: debhelper.pod:705
 msgid "B<DH_OPTIONS>"
 msgstr "B<DH_OPTIONS>"
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:668
+#: debhelper.pod:707
 msgid ""
 "Anything in this variable will be prepended to the command line arguments of "
 "all debhelper commands."
@@ -1710,7 +1769,7 @@ msgstr ""
 "les commandes debhelper."
 
 #. type: textblock
-#: debhelper.pod:671
+#: debhelper.pod:710
 msgid ""
 "When using L<dh(1)>, it can be passed options that will be passed on to each "
 "debhelper command, which is generally better than using DH_OPTIONS."
@@ -1720,13 +1779,13 @@ msgstr ""
 
 # type: =item
 #. type: =item
-#: debhelper.pod:674
+#: debhelper.pod:713
 msgid "B<DH_ALWAYS_EXCLUDE>"
 msgstr "B<DH_ALWAYS_EXCLUDE>"
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:676
+#: debhelper.pod:715
 msgid ""
 "If set, this adds the value the variable is set to to the B<-X> options of "
 "all commands that support the B<-X> option. Moreover, B<dh_builddeb> will "
@@ -1739,7 +1798,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:680
+#: debhelper.pod:719
 msgid ""
 "This can be useful if you are doing a build from a CVS source tree, in which "
 "case setting B<DH_ALWAYS_EXCLUDE=CVS> will prevent any CVS directories from "
@@ -1758,7 +1817,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:687
+#: debhelper.pod:726
 msgid ""
 "Multiple things to exclude can be separated with colons, as in "
 "B<DH_ALWAYS_EXCLUDE=CVS:.svn>"
@@ -1768,20 +1827,20 @@ msgstr ""
 
 # type: =head1
 #. type: =head1
-#: debhelper.pod:692 dh:972 dh_auto_build:47 dh_auto_clean:50
-#: dh_auto_configure:52 dh_auto_install:92 dh_auto_test:63 dh_bugfiles:124
-#: dh_builddeb:124 dh_clean:147 dh_compress:210 dh_desktop:31 dh_fixperms:131
-#: dh_gconf:101 dh_gencontrol:78 dh_icons:71 dh_install:260
-#: dh_installcatalogs:122 dh_installchangelogs:241 dh_installcron:79
-#: dh_installdeb:142 dh_installdebconf:128 dh_installdirs:88
-#: dh_installdocs:337 dh_installemacsen:141 dh_installexamples:108
+#: debhelper.pod:731 dh:974 dh_auto_build:47 dh_auto_clean:50
+#: dh_auto_configure:52 dh_auto_install:92 dh_auto_test:62 dh_bugfiles:130
+#: dh_builddeb:154 dh_clean:150 dh_compress:212 dh_desktop:31 dh_fixperms:142
+#: dh_gconf:97 dh_gencontrol:148 dh_icons:71 dh_install:281
+#: dh_installcatalogs:122 dh_installchangelogs:240 dh_installcron:79
+#: dh_installdeb:147 dh_installdebconf:127 dh_installdirs:88
+#: dh_installdocs:351 dh_installemacsen:142 dh_installexamples:109
 #: dh_installifupdown:71 dh_installinfo:77 dh_installinit:324
 #: dh_installlogcheck:80 dh_installlogrotate:52 dh_installman:263
-#: dh_installmanpages:197 dh_installmenu:89 dh_installmime:63
+#: dh_installmanpages:197 dh_installmenu:89 dh_installmime:64
 #: dh_installmodules:115 dh_installpam:61 dh_installppp:67 dh_installudev:117
-#: dh_installwm:110 dh_installxfonts:89 dh_link:228 dh_lintian:59
-#: dh_listpackages:30 dh_makeshlibs:264 dh_md5sums:90 dh_movefiles:170
-#: dh_perl:152 dh_prep:60 dh_scrollkeeper:28 dh_shlibdeps:152 dh_strip:242
+#: dh_installwm:114 dh_installxfonts:89 dh_link:145 dh_lintian:59
+#: dh_listpackages:30 dh_makeshlibs:280 dh_md5sums:107 dh_movefiles:170
+#: dh_perl:152 dh_prep:60 dh_scrollkeeper:28 dh_shlibdeps:152 dh_strip:345
 #: dh_suidregister:117 dh_testdir:53 dh_testroot:27 dh_undocumented:28
 #: dh_usrlocal:116
 msgid "SEE ALSO"
@@ -1789,20 +1848,20 @@ msgstr "VOIR AUSSI"
 
 # type: =item
 #. type: =item
-#: debhelper.pod:696
+#: debhelper.pod:735
 msgid "F</usr/share/doc/debhelper/examples/>"
 msgstr "F</usr/share/doc/debhelper/examples/>"
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:698
+#: debhelper.pod:737
 msgid "A set of example F<debian/rules> files that use debhelper."
 msgstr ""
 "Un ensemble d'exemples de fichiers F<debian/rules> qui utilisent debhelper."
 
 # type: =item
 #. type: =item
-#: debhelper.pod:700
+#: debhelper.pod:739
 #, fuzzy
 #| msgid "L<http://kitenet.net/~joey/code/debhelper/>"
 msgid "L<http://joeyh.name/code/debhelper/>"
@@ -1810,44 +1869,44 @@ msgstr "L<http://kitenet.net/~joey/code/debhelper/>"
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:702
+#: debhelper.pod:741
 msgid "Debhelper web site."
 msgstr "Le site internet de debhelper."
 
 # type: =head1
 #. type: =head1
-#: debhelper.pod:706 dh:978 dh_auto_build:53 dh_auto_clean:56
-#: dh_auto_configure:58 dh_auto_install:98 dh_auto_test:69 dh_bugfiles:132
-#: dh_builddeb:130 dh_clean:153 dh_compress:216 dh_desktop:37 dh_fixperms:137
-#: dh_gconf:107 dh_gencontrol:84 dh_icons:77 dh_install:266
-#: dh_installcatalogs:128 dh_installchangelogs:247 dh_installcron:85
-#: dh_installdeb:148 dh_installdebconf:134 dh_installdirs:94
-#: dh_installdocs:343 dh_installemacsen:148 dh_installexamples:114
+#: debhelper.pod:745 dh:980 dh_auto_build:53 dh_auto_clean:56
+#: dh_auto_configure:58 dh_auto_install:98 dh_auto_test:68 dh_bugfiles:138
+#: dh_builddeb:160 dh_clean:156 dh_compress:218 dh_desktop:37 dh_fixperms:148
+#: dh_gconf:103 dh_gencontrol:154 dh_icons:77 dh_install:287
+#: dh_installcatalogs:128 dh_installchangelogs:246 dh_installcron:85
+#: dh_installdeb:153 dh_installdebconf:133 dh_installdirs:94
+#: dh_installdocs:357 dh_installemacsen:149 dh_installexamples:115
 #: dh_installifupdown:77 dh_installinfo:83 dh_installlogcheck:86
 #: dh_installlogrotate:58 dh_installman:269 dh_installmanpages:203
-#: dh_installmenu:97 dh_installmime:69 dh_installmodules:121 dh_installpam:67
-#: dh_installppp:73 dh_installudev:123 dh_installwm:116 dh_installxfonts:95
-#: dh_link:234 dh_lintian:67 dh_listpackages:36 dh_makeshlibs:270
-#: dh_md5sums:96 dh_movefiles:176 dh_perl:158 dh_prep:66 dh_scrollkeeper:34
-#: dh_shlibdeps:158 dh_strip:248 dh_suidregister:123 dh_testdir:59
+#: dh_installmenu:97 dh_installmime:70 dh_installmodules:121 dh_installpam:67
+#: dh_installppp:73 dh_installudev:123 dh_installwm:120 dh_installxfonts:95
+#: dh_link:151 dh_lintian:67 dh_listpackages:36 dh_makeshlibs:286
+#: dh_md5sums:113 dh_movefiles:176 dh_perl:158 dh_prep:66 dh_scrollkeeper:34
+#: dh_shlibdeps:158 dh_strip:351 dh_suidregister:123 dh_testdir:59
 #: dh_testroot:33 dh_undocumented:34 dh_usrlocal:122
 msgid "AUTHOR"
 msgstr "AUTEUR"
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:708 dh:980 dh_auto_build:55 dh_auto_clean:58
-#: dh_auto_configure:60 dh_auto_install:100 dh_auto_test:71 dh_builddeb:132
-#: dh_clean:155 dh_compress:218 dh_fixperms:139 dh_gencontrol:86
-#: dh_install:268 dh_installchangelogs:249 dh_installcron:87 dh_installdeb:150
-#: dh_installdebconf:136 dh_installdirs:96 dh_installdocs:345
-#: dh_installemacsen:150 dh_installexamples:116 dh_installifupdown:79
+#: debhelper.pod:747 dh:982 dh_auto_build:55 dh_auto_clean:58
+#: dh_auto_configure:60 dh_auto_install:100 dh_auto_test:70 dh_builddeb:162
+#: dh_clean:158 dh_compress:220 dh_fixperms:150 dh_gencontrol:156
+#: dh_install:289 dh_installchangelogs:248 dh_installcron:87 dh_installdeb:155
+#: dh_installdebconf:135 dh_installdirs:96 dh_installdocs:359
+#: dh_installemacsen:151 dh_installexamples:117 dh_installifupdown:79
 #: dh_installinfo:85 dh_installinit:332 dh_installlogrotate:60
 #: dh_installman:271 dh_installmanpages:205 dh_installmenu:99
-#: dh_installmime:71 dh_installmodules:123 dh_installpam:69 dh_installppp:75
-#: dh_installudev:125 dh_installwm:118 dh_installxfonts:97 dh_link:236
-#: dh_listpackages:38 dh_makeshlibs:272 dh_md5sums:98 dh_movefiles:178
-#: dh_prep:68 dh_shlibdeps:160 dh_strip:250 dh_suidregister:125 dh_testdir:61
+#: dh_installmime:72 dh_installmodules:123 dh_installpam:69 dh_installppp:75
+#: dh_installudev:125 dh_installwm:122 dh_installxfonts:97 dh_link:153
+#: dh_listpackages:38 dh_makeshlibs:288 dh_md5sums:115 dh_movefiles:178
+#: dh_prep:68 dh_shlibdeps:160 dh_strip:353 dh_suidregister:125 dh_testdir:61
 #: dh_testroot:35 dh_undocumented:36
 msgid "Joey Hess <joeyh@debian.org>"
 msgstr "Joey Hess <joeyh@debian.org>"
@@ -1943,15 +2002,15 @@ msgstr ""
 # type: =head1
 #. type: =head1
 #: dh:41 dh_auto_build:28 dh_auto_clean:30 dh_auto_configure:31
-#: dh_auto_install:43 dh_auto_test:31 dh_bugfiles:50 dh_builddeb:24
-#: dh_clean:41 dh_compress:48 dh_fixperms:32 dh_gconf:39 dh_gencontrol:26
+#: dh_auto_install:43 dh_auto_test:31 dh_bugfiles:50 dh_builddeb:25
+#: dh_clean:41 dh_compress:48 dh_fixperms:32 dh_gconf:39 dh_gencontrol:33
 #: dh_icons:30 dh_install:59 dh_installcatalogs:49 dh_installchangelogs:59
 #: dh_installcron:40 dh_installdebconf:61 dh_installdirs:31 dh_installdocs:71
 #: dh_installemacsen:53 dh_installexamples:32 dh_installifupdown:39
 #: dh_installinfo:31 dh_installinit:59 dh_installlogcheck:42
 #: dh_installlogrotate:22 dh_installman:61 dh_installmanpages:40
 #: dh_installmenu:41 dh_installmodules:38 dh_installpam:31 dh_installppp:35
-#: dh_installudev:35 dh_installwm:34 dh_link:53 dh_makeshlibs:43 dh_md5sums:28
+#: dh_installudev:35 dh_installwm:34 dh_link:53 dh_makeshlibs:47 dh_md5sums:28
 #: dh_movefiles:38 dh_perl:31 dh_prep:26 dh_shlibdeps:26 dh_strip:35
 #: dh_testdir:23 dh_usrlocal:39
 msgid "OPTIONS"
@@ -2033,7 +2092,7 @@ msgstr ""
 
 # type: =head1
 #. type: =head1
-#: dh:77 dh_installdocs:110 dh_link:75 dh_makeshlibs:97 dh_shlibdeps:70
+#: dh:77 dh_installdocs:120 dh_link:75 dh_makeshlibs:101 dh_shlibdeps:70
 msgid "EXAMPLES"
 msgstr "EXEMPLES"
 
@@ -2623,37 +2682,37 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
-#: dh:974 dh_auto_build:49 dh_auto_clean:52 dh_auto_configure:54
-#: dh_auto_install:94 dh_auto_test:65 dh_builddeb:126 dh_clean:149
-#: dh_compress:212 dh_fixperms:133 dh_gconf:103 dh_gencontrol:80
-#: dh_install:262 dh_installcatalogs:124 dh_installchangelogs:243
-#: dh_installcron:81 dh_installdeb:144 dh_installdebconf:130 dh_installdirs:90
-#: dh_installdocs:339 dh_installexamples:110 dh_installifupdown:73
+#: dh:976 dh_auto_build:49 dh_auto_clean:52 dh_auto_configure:54
+#: dh_auto_install:94 dh_auto_test:64 dh_builddeb:156 dh_clean:152
+#: dh_compress:214 dh_fixperms:144 dh_gconf:99 dh_gencontrol:150
+#: dh_install:283 dh_installcatalogs:124 dh_installchangelogs:242
+#: dh_installcron:81 dh_installdeb:149 dh_installdebconf:129 dh_installdirs:90
+#: dh_installdocs:353 dh_installexamples:111 dh_installifupdown:73
 #: dh_installinfo:79 dh_installinit:326 dh_installlogcheck:82
 #: dh_installlogrotate:54 dh_installman:265 dh_installmanpages:199
-#: dh_installmime:65 dh_installmodules:117 dh_installpam:63 dh_installppp:69
-#: dh_installudev:119 dh_installwm:112 dh_installxfonts:91 dh_link:230
-#: dh_listpackages:32 dh_makeshlibs:266 dh_md5sums:92 dh_movefiles:172
-#: dh_perl:154 dh_prep:62 dh_strip:244 dh_suidregister:119 dh_testdir:55
+#: dh_installmime:66 dh_installmodules:117 dh_installpam:63 dh_installppp:69
+#: dh_installudev:119 dh_installwm:116 dh_installxfonts:91 dh_link:147
+#: dh_listpackages:32 dh_makeshlibs:282 dh_md5sums:109 dh_movefiles:172
+#: dh_perl:154 dh_prep:62 dh_strip:347 dh_suidregister:119 dh_testdir:55
 #: dh_testroot:29 dh_undocumented:30 dh_usrlocal:118
 msgid "L<debhelper(7)>"
 msgstr "L<debhelper(7)>"
 
 # type: textblock
 #. type: textblock
-#: dh:976 dh_auto_build:51 dh_auto_clean:54 dh_auto_configure:56
-#: dh_auto_install:96 dh_auto_test:67 dh_bugfiles:130 dh_builddeb:128
-#: dh_clean:151 dh_compress:214 dh_desktop:35 dh_fixperms:135 dh_gconf:105
-#: dh_gencontrol:82 dh_icons:75 dh_install:264 dh_installchangelogs:245
-#: dh_installcron:83 dh_installdeb:146 dh_installdebconf:132 dh_installdirs:92
-#: dh_installdocs:341 dh_installemacsen:146 dh_installexamples:112
+#: dh:978 dh_auto_build:51 dh_auto_clean:54 dh_auto_configure:56
+#: dh_auto_install:96 dh_auto_test:66 dh_bugfiles:136 dh_builddeb:158
+#: dh_clean:154 dh_compress:216 dh_desktop:35 dh_fixperms:146 dh_gconf:101
+#: dh_gencontrol:152 dh_icons:75 dh_install:285 dh_installchangelogs:244
+#: dh_installcron:83 dh_installdeb:151 dh_installdebconf:131 dh_installdirs:92
+#: dh_installdocs:355 dh_installemacsen:147 dh_installexamples:113
 #: dh_installifupdown:75 dh_installinfo:81 dh_installinit:328
 #: dh_installlogrotate:56 dh_installman:267 dh_installmanpages:201
-#: dh_installmenu:95 dh_installmime:67 dh_installmodules:119 dh_installpam:65
-#: dh_installppp:71 dh_installudev:121 dh_installwm:114 dh_installxfonts:93
-#: dh_link:232 dh_lintian:63 dh_listpackages:34 dh_makeshlibs:268
-#: dh_md5sums:94 dh_movefiles:174 dh_perl:156 dh_prep:64 dh_scrollkeeper:32
-#: dh_shlibdeps:156 dh_strip:246 dh_suidregister:121 dh_testdir:57
+#: dh_installmenu:95 dh_installmime:68 dh_installmodules:119 dh_installpam:65
+#: dh_installppp:71 dh_installudev:121 dh_installwm:118 dh_installxfonts:93
+#: dh_link:149 dh_lintian:63 dh_listpackages:34 dh_makeshlibs:284
+#: dh_md5sums:111 dh_movefiles:174 dh_perl:156 dh_prep:64 dh_scrollkeeper:32
+#: dh_shlibdeps:156 dh_strip:349 dh_suidregister:121 dh_testdir:57
 #: dh_testroot:31 dh_undocumented:32 dh_usrlocal:120
 msgid "This program is a part of debhelper."
 msgstr "Ce programme fait partie de debhelper."
@@ -2719,8 +2778,8 @@ msgstr ""
 # type: =item
 #. type: =item
 #: dh_auto_build:35 dh_auto_clean:37 dh_auto_configure:38 dh_auto_install:56
-#: dh_auto_test:38 dh_builddeb:38 dh_gencontrol:30 dh_installdebconf:69
-#: dh_installinit:105 dh_makeshlibs:91 dh_shlibdeps:37
+#: dh_auto_test:38 dh_builddeb:39 dh_gencontrol:37 dh_installdebconf:69
+#: dh_installinit:105 dh_makeshlibs:95 dh_shlibdeps:37
 msgid "B<--> I<params>"
 msgstr "B<--> I<paramètres>"
 
@@ -2953,7 +3012,7 @@ msgstr ""
 
 # type: =item
 #. type: =item
-#: dh_auto_install:50 dh_builddeb:28
+#: dh_auto_install:50 dh_builddeb:29
 msgid "B<--destdir=>I<directory>"
 msgstr "B<--destdir=>I<répertoire>"
 
@@ -3094,7 +3153,7 @@ msgstr ""
 #: dh_installinfo:21 dh_installinit:27 dh_installlogcheck:21 dh_installman:51
 #: dh_installmenu:25 dh_installmime:21 dh_installmodules:28 dh_installpam:21
 #: dh_installppp:21 dh_installudev:25 dh_installwm:24 dh_link:41 dh_lintian:21
-#: dh_makeshlibs:29 dh_movefiles:26
+#: dh_makeshlibs:24 dh_movefiles:26
 msgid "FILES"
 msgstr "FICHIERS"
 
@@ -3177,19 +3236,19 @@ msgstr ""
 
 # type: =item
 #. type: textblock
-#: dh_bugfiles:126
+#: dh_bugfiles:132
 msgid "F</usr/share/doc/reportbug/README.developers.gz>"
 msgstr "F</usr/share/doc/reportbug/README.developers.gz>"
 
 # type: textblock
 #. type: textblock
-#: dh_bugfiles:128 dh_lintian:61
+#: dh_bugfiles:134 dh_lintian:61
 msgid "L<debhelper(1)>"
 msgstr "L<debhelper(1)>"
 
 # type: textblock
 #. type: textblock
-#: dh_bugfiles:134
+#: dh_bugfiles:140
 msgid "Modestas Vainius <modestas@vainius.eu>"
 msgstr "Modestas Vainius <modestas@vainius.eu>"
 
@@ -3212,15 +3271,20 @@ msgstr ""
 # type: textblock
 #. type: textblock
 #: dh_builddeb:18
+#, fuzzy
+#| msgid ""
+#| "B<dh_builddeb> simply calls L<dpkg-deb(1)> to build a Debian package or "
+#| "packages."
 msgid ""
 "B<dh_builddeb> simply calls L<dpkg-deb(1)> to build a Debian package or "
-"packages."
+"packages.  It will also build packages for ddebs when L<dh_strip(1)> and "
+"L<dh_gencontrol(1)> have prepared them."
 msgstr ""
 "B<dh_builddeb> fait simplement appel à L<dpkg-deb(1)> pour construire un ou "
 "plusieurs paquets Debian."
 
 #. type: textblock
-#: dh_builddeb:21
+#: dh_builddeb:22
 msgid ""
 "It supports building multiple binary packages in parallel, when enabled by "
 "DEB_BUILD_OPTIONS."
@@ -3230,7 +3294,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
-#: dh_builddeb:30
+#: dh_builddeb:31
 msgid ""
 "Use this if you want the generated F<.deb> files to be put in a directory "
 "other than the default of \"F<..>\"."
@@ -3240,13 +3304,13 @@ msgstr ""
 
 # type: =item
 #. type: =item
-#: dh_builddeb:33
+#: dh_builddeb:34
 msgid "B<--filename=>I<name>"
 msgstr "B<--filename=>I<nom>"
 
 # type: textblock
 #. type: textblock
-#: dh_builddeb:35
+#: dh_builddeb:36
 msgid ""
 "Use this if you want to force the generated .deb file to have a particular "
 "file name. Does not work well if more than one .deb is generated!"
@@ -3256,19 +3320,19 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
-#: dh_builddeb:40
+#: dh_builddeb:41
 msgid "Pass I<params> to L<dpkg-deb(1)> when it is used to build the package."
 msgstr ""
 "Fournit les I<paramètres> à L<dpkg-deb(1)> lors de la construction du paquet."
 
 # type: =item
 #. type: =item
-#: dh_builddeb:43
+#: dh_builddeb:44
 msgid "B<-u>I<params>"
 msgstr "B<-u> I<paramètres>"
 
 #. type: textblock
-#: dh_builddeb:45
+#: dh_builddeb:46
 msgid ""
 "This is another way to pass I<params> to L<dpkg-deb(1)>.  It is deprecated; "
 "use B<--> instead."
@@ -3397,7 +3461,7 @@ msgstr ""
 
 # type: =item
 #. type: =item
-#: dh_clean:60 dh_compress:64 dh_installdocs:103 dh_installexamples:46
+#: dh_clean:60 dh_compress:64 dh_installdocs:113 dh_installexamples:46
 #: dh_installinfo:40 dh_installmanpages:44 dh_movefiles:55 dh_testdir:27
 msgid "I<file> ..."
 msgstr "I<fichier> ..."
@@ -3525,7 +3589,7 @@ msgstr "Ajoute ces fichiers à la liste des fichiers à compresser."
 
 # type: =head1
 #. type: =head1
-#: dh_compress:70 dh_perl:61 dh_strip:74 dh_usrlocal:55
+#: dh_compress:70 dh_perl:61 dh_strip:113 dh_usrlocal:55
 msgid "CONFORMS TO"
 msgstr "CONFORMITÉ"
 
@@ -3738,7 +3802,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
-#: dh_gconf:109
+#: dh_gconf:105
 msgid "Ross Burton <ross@burtonini.com> Josselin Mouette <joss@debian.org>"
 msgstr "Ross Burton <ross@burtonini.com> Josselin Mouette <joss@debian.org>"
 
@@ -3769,29 +3833,44 @@ msgstr ""
 # type: textblock
 #. type: textblock
 #: dh_gencontrol:22
+#, fuzzy
+#| msgid ""
+#| "This program is merely a wrapper around L<dpkg-gencontrol(1)>, which "
+#| "calls it once for each package being acted on, and passes in some "
+#| "additional useful flags."
 msgid ""
 "This program is merely a wrapper around L<dpkg-gencontrol(1)>, which calls "
-"it once for each package being acted on, and passes in some additional "
-"useful flags."
+"it once for each package being acted on (plus related ddebs), and passes in "
+"some additional useful flags."
 msgstr ""
 "Ce programme est simplement une encapsulation de L<dpkg-gencontrol(1)>. "
 "dh_gencontrol l'invoque pour chacun des paquets construits, et lui transmet "
 "quelques options utiles."
 
+#. type: textblock
+#: dh_gencontrol:26
+msgid ""
+"B<Note> that if you use B<dh_gencontrol>, you must also use "
+"L<dh_builddeb(1)> to build the packages.  Otherwise, your build may fail to "
+"build as B<dh_gencontrol> (via L<dpkg-gencontrol(1)>) declares which "
+"packages are built.  As debhelper automatically generates ddebs, it some "
+"times adds additional packages, which will be built by L<dh_builddeb(1)>."
+msgstr ""
+
 # type: textblock
 #. type: textblock
-#: dh_gencontrol:32
+#: dh_gencontrol:39
 msgid "Pass I<params> to L<dpkg-gencontrol(1)>."
 msgstr "Fournit I<paramètres> à L<dpkg-gencontrol(1)>."
 
 # type: =item
 #. type: =item
-#: dh_gencontrol:34
+#: dh_gencontrol:41
 msgid "B<-u>I<params>, B<--dpkg-gencontrol-params=>I<params>"
 msgstr "B<-u>I<paramètres>, B<--dpkg-gencontrol-params=>I<paramètres>"
 
 #. type: textblock
-#: dh_gencontrol:36
+#: dh_gencontrol:43
 msgid ""
 "This is another way to pass I<params> to L<dpkg-gencontrol(1)>.  It is "
 "deprecated; use B<--> instead."
@@ -3856,7 +3935,7 @@ msgstr ""
 #. type: =item
 #: dh_icons:34 dh_installcatalogs:53 dh_installdebconf:65 dh_installemacsen:57
 #: dh_installinit:63 dh_installmenu:45 dh_installmodules:42 dh_installudev:49
-#: dh_installwm:44 dh_makeshlibs:77 dh_usrlocal:43
+#: dh_installwm:44 dh_makeshlibs:81 dh_usrlocal:43
 msgid "B<-n>, B<--noscripts>"
 msgstr "B<-n>, B<--noscripts>"
 
@@ -4151,24 +4230,70 @@ msgstr ""
 
 # type: =head1
 #. type: =head1
-#: dh_install:254
+#: dh_install:256
 msgid "LIMITATIONS"
 msgstr "LIMITES"
 
 # type: verbatim
+#. type: textblock
+#: dh_install:258
+#, fuzzy
+#| msgid ""
+#| "B<dh_install> cannot rename files or directories, it can only install "
+#| "them\n"
+#| "with the names they already have into wherever you want in the package\n"
+#| "build tree.\n"
+#| "  \n"
+msgid ""
+"B<dh_install> cannot rename files or directories, it can only install them "
+"with the names they already have into wherever you want in the package build "
+"tree."
+msgstr ""
+"B<dh_install> ne peut pas renommer les fichiers ou les répertoires, il peut "
+"seulement\n"
+"les implanter n'importe où dans l'arbre de construction du paquet mais avec "
+"le nom\n"
+"qu'ils possèdent déjà.\n"
+"\n"
+
+#. type: textblock
+#: dh_install:262
+msgid ""
+"However, renaming can be achieved by using B<dh-exec> with compatibility "
+"level 9 or later.  An example debian/I<package>.install file using B<dh-"
+"exec> could look like:"
+msgstr ""
+
 #. type: verbatim
-#: dh_install:256
+#: dh_install:266
 #, no-wrap
 msgid ""
-"B<dh_install> cannot rename files or directories, it can only install them\n"
-"with the names they already have into wherever you want in the package\n"
-"build tree.\n"
-"  \n"
-msgstr ""
-"B<dh_install> ne peut pas renommer les fichiers ou les répertoires, il peut seulement\n"
-"les implanter n'importe où dans l'arbre de construction du paquet mais avec le nom\n"
-"qu'ils possèdent déjà.\n"
+" #!/usr/bin/dh-exec\n"
+" debian/default.conf => /etc/my-package/start.conf\n"
 "\n"
+msgstr ""
+
+#. type: textblock
+#: dh_install:269
+msgid "Please remember the following three things:"
+msgstr ""
+
+#. type: =item
+#: dh_install:273
+msgid ""
+"* The package must be using compatibility level 9 or later (see "
+"L<debhelper(7)>)"
+msgstr ""
+
+#. type: =item
+#: dh_install:275
+msgid "* The package will need a build-dependency on dh-exec."
+msgstr ""
+
+#. type: =item
+#: dh_install:277
+msgid "* The install file must be marked as executable."
+msgstr ""
 
 # type: textblock
 #. type: textblock
@@ -4264,9 +4389,8 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
-#: dh_installcatalogs:61 dh_installdocs:127 dh_installemacsen:74
-#: dh_installinit:142 dh_installmodules:56 dh_installudev:57 dh_installwm:56
-#: dh_usrlocal:51
+#: dh_installcatalogs:61 dh_installemacsen:74 dh_installinit:142
+#: dh_installmodules:56 dh_installudev:57 dh_installwm:56 dh_usrlocal:51
 msgid ""
 "Note that this command is not idempotent. L<dh_prep(1)> should be called "
 "between invocations of this command. Otherwise, it may cause multiple "
@@ -4616,21 +4740,28 @@ msgstr "I<paquet>.shlibs"
 msgid "These control files are installed into the F<DEBIAN> directory."
 msgstr "Ces fichiers de contrôle sont installés dans le répertoire F<DEBIAN>."
 
+#. type: textblock
+#: dh_installdeb:45
+msgid ""
+"Note that I<package>.shlibs is only installed in compat level 9 and "
+"earlier.  In compat 10, please use L<dh_makeshlibs(1)>."
+msgstr ""
+
 # type: =item
 #. type: =item
-#: dh_installdeb:45
+#: dh_installdeb:48
 msgid "I<package>.conffiles"
 msgstr "I<paquet>.conffiles"
 
 # type: textblock
 #. type: textblock
-#: dh_installdeb:47
+#: dh_installdeb:50
 msgid "This control file will be installed into the F<DEBIAN> directory."
 msgstr "Ce fichier de contrôle sera installé dans le répertoire F<DEBIAN>."
 
 # type: textblock
 #. type: textblock
-#: dh_installdeb:49
+#: dh_installdeb:52
 msgid ""
 "In v3 compatibility mode and higher, all files in the F<etc/> directory in a "
 "package will automatically be flagged as conffiles by this program, so there "
@@ -4642,12 +4773,12 @@ msgstr ""
 
 # type: =item
 #. type: =item
-#: dh_installdeb:53
+#: dh_installdeb:56
 msgid "I<package>.maintscript"
 msgstr "I<paquet>.maintscript"
 
 #. type: textblock
-#: dh_installdeb:55
+#: dh_installdeb:58
 msgid ""
 "Lines in this file correspond to L<dpkg-maintscript-helper(1)> commands and "
 "parameters.  Any shell metacharacters will be escaped, so arbitrary shell "
@@ -5105,9 +5236,25 @@ msgstr ""
 "possible, est de faire du répertoire de documentation un lien symbolique "
 "« en l'air » avant l'appel à B<dh_installdocs>.)"
 
+#. type: textblock
+#: dh_installdocs:103
+msgid ""
+"B<CAVEAT>: If a previous version of the package was built without this "
+"option and is now built with it (or vice-versa), it requries a \"dir to "
+"symlink\" (or \"symlink to dir\") migration.  Since debhelper has no "
+"knowledge of previous versions, you have to enable this migration itself."
+msgstr ""
+
+#. type: textblock
+#: dh_installdocs:109
+msgid ""
+"This can be done by providing a \"debian/I<package>.maintscript\" file and "
+"using L<dh_installdeb(1)> to provide the relevant maintainer script snippets."
+msgstr ""
+
 # type: textblock
 #. type: textblock
-#: dh_installdocs:105
+#: dh_installdocs:115
 msgid ""
 "Install these files as documentation into the first package acted on. (Or in "
 "all packages if B<-A> is specified)."
@@ -5117,13 +5264,13 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
-#: dh_installdocs:112
+#: dh_installdocs:122
 msgid "This is an example of a F<debian/package.docs> file:"
 msgstr "Voici un exemple de fichier F<debian/paquet.docs> :"
 
 # type: verbatim
 #. type: verbatim
-#: dh_installdocs:114
+#: dh_installdocs:124
 #, no-wrap
 msgid ""
 "  README\n"
@@ -5144,7 +5291,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
-#: dh_installdocs:123
+#: dh_installdocs:133
 msgid ""
 "Note that B<dh_installdocs> will happily copy entire directory hierarchies "
 "if you ask it to (similar to B<cp -a>). If it is asked to install a "
@@ -5314,7 +5461,7 @@ msgstr ""
 "B<xemacs> et B<emacs20>."
 
 #. type: textblock
-#: dh_installemacsen:143
+#: dh_installemacsen:144
 msgid "L<debhelper(7)> L</usr/share/doc/emacsen-common/debian-emacs-policy.gz>"
 msgstr ""
 
@@ -6347,7 +6494,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
-#: dh_installmenu:47 dh_makeshlibs:79
+#: dh_installmenu:47 dh_makeshlibs:83
 msgid "Do not modify F<postinst>/F<postrm> scripts."
 msgstr ""
 "Empêche la modification des scripts de maintenance du paquet F<postinst> et "
@@ -7190,35 +7337,44 @@ msgstr ""
 "maintenance F<postinst> et F<postrm> (en mode v3 et suivants seulement) pour "
 "tous les paquets où des bibliothèques partagées ont été trouvées."
 
+# type: =item
+#. type: =item
+#: dh_makeshlibs:28
+#, fuzzy
+#| msgid "debian/I<package>.links"
+msgid "debian/I<package>.shlibs"
+msgstr "debian/I<paquet>.links"
+
 #. type: textblock
-#: dh_makeshlibs:24
+#: dh_makeshlibs:30
 msgid ""
-"Packages that support multiarch are detected, and a Pre-Dependency on "
-"multiarch-support is set in ${misc:Pre-Depends} ; you should make sure to "
-"put that token into an appropriate place in your debian/control file for "
-"packages supporting multiarch."
+"Installs this file, if present, into the package as DEBIAN/shlibs.  If "
+"omitted, debhelper will generate a shlibs file automatically if it detects "
+"any libraries."
+msgstr ""
+
+#. type: textblock
+#: dh_makeshlibs:34
+msgid ""
+"Note in compat levels 9 and earlier, this file was installed by "
+"L<dh_installdeb(1)> rather than B<dh_makeshlibs>."
 msgstr ""
-"Les paquets prenant en charge le multiarchitecture sont détectés et une "
-"prédépendance sur B<multiarch-support> est placée dans B<${misc:Pre-Depends}"
-"> ; il faut s'assurer que cet item a été placé au bon endroit dans le "
-"fichier F<debian/control> pour les paquet prenant en charge le "
-"multiarchitecture."
 
 # type: =item
 #. type: =item
-#: dh_makeshlibs:33
+#: dh_makeshlibs:37
 msgid "debian/I<package>.symbols"
 msgstr "debian/I<paquet>.symbols"
 
 # type: =item
 #. type: =item
-#: dh_makeshlibs:35
+#: dh_makeshlibs:39
 msgid "debian/I<package>.symbols.I<arch>"
 msgstr "debian/I<paquet>.symbols.I<arch>"
 
 # type: textblock
 #. type: textblock
-#: dh_makeshlibs:37
+#: dh_makeshlibs:41
 msgid ""
 "These symbols files, if present, are passed to L<dpkg-gensymbols(1)> to be "
 "processed and installed. Use the I<arch> specific names if you need to "
@@ -7231,13 +7387,13 @@ msgstr ""
 
 # type: =item
 #. type: =item
-#: dh_makeshlibs:47
+#: dh_makeshlibs:51
 msgid "B<-m>I<major>, B<--major=>I<major>"
 msgstr "B<-m>I<numéro-majeur>, B<--major=>I<numéro-majeur>"
 
 # type: textblock
 #. type: textblock
-#: dh_makeshlibs:49
+#: dh_makeshlibs:53
 msgid ""
 "Instead of trying to guess the major number of the library with objdump, use "
 "the major number specified after the -m parameter. This is much less useful "
@@ -7252,19 +7408,19 @@ msgstr ""
 
 # type: =item
 #. type: =item
-#: dh_makeshlibs:54
+#: dh_makeshlibs:58
 msgid "B<-V>, B<-V>I<dependencies>"
 msgstr "B<-V>, B<-V>I<dépendances>"
 
 # type: =item
 #. type: =item
-#: dh_makeshlibs:56
+#: dh_makeshlibs:60
 msgid "B<--version-info>, B<--version-info=>I<dependencies>"
 msgstr "B<--version-info>, B<--version-info=>I<dépendances>"
 
 # type: textblock
 #. type: textblock
-#: dh_makeshlibs:58
+#: dh_makeshlibs:62
 msgid ""
 "By default, the shlibs file generated by this program does not make packages "
 "depend on any particular version of the package containing the shared "
@@ -7291,7 +7447,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
-#: dh_makeshlibs:69
+#: dh_makeshlibs:73
 msgid ""
 "Beware of using B<-V> without any parameters; this is a conservative setting "
 "that always ensures that other packages' shared library dependencies are at "
@@ -7311,7 +7467,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
-#: dh_makeshlibs:83
+#: dh_makeshlibs:87
 msgid ""
 "Exclude files that contain I<item> anywhere in their filename or directory "
 "from being treated as shared libraries."
@@ -7321,13 +7477,13 @@ msgstr ""
 
 # type: =item
 #. type: =item
-#: dh_makeshlibs:86
+#: dh_makeshlibs:90
 msgid "B<--add-udeb=>I<udeb>"
 msgstr "B<--add-udeb=>I<udeb>"
 
 # type: textblock
 #. type: textblock
-#: dh_makeshlibs:88
+#: dh_makeshlibs:92
 msgid ""
 "Create an additional line for udebs in the shlibs file and use I<udeb> as "
 "the package name for udebs to depend on instead of the regular library "
@@ -7339,19 +7495,19 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
-#: dh_makeshlibs:93
+#: dh_makeshlibs:97
 msgid "Pass I<params> to L<dpkg-gensymbols(1)>."
 msgstr "Fournit I<paramètres> à L<dpkg-gensymbols(1)>."
 
 # type: =item
 #. type: =item
-#: dh_makeshlibs:101
+#: dh_makeshlibs:105
 msgid "B<dh_makeshlibs>"
 msgstr "B<dh_makeshlibs>"
 
 # type: verbatim
 #. type: verbatim
-#: dh_makeshlibs:103
+#: dh_makeshlibs:107
 #, no-wrap
 msgid ""
 "Assuming this is a package named F<libfoobar1>, generates a shlibs file that\n"
@@ -7366,13 +7522,13 @@ msgstr ""
 
 # type: =item
 #. type: =item
-#: dh_makeshlibs:107
+#: dh_makeshlibs:111
 msgid "B<dh_makeshlibs -V>"
 msgstr "B<dh_makeshlibs -V>"
 
 # type: verbatim
 #. type: verbatim
-#: dh_makeshlibs:109
+#: dh_makeshlibs:113
 #, no-wrap
 msgid ""
 "Assuming the current version of the package is 1.1-3, generates a shlibs\n"
@@ -7386,13 +7542,13 @@ msgstr ""
 
 # type: =item
 #. type: =item
-#: dh_makeshlibs:113
+#: dh_makeshlibs:117
 msgid "B<dh_makeshlibs -V 'libfoobar1 (E<gt>= 1.0)'>"
 msgstr "B<dh_makeshlibs -V `libtoto1 (E<gt>= 1.0)'>"
 
 # type: verbatim
 #. type: verbatim
-#: dh_makeshlibs:115
+#: dh_makeshlibs:119
 #, no-wrap
 msgid ""
 "Generates a shlibs file that looks something like:\n"
@@ -8125,10 +8281,20 @@ msgstr ""
 msgid "B<--dbg-package=>I<package>"
 msgstr "B<--dbg-package=>I<paquet>"
 
-# type: textblock
 #. type: textblock
 #: dh_strip:47
 msgid ""
+"B<This option is a now special purpose option that you normally do not "
+"need>.  In most cases, there should be little reason to use this option for "
+"new source packages as debhelper generates automatic debug packages (\"ddebs"
+"\").  B<If you have a manual --dbg-package> that you want to migrate to the "
+"automatic ddeb, please see the B<--ddeb-migration> option."
+msgstr ""
+
+# type: textblock
+#. type: textblock
+#: dh_strip:54
+msgid ""
 "Causes B<dh_strip> to save debug symbols stripped from the packages it acts "
 "on as independent files in the package build directory of the specified "
 "debugging package."
@@ -8140,7 +8306,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
-#: dh_strip:51
+#: dh_strip:58
 msgid ""
 "For example, if your packages are libfoo and foo and you want to include a "
 "I<foo-dbg> package with debugging symbols, use B<dh_strip --dbg-"
@@ -8152,7 +8318,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
-#: dh_strip:54
+#: dh_strip:61
 msgid ""
 "Note that this option behaves significantly different in debhelper "
 "compatibility levels 4 and below. Instead of specifying the name of a debug "
@@ -8167,15 +8333,22 @@ msgstr ""
 "proviennent les symboles de mise au point. Les symboles sont alors placés "
 "dans des paquets, suffixés par B<-dbg>."
 
+#. type: textblock
+#: dh_strip:67
+msgid ""
+"This option implies B<--no-ddebs> and I<cannot> be used with B<--ddeb> or "
+"B<--ddeb-migration>."
+msgstr ""
+
 # type: =item
 #. type: =item
-#: dh_strip:60
+#: dh_strip:70
 msgid "B<-k>, B<--keep-debug>"
 msgstr "B<-k>, B<--keep-debug>"
 
 # type: textblock
 #. type: textblock
-#: dh_strip:62
+#: dh_strip:72
 msgid ""
 "Debug symbols will be retained, but split into an independent file in F<usr/"
 "lib/debug/> in the package build directory. B<--dbg-package> is easier to "
@@ -8186,21 +8359,101 @@ msgstr ""
 "paquet. Il est plus facile d'employer B<--dbg-package> que cette option, "
 "mais cette dernière est plus souple."
 
+#. type: textblock
+#: dh_strip:76
+msgid ""
+"This option implies B<--no-ddebs> and I<cannot> be used with B<--ddebs>."
+msgstr ""
+
+# type: =item
+#. type: =item
+#: dh_strip:79
+#, fuzzy
+#| msgid "B<--dbg-package=>I<package>"
+msgid "B<--ddeb-migration=>I<package-relation>"
+msgstr "B<--dbg-package=>I<paquet>"
+
+#. type: textblock
+#: dh_strip:81
+msgid ""
+"This option is used to migrate from a manual \"-dbg\" package (created with "
+"B<--dbg-package>) to the automatic \"ddebs\".  The value of this option "
+"should describe a valid B<Replaces>- and B<Breaks>-relation, which will be "
+"added to the ddebs to avoid file conflicts with the (now obsolete) -dbg "
+"package."
+msgstr ""
+
+#. type: textblock
+#: dh_strip:87
+msgid ""
+"This option implies B<--ddebs> and I<cannot> be used with B<--keep-debug>, "
+"B<--dbg-package> or B<--no-ddebs>."
+msgstr ""
+
+#. type: textblock
+#: dh_strip:90
+msgid "Examples:"
+msgstr ""
+
+#. type: verbatim
+#: dh_strip:92
+#, no-wrap
+msgid ""
+"  dh_strip --ddeb-migration='libfoo-dbg (<< 2.1-3~)'\n"
+"\n"
+msgstr ""
+
+#. type: verbatim
+#: dh_strip:94
+#, no-wrap
+msgid ""
+"  dh_strip --ddeb-migration='libfoo-tools-dbg (<< 2.1-3~), libfoo2-dbg (<< 2.1-3~)'\n"
+"\n"
+msgstr ""
+
+# type: =item
+#. type: =item
+#: dh_strip:96
+#, fuzzy
+#| msgid "B<-i>, B<--indep>"
+msgid "B<--ddebs>, B<--no-ddebs>"
+msgstr "B<-i>, B<--indep>"
+
+#. type: textblock
+#: dh_strip:98
+msgid ""
+"Control whether B<dh_strip> should be creating ddebs when possible.  By "
+"default, B<dh_strip> will attempt to build ddebs and this option is "
+"primarily useful for disabling this."
+msgstr ""
+
 # type: textblock
 #. type: textblock
-#: dh_strip:70
+#: dh_strip:106
+#, fuzzy
+#| msgid ""
+#| "If the B<DEB_BUILD_OPTIONS> environment variable contains B<nostrip>, "
+#| "nothing will be stripped, in accordance with Debian policy (section 10.1 "
+#| "\"Binaries\")."
 msgid ""
 "If the B<DEB_BUILD_OPTIONS> environment variable contains B<nostrip>, "
 "nothing will be stripped, in accordance with Debian policy (section 10.1 "
-"\"Binaries\")."
+"\"Binaries\").  This will also inhibit the creation of automatic \"ddebs\"."
 msgstr ""
 "Si la variable d'environnement B<DEB_BUILD_OPTIONS> contient B<nostrip>, "
 "rien ne sera dépouillé, conformément à la Charte Debian (section 10.1 "
 "« Binaries »)."
 
+#. type: textblock
+#: dh_strip:110
+msgid ""
+"The creation of automatic \"ddebs\" can also be prevented by adding "
+"B<noddebs> to the B<DEB_BUILD_OPTIONS> environment variable."
+msgstr ""
+
 # type: textblock
 #. type: textblock
-#: dh_strip:76
+#: dh_strip:115
 msgid "Debian policy, version 3.0.1"
 msgstr "Charte Debian, version 3.0.1"
 
@@ -8433,6 +8686,18 @@ msgstr "Charte Debian, version 2.2"
 msgid "Andrew Stribblehill <ads@debian.org>"
 msgstr "Andrew Stribblehill <ads@debian.org>"
 
+#~ msgid ""
+#~ "Packages that support multiarch are detected, and a Pre-Dependency on "
+#~ "multiarch-support is set in ${misc:Pre-Depends} ; you should make sure to "
+#~ "put that token into an appropriate place in your debian/control file for "
+#~ "packages supporting multiarch."
+#~ msgstr ""
+#~ "Les paquets prenant en charge le multiarchitecture sont détectés et une "
+#~ "prédépendance sur B<multiarch-support> est placée dans B<${misc:Pre-"
+#~ "Depends}> ; il faut s'assurer que cet item a été placé au bon endroit "
+#~ "dans le fichier F<debian/control> pour les paquet prenant en charge le "
+#~ "multiarchitecture."
+
 # type: textblock
 #~ msgid "Sets the priority string of the F<rules.d> symlink. Default is 60."
 #~ msgstr ""
diff --git a/man/po4a/po/pt.po b/man/po4a/po/pt.po
index a6007bee..efe6b2c9 100644
--- a/man/po4a/po/pt.po
+++ b/man/po4a/po/pt.po
@@ -2,13 +2,13 @@
 # Copyright (C) 2014 The debhelper's copyright holder.
 # This file is distributed under the same license as the debhelper package.
 #
-# Américo Monteiro <a_monteiro@gmx.com>, 2014.
+# Américo Monteiro <a_monteiro@gmx.com>, 2014, 2015.
 msgid ""
 msgstr ""
-"Project-Id-Version: debhelper 9.20131227\n"
+"Project-Id-Version: debhelper 9.20140817\n"
 "Report-Msgid-Bugs-To: debhelper@packages.debian.org\n"
-"POT-Creation-Date: 2014-10-03 15:16-0400\n"
-"PO-Revision-Date: 2014-08-13 17:54+0100\n"
+"POT-Creation-Date: 2015-06-28 11:53+0000\n"
+"PO-Revision-Date: 2015-05-06 23:25+0100\n"
 "Last-Translator: Américo Monteiro <a_monteiro@gmx.com>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
 "Language: pt\n"
@@ -521,7 +521,7 @@ msgstr "Não modifique os scripts F<postinst>, F<postrm>, etc."
 
 #. type: =item
 #: debhelper.pod:185 dh_compress:52 dh_install:81 dh_installchangelogs:71
-#: dh_installdocs:80 dh_installexamples:41 dh_link:62 dh_makeshlibs:81
+#: dh_installdocs:80 dh_installexamples:41 dh_link:62 dh_makeshlibs:85
 #: dh_md5sums:37 dh_shlibdeps:30 dh_strip:39
 msgid "B<-X>I<item>, B<--exclude=>I<item>"
 msgstr "B<-X>I<item>, B<--exclude=>I<item>"
@@ -856,7 +856,8 @@ msgstr "Este modo funciona como v2, com as seguintes adições:"
 #: debhelper.pod:453 debhelper.pod:461 debhelper.pod:466 debhelper.pod:480
 #: debhelper.pod:485 debhelper.pod:492 debhelper.pod:497 debhelper.pod:502
 #: debhelper.pod:506 debhelper.pod:512 debhelper.pod:517 debhelper.pod:522
-#: debhelper.pod:535 debhelper.pod:542
+#: debhelper.pod:537 debhelper.pod:542 debhelper.pod:548 debhelper.pod:555
+#: debhelper.pod:562 debhelper.pod:568
 msgid "-"
 msgstr "-"
 
@@ -1234,7 +1235,7 @@ msgid "Changes from v9 are:"
 msgstr "As alterações a partir de v9 são:"
 
 #. type: textblock
-#: debhelper.pod:537
+#: debhelper.pod:539
 msgid ""
 "B<dh_installinit> will no longer install a file named debian/I<package> as "
 "an init script."
@@ -1245,6 +1246,17 @@ msgstr ""
 #. type: textblock
 #: debhelper.pod:544
 msgid ""
+"B<dh_installdocs> will error out if it detects links created with --link-doc "
+"between packages of architecture \"all\" and non-\"all\" as it breaks "
+"binNMUs."
+msgstr ""
+"O B<dh_installdocs> irá dar erro se detectar links criados com --link-doc "
+"entre pacotes de arquitectura \"all\" e não-\"all\" porque isso faz quebrar "
+"binNMUs."
+
+#. type: textblock
+#: debhelper.pod:550
+msgid ""
 "B<dh> no longer creates the package build directory when skipping running "
 "debhelper commands. This will not affect packages that only build with "
 "debhelper commands, but it may expose bugs in commands not included in "
@@ -1255,21 +1267,52 @@ msgstr ""
 "compilam com comandos debhelper, mas pode expor bugs em comandos não "
 "incluídos no debhelper."
 
+#. type: textblock
+#: debhelper.pod:557
+msgid ""
+"B<dh_makeshlibs> now invokes I<ldconfig -X> instead of just I<ldconfig> in "
+"its generated maintainer scripts snippets.  The new call will only update "
+"the ld cache (instead of also updating symlinks)."
+msgstr ""
+"O B<dh_makeshlibs> agora invoca I<ldconfig -X> em vez de apenas fazer "
+"I<ldconfig> nos fragmentos de script de mantenedor gerados. A nova chamada "
+"irá apenas actualizar a cache ld (em vez de também actualizar os symlinks)."
+
+#. type: textblock
+#: debhelper.pod:564
+msgid ""
+"B<dh_installdeb> no longer installs a maintainer-provided debian/I<package>."
+"shlibs file.  This is now done by B<dh_makeshlibs> instead."
+msgstr ""
+"O B<dh_installdeb> já não instala um ficheiro debian/I<pacote>.shlibs "
+"disponibilizado pelo mantenedor. Em vez disso, isto agora é feito pelo "
+"B<dh_makeshlibs>."
+
+#. type: textblock
+#: debhelper.pod:570
+msgid ""
+"B<dh_installwm> refuses to create a broken package if no man page can be "
+"found (required to register for the x-window-manager alternative)."
+msgstr ""
+"O B<dh_installwm> recusa-se a criar um pacote quebrado se não encontrar "
+"nenhuma página de manual (necessário para registo para a alternativa do x-"
+"window-manager)."
+
 #. type: =head1
-#: debhelper.pod:553 dh_auto_test:45 dh_installcatalogs:59 dh_installdocs:121
+#: debhelper.pod:577 dh_auto_test:45 dh_installcatalogs:59 dh_installdocs:131
 #: dh_installemacsen:72 dh_installexamples:53 dh_installinit:140
 #: dh_installman:82 dh_installmodules:54 dh_installudev:55 dh_installwm:54
-#: dh_installxfonts:37 dh_movefiles:64 dh_strip:68 dh_usrlocal:49
+#: dh_installxfonts:37 dh_movefiles:64 dh_strip:104 dh_usrlocal:49
 msgid "NOTES"
 msgstr "NOTAS"
 
 #. type: =head2
-#: debhelper.pod:555
+#: debhelper.pod:579
 msgid "Multiple binary package support"
 msgstr "Suporte a pacotes de múltiplos binários"
 
 #. type: textblock
-#: debhelper.pod:557
+#: debhelper.pod:581
 msgid ""
 "If your source package generates more than one binary package, debhelper "
 "programs will default to acting on all binary packages when run. If your "
@@ -1288,7 +1331,7 @@ msgstr ""
 "independentes de arquitectura na meta F<debian/rules> binary-indep."
 
 #. type: textblock
-#: debhelper.pod:565
+#: debhelper.pod:589
 msgid ""
 "To facilitate this, as well as give you more control over which packages are "
 "acted on by debhelper programs, all debhelper programs accept the B<-a>, B<-"
@@ -1304,7 +1347,7 @@ msgstr ""
 "excepções em baixo."
 
 #. type: textblock
-#: debhelper.pod:571
+#: debhelper.pod:595
 msgid ""
 "First, any package whose B<Architecture> field in B<debian/control> does not "
 "match the build architecture will be excluded (L<Debian Policy, section "
@@ -1315,7 +1358,7 @@ msgstr ""
 "secção 5.6.8>)."
 
 #. type: textblock
-#: debhelper.pod:575
+#: debhelper.pod:599
 msgid ""
 "Also, some additional packages may be excluded based on the contents of the "
 "B<DEB_BUILD_PROFILES> environment variable and B<Build-Profiles> fields in "
@@ -1328,12 +1371,12 @@ msgstr ""
 "política proposta em  L<https://wiki.debian.org/BuildProfileSpec>."
 
 #. type: =head2
-#: debhelper.pod:580
+#: debhelper.pod:604
 msgid "Automatic generation of Debian install scripts"
 msgstr "Geração automática de scripts de instalação Debian"
 
 #. type: textblock
-#: debhelper.pod:582
+#: debhelper.pod:606
 msgid ""
 "Some debhelper commands will automatically generate parts of Debian "
 "maintainer scripts. If you want these automatically generated things "
@@ -1350,7 +1393,7 @@ msgstr ""
 "auto-gerado quando você correr o B<dh_installdeb>."
 
 #. type: textblock
-#: debhelper.pod:589
+#: debhelper.pod:613
 msgid ""
 "If a script does not exist at all and debhelper needs to add something to "
 "it, then debhelper will create the complete script."
@@ -1359,7 +1402,7 @@ msgstr ""
 "então o debhelper irá criar o script completo."
 
 #. type: textblock
-#: debhelper.pod:592
+#: debhelper.pod:616
 msgid ""
 "All debhelper commands that automatically generate code in this way let it "
 "be disabled by the -n parameter (see above)."
@@ -1368,7 +1411,7 @@ msgstr ""
 "permitem que o seja desactivado pelo parâmetro -n (ver em cima)."
 
 #. type: textblock
-#: debhelper.pod:595
+#: debhelper.pod:619
 msgid ""
 "Note that the inserted code will be shell code, so you cannot directly use "
 "it in a Perl script. If you would like to embed it into a Perl script, here "
@@ -1381,7 +1424,7 @@ msgstr ""
 "definidos com o comando \"set\"):"
 
 #. type: verbatim
-#: debhelper.pod:600
+#: debhelper.pod:624
 #, no-wrap
 msgid ""
 "  my $temp=\"set -e\\nset -- @ARGV\\n\" . << 'EOF';\n"
@@ -1399,12 +1442,12 @@ msgstr ""
 "\n"
 
 #. type: =head2
-#: debhelper.pod:606
+#: debhelper.pod:630
 msgid "Automatic generation of miscellaneous dependencies."
 msgstr "Geração automática de dependências variadas."
 
 #. type: textblock
-#: debhelper.pod:608
+#: debhelper.pod:632
 msgid ""
 "Some debhelper commands may make the generated package need to depend on "
 "some other packages. For example, if you use L<dh_installdebconf(1)>, your "
@@ -1423,7 +1466,7 @@ msgstr ""
 "debhelper oferece um modo de automatizar isto."
 
 #. type: textblock
-#: debhelper.pod:616
+#: debhelper.pod:640
 msgid ""
 "All commands of this type, besides documenting what dependencies may be "
 "needed on their man pages, will automatically generate a substvar called B<"
@@ -1437,7 +1480,7 @@ msgstr ""
 "que você precisa."
 
 #. type: textblock
-#: debhelper.pod:621
+#: debhelper.pod:645
 msgid ""
 "This is entirely independent of the standard B<${shlibs:Depends}> generated "
 "by L<dh_makeshlibs(1)>, and the B<${perl:Depends}> generated by "
@@ -1450,12 +1493,12 @@ msgstr ""
 "corresponderem à realidade."
 
 #. type: =head2
-#: debhelper.pod:626
+#: debhelper.pod:650
 msgid "Package build directories"
 msgstr "Directórios de compilação de pacotes"
 
 #. type: textblock
-#: debhelper.pod:628
+#: debhelper.pod:652
 msgid ""
 "By default, all debhelper programs assume that the temporary directory used "
 "for assembling the tree of files in a package is debian/I<package>."
@@ -1465,7 +1508,7 @@ msgstr ""
 "I<pacote>."
 
 #. type: textblock
-#: debhelper.pod:631
+#: debhelper.pod:655
 msgid ""
 "Sometimes, you might want to use some other temporary directory. This is "
 "supported by the B<-P> flag. For example, \"B<dh_installdocs -Pdebian/tmp>"
@@ -1484,13 +1527,13 @@ msgstr ""
 "programa debhelper irá actuar."
 
 #. type: =head2
-#: debhelper.pod:639
+#: debhelper.pod:663
 msgid "udebs"
 msgstr "udebs"
 
 # FIXME : an udeb
 #. type: textblock
-#: debhelper.pod:641
+#: debhelper.pod:665
 msgid ""
 "Debhelper includes support for udebs. To create a udeb with debhelper, add "
 "\"B<Package-Type: udeb>\" to the package's stanza in F<debian/control>.  "
@@ -1507,17 +1550,33 @@ msgstr ""
 "F<preinst>, F<postrm>, F<prerm>, e F<config>, etc."
 
 #. type: =head1
-#: debhelper.pod:648
+#: debhelper.pod:672
 msgid "ENVIRONMENT"
 msgstr "AMBIENTE"
 
+#. type: textblock
+#: debhelper.pod:674
+msgid ""
+"The following environment variables can influence the behavior of "
+"debhelper.  It is important to note that these must be actual environment "
+"variables in order to function properly (not simply F<Makefile> variables). "
+"To specify them properly in F<debian/rules>, be sure to \"B<export>\" them. "
+"For example, \"B<export DH_VERBOSE>\"."
+msgstr ""
+"As seguintes variáveis de ambiente podem influenciar o comportamento do "
+"debhelper. É importante notar que estas que estas têm de ser mesmo variáveis "
+"de ambiente de modo a funcionarem correctamente (e não simplesmente "
+"variáveis do F<Makefile>). Para as especificar correctamente em F<debian/"
+"rules>, assegure-se de lhes fazer \"B<export>\". Por exemplo, \"B<export "
+"DH_VERBOSE>\""
+
 #. type: =item
-#: debhelper.pod:652
+#: debhelper.pod:682
 msgid "B<DH_VERBOSE>"
 msgstr "B<DH_VERBOSE>"
 
 #. type: textblock
-#: debhelper.pod:654
+#: debhelper.pod:684
 msgid ""
 "Set to B<1> to enable verbose mode. Debhelper will output every command it "
 "runs. Also enables verbose build logs for some build systems like autoconf."
@@ -1527,12 +1586,34 @@ msgstr ""
 "detalhados para alguns sistemas de compilação como o autoconf."
 
 #. type: =item
-#: debhelper.pod:657
+#: debhelper.pod:687
+msgid "B<DH_QUIET>"
+msgstr "B<DH_QUIET>"
+
+#. type: textblock
+#: debhelper.pod:689
+msgid ""
+"Set to B<1> to enable quiet mode. Debhelper will not output commands calling "
+"the upstream build system nor will dh print which subcommands are called and "
+"depending on the upstream build system might make that more quiet, too.  "
+"This makes it easier to spot important messages but makes the output quite "
+"useless as buildd log.  Ignored if DH_VERBOSE is also set."
+msgstr ""
+"Definir para B<1> para activar o modo silencioso. O Debhelper não irá "
+"escrever os comandos a chamar o sistema de compilação do autor nem o dh irá "
+"escrever quais sub-comandos são chamados e dependendo do sistema de "
+"compilação do autor, poderá também tornar isso mais silencioso. Isto "
+"facilita a identificação de mensagens importantes mas torna os resultados "
+"inúteis como relatório do buildd. É ignorado se DH_VERBOSE for também "
+"definido."
+
+#. type: =item
+#: debhelper.pod:696
 msgid "B<DH_COMPAT>"
 msgstr "B<DH_COMPAT>"
 
 #. type: textblock
-#: debhelper.pod:659
+#: debhelper.pod:698
 msgid ""
 "Temporarily specifies what compatibility level debhelper should run at, "
 "overriding any value in F<debian/compat>."
@@ -1541,22 +1622,22 @@ msgstr ""
 "correr, sobrepondo qualquer valor em F<debian/compat>."
 
 #. type: =item
-#: debhelper.pod:662
+#: debhelper.pod:701
 msgid "B<DH_NO_ACT>"
 msgstr "B<DH_NO_ACT>"
 
 #. type: textblock
-#: debhelper.pod:664
+#: debhelper.pod:703
 msgid "Set to B<1> to enable no-act mode."
 msgstr "Defina para B<1> para activar o modo no-act."
 
 #. type: =item
-#: debhelper.pod:666
+#: debhelper.pod:705
 msgid "B<DH_OPTIONS>"
 msgstr "B<DH_OPTIONS>"
 
 #. type: textblock
-#: debhelper.pod:668
+#: debhelper.pod:707
 msgid ""
 "Anything in this variable will be prepended to the command line arguments of "
 "all debhelper commands."
@@ -1565,7 +1646,7 @@ msgstr ""
 "comandos de todos os comandos do debhelper."
 
 #. type: textblock
-#: debhelper.pod:671
+#: debhelper.pod:710
 msgid ""
 "When using L<dh(1)>, it can be passed options that will be passed on to each "
 "debhelper command, which is generally better than using DH_OPTIONS."
@@ -1574,12 +1655,12 @@ msgstr ""
 "comando do debhelper, o que é geralmente melhor do que usar DH_OPTIONS."
 
 #. type: =item
-#: debhelper.pod:674
+#: debhelper.pod:713
 msgid "B<DH_ALWAYS_EXCLUDE>"
 msgstr "B<DH_ALWAYS_EXCLUDE>"
 
 #. type: textblock
-#: debhelper.pod:676
+#: debhelper.pod:715
 msgid ""
 "If set, this adds the value the variable is set to to the B<-X> options of "
 "all commands that support the B<-X> option. Moreover, B<dh_builddeb> will "
@@ -1591,7 +1672,7 @@ msgstr ""
 "sua árvore de compilação do pacote."
 
 #. type: textblock
-#: debhelper.pod:680
+#: debhelper.pod:719
 msgid ""
 "This can be useful if you are doing a build from a CVS source tree, in which "
 "case setting B<DH_ALWAYS_EXCLUDE=CVS> will prevent any CVS directories from "
@@ -1609,7 +1690,7 @@ msgstr ""
 "seu é compilado."
 
 #. type: textblock
-#: debhelper.pod:687
+#: debhelper.pod:726
 msgid ""
 "Multiple things to exclude can be separated with colons, as in "
 "B<DH_ALWAYS_EXCLUDE=CVS:.svn>"
@@ -1618,79 +1699,77 @@ msgstr ""
 "B<DH_ALWAYS_EXCLUDE=CVS:.svn>"
 
 #. type: =head1
-#: debhelper.pod:692 dh:972 dh_auto_build:47 dh_auto_clean:50
-#: dh_auto_configure:52 dh_auto_install:92 dh_auto_test:63 dh_bugfiles:124
-#: dh_builddeb:124 dh_clean:147 dh_compress:210 dh_desktop:31 dh_fixperms:131
-#: dh_gconf:101 dh_gencontrol:78 dh_icons:71 dh_install:260
-#: dh_installcatalogs:122 dh_installchangelogs:241 dh_installcron:79
-#: dh_installdeb:142 dh_installdebconf:128 dh_installdirs:88
-#: dh_installdocs:337 dh_installemacsen:141 dh_installexamples:108
+#: debhelper.pod:731 dh:974 dh_auto_build:47 dh_auto_clean:50
+#: dh_auto_configure:52 dh_auto_install:92 dh_auto_test:62 dh_bugfiles:130
+#: dh_builddeb:154 dh_clean:150 dh_compress:212 dh_desktop:31 dh_fixperms:142
+#: dh_gconf:97 dh_gencontrol:148 dh_icons:71 dh_install:281
+#: dh_installcatalogs:122 dh_installchangelogs:240 dh_installcron:79
+#: dh_installdeb:147 dh_installdebconf:127 dh_installdirs:88
+#: dh_installdocs:351 dh_installemacsen:142 dh_installexamples:109
 #: dh_installifupdown:71 dh_installinfo:77 dh_installinit:324
 #: dh_installlogcheck:80 dh_installlogrotate:52 dh_installman:263
-#: dh_installmanpages:197 dh_installmenu:89 dh_installmime:63
+#: dh_installmanpages:197 dh_installmenu:89 dh_installmime:64
 #: dh_installmodules:115 dh_installpam:61 dh_installppp:67 dh_installudev:117
-#: dh_installwm:110 dh_installxfonts:89 dh_link:228 dh_lintian:59
-#: dh_listpackages:30 dh_makeshlibs:264 dh_md5sums:90 dh_movefiles:170
-#: dh_perl:152 dh_prep:60 dh_scrollkeeper:28 dh_shlibdeps:152 dh_strip:242
+#: dh_installwm:114 dh_installxfonts:89 dh_link:145 dh_lintian:59
+#: dh_listpackages:30 dh_makeshlibs:280 dh_md5sums:107 dh_movefiles:170
+#: dh_perl:152 dh_prep:60 dh_scrollkeeper:28 dh_shlibdeps:152 dh_strip:345
 #: dh_suidregister:117 dh_testdir:53 dh_testroot:27 dh_undocumented:28
 #: dh_usrlocal:116
 msgid "SEE ALSO"
 msgstr "VEJA TAMBÉM"
 
 #. type: =item
-#: debhelper.pod:696
+#: debhelper.pod:735
 msgid "F</usr/share/doc/debhelper/examples/>"
 msgstr "F</usr/share/doc/debhelper/examples/>"
 
 #. type: textblock
-#: debhelper.pod:698
+#: debhelper.pod:737
 msgid "A set of example F<debian/rules> files that use debhelper."
 msgstr "Um conjunto de ficheiros F<debian/rules> exemplo que usam debhelper."
 
 #. type: =item
-#: debhelper.pod:700
-#, fuzzy
-#| msgid "L<http://kitenet.net/~joey/code/debhelper/>"
+#: debhelper.pod:739
 msgid "L<http://joeyh.name/code/debhelper/>"
-msgstr "L<http://kitenet.net/~joey/code/debhelper/>"
+msgstr "L<http://joeyh.name/code/debhelper/>"
 
 #. type: textblock
-#: debhelper.pod:702
+#: debhelper.pod:741
 msgid "Debhelper web site."
 msgstr "Sítio web do debhelper."
 
 #. type: =head1
-#: debhelper.pod:706 dh:978 dh_auto_build:53 dh_auto_clean:56
-#: dh_auto_configure:58 dh_auto_install:98 dh_auto_test:69 dh_bugfiles:132
-#: dh_builddeb:130 dh_clean:153 dh_compress:216 dh_desktop:37 dh_fixperms:137
-#: dh_gconf:107 dh_gencontrol:84 dh_icons:77 dh_install:266
-#: dh_installcatalogs:128 dh_installchangelogs:247 dh_installcron:85
-#: dh_installdeb:148 dh_installdebconf:134 dh_installdirs:94
-#: dh_installdocs:343 dh_installemacsen:148 dh_installexamples:114
+#: debhelper.pod:745 dh:980 dh_auto_build:53 dh_auto_clean:56
+#: dh_auto_configure:58 dh_auto_install:98 dh_auto_test:68 dh_bugfiles:138
+#: dh_builddeb:160 dh_clean:156 dh_compress:218 dh_desktop:37 dh_fixperms:148
+#: dh_gconf:103 dh_gencontrol:154 dh_icons:77 dh_install:287
+#: dh_installcatalogs:128 dh_installchangelogs:246 dh_installcron:85
+#: dh_installdeb:153 dh_installdebconf:133 dh_installdirs:94
+#: dh_installdocs:357 dh_installemacsen:149 dh_installexamples:115
 #: dh_installifupdown:77 dh_installinfo:83 dh_installlogcheck:86
 #: dh_installlogrotate:58 dh_installman:269 dh_installmanpages:203
-#: dh_installmenu:97 dh_installmime:69 dh_installmodules:121 dh_installpam:67
-#: dh_installppp:73 dh_installudev:123 dh_installwm:116 dh_installxfonts:95
-#: dh_link:234 dh_lintian:67 dh_listpackages:36 dh_makeshlibs:270
-#: dh_md5sums:96 dh_movefiles:176 dh_perl:158 dh_prep:66 dh_scrollkeeper:34
-#: dh_shlibdeps:158 dh_strip:248 dh_suidregister:123 dh_testdir:59
+#: dh_installmenu:97 dh_installmime:70 dh_installmodules:121 dh_installpam:67
+#: dh_installppp:73 dh_installudev:123 dh_installwm:120 dh_installxfonts:95
+#: dh_link:151 dh_lintian:67 dh_listpackages:36 dh_makeshlibs:286
+#: dh_md5sums:113 dh_movefiles:176 dh_perl:158 dh_prep:66 dh_scrollkeeper:34
+#: dh_shlibdeps:158 dh_strip:351 dh_suidregister:123 dh_testdir:59
 #: dh_testroot:33 dh_undocumented:34 dh_usrlocal:122
 msgid "AUTHOR"
 msgstr "AUTOR"
 
 #. type: textblock
-#: debhelper.pod:708 dh:980 dh_auto_build:55 dh_auto_clean:58
-#: dh_auto_configure:60 dh_auto_install:100 dh_auto_test:71 dh_builddeb:132
-#: dh_clean:155 dh_compress:218 dh_fixperms:139 dh_gencontrol:86
-#: dh_install:268 dh_installchangelogs:249 dh_installcron:87 dh_installdeb:150
-#: dh_installdebconf:136 dh_installdirs:96 dh_installdocs:345
-#: dh_installemacsen:150 dh_installexamples:116 dh_installifupdown:79
+#: debhelper.pod:747 dh:982 dh_auto_build:55 dh_auto_clean:58
+#: dh_auto_configure:60 dh_auto_install:100 dh_auto_test:70 dh_builddeb:162
+#: dh_clean:158 dh_compress:220 dh_fixperms:150 dh_gencontrol:156
+#: dh_install:289 dh_installchangelogs:248 dh_installcron:87 dh_installdeb:155
+#: dh_installdebconf:135 dh_installdirs:96 dh_installdocs:359
+#: dh_installemacsen:151 dh_installexamples:117 dh_installifupdown:79
 #: dh_installinfo:85 dh_installinit:332 dh_installlogrotate:60
 #: dh_installman:271 dh_installmanpages:205 dh_installmenu:99
-#: dh_installmime:71 dh_installmodules:123 dh_installpam:69 dh_installppp:75
-#: dh_installudev:125 dh_installwm:118 dh_installxfonts:97 dh_link:236
-#: dh_listpackages:38 dh_makeshlibs:272 dh_md5sums:98 dh_movefiles:178
-#: dh_prep:68 dh_shlibdeps:160 dh_strip:250 dh_suidregister:125 dh_testdir:61
+#: dh_installmime:72 dh_installmodules:123 dh_installpam:69 dh_installppp:75
+#: dh_installudev:125 dh_installwm:122 dh_installxfonts:97 dh_link:153
+#: dh_listpackages:38 dh_makeshlibs:288 dh_md5sums:115 dh_movefiles:178
+#: dh_prep:68 dh_shlibdeps:160 dh_strip:353 dh_suidregister:125 dh_testdir:61
 #: dh_testroot:35 dh_undocumented:36
 msgid "Joey Hess <joeyh@debian.org>"
 msgstr "Joey Hess <joeyh@debian.org>"
@@ -1769,15 +1848,15 @@ msgstr ""
 
 #. type: =head1
 #: dh:41 dh_auto_build:28 dh_auto_clean:30 dh_auto_configure:31
-#: dh_auto_install:43 dh_auto_test:31 dh_bugfiles:50 dh_builddeb:24
-#: dh_clean:41 dh_compress:48 dh_fixperms:32 dh_gconf:39 dh_gencontrol:26
+#: dh_auto_install:43 dh_auto_test:31 dh_bugfiles:50 dh_builddeb:25
+#: dh_clean:41 dh_compress:48 dh_fixperms:32 dh_gconf:39 dh_gencontrol:33
 #: dh_icons:30 dh_install:59 dh_installcatalogs:49 dh_installchangelogs:59
 #: dh_installcron:40 dh_installdebconf:61 dh_installdirs:31 dh_installdocs:71
 #: dh_installemacsen:53 dh_installexamples:32 dh_installifupdown:39
 #: dh_installinfo:31 dh_installinit:59 dh_installlogcheck:42
 #: dh_installlogrotate:22 dh_installman:61 dh_installmanpages:40
 #: dh_installmenu:41 dh_installmodules:38 dh_installpam:31 dh_installppp:35
-#: dh_installudev:35 dh_installwm:34 dh_link:53 dh_makeshlibs:43 dh_md5sums:28
+#: dh_installudev:35 dh_installwm:34 dh_link:53 dh_makeshlibs:47 dh_md5sums:28
 #: dh_movefiles:38 dh_perl:31 dh_prep:26 dh_shlibdeps:26 dh_strip:35
 #: dh_testdir:23 dh_usrlocal:39
 msgid "OPTIONS"
@@ -1855,7 +1934,7 @@ msgstr ""
 "assim como para opções mais especializadas."
 
 #. type: =head1
-#: dh:77 dh_installdocs:110 dh_link:75 dh_makeshlibs:97 dh_shlibdeps:70
+#: dh:77 dh_installdocs:120 dh_link:75 dh_makeshlibs:101 dh_shlibdeps:70
 msgid "EXAMPLES"
 msgstr "EXEMPLOS"
 
@@ -2395,36 +2474,36 @@ msgstr ""
 "sequência."
 
 #. type: textblock
-#: dh:974 dh_auto_build:49 dh_auto_clean:52 dh_auto_configure:54
-#: dh_auto_install:94 dh_auto_test:65 dh_builddeb:126 dh_clean:149
-#: dh_compress:212 dh_fixperms:133 dh_gconf:103 dh_gencontrol:80
-#: dh_install:262 dh_installcatalogs:124 dh_installchangelogs:243
-#: dh_installcron:81 dh_installdeb:144 dh_installdebconf:130 dh_installdirs:90
-#: dh_installdocs:339 dh_installexamples:110 dh_installifupdown:73
+#: dh:976 dh_auto_build:49 dh_auto_clean:52 dh_auto_configure:54
+#: dh_auto_install:94 dh_auto_test:64 dh_builddeb:156 dh_clean:152
+#: dh_compress:214 dh_fixperms:144 dh_gconf:99 dh_gencontrol:150
+#: dh_install:283 dh_installcatalogs:124 dh_installchangelogs:242
+#: dh_installcron:81 dh_installdeb:149 dh_installdebconf:129 dh_installdirs:90
+#: dh_installdocs:353 dh_installexamples:111 dh_installifupdown:73
 #: dh_installinfo:79 dh_installinit:326 dh_installlogcheck:82
 #: dh_installlogrotate:54 dh_installman:265 dh_installmanpages:199
-#: dh_installmime:65 dh_installmodules:117 dh_installpam:63 dh_installppp:69
-#: dh_installudev:119 dh_installwm:112 dh_installxfonts:91 dh_link:230
-#: dh_listpackages:32 dh_makeshlibs:266 dh_md5sums:92 dh_movefiles:172
-#: dh_perl:154 dh_prep:62 dh_strip:244 dh_suidregister:119 dh_testdir:55
+#: dh_installmime:66 dh_installmodules:117 dh_installpam:63 dh_installppp:69
+#: dh_installudev:119 dh_installwm:116 dh_installxfonts:91 dh_link:147
+#: dh_listpackages:32 dh_makeshlibs:282 dh_md5sums:109 dh_movefiles:172
+#: dh_perl:154 dh_prep:62 dh_strip:347 dh_suidregister:119 dh_testdir:55
 #: dh_testroot:29 dh_undocumented:30 dh_usrlocal:118
 msgid "L<debhelper(7)>"
 msgstr "L<debhelper(7)>"
 
 #. type: textblock
-#: dh:976 dh_auto_build:51 dh_auto_clean:54 dh_auto_configure:56
-#: dh_auto_install:96 dh_auto_test:67 dh_bugfiles:130 dh_builddeb:128
-#: dh_clean:151 dh_compress:214 dh_desktop:35 dh_fixperms:135 dh_gconf:105
-#: dh_gencontrol:82 dh_icons:75 dh_install:264 dh_installchangelogs:245
-#: dh_installcron:83 dh_installdeb:146 dh_installdebconf:132 dh_installdirs:92
-#: dh_installdocs:341 dh_installemacsen:146 dh_installexamples:112
+#: dh:978 dh_auto_build:51 dh_auto_clean:54 dh_auto_configure:56
+#: dh_auto_install:96 dh_auto_test:66 dh_bugfiles:136 dh_builddeb:158
+#: dh_clean:154 dh_compress:216 dh_desktop:35 dh_fixperms:146 dh_gconf:101
+#: dh_gencontrol:152 dh_icons:75 dh_install:285 dh_installchangelogs:244
+#: dh_installcron:83 dh_installdeb:151 dh_installdebconf:131 dh_installdirs:92
+#: dh_installdocs:355 dh_installemacsen:147 dh_installexamples:113
 #: dh_installifupdown:75 dh_installinfo:81 dh_installinit:328
 #: dh_installlogrotate:56 dh_installman:267 dh_installmanpages:201
-#: dh_installmenu:95 dh_installmime:67 dh_installmodules:119 dh_installpam:65
-#: dh_installppp:71 dh_installudev:121 dh_installwm:114 dh_installxfonts:93
-#: dh_link:232 dh_lintian:63 dh_listpackages:34 dh_makeshlibs:268
-#: dh_md5sums:94 dh_movefiles:174 dh_perl:156 dh_prep:64 dh_scrollkeeper:32
-#: dh_shlibdeps:156 dh_strip:246 dh_suidregister:121 dh_testdir:57
+#: dh_installmenu:95 dh_installmime:68 dh_installmodules:119 dh_installpam:65
+#: dh_installppp:71 dh_installudev:121 dh_installwm:118 dh_installxfonts:93
+#: dh_link:149 dh_lintian:63 dh_listpackages:34 dh_makeshlibs:284
+#: dh_md5sums:111 dh_movefiles:174 dh_perl:156 dh_prep:64 dh_scrollkeeper:32
+#: dh_shlibdeps:156 dh_strip:349 dh_suidregister:121 dh_testdir:57
 #: dh_testroot:31 dh_undocumented:32 dh_usrlocal:120
 msgid "This program is a part of debhelper."
 msgstr "Este programa é parte do debhelper."
@@ -2482,8 +2561,8 @@ msgstr ""
 
 #. type: =item
 #: dh_auto_build:35 dh_auto_clean:37 dh_auto_configure:38 dh_auto_install:56
-#: dh_auto_test:38 dh_builddeb:38 dh_gencontrol:30 dh_installdebconf:69
-#: dh_installinit:105 dh_makeshlibs:91 dh_shlibdeps:37
+#: dh_auto_test:38 dh_builddeb:39 dh_gencontrol:37 dh_installdebconf:69
+#: dh_installinit:105 dh_makeshlibs:95 dh_shlibdeps:37
 msgid "B<--> I<params>"
 msgstr "B<--> I<params>"
 
@@ -2689,7 +2768,7 @@ msgstr ""
 "não usar o B<dh_auto_install>, e correr o make install manualmente."
 
 #. type: =item
-#: dh_auto_install:50 dh_builddeb:28
+#: dh_auto_install:50 dh_builddeb:29
 msgid "B<--destdir=>I<directory>"
 msgstr "B<--destdir=>I<directório>"
 
@@ -2818,7 +2897,7 @@ msgstr ""
 #: dh_installinfo:21 dh_installinit:27 dh_installlogcheck:21 dh_installman:51
 #: dh_installmenu:25 dh_installmime:21 dh_installmodules:28 dh_installpam:21
 #: dh_installppp:21 dh_installudev:25 dh_installwm:24 dh_link:41 dh_lintian:21
-#: dh_makeshlibs:29 dh_movefiles:26
+#: dh_makeshlibs:24 dh_movefiles:26
 msgid "FILES"
 msgstr "FICHEIROS"
 
@@ -2891,17 +2970,17 @@ msgstr ""
 "F<debian/bug-*> será instalado apenas no primeiro pacote."
 
 #. type: textblock
-#: dh_bugfiles:126
+#: dh_bugfiles:132
 msgid "F</usr/share/doc/reportbug/README.developers.gz>"
 msgstr "F</usr/share/doc/reportbug/README.developers.gz>"
 
 #. type: textblock
-#: dh_bugfiles:128 dh_lintian:61
+#: dh_bugfiles:134 dh_lintian:61
 msgid "L<debhelper(1)>"
 msgstr "L<debhelper(1)>"
 
 #. type: textblock
-#: dh_bugfiles:134
+#: dh_bugfiles:140
 msgid "Modestas Vainius <modestas@vainius.eu>"
 msgstr "Modestas Vainius <modestas@vainius.eu>"
 
@@ -2921,15 +3000,20 @@ msgstr ""
 
 #. type: textblock
 #: dh_builddeb:18
+#, fuzzy
+#| msgid ""
+#| "B<dh_builddeb> simply calls L<dpkg-deb(1)> to build a Debian package or "
+#| "packages."
 msgid ""
 "B<dh_builddeb> simply calls L<dpkg-deb(1)> to build a Debian package or "
-"packages."
+"packages.  It will also build packages for ddebs when L<dh_strip(1)> and "
+"L<dh_gencontrol(1)> have prepared them."
 msgstr ""
 "B<dh_builddeb> chama simplesmente L<dpkg-deb(1)> para compilar um pacote ou "
 "vários pacotes Debian."
 
 #. type: textblock
-#: dh_builddeb:21
+#: dh_builddeb:22
 msgid ""
 "It supports building multiple binary packages in parallel, when enabled by "
 "DEB_BUILD_OPTIONS."
@@ -2938,7 +3022,7 @@ msgstr ""
 "activado por DEB_BUILD_OPTIONS."
 
 #. type: textblock
-#: dh_builddeb:30
+#: dh_builddeb:31
 msgid ""
 "Use this if you want the generated F<.deb> files to be put in a directory "
 "other than the default of \"F<..>\"."
@@ -2947,12 +3031,12 @@ msgstr ""
 "directório diferente da predefinição \"F<..>\"."
 
 #. type: =item
-#: dh_builddeb:33
+#: dh_builddeb:34
 msgid "B<--filename=>I<name>"
 msgstr "B<--filename=>I<nome>"
 
 #. type: textblock
-#: dh_builddeb:35
+#: dh_builddeb:36
 msgid ""
 "Use this if you want to force the generated .deb file to have a particular "
 "file name. Does not work well if more than one .deb is generated!"
@@ -2961,18 +3045,18 @@ msgstr ""
 "ficheiro particular. Não funciona bem se for gerado mais do que um .deb!"
 
 #. type: textblock
-#: dh_builddeb:40
+#: dh_builddeb:41
 msgid "Pass I<params> to L<dpkg-deb(1)> when it is used to build the package."
 msgstr ""
 "Passa I<params> para L<dpkg-deb(1)> quando é usado para compilar o pacote."
 
 #. type: =item
-#: dh_builddeb:43
+#: dh_builddeb:44
 msgid "B<-u>I<params>"
 msgstr "B<-u>I<params>"
 
 #. type: textblock
-#: dh_builddeb:45
+#: dh_builddeb:46
 msgid ""
 "This is another way to pass I<params> to L<dpkg-deb(1)>.  It is deprecated; "
 "use B<--> instead."
@@ -3084,7 +3168,7 @@ msgstr ""
 "excluir."
 
 #. type: =item
-#: dh_clean:60 dh_compress:64 dh_installdocs:103 dh_installexamples:46
+#: dh_clean:60 dh_compress:64 dh_installdocs:113 dh_installexamples:46
 #: dh_installinfo:40 dh_installmanpages:44 dh_movefiles:55 dh_testdir:27
 msgid "I<file> ..."
 msgstr "I<ficheiro> ..."
@@ -3197,7 +3281,7 @@ msgid "Add these files to the list of files to compress."
 msgstr "Adiciona estes ficheiros à lista de ficheiros para comprimir."
 
 #. type: =head1
-#: dh_compress:70 dh_perl:61 dh_strip:74 dh_usrlocal:55
+#: dh_compress:70 dh_perl:61 dh_strip:113 dh_usrlocal:55
 msgid "CONFORMS TO"
 msgstr "EM CONFORMIDADE COM"
 
@@ -3384,7 +3468,7 @@ msgstr ""
 "específicos de site (B<90>)."
 
 #. type: textblock
-#: dh_gconf:109
+#: dh_gconf:105
 msgid "Ross Burton <ross@burtonini.com> Josselin Mouette <joss@debian.org>"
 msgstr "Ross Burton <ross@burtonini.com> Josselin Mouette <joss@debian.org>"
 
@@ -3411,27 +3495,42 @@ msgstr ""
 
 #. type: textblock
 #: dh_gencontrol:22
+#, fuzzy
+#| msgid ""
+#| "This program is merely a wrapper around L<dpkg-gencontrol(1)>, which "
+#| "calls it once for each package being acted on, and passes in some "
+#| "additional useful flags."
 msgid ""
 "This program is merely a wrapper around L<dpkg-gencontrol(1)>, which calls "
-"it once for each package being acted on, and passes in some additional "
-"useful flags."
+"it once for each package being acted on (plus related ddebs), and passes in "
+"some additional useful flags."
 msgstr ""
 "Este programa é meramente um wrapper em volta de L<dpkg-gencontrol(1)>, o "
 "qual o chama uma vez por cada pacote em que actua, e passa para ele algumas "
 "bandeiras úteis adicionais."
 
 #. type: textblock
-#: dh_gencontrol:32
+#: dh_gencontrol:26
+msgid ""
+"B<Note> that if you use B<dh_gencontrol>, you must also use "
+"L<dh_builddeb(1)> to build the packages.  Otherwise, your build may fail to "
+"build as B<dh_gencontrol> (via L<dpkg-gencontrol(1)>) declares which "
+"packages are built.  As debhelper automatically generates ddebs, it some "
+"times adds additional packages, which will be built by L<dh_builddeb(1)>."
+msgstr ""
+
+#. type: textblock
+#: dh_gencontrol:39
 msgid "Pass I<params> to L<dpkg-gencontrol(1)>."
 msgstr "Passa I<params> para L<dpkg-gencontrol(1)>."
 
 #. type: =item
-#: dh_gencontrol:34
+#: dh_gencontrol:41
 msgid "B<-u>I<params>, B<--dpkg-gencontrol-params=>I<params>"
 msgstr "B<-u>I<params>, B<--dpkg-gencontrol-params=>I<params>"
 
 #. type: textblock
-#: dh_gencontrol:36
+#: dh_gencontrol:43
 msgid ""
 "This is another way to pass I<params> to L<dpkg-gencontrol(1)>.  It is "
 "deprecated; use B<--> instead."
@@ -3481,7 +3580,7 @@ msgstr ""
 #. type: =item
 #: dh_icons:34 dh_installcatalogs:53 dh_installdebconf:65 dh_installemacsen:57
 #: dh_installinit:63 dh_installmenu:45 dh_installmodules:42 dh_installudev:49
-#: dh_installwm:44 dh_makeshlibs:77 dh_usrlocal:43
+#: dh_installwm:44 dh_makeshlibs:81 dh_usrlocal:43
 msgid "B<-n>, B<--noscripts>"
 msgstr "B<-n>, B<--noscripts>"
 
@@ -3555,12 +3654,6 @@ msgstr ""
 
 #. type: textblock
 #: dh_install:34
-#, fuzzy
-#| msgid ""
-#| "From debhelper compatibility level 7 on, B<dh_install> will fall back to "
-#| "looking in F<debian/tmp> for files, if it doesn't find them in the "
-#| "current directory (or whereever you've told it to look using B<--"
-#| "sourcedir>)."
 msgid ""
 "From debhelper compatibility level 7 on, B<dh_install> will fall back to "
 "looking in F<debian/tmp> for files, if it doesn't find them in the current "
@@ -3741,23 +3834,67 @@ msgstr ""
 "ficheiros serão instalados no primeiro pacote em que o F<dh_install> actua."
 
 #. type: =head1
-#: dh_install:254
+#: dh_install:256
 msgid "LIMITATIONS"
 msgstr "LIMITAÇÕES"
 
+#. type: textblock
+#: dh_install:258
+msgid ""
+"B<dh_install> cannot rename files or directories, it can only install them "
+"with the names they already have into wherever you want in the package build "
+"tree."
+msgstr ""
+"B<dh_install> não pode renomear ficheiros ou directórios, pode apenas "
+"instalá-los com os nomes que já têm para onde você os deseja na árvore de "
+"compilação do pacote."
+
+#. type: textblock
+#: dh_install:262
+msgid ""
+"However, renaming can be achieved by using B<dh-exec> with compatibility "
+"level 9 or later.  An example debian/I<package>.install file using B<dh-"
+"exec> could look like:"
+msgstr ""
+"No entanto, o renomear pode ser conseguido ao usar o B<dh-exec> com "
+"compatibilidade 9 ou posterior. Um ficheiro exemplo debian/I<pacote>.install "
+"que usa o B<dh-exec> poderá ser parecer com:"
+
 #. type: verbatim
-#: dh_install:256
+#: dh_install:266
 #, no-wrap
 msgid ""
-"B<dh_install> cannot rename files or directories, it can only install them\n"
-"with the names they already have into wherever you want in the package\n"
-"build tree.\n"
-"  \n"
+" #!/usr/bin/dh-exec\n"
+" debian/default.conf => /etc/my-package/start.conf\n"
+"\n"
 msgstr ""
-"B<dh_install> não pode renomear ficheiros ou directórios, pode apenas\n"
-"instalá-los com os nomes que já têm para onde você os deseja na árvore\n"
-"de compilação do pacote.\n"
-"  \n"
+" #!/usr/bin/dh-exec\n"
+" debian/default.conf => /etc/my-package/start.conf\n"
+"\n"
+
+#. type: textblock
+#: dh_install:269
+msgid "Please remember the following three things:"
+msgstr "Por favor lembre-se das três coisas seguintes:"
+
+#. type: =item
+#: dh_install:273
+msgid ""
+"* The package must be using compatibility level 9 or later (see "
+"L<debhelper(7)>)"
+msgstr ""
+"* O pacote tem se usar nível de compatibilidade 9 ou superior veja "
+"L<debhelper(7)>)"
+
+#. type: =item
+#: dh_install:275
+msgid "* The package will need a build-dependency on dh-exec."
+msgstr "* O pacote irá precisar de uma dependência de compilação em dh-exec."
+
+#. type: =item
+#: dh_install:277
+msgid "* The install file must be marked as executable."
+msgstr "* O ficheiro install tem de ser marcado como executável."
 
 #. type: textblock
 #: dh_installcatalogs:5
@@ -3838,9 +3975,8 @@ msgid "Do not modify F<postinst>/F<postrm>/F<prerm> scripts."
 msgstr "Não modifique os scripts F<postinst>/F<postrm>/F<prerm>."
 
 #. type: textblock
-#: dh_installcatalogs:61 dh_installdocs:127 dh_installemacsen:74
-#: dh_installinit:142 dh_installmodules:56 dh_installudev:57 dh_installwm:56
-#: dh_usrlocal:51
+#: dh_installcatalogs:61 dh_installemacsen:74 dh_installinit:142
+#: dh_installmodules:56 dh_installudev:57 dh_installwm:56 dh_usrlocal:51
 msgid ""
 "Note that this command is not idempotent. L<dh_prep(1)> should be called "
 "between invocations of this command. Otherwise, it may cause multiple "
@@ -4152,18 +4288,27 @@ msgstr "I<pacote>.shlibs"
 msgid "These control files are installed into the F<DEBIAN> directory."
 msgstr "Estes ficheiros de controle são instalados no directório F<DEBIAN>."
 
-#. type: =item
+#. type: textblock
 #: dh_installdeb:45
+msgid ""
+"Note that I<package>.shlibs is only installed in compat level 9 and "
+"earlier.  In compat 10, please use L<dh_makeshlibs(1)>."
+msgstr ""
+"Note que o I<pacote>.shlibs é apenas instalado em nível de compatibilidade 9 "
+"e anteriores. Em compatibilidade 10, use L<dh_makeshlibs(1)>."
+
+#. type: =item
+#: dh_installdeb:48
 msgid "I<package>.conffiles"
 msgstr "I<pacote>.conffiles"
 
 #. type: textblock
-#: dh_installdeb:47
+#: dh_installdeb:50
 msgid "This control file will be installed into the F<DEBIAN> directory."
 msgstr "Este ficheiro de controle será instalado no directório F<DEBIAN>."
 
 #. type: textblock
-#: dh_installdeb:49
+#: dh_installdeb:52
 msgid ""
 "In v3 compatibility mode and higher, all files in the F<etc/> directory in a "
 "package will automatically be flagged as conffiles by this program, so there "
@@ -4175,12 +4320,12 @@ msgstr ""
 "aqui."
 
 #. type: =item
-#: dh_installdeb:53
+#: dh_installdeb:56
 msgid "I<package>.maintscript"
 msgstr "I<pacote>.maintscript"
 
 #. type: textblock
-#: dh_installdeb:55
+#: dh_installdeb:58
 msgid ""
 "Lines in this file correspond to L<dpkg-maintscript-helper(1)> commands and "
 "parameters.  Any shell metacharacters will be escaped, so arbitrary shell "
@@ -4586,7 +4731,31 @@ msgstr ""
 "de chamar o B<dh_installdocs>.)"
 
 #. type: textblock
-#: dh_installdocs:105
+#: dh_installdocs:103
+msgid ""
+"B<CAVEAT>: If a previous version of the package was built without this "
+"option and is now built with it (or vice-versa), it requries a \"dir to "
+"symlink\" (or \"symlink to dir\") migration.  Since debhelper has no "
+"knowledge of previous versions, you have to enable this migration itself."
+msgstr ""
+"B<CAVEAT>: Se uma versão anterior do pacote foi compilada sem esta opção e "
+"for agora compilada com ela (ou vice-versa), precisa de uma migração de dir "
+"para symlink\" (ou de \"symlink para dir\"). Como o debhelper não tem "
+"conhecimento das versões anteriores, você terá que ser o próprio a activar "
+"esta migração."
+
+#. type: textblock
+#: dh_installdocs:109
+msgid ""
+"This can be done by providing a \"debian/I<package>.maintscript\" file and "
+"using L<dh_installdeb(1)> to provide the relevant maintainer script snippets."
+msgstr ""
+"Isto pode ser feito ao fornecer um ficheiro \"debian/I<pacote>.maintscript\" "
+"e usar o L<dh_installdeb(1)> para fornecer os fragmentos relevantes do "
+"script do mantenedor."
+
+#. type: textblock
+#: dh_installdocs:115
 msgid ""
 "Install these files as documentation into the first package acted on. (Or in "
 "all packages if B<-A> is specified)."
@@ -4595,12 +4764,12 @@ msgstr ""
 "actua. (Ou em todos os pacotes se for especificado B<-A>)."
 
 #. type: textblock
-#: dh_installdocs:112
+#: dh_installdocs:122
 msgid "This is an example of a F<debian/package.docs> file:"
 msgstr "Este é um exemplo de um ficheiro F<debian/package.docs>:"
 
 #. type: verbatim
-#: dh_installdocs:114
+#: dh_installdocs:124
 #, no-wrap
 msgid ""
 "  README\n"
@@ -4620,7 +4789,7 @@ msgstr ""
 "\n"
 
 #. type: textblock
-#: dh_installdocs:123
+#: dh_installdocs:133
 msgid ""
 "Note that B<dh_installdocs> will happily copy entire directory hierarchies "
 "if you ask it to (similar to B<cp -a>). If it is asked to install a "
@@ -4758,7 +4927,7 @@ msgstr ""
 "predefinição é B<emacs>, as alternativas incluem B<xemacs> e B<emacs20>."
 
 #. type: textblock
-#: dh_installemacsen:143
+#: dh_installemacsen:144
 msgid "L<debhelper(7)> L</usr/share/doc/emacsen-common/debian-emacs-policy.gz>"
 msgstr ""
 "L<debhelper(7)> L</usr/share/doc/emacsen-common/debian-emacs-policy.gz>"
@@ -5670,7 +5839,7 @@ msgstr ""
 "no directório de compilação do pacote."
 
 #. type: textblock
-#: dh_installmenu:47 dh_makeshlibs:79
+#: dh_installmenu:47 dh_makeshlibs:83
 msgid "Do not modify F<postinst>/F<postrm> scripts."
 msgstr "Não modifique os scripts F<postinst>/F<postrm>."
 
@@ -6395,31 +6564,47 @@ msgstr ""
 "(apenas em modo v3 e superior) em quaisquer pacotes nos quais encontra "
 "bibliotecas partilhadas."
 
+#. type: =item
+#: dh_makeshlibs:28
+msgid "debian/I<package>.shlibs"
+msgstr "debian/I<pacote>.shlibs"
+
+#. type: textblock
+#: dh_makeshlibs:30
+msgid ""
+"Installs this file, if present, into the package as DEBIAN/shlibs.  If "
+"omitted, debhelper will generate a shlibs file automatically if it detects "
+"any libraries."
+msgstr ""
+"Instala este ficheiro, se presente, no pacote como DEBIAN/shlibs. Se "
+"omitido, o debhelper irá gerar um ficheiro shlibs automaticamente se "
+"detectar quaisquer bibliotecas."
+
 #. type: textblock
-#: dh_makeshlibs:24
+#: dh_makeshlibs:34
+#, fuzzy
+#| msgid ""
+#| "Note in compat levels 9 and earlier, this file was installed by "
+#| "qL<dh_installdeb(1)> rather than B<dh_makeshlibs>."
 msgid ""
-"Packages that support multiarch are detected, and a Pre-Dependency on "
-"multiarch-support is set in ${misc:Pre-Depends} ; you should make sure to "
-"put that token into an appropriate place in your debian/control file for "
-"packages supporting multiarch."
+"Note in compat levels 9 and earlier, this file was installed by "
+"L<dh_installdeb(1)> rather than B<dh_makeshlibs>."
 msgstr ""
-"Os pacotes que suportam multi-arquitectura são detectados, e é definida uma "
-"Pré-Dependência em multiarch-support em ${misc:Pre-Depends} ; você deve "
-"certificar-se de colocar esse testemunho num local apropriado no seu "
-"ficheiro debian/control para os pacotes que suportam multi-arquitectura."
+"Note que em níveis de compatibilidade 9 e anteriores, este ficheiro era "
+"instalado pelo qL<dh_installdeb(1)> em vez do B<dh_makeshlibs>."
 
 #. type: =item
-#: dh_makeshlibs:33
+#: dh_makeshlibs:37
 msgid "debian/I<package>.symbols"
 msgstr "debian/I<pacote>.symbols"
 
 #. type: =item
-#: dh_makeshlibs:35
+#: dh_makeshlibs:39
 msgid "debian/I<package>.symbols.I<arch>"
 msgstr "debian/I<pacote>.symbols.I<arquitectura>"
 
 #. type: textblock
-#: dh_makeshlibs:37
+#: dh_makeshlibs:41
 msgid ""
 "These symbols files, if present, are passed to L<dpkg-gensymbols(1)> to be "
 "processed and installed. Use the I<arch> specific names if you need to "
@@ -6431,12 +6616,12 @@ msgstr ""
 "para diferentes arquitecturas."
 
 #. type: =item
-#: dh_makeshlibs:47
+#: dh_makeshlibs:51
 msgid "B<-m>I<major>, B<--major=>I<major>"
 msgstr "B<-m>I<major>, B<--major=>I<major>"
 
 #. type: textblock
-#: dh_makeshlibs:49
+#: dh_makeshlibs:53
 msgid ""
 "Instead of trying to guess the major number of the library with objdump, use "
 "the major number specified after the -m parameter. This is much less useful "
@@ -6449,17 +6634,17 @@ msgstr ""
 "olhava para os nomes de ficheiro das bibliotecas em vez de usar o objdump."
 
 #. type: =item
-#: dh_makeshlibs:54
+#: dh_makeshlibs:58
 msgid "B<-V>, B<-V>I<dependencies>"
 msgstr "B<-V>, B<-V>I<dependências>"
 
 #. type: =item
-#: dh_makeshlibs:56
+#: dh_makeshlibs:60
 msgid "B<--version-info>, B<--version-info=>I<dependencies>"
 msgstr "B<--version-info>, B<--version-info=>I<dependências>"
 
 #. type: textblock
-#: dh_makeshlibs:58
+#: dh_makeshlibs:62
 msgid ""
 "By default, the shlibs file generated by this program does not make packages "
 "depend on any particular version of the package containing the shared "
@@ -6485,7 +6670,7 @@ msgstr ""
 "(certifique-se que inclui o nome do pacote)."
 
 #. type: textblock
-#: dh_makeshlibs:69
+#: dh_makeshlibs:73
 msgid ""
 "Beware of using B<-V> without any parameters; this is a conservative setting "
 "that always ensures that other packages' shared library dependencies are at "
@@ -6504,7 +6689,7 @@ msgstr ""
 "difíceis de serem actualizados."
 
 #. type: textblock
-#: dh_makeshlibs:83
+#: dh_makeshlibs:87
 msgid ""
 "Exclude files that contain I<item> anywhere in their filename or directory "
 "from being treated as shared libraries."
@@ -6513,12 +6698,12 @@ msgstr ""
 "ficheiro ou directório de serem tratados como bibliotecas partilhadas."
 
 #. type: =item
-#: dh_makeshlibs:86
+#: dh_makeshlibs:90
 msgid "B<--add-udeb=>I<udeb>"
 msgstr "B<--add-udeb=>I<udeb>"
 
 #. type: textblock
-#: dh_makeshlibs:88
+#: dh_makeshlibs:92
 msgid ""
 "Create an additional line for udebs in the shlibs file and use I<udeb> as "
 "the package name for udebs to depend on instead of the regular library "
@@ -6529,17 +6714,17 @@ msgstr ""
 "normal."
 
 #. type: textblock
-#: dh_makeshlibs:93
+#: dh_makeshlibs:97
 msgid "Pass I<params> to L<dpkg-gensymbols(1)>."
 msgstr "Passa I<params> para L<dpkg-gensymbols(1)>."
 
 #. type: =item
-#: dh_makeshlibs:101
+#: dh_makeshlibs:105
 msgid "B<dh_makeshlibs>"
 msgstr "B<dh_makeshlibs>"
 
 #. type: verbatim
-#: dh_makeshlibs:103
+#: dh_makeshlibs:107
 #, no-wrap
 msgid ""
 "Assuming this is a package named F<libfoobar1>, generates a shlibs file that\n"
@@ -6553,12 +6738,12 @@ msgstr ""
 "\n"
 
 #. type: =item
-#: dh_makeshlibs:107
+#: dh_makeshlibs:111
 msgid "B<dh_makeshlibs -V>"
 msgstr "B<dh_makeshlibs -V>"
 
 #. type: verbatim
-#: dh_makeshlibs:109
+#: dh_makeshlibs:113
 #, no-wrap
 msgid ""
 "Assuming the current version of the package is 1.1-3, generates a shlibs\n"
@@ -6572,12 +6757,12 @@ msgstr ""
 "\n"
 
 #. type: =item
-#: dh_makeshlibs:113
+#: dh_makeshlibs:117
 msgid "B<dh_makeshlibs -V 'libfoobar1 (E<gt>= 1.0)'>"
 msgstr "B<dh_makeshlibs -V 'libfoobar1 (E<gt>= 1.0)'>"
 
 #. type: verbatim
-#: dh_makeshlibs:115
+#: dh_makeshlibs:119
 #, no-wrap
 msgid ""
 "Generates a shlibs file that looks something like:\n"
@@ -7226,6 +7411,16 @@ msgstr "B<--dbg-package=>I<pacote>"
 #. type: textblock
 #: dh_strip:47
 msgid ""
+"B<This option is a now special purpose option that you normally do not "
+"need>.  In most cases, there should be little reason to use this option for "
+"new source packages as debhelper generates automatic debug packages (\"ddebs"
+"\").  B<If you have a manual --dbg-package> that you want to migrate to the "
+"automatic ddeb, please see the B<--ddeb-migration> option."
+msgstr ""
+
+#. type: textblock
+#: dh_strip:54
+msgid ""
 "Causes B<dh_strip> to save debug symbols stripped from the packages it acts "
 "on as independent files in the package build directory of the specified "
 "debugging package."
@@ -7235,7 +7430,7 @@ msgstr ""
 "do pacote de depuração especificado."
 
 #. type: textblock
-#: dh_strip:51
+#: dh_strip:58
 msgid ""
 "For example, if your packages are libfoo and foo and you want to include a "
 "I<foo-dbg> package with debugging symbols, use B<dh_strip --dbg-"
@@ -7246,7 +7441,7 @@ msgstr ""
 "package=>I<foo-dbg>."
 
 #. type: textblock
-#: dh_strip:54
+#: dh_strip:61
 msgid ""
 "Note that this option behaves significantly different in debhelper "
 "compatibility levels 4 and below. Instead of specifying the name of a debug "
@@ -7261,13 +7456,20 @@ msgstr ""
 "os símbolos separados são colocados em pacotes com B<-dbg> adicionado ao seu "
 "nome."
 
+#. type: textblock
+#: dh_strip:67
+msgid ""
+"This option implies B<--no-ddebs> and I<cannot> be used with B<--ddeb> or "
+"B<--ddeb-migration>."
+msgstr ""
+
 #. type: =item
-#: dh_strip:60
+#: dh_strip:70
 msgid "B<-k>, B<--keep-debug>"
 msgstr "B<-k>, B<--keep-debug>"
 
 #. type: textblock
-#: dh_strip:62
+#: dh_strip:72
 msgid ""
 "Debug symbols will be retained, but split into an independent file in F<usr/"
 "lib/debug/> in the package build directory. B<--dbg-package> is easier to "
@@ -7279,17 +7481,95 @@ msgstr ""
 "flexível."
 
 #. type: textblock
-#: dh_strip:70
+#: dh_strip:76
+msgid ""
+"This option implies B<--no-ddebs> and I<cannot> be used with B<--ddebs>."
+msgstr ""
+
+#. type: =item
+#: dh_strip:79
+#, fuzzy
+#| msgid "B<--dbg-package=>I<package>"
+msgid "B<--ddeb-migration=>I<package-relation>"
+msgstr "B<--dbg-package=>I<pacote>"
+
+#. type: textblock
+#: dh_strip:81
+msgid ""
+"This option is used to migrate from a manual \"-dbg\" package (created with "
+"B<--dbg-package>) to the automatic \"ddebs\".  The value of this option "
+"should describe a valid B<Replaces>- and B<Breaks>-relation, which will be "
+"added to the ddebs to avoid file conflicts with the (now obsolete) -dbg "
+"package."
+msgstr ""
+
+#. type: textblock
+#: dh_strip:87
+msgid ""
+"This option implies B<--ddebs> and I<cannot> be used with B<--keep-debug>, "
+"B<--dbg-package> or B<--no-ddebs>."
+msgstr ""
+
+#. type: textblock
+#: dh_strip:90
+msgid "Examples:"
+msgstr ""
+
+#. type: verbatim
+#: dh_strip:92
+#, no-wrap
+msgid ""
+"  dh_strip --ddeb-migration='libfoo-dbg (<< 2.1-3~)'\n"
+"\n"
+msgstr ""
+
+#. type: verbatim
+#: dh_strip:94
+#, no-wrap
+msgid ""
+"  dh_strip --ddeb-migration='libfoo-tools-dbg (<< 2.1-3~), libfoo2-dbg (<< 2.1-3~)'\n"
+"\n"
+msgstr ""
+
+#. type: =item
+#: dh_strip:96
+#, fuzzy
+#| msgid "B<-i>, B<--indep>"
+msgid "B<--ddebs>, B<--no-ddebs>"
+msgstr "B<-i>, B<--indep>"
+
+#. type: textblock
+#: dh_strip:98
+msgid ""
+"Control whether B<dh_strip> should be creating ddebs when possible.  By "
+"default, B<dh_strip> will attempt to build ddebs and this option is "
+"primarily useful for disabling this."
+msgstr ""
+
+#. type: textblock
+#: dh_strip:106
+#, fuzzy
+#| msgid ""
+#| "If the B<DEB_BUILD_OPTIONS> environment variable contains B<nostrip>, "
+#| "nothing will be stripped, in accordance with Debian policy (section 10.1 "
+#| "\"Binaries\")."
 msgid ""
 "If the B<DEB_BUILD_OPTIONS> environment variable contains B<nostrip>, "
 "nothing will be stripped, in accordance with Debian policy (section 10.1 "
-"\"Binaries\")."
+"\"Binaries\").  This will also inhibit the creation of automatic \"ddebs\"."
 msgstr ""
 "Se a variável de ambiente B<DEB_BUILD_OPTIONS> conter B<nostrip>,  nada será "
 "despojado, em conformidade com a política Debian (secção 10.1 \"Binários\")."
 
 #. type: textblock
-#: dh_strip:76
+#: dh_strip:110
+msgid ""
+"The creation of automatic \"ddebs\" can also be prevented by adding "
+"B<noddebs> to the B<DEB_BUILD_OPTIONS> environment variable."
+msgstr ""
+
+#. type: textblock
+#: dh_strip:115
 msgid "Debian policy, version 3.0.1"
 msgstr "Debian policy, versão 3.0.1"
 
@@ -7489,3 +7769,14 @@ msgstr "Debian policy, versão 2.2"
 #: dh_usrlocal:124
 msgid "Andrew Stribblehill <ads@debian.org>"
 msgstr "Andrew Stribblehill <ads@debian.org>"
+
+#~ msgid ""
+#~ "Packages that support multiarch are detected, and a Pre-Dependency on "
+#~ "multiarch-support is set in ${misc:Pre-Depends} ; you should make sure to "
+#~ "put that token into an appropriate place in your debian/control file for "
+#~ "packages supporting multiarch."
+#~ msgstr ""
+#~ "Os pacotes que suportam multi-arquitectura são detectados, e é definida "
+#~ "uma Pré-Dependência em multiarch-support em ${misc:Pre-Depends} ; você "
+#~ "deve certificar-se de colocar esse testemunho num local apropriado no seu "
+#~ "ficheiro debian/control para os pacotes que suportam multi-arquitectura."
diff --git a/t/buildsystems/autoconf/configure b/t/buildsystems/autoconf/configure
index adea14e6..b606f9eb 100755
--- a/t/buildsystems/autoconf/configure
+++ b/t/buildsystems/autoconf/configure
@@ -14,6 +14,7 @@ my @OPTIONS=qw(
    ^--sysconfdir=/etc$
    ^--localstatedir=/var$
    ^--libexecdir=\$\{prefix\}/lib/.*$
+   ^--disable-silent-rules$
    ^--disable-maintainer-mode$
    ^--disable-dependency-tracking$
 );
diff --git a/t/dh-lib b/t/dh-lib
index 772b1a1e..1006c929 100755
--- a/t/dh-lib
+++ b/t/dh-lib
@@ -29,3 +29,9 @@ ok(autoscript('testpackage', 'postinst', 'postinst-init',
 ok_autoscript_result;
 
 ok(unlink('debian/testpackage.postinst.debhelper') >= 0);
+
+# Local Variables:
+# indent-tabs-mode: t
+# tab-width: 4
+# cperl-indent-level: 4
+# End:
diff --git a/t/dh_install b/t/dh_install
index 447a40a8..c2666941 100755
--- a/t/dh_install
+++ b/t/dh_install
@@ -86,3 +86,9 @@ system("mkdir -p bar/usr/bin; touch bar/usr/bin/foo");
 system("./dh_install", "bar/usr/bin/foo");
 ok(-e "debian/debhelper/bar/usr/bin/foo");
 system("rm -rf debian/debhelper bar");
+
+# Local Variables:
+# indent-tabs-mode: t
+# tab-width: 4
+# cperl-indent-level: 4
+# End:
diff --git a/t/dh_link b/t/dh_link
index c6be35be..6b13073c 100755
--- a/t/dh_link
+++ b/t/dh_link
@@ -43,3 +43,9 @@ ok(! -l "debian/debhelper/usr/lib/foo");
 ok(readlink("debian/debhelper/usr/lib/bar"), "/etc/foo");
 ok(readlink("debian/debhelper/usr/bin/bar"), "foo");
 ok(readlink("debian/debhelper/usr/bin/2"),"../lib/1");
+
+# Local Variables:
+# indent-tabs-mode: t
+# tab-width: 4
+# cperl-indent-level: 4
+# End:
diff --git a/t/maintscript b/t/maintscript
index bf15d445..a07ae3e4 100644
--- a/t/maintscript
+++ b/t/maintscript
@@ -17,3 +17,9 @@ for my $script (qw{postinst preinst prerm postrm}) {
 	ok(grep { m{^dpkg-maintscript-helper mv_conffile /etc/2 /etc/3 1\.0-1 -- "\$\@"$} } @output);
 }
 system("rm -rf t/tmp");
+
+# Local Variables:
+# indent-tabs-mode: t
+# tab-width: 4
+# cperl-indent-level: 4
+# End:
diff --git a/t/override_target b/t/override_target
index 28ceda84..c4c7eb10 100755
--- a/t/override_target
+++ b/t/override_target
@@ -20,3 +20,9 @@ system("chmod +x t/tmp/debian/rules");
 my @output=`cd t/tmp && debian/rules build 2>&1`;
 ok(grep { m/override called/ } @output);
 system("rm -rf t/tmp");
+
+# Local Variables:
+# indent-tabs-mode: t
+# tab-width: 4
+# cperl-indent-level: 4
+# End:
diff --git a/t/pod b/t/pod
index 8a9c0bf0..b5b5694e 100755
--- a/t/pod
+++ b/t/pod
@@ -8,3 +8,9 @@ eval 'use Test::Pod';
 plan skip_all => 'Test::Pod required' if $@;
 
 all_pod_files_ok(grep { -x $_ } glob 'dh_*');
+
+# Local Variables:
+# indent-tabs-mode: t
+# tab-width: 4
+# cperl-indent-level: 4
+# End:
diff --git a/t/size b/t/size
index d8b98964..813b2796 100755
--- a/t/size
+++ b/t/size
@@ -18,7 +18,7 @@ foreach my $file (@progs) {
 	while (<IN>) {
 		$cutting=1 if /^=/;
 		$cutting=0 if /^=cut/;
-		next if $cutting || /^(=|\s*\#)/;
+		next if $cutting || /^(?:=|\s*(?:\#.*)?$)/;
 		$lines++;
 		$maxlength=length($_) if length($_) > $maxlength;
 	}
@@ -27,3 +27,9 @@ foreach my $file (@progs) {
 	ok($lines < 200, $file);
 	ok($maxlength < 160, $file);
 }
+
+# Local Variables:
+# indent-tabs-mode: t
+# tab-width: 4
+# cperl-indent-level: 4
+# End:
diff --git a/t/syntax b/t/syntax
index 92455457..f58577ac 100755
--- a/t/syntax
+++ b/t/syntax
@@ -10,3 +10,9 @@ foreach my $file (@progs, @libs) {
 	print "# Testing $file\n";
 	ok(system("perl -c $file >/dev/null 2>&1"), 0);
 }
+
+# Local Variables:
+# indent-tabs-mode: t
+# tab-width: 4
+# cperl-indent-level: 4
+# End: