dh_movefiles: Optimise use of xargs. Closes: #627737

diff --git a/debian/changelog b/debian/changelog
index 47a661821832a6d11dc3b22408fe60bf93c58ef7..8404462db93eb092ed17da25747f0056de8c93cc 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ debhelper (8.1.7) UNRELEASED; urgency=low
 
   * Fix example. Closes: #627534
   * Fix error message. Closes: #628053
+  * dh_movefiles: Optimise use of xargs. Closes: #627737
 
  -- Joey Hess <joeyh@debian.org>  Sat, 21 May 2011 15:24:19 -0400
 

diff --git a/dh_movefiles b/dh_movefiles
index b146b8e90f1d313e8c1a086091cc4efe5abdaf9b..3f59d9e5dfddbc5929e2dfc8dea80fca22867186 100755 (executable)
--- a/dh_movefiles
+++ b/dh_movefiles
@@ -153,7 +153,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
                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 ; tr '\\n' '\\0' < $pwd/debian/movelist | xargs -0  -i rm -f '{}')");
+               complex_doit("(cd $sourcedir >/dev/null ; tr '\\n' '\\0' < $pwd/debian/movelist | xargs -0 rm -f)");
                doit("rm","-f","debian/movelist");
        }
 }