r141: Initial Import

diff --git a/debian/changelog b/debian/changelog
index 05636c5d2eff4deb5e3e8cca45faacf31a7036b6..edfcacf70524dda36d8d6315dda7e9ce15b58ebd 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+debhelper (1.2.7) unstable; urgency=low
+
+  * dh_movefiles: Fixed another bug.
+
+ -- Joey Hess <joeyh@master.debian.org>  Mon, 16 Nov 1998 12:53:05 -0800
+
 debhelper (1.2.6) unstable; urgency=low
 
   * dh_movefiles: fixed non-integer comparison (#29476)

diff --git a/dh_movefiles b/dh_movefiles
index 52a7fe347fe3cf19e38a020916ad8f4fb60ca3ac..d6af3467ef48cc3b3ddf44612f1d034deda5469a 100755 (executable)
--- a/dh_movefiles
+++ b/dh_movefiles
@@ -46,14 +46,16 @@ foreach $PACKAGE (@{$dh{DOPACKAGES}}) {
                # packages and doesn't affect much of anything else.
                doit("rm","-f","movelist");
                foreach (@filelist) {
-                       $ret=1 if (! -e $_ && ! -l $_);
-                       s:^debian/tmp/*::;
-                       complex_doit("(cd debian/tmp ; find $_ ! -type d -and ! -type l -print || true) >> movelist");
+                       $file=$_;
+                       $ret=1 if (! -e $file && ! -l $file);
+                       $file=~s:^debian/tmp/*::;
+                       complex_doit("(cd debian/tmp ; find $file ! -type d -and ! -type l -print || true) >> movelist");
                }
                foreach (@filelist) {
-                       $ret=1 if (! -e $_ && ! -l $_);
-                       s:^debian/tmp/*::;
-                       complex_doit("(cd debian/tmp ; find $_ ! -type d -and -type l -print || true) >> movelist");
+                       $file=$_;
+                       $ret=1 if (! -e $file && ! -l $file);
+                       $file=~s:^debian/tmp/*::;
+                       complex_doit("(cd debian/tmp ; find $file ! -type d -and -type l -print || true) >> movelist");
                }
                complex_doit("(cd debian/tmp;tar --create --remove-files --files-from=../../movelist --file -) | (cd $TMP;tar xpf -)");
                doit("rm","-f","movelist");