r92: Initial Import

diff --git a/debian/changelog b/debian/changelog
index 05337cf12613fe1a44538fe48c58f9bf0b4dd935..b2263d29d703b290b5eebcc36446b51567f13926 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debhelper (0.95) unstable; urgency=low
+
+  * dh_movefiles: move even very strangly named files. (#23775) Unfortunatly,
+    I had to use a temporary file. Oh well..
+
+ -- Joey Hess <joeyh@master.debian.org>  Mon, 22 Jun 1998 17:16:17 -0700
+
 debhelper (0.94) unstable; urgency=low
 
   * dh_md5sums: fixed so it handles spaces and other odd characters in 

diff --git a/debian/rules b/debian/rules
index 44c77e076818b515a70d65187f92441dffc767e0..b2ea0bd0abbc7d0ab69208364e74d94054a37d00 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -47,7 +47,7 @@ binary-indep: build
        cp -a dh_lib dh_getopt.pl debian/tmp/usr/lib/debhelper
        cp -a autoscripts debian/tmp/usr/lib/debhelper
 
-       ./dh_installdocs TODO README PROGRAMMING from-debstd
+       ./dh_installdocs doc/TODO doc/README doc/PROGRAMMING doc/from-debstd
        ./dh_installexamples examples/*
        ./dh_installmenu
        ./dh_installmanpages

diff --git a/dh_movefiles b/dh_movefiles
index 8a365623f0dad29765a17f6f2097aa63b2e66715..79dc08925c64727474d9f3439335ea12d40f11ba 100755 (executable)
--- a/dh_movefiles
+++ b/dh_movefiles
@@ -15,9 +15,9 @@ for PACKAGE in $DH_DOPACKAGES; do
 
        # debian/files has a different purpose, so ignore it.
        if [ "$files" -a "$files" != "debian/files" ]; then
-               if [ "$TMP" = "debian/tmp" ]; then
-                       error "I was asked to move some files from debian/tmp to debian/tmp."
-               fi
+#              if [ "$TMP" = "debian/tmp" ]; then
+#                      error "I was asked to move some files from debian/tmp to debian/tmp."
+#              fi
 
                if [ ! -d "$TMP" ]; then
                        doit "install -d $TMP"
@@ -31,17 +31,15 @@ for PACKAGE in $DH_DOPACKAGES; do
                #
                # (The echo is in here to expand wildcards. Note that 'ls'
                # won't work properly.)
-               tomove=""
+               # The filelist is used, so even very weird filenames can be
+               # moved.
+               doit "rm -f movelist"
+               for i in `(cd debian/tmp ; echo \`cat $files\`)`; do
+                       complex_doit "(cd debian/tmp ; find $i ! -type d -and ! -type l -print) >> movelist"
+               done
                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)`"
+                       complex_doit "(cd debian/tmp ; find $i ! -type d -and -type l -print) >> movelist"
                done
-               
-               # 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