r397: horribly broke everything I touched :-)

diff --git a/debhelper.1 b/debhelper.1
index aedecd729a98aad66c89324e822021add90f274c..c8cd186cb208f15138d226b3228ff1b08f2cde53 100644 (file)
--- a/debhelper.1
+++ b/debhelper.1
@@ -50,6 +50,11 @@ In some rare cases, you may want to have different versions of these files
 for different architectures. If files named debian/<package>.foo.<arch>
 exist, where <arch> is the same as the output of "dpkg --print-architecture",
 then they will be used in preference to other, more general files.
+.P
+In many cases, these config files are used to specify various types of
+files. Documentation or example files to install, files to move, and so on.
+When appropriate, in cases like these, you can use standard shell wildcard
+characters ("?" and "*") in the files.
 .SH "SHARED DEBHELPER OPTIONS"
 The following command line options are supported by all debhelper programs.
 .TP

diff --git a/dh_installdocs b/dh_installdocs
index 7af380947bd1a27853ea870896b286052c3dca76..6191091ac62a1ddcb5438c00338832203a200c41 100755 (executable)
--- a/dh_installdocs
+++ b/dh_installdocs
@@ -21,7 +21,7 @@ foreach $PACKAGE (@{$dh{DOPACKAGES}}) {
        undef @docs;
 
        if ($file) {
-               @docs=filearray($file);
+               @docs=filearray($file, ".");
        }
 
        if (($PACKAGE eq $dh{FIRSTPACKAGE} || $dh{PARAMS_ALL}) && @ARGV) {

diff --git a/dh_installexamples b/dh_installexamples
index bf0bbe4ac6d3d88cf13f19e1f0c46efca5c865d4..7e627675b44fac14139b79aa90c475bededdfd9c 100755 (executable)
--- a/dh_installexamples
+++ b/dh_installexamples
@@ -13,7 +13,7 @@ foreach $PACKAGE (@{$dh{DOPACKAGES}}) {
        undef @examples;
        
        if ($file) {
-               @examples=filearray($file);
+               @examples=filearray($file, ".");
        }       
 
        if (($PACKAGE eq $dh{FIRSTPACKAGE} || $dh{PARAMS_ALL}) && @ARGV) {

diff --git a/dh_installinfo b/dh_installinfo
index e00981ef16947c531b43d61a7f34ac5efeb2e608..146aede996a4802571836ec99e0baff473e52b8b 100755 (executable)
--- a/dh_installinfo
+++ b/dh_installinfo
@@ -13,7 +13,7 @@ foreach $PACKAGE (@{$dh{DOPACKAGES}}) {
        undef @info;
        
        if ($file) {
-               @info=filearray($file);
+               @info=filearray($file, ".");
        }
 
        if (($PACKAGE eq $dh{FIRSTPACKAGE} || $dh{PARAMS_ALL}) && @ARGV) {

diff --git a/dh_installwm b/dh_installwm
index 93d464d2a3b39e0aac781d4106ab5a244c3df4a6..7bc98aaed585bed829e3509e8e46a946ce431aec 100755 (executable)
--- a/dh_installwm
+++ b/dh_installwm
@@ -18,11 +18,11 @@ if (@ARGV) {
 }
 
 foreach $PACKAGE (@{$dh{DOPACKAGES}}) {
-#      $TMP=tmpdir($PACKAGE);
+       $TMP=tmpdir($PACKAGE);
        $file=pkgfile($PACKAGE,"wm");
 
        if ($file) {
-               @wm=filearray($file);
+               @wm=filearray($file, $TMP);
        }
 
        if (($PACKAGE eq $dh{FIRSTPACKAGE} || $dh{PARAMS_ALL}) && @ARGV) {

diff --git a/dh_movefiles b/dh_movefiles
index f2ea12315dac24ed702b406a2cb2f45ac43322b1..1ee71e76738cd5872d2ad78e41986d1efa76246d 100755 (executable)
--- a/dh_movefiles
+++ b/dh_movefiles
@@ -29,7 +29,7 @@ foreach $PACKAGE (@{$dh{DOPACKAGES}}) {
 
         # debian/files has a different purpose, so ignore it.
        if ( $files && $files ne "debian/files" ) {
-               @tomove=filearray($files);
+               @tomove=filearray($files, $sourcedir);
        }
        
        if (($PACKAGE eq $dh{FIRSTPACKAGE} || $dh{PARAMS_ALL}) && @ARGV) {
@@ -40,24 +40,27 @@ foreach $PACKAGE (@{$dh{DOPACKAGES}}) {
                error("I was asked to move files from $sourcedir to $sourcedir. Perhaps you should set DH_COMAPT=2?");
        }
 
-       if (@tomove) {
-               if (! -d $TMP) {
-                       doit("install","-d",$TMP);
-               }
-               # Now we need to expand wildcards in @tomove.
+       # Now we need to expand wildcards in @tomove.
+       # This is only necessary in pre-v3 land, as of v3, the
+       # expension is automatically done by filearray().
+       if (@tomove && ! Debian::Debhelper::Dh_Lib::compat(3)) {
                @filelist=();
                foreach (@tomove) {
                        push @filelist, glob("$sourcedir/$_");
                }
+               @tomove=@filelist;
+       }
 
-               # If the globs expended to nothing, we are done.
-               next unless @filelist;
+       if (@tomove) {
+               if (! -d $TMP) {
+                       doit("install","-d",$TMP);
+               }
 
                # Order the files. First all real files, then symlinks. 
                # Putting symlinks last is a nice thing to do for library 
                # packages and doesn't affect much of anything else.
                doit("rm","-f","debian/movelist");
-               foreach (@filelist) {
+               foreach (@tomove) {
                        $file=$_;
                        $ret=1 if (! -e $file && ! -l $file);
                        $file=~s:^\Q$sourcedir\E/+::;

diff --git a/dh_suidregister b/dh_suidregister
index 50d64b21cea2e1d9dd5ef860cb14d33685784a36..08cc324845b11c1733b43e26a6ed15ed0ef84893 100755 (executable)
--- a/dh_suidregister
+++ b/dh_suidregister
@@ -15,7 +15,7 @@ foreach $PACKAGE (@{$dh{DOPACKAGES}}) {
 
        @files=();
        if ($suid) {
-               @files=filearray($suid);
+               @files=filearray($suid, $TMP);
        }
 
        if (($PACKAGE eq $dh{FIRSTPACKAGE} || $dh{PARAMS_ALL}) && @ARGV) {