r584: * Fix stupid typo in dh_movefiles. Closes: #188833

[debhelper.git] / dh_movefiles

diff --git a/dh_movefiles b/dh_movefiles
index 18e46d4d8c9f3b85491f287a97e591b26cac5af8..2c8a63fd934bbc32f601839caeb331700f765b41 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
@@ -91,7 +99,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
        }
 
        if (@tomove && $tmp eq $sourcedir) {
-               error("I was asked to move files from $sourcedir to $sourcedir. Perhaps you should set DH_COMAPT=2?");
+               error("I was asked to move files from $sourcedir to $sourcedir. Perhaps you should set DH_COMPAT=2?");
        }
 
        # Now we need to expand wildcards in @tomove.
@@ -118,14 +126,24 @@ 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");
+                               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 --files-from=$pwd/debian/movelist --file -) | (cd $tmp >/dev/null ;tar xpf -)");
+               # --remove-files is not used above because tar then doesn't
+               # preserve hard links
+               complex_doit("(cd $sourcedir >/dev/null ; cat $pwd/debian/movelist | xargs rm -f)");
                doit("rm","-f","debian/movelist");
        }
 }
@@ -141,7 +159,7 @@ exit $ret;
 
 =head1 SEE ALSO
 
-L<debhelper(1)>
+L<debhelper(7)>
 
 This program is a part of debhelper.