summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debhelper.15
-rwxr-xr-xdh_installdocs2
-rwxr-xr-xdh_installexamples2
-rwxr-xr-xdh_installinfo2
-rwxr-xr-xdh_installwm4
-rwxr-xr-xdh_movefiles21
-rwxr-xr-xdh_suidregister2
7 files changed, 23 insertions, 15 deletions
diff --git a/debhelper.1 b/debhelper.1
index aedecd7..c8cd186 100644
--- 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 7af3809..6191091 100755
--- 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 bf0bbe4..7e62767 100755
--- 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 e00981e..146aede 100755
--- 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 93d464d..7bc98aa 100755
--- 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 f2ea123..1ee71e7 100755
--- 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 50d64b2..08cc324 100755
--- 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) {