r583: * dh_movefiles: Do not pass --remove-files to tar, since that makes

     it break hard links (see #188663).

diff --git a/debian/changelog b/debian/changelog
index 2222d3d8244d1cbe2e0270a832a8ef20f6ba6b23..e7c9bb6b066e8d2a6673db1c89b388e1d2a6033c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debhelper (4.1.41) unstable; urgency=low
+
+  * dh_movefiles: Do not pass --remove-files to tar, since that makes
+    it break hard links (see #188663).
+
+ -- Joey Hess <joeyh@debian.org>  Sat, 12 Apr 2003 17:11:28 -0400
+

 debhelper (4.1.40) unstable; urgency=low
 
   * Fix build with 077 umask. Closes: #187757
 debhelper (4.1.40) unstable; urgency=low
 
   * Fix build with 077 umask. Closes: #187757

diff --git a/dh_movefiles b/dh_movefiles
index cc1af45eba1a2eb2f90a81b4144ed9326e50a84e..8762487ac6bd10a4480f10d83dedc87b89792964 100755 (executable)
--- a/dh_movefiles
+++ b/dh_movefiles
@@ -140,7 +140,10 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
                }
                my $pwd=`pwd`;
                chomp $pwd;
                }
                my $pwd=`pwd`;
                chomp $pwd;

-               complex_doit("(cd $sourcedir >/dev/null ; tar --create --remove-files --files-from=$pwd/debian/movelist --file -) | (cd $tmp >/dev/null ;tar xpf -)");
+               complex_doit("(cd $sourcedir >/dev/null ; tar --create --files-from=$pwd/debian/movelist --file -) | (cd $tmp >/dev/null ;tar xpf -)");
+               # --remove-files is not used above because tar then doesn't
+               # preserve hard links
+               complex_doit("cd $sourcedir >/dev/null ; cat $pwd/debian/movelist | xargs rm -f)");

                doit("rm","-f","debian/movelist");
        }
 }
                doit("rm","-f","debian/movelist");
        }
 }