From 2498b1b9d483d1b79883677a72689e76acee3b9d Mon Sep 17 00:00:00 2001
From: joey <joey>
Date: Tue, 17 Aug 1999 05:04:45 +0000
Subject: [PATCH] r146: Initial Import

---
 debian/changelog | 8 ++++++++
 debian/rules     | 1 +
 dh_link          | 5 ++---
 dh_movefiles     | 4 ++--
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3c124e7..b93b147 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+debhelper (1.2.11) unstable; urgency=low
+
+  * dh_movefiles: if given absolute filenames to move (note that that is
+    *wrong*), it will move relative files anyway. Related to bug #29761.
+  * dh_link: made relative links work right. (I hope!)
+
+ -- Joey Hess <joeyh@master.debian.org>  Fri, 20 Nov 1998 20:21:51 -0800
+
 debhelper (1.2.10) unstable; urgency=low
 
   * examples/*: added dh_link calls to example rules files.
diff --git a/debian/rules b/debian/rules
index 4827597..14b5e7f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -43,6 +43,7 @@ binary-indep: build
 	./dh_installmanpages
 	./dh_installchangelogs
 	./dh_movefiles
+	./dh_link
 	./dh_compress
 	./dh_fixperms
 	./dh_suidregister
diff --git a/dh_link b/dh_link
index 8d4c32a..41dd736 100755
--- a/dh_link
+++ b/dh_link
@@ -58,12 +58,11 @@ foreach $PACKAGE (@{$dh{DOPACKAGES}}) {
 			for (1..$#dest_dirs - $x) {
 				$src.="../";
 			}
-			# The + 1 is here to include the actual filename.
-			for (1..$#src_dirs - $x + 1) {
+			for ($x .. $#src_dirs) {
 				$src.=$src_dirs[$_]."/";
 			}
 			$src=~s:/$::;
-		}	
+		}
 		
 		doit("ln","-sf",$src,"$TMP/$dest");
 	}
diff --git a/dh_movefiles b/dh_movefiles
index d6af346..9819fd2 100755
--- a/dh_movefiles
+++ b/dh_movefiles
@@ -48,13 +48,13 @@ foreach $PACKAGE (@{$dh{DOPACKAGES}}) {
 		foreach (@filelist) {
 			$file=$_;
 			$ret=1 if (! -e $file && ! -l $file);
-			$file=~s:^debian/tmp/*::;
+			$file=~s:^debian/tmp/+::;
 			complex_doit("(cd debian/tmp ; find $file ! -type d -and ! -type l -print || true) >> movelist");
 		}
 		foreach (@filelist) {
 			$file=$_;
 			$ret=1 if (! -e $file && ! -l $file);
-			$file=~s:^debian/tmp/*::;
+			$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 -)");
-- 
2.39.5