r522: * Set DH_ALWAYS_EXCLUDE=CVS and debhelper will exclude CVS directories

[debhelper.git] / dh_movefiles

diff --git a/dh_movefiles b/dh_movefiles
index 4cde0887faa1c7c594e97ac22c8a67c19dbdcc43..97427b8d08d3604ef979492c181d8bbac57b41a5 100755 (executable)
--- a/dh_movefiles
+++ b/dh_movefiles
@@ -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
@@ -118,7 +121,7 @@ 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)");
                        }
@@ -127,7 +130,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
                }
                my $pwd=`pwd`;
                chomp $pwd;
-               complex_doit("(cd $sourcedir >/dev/null ; tar --create --remove-files --files-from=$pwd/movelist --file -) | (cd $tmp >/dev/null ;tar xpf -)");
+               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");
        }
 }