r1703: * dh_cgonf: deal with problems if /etc/gconf/schemas doesn't exist any...

[debhelper.git] / dh_movefiles

diff --git a/dh_movefiles b/dh_movefiles
index cc1af45eba1a2eb2f90a81b4144ed9326e50a84e..acd3b20d596c742d4852b7bd75887ebe46c36425 100755 (executable)
--- a/dh_movefiles
+++ b/dh_movefiles
@@ -130,17 +130,22 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
                                $ret=1;
                                warning("$file not found (supposed to put it in $package)");
                        }
-                       $file=~s:^\Q$sourcedir\E/+::;
-                       my $cmd="(cd $sourcedir >/dev/null ; find $file ! -type d ";
-                       if ($dh{EXCLUDE_FIND}) {
-                               $cmd.="-a ! \\( $dh{EXCLUDE_FIND} \\) ";
+                       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);
                        }
-                       $cmd.="-print || true) >> debian/movelist";
-                       complex_doit($cmd);
                }
                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 -)");
+               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");
        }
 }