From: joey <joey>
Date: Tue, 17 Aug 1999 05:04:15 +0000 (+0000)
Subject: r141: Initial Import
X-Git-Tag: debian_version_0_1~98
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=7a3034bad2993ee50755a5a2e22e2e4d58a5c4fe;p=debhelper.git

r141: Initial Import
---

diff --git a/debian/changelog b/debian/changelog
index 05636c5..edfcacf 100644
--- 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 52a7fe3..d6af346 100755
--- 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");