Updated French man page translation. Closes: #685560

[debhelper.git] / dh_movefiles

diff --git a/dh_movefiles b/dh_movefiles
index 3fc689f6490cb0c81b640cc83d5e9cab220c512e..e9439bded17c2241eb06b2542621f417c79fc2d9 100755 (executable)
--- a/dh_movefiles
+++ b/dh_movefiles
@@ -11,20 +11,29 @@ use Debian::Debhelper::Dh_Lib;
 
 =head1 SYNOPSIS
 
 
 =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
 
 
 =head1 DESCRIPTION
 

-dh_movefiles is a debhelper program that is responsible for moving files
-out of debian/tmp or some other directory and into other package build
-directories. This may be useful if your package has a Makefile that installs
-everything into debian/tmp, and you need to break that up into subpackages.
+B<dh_movefiles> is a debhelper program that is responsible for moving files
+out of F<debian/tmp> or some other directory and into other package build
+directories. This may be useful if your package has a F<Makefile> that installs
+everything into F<debian/tmp>, and you need to break that up into subpackages.

 
 

-Files named debian/package.files list the files to be moved, separated by
-whitespace. The filenames listed should be relative to debian/tmp/. You can
-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: B<dh_install> is a much better program, and you are recommended to use
+it instead of B<dh_movefiles>.
+
+=head1 FILES
+
+=over 4
+
+=item debian/I<package>.files
+
+Lists the files to be moved into a package, separated by whitespace. The
+filenames listed should be relative to F<debian/tmp/>. You can also list
+directory names, and the whole directory will be moved.
+
+=back

 
 =head1 OPTIONS
 
 
 =head1 OPTIONS
 


@@ -32,34 +41,41 @@ apply to the first package dh_movefiles is told to act on.
 
 =item B<--sourcedir=>I<dir>
 
 
 =item B<--sourcedir=>I<dir>
 

-Instead of moving files out of debian/tmp (the default), this option makes
+Instead of moving files out of F<debian/tmp> (the default), this option makes

 it move files out of some other directory. Since the entire contents of
 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 B<--sourcedir=/> is very

 unsafe, so to prevent mistakes, the sourcedir must be a relative filename;
 unsafe, so to prevent mistakes, the sourcedir must be a relative filename;

-it cannot begin with a `/'.
+it cannot begin with a `B</>'.
+
+=item B<-Xitem>, B<--exclude=item>

 
 

-=item I<file ...>
+Exclude files that contain B<item> anywhere in their filename from
+being installed.
+
+=item I<file> ...

 
 Lists files to move. The filenames listed should be relative to
 
 Lists files to move. The filenames listed should be relative to

-debian/tmp/. You can also list directory names, and the whole directory will
-be moved. It is an error to list files here unless you use -p, -i, or -a to
-tell dh_movefiles which subpackage to put them in.
+F<debian/tmp/>. You can also list directory names, and the whole directory will
+be moved. It is an error to list files here unless you use B<-p>, B<-i>, or B<-a> to
+tell B<dh_movefiles> which subpackage to put them in.

 
 =back
 
 =head1 NOTES
 
 
 =back
 
 =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,
+Note that files are always moved out of F<debian/tmp> by default (even if you
+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
 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
+into F<debian/tmp>, and then files can be moved by B<dh_movefiles> from that

 directory. Any files or directories that remain are ignored, and get
 directory. Any files or directories that remain are ignored, and get

-deleted by dh_clean later.
+deleted by B<dh_clean> later.

 
 =cut
 
 
 =cut
 

-init();
+init(options => {
+       "sourcedir=s" => \$dh{SOURCEDIR},       
+});

 
 my $ret=0;
 
 
 my $ret=0;
 


@@ -91,12 +107,12 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
        }
 
        if (@tomove && $tmp eq $sourcedir) {
        }
 
        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.
        # This is only necessary in pre-v3 land -- as of v3, the
        }
 
        # 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().
+       # expansion is automatically done by filearray().

        if (@tomove && compat(2)) {
                my @filelist=();
                foreach (@tomove) {
        if (@tomove && compat(2)) {
                my @filelist=();
                foreach (@tomove) {


@@ -118,30 +134,42 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
                doit("rm","-f","debian/movelist");
                foreach (@tomove) {
                        my $file=$_;
                doit("rm","-f","debian/movelist");
                foreach (@tomove) {
                        my $file=$_;

-                       if (! -e $file && ! -l $file) {
+                       if (! -e $file && ! -l $file && ! $dh{NO_ACT}) {

                                $ret=1;
                                $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 rm -f)");

                doit("rm","-f","debian/movelist");
        }
 }
 
                doit("rm","-f","debian/movelist");
        }
 }
 

-# If $ret is set, we wern't actually able to find some 
+# If $ret is set, we weren't actually able to find some

 # files that were specified to be moved, and we should
 # exit with the code in $ret. This program puts off 
 # exiting with an error until all files have been tried
 # to be moved, because this makes it easier for some 
 # files that were specified to be moved, and we should
 # exit with the code in $ret. This program puts off 
 # exiting with an error until all files have been tried
 # to be moved, because this makes it easier for some 

-# packages that arn't always sure exactly which files need
+# packages that aren't always sure exactly which files need

 # to be moved.
 exit $ret;
 
 =head1 SEE ALSO
 
 # to be moved.
 exit $ret;
 
 =head1 SEE ALSO
 

-L<debhelper(1)>
+L<debhelper(7)>

 
 This program is a part of debhelper.
 
 
 This program is a part of debhelper.