Fix typo in French translation, about debian/package.README.Debian files.

[debhelper.git] / dh_movefiles

diff --git a/dh_movefiles b/dh_movefiles
index 3fc689f6490cb0c81b640cc83d5e9cab220c512e..72cbb0ba38a5457bf56d730e018620c5799c9768 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, and you are recommended to use
+it instead of dh_movefiles.
+
 =head1 OPTIONS
 
 =over 4
@@ -34,10 +37,15 @@ apply to the first package dh_movefiles is told to act on.
 
 Instead of moving files out of debian/tmp (the default), this option makes
 it move files out of some other directory. Since the entire contents of
-the sourcedir is moved, specifiying something like --sourcedir=/ is very
+the sourcedir is moved, specifying 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
@@ -50,7 +58,7 @@ tell dh_movefiles which subpackage to put them in.
 =head1 NOTES
 
 Note that files are always moved out of debian/tmp by default (even if you
-have instructed debhelper to use a compatability level higher than one,
+have instructed debhelper to use a compatibility level higher than one,
 which does not otherwise use debian/tmp for anything at all). The idea
 behind this is that the package that is being built can be told to install
 into debian/tmp, and then files can be moved by dh_movefiles from that
@@ -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,26 @@ 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)");
+                       }
+                       else {
+                               $file=~s:^\Q$sourcedir\E/+::;
+                               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);
                        }
-                       $file=~s:^\Q$sourcedir\E/+::;
-                       complex_doit("(cd $sourcedir >/dev/null ; find $file ! -type d -print || true) >> debian/movelist");
                }
-               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 ; tr '\\n' '\\0' < $pwd/debian/movelist | xargs -0  -i rm -f '{}')");
                doit("rm","-f","debian/movelist");
        }
 }
@@ -141,7 +161,7 @@ exit $ret;
 
 =head1 SEE ALSO
 
-L<debhelper(1)>
+L<debhelper(7)>
 
 This program is a part of debhelper.