r91: Initial Import

diff --git a/debian/changelog b/debian/changelog
index e37b9d76b45dbc270e6ce937502136e7b817d5bf..05337cf12613fe1a44538fe48c58f9bf0b4dd935 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+debhelper (0.94) unstable; urgency=low
+
+  * dh_md5sums: fixed so it handles spaces and other odd characters in 
+    filenames correctly. (#23046, #23700, #22010)
+  * As a side effect, got rid of the nasty temporary file dh_md5sums used
+    before.
+
+ -- Joey Hess <joeyh@master.debian.org>  Mon, 22 Jun 1998 16:14:42 -0700
+
 debhelper (0.93) unstable; urgency=low
 
   * Depend on file, since several dh_*'s use it.

diff --git a/dh_movefiles b/dh_movefiles
index 964d4068dff27a5d842a04f8eaf4500de15fe237..8a365623f0dad29765a17f6f2097aa63b2e66715 100755 (executable)
--- a/dh_movefiles
+++ b/dh_movefiles
@@ -33,13 +33,16 @@ for PACKAGE in $DH_DOPACKAGES; do
                # won't work properly.)
                tomove=""
                for i in `(cd debian/tmp ; echo \`cat $files\`)`; do
-                       tomove="`(cd debian/tmp ; \
-                               find $i ! -type d -and ! -type l -print)` \
-                               $tomove \
-                               `(cd debian/tmp ; \
-                               find $i ! -type d -and -type l -print)`"
+tomove="`(cd debian/tmp ;\
+find $i ! -type d -and ! -type l -print)`\
+$tomove\
+`(cd debian/tmp ;\
+find $i ! -type d -and -type l -print)`"
                done
-
-               complex_doit "(cd debian/tmp;tar --create --remove-files --file - "$tomove") | (cd $TMP;tar xpf -)"
+               
+               # Use a filelist, so very weird filenames can be moved.
+               complex_doit "echo '$tomove' > movelist"
+               complex_doit "(cd debian/tmp;tar --create --remove-files --files-from=../../movelist --file -) | (cd $TMP;tar xpf -)"
+               doit "rm -f movelist"
        fi
 done