r146: Initial Import

diff --git a/debian/changelog b/debian/changelog
index 3c124e77f4573a17849a71a05d5eb44082dedefa..b93b147164e1cc010bae1d1f605b1d65d0dc71b6 100644 (file)
--- 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 482759799fa5df96c20d1eb3801f599b31c7fbcc..14b5e7f0d8f5455b435940341ae74e1392ec9e7e 100755 (executable)
--- 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 8d4c32ad60eac332248b93c5c22dc5022da3ae4d..41dd736e4d60e468b1fd3cfcc651a43c51d8c270 100755 (executable)
--- 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 d6af3467ef48cc3b3ddf44612f1d034deda5469a..9819fd2d2841c54273df483ed03a3164d3777852 100755 (executable)
--- 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 -)");