r536: * Patch from doogie to make dh_movefiles support -X. Closes: #150978

[debhelper.git] / dh_movefiles

diff --git a/dh_movefiles b/dh_movefiles
index afed17cad98b6c34373268e59a8afab1352f1d47..ec13a01a9e18ad0fab4f7e4d8dcfe9000598e381 100755 (executable)
--- a/dh_movefiles
+++ b/dh_movefiles
@@ -11,7 +11,7 @@ use Debian::Debhelper::Dh_Lib;
 
 =head1 SYNOPSIS
 
-  dh_movefiles [debhelper options] [--sourcedir=dir] [file ...]
+B<dh_movefiles> [S<I<debhelper options>>] [B<--sourcedir=>I<dir>] [B<-X>I<item>] S<I<file ...>>]
 
 =head1 DESCRIPTION
 
@@ -26,6 +26,9 @@ also list directory names, and the whole directory will be moved. If you
 prefer, you can list the files to move on the command line and this will
 apply to the first package dh_movefiles is told to act on.
 
+Note: dh_install is a much better program that can do everything this one can,
+and more.
+
 =head1 OPTIONS
 
 =over 4
@@ -38,6 +41,11 @@ the sourcedir is moved, specifiying something like --sourcedir=/ is very
 unsafe, so to prevent mistakes, the sourcedir must be a relative filename;
 it cannot begin with a `/'.
 
+=item B<-Xitem>, B<--exclude=item>
+
+Exclude files that contain "item" anywhere in their filename from
+being installed.
+
 =item I<file ...>
 
 Lists files to move. The filenames listed should be relative to
@@ -118,14 +126,21 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
                doit("rm","-f","debian/movelist");
                foreach (@tomove) {
                        my $file=$_;
-                       if (! -e $file && ! -l $file) {
+                       if (! -e $file && ! -l $file && ! $dh{NO_ACT}) {
                                $ret=1;
                                warning("$file not found (supposed to put it in $package)");
                        }
                        $file=~s:^\Q$sourcedir\E/+::;
-                       complex_doit("(cd $sourcedir >/dev/null ; find $file ! -type d -print || true) >> debian/movelist");
+                       my $cmd="(cd $sourcedir >/dev/null ; find $file ! -type d ";
+                       if ($dh{EXCLUDE_FIND}) {
+                               $cmd.="-a ! \\( $dh{EXCLUDE_FIND} \\) ";
+                       }
+                       $cmd.="-print || true) >> debian/movelist";
+                       complex_doit($cmd);
                }
-               complex_doit("(cd $sourcedir >/dev/null ; tar --create --remove-files --files-from=../movelist --file -) | (cd $tmp >/dev/null ;tar xpf -)");
+               my $pwd=`pwd`;
+               chomp $pwd;
+               complex_doit("(cd $sourcedir >/dev/null ; tar --create --remove-files --files-from=$pwd/debian/movelist --file -) | (cd $tmp >/dev/null ;tar xpf -)");
                doit("rm","-f","debian/movelist");
        }
 }