r383: * dh_movefiles: no longer does the symlink ordering hack, as

[debhelper.git] / dh_movefiles

diff --git a/dh_movefiles b/dh_movefiles
index ad9add28b2edbd978f255aaebc9f08389063dcef..f2ea12315dac24ed702b406a2cb2f45ac43322b1 100755 (executable)
--- a/dh_movefiles
+++ b/dh_movefiles
@@ -60,14 +60,8 @@ foreach $PACKAGE (@{$dh{DOPACKAGES}}) {
                foreach (@filelist) {
                        $file=$_;
                        $ret=1 if (! -e $file && ! -l $file);
-                       $file=~s:^$sourcedir/+::;
-                       complex_doit("(cd $sourcedir >/dev/null ; find $file ! -type d -and ! -type l -print || true) >> debian/movelist");
-               }
-               foreach (@filelist) {
-                       $file=$_;
-                       $ret=1 if (! -e $file && ! -l $file);
-                       $file=~s:^$sourcedir/+::;
-                       complex_doit("(cd $sourcedir >/dev/null ; find $file ! -type d -and -type l -print || true) >> debian/movelist");
+                       $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 -)");
                doit("rm","-f","debian/movelist");