r112: Initial Import

diff --git a/Dh_Lib.pm b/Dh_Lib.pm
index 49e337a9f8df0450708added56e2590084b34f64..b4d0db53777edf6b7c170674c9498868d837e57e 100644 (file)
--- a/Dh_Lib.pm
+++ b/Dh_Lib.pm
@@ -74,7 +74,8 @@ sub init {
 
 # Escapes out shell metacharacters in a word of shell script.
 sub escape_shell { my $word=shift;
-       $word=~s/([\s><&!\[\]\{\}\(\)\$])/\\$1/g;
+       # This list is from )Unix in a Nutshell_. (except '#')
+       $word=~s/([-\s!"$()*+#;<>?@\[\]\\`|~])/\\$1/g;
        return $word;
 }
 

diff --git a/debian/changelog b/debian/changelog
index 05caf2c96876b66c4d42a3328265217b8ada2e16..b96ab89d9dceff1b5299d5db4887329dfd036e3e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debhelper (1.1.6) unstable; urgency=low
+
+  * dh_movefiles: don't die on symlinks (#25642). (Hope I got the fix right
+    this time..)
+
+ -- Joey Hess <joeyh@master.debian.org>  Tue, 11 Aug 1998 20:11:13 -0700
+
 debhelper (1.1.5) unstable; urgency=low
 
   * dh_builddeb, dh_installchangelogs: converted to perl.

diff --git a/doc/README b/doc/README
index 845f94ef42fc6b65e3451f9401fa1278cf8f072f..76b2263e118553bd86f1ef6cc67db76c3339ccd2 100644 (file)
--- a/doc/README
+++ b/doc/README
@@ -41,4 +41,14 @@ print << `EOF`
 #DEBHELPER#
 EOF
 
+Other notes:
+-----------
+
+Note that if you are generating a debian package that has arch-indep and
+arch-dependant portions, and you are using dh_movefiles to move the
+arch-indep files out of debian/tmp, you need to make sure that dh_movefiles
+does this even if only the arch-dependant package is being built (for ports
+to other architectures). I handle this in debian/rules.multi by calling
+dh_movefiles in the install target.
+
 -- Joey Hess <joeyh@master.debian.org>

diff --git a/examples/rules.multi b/examples/rules.multi
index 5852751ec3cca9f7e5948ddfffb65eb22b7cb1ce..04732edbb789ee78b218dc35b015ffb572c0844a 100755 (executable)
--- a/examples/rules.multi
+++ b/examples/rules.multi
@@ -37,6 +37,7 @@ install-stamp: build-stamp
        # Add here commands to install the package into debian/tmp.
        #$(MAKE) prefix=`pwd`/debian/tmp/usr install
 
+       dh_movefiles
        touch install-stamp
 
 # Build architecture-independent files here.
@@ -44,7 +45,6 @@ binary-indep: build install
 #      dh_testversion
        dh_testdir -i
        dh_testroot -i
-       dh_movefiles -i
        dh_installdocs -i
        dh_installexamples -i
        dh_installmenu -i
@@ -67,7 +67,6 @@ binary-arch: build install
 #      dh_testversion
        dh_testdir -a
        dh_testroot -a
-       dh_movefiles -a
        dh_installdocs -a
        dh_installexamples -a
        dh_installmenu -a