r518: * dh_movefiles has long been a sore point in debhelper. Inherited

[debhelper.git] / dh_installdeb

diff --git a/dh_installdeb b/dh_installdeb
index a97fc00943f88688a9e2aeb3eb4967ece23cd896..69c66ddc15fbd536705302bf3812ff1a20e91c87 100755 (executable)
--- a/dh_installdeb
+++ b/dh_installdeb
@@ -11,7 +11,7 @@ use Debian::Debhelper::Dh_Lib;
 
 =head1 SYNOPSIS
 
-  dh_installdeb [debhelper options]
+B<dh_installdeb> [S<I<debhelper options>>]
 
 =head1 DESCRIPTION
 
@@ -36,7 +36,7 @@ inserted. If the script does not exist, then a script is generated from
 the .debhelper file. The .debhelper files are created by other debhelper
 programs, such as L<dh_installmenu(1)>, and are shell script fragments.
 
-If DH_COMPAT is set to 3 or higher, all files in the etc/ directory in a
+In V3 compatability mode and higher, all files in the etc/ directory in a
 package will automatically be flagged as conffiles by this program, so
 there is no need to list them manually in package.conffiles.
 
@@ -75,7 +75,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
                        # Auto-generate script header and add .debhelper
                        # content to it.
                        if (-f "debian/$ext$file.debhelper") {
-                               complex_doit("echo '#!/bin/sh -e' > $tmp/DEBIAN/$file");
+                               complex_doit("printf '#!/bin/sh\nset -e\n' > $tmp/DEBIAN/$file");
                                complex_doit("cat debian/$ext$file.debhelper >> $tmp/DEBIAN/$file");
                                doit("chown","0.0","$tmp/DEBIAN/$file");
                                doit("chmod",755,"$tmp/DEBIAN/$file");
@@ -94,7 +94,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
        # Automatic conffiles registration: If it is in /etc, it is a
        # conffile.
        if (! compat(2) && -d "$tmp/etc") {
-               complex_doit("find $tmp/etc -type f |sed 's~^$tmp~~' >> $tmp/DEBIAN/conffiles");
+               complex_doit("find $tmp/etc -type f -printf '/etc/%P\n' >> $tmp/DEBIAN/conffiles");
                # Anything found?
                if (-z "$tmp/DEBIAN/conffiles") {
                        doit("rm", "-f", "$tmp/DEBIAN/conffiles");