r35: Initial Import

diff --git a/BUGS b/BUGS
index 51a7b6133b1081b50a24d530f4872118ca683b68..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/BUGS
+++ b/BUGS
@@ -1,5 +0,0 @@
-dh_compress: doesn't verbose echo that it's cd'd to $TMP. 
-dh_installdirs, dh_md5sums: uses ../.. to cd back to original location, but
-       we don't know that $TMP is 2 levels deep.
-dh_compress: refers to ../compress (meaning debian/compress), but we don't
-know that this will work - exp if $TMP is not under debian/.

diff --git a/debian/changelog b/debian/changelog
index 7badab5c18cb5512e217a2d562c5c8cd0e5b7913..249f8f28579b6731a1bcd99dd1f5076d15561406 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+debhelper (0.29) unstable; urgency=low
+
+  * dh_lib: don't expand text passed to doit() a second time. This fixes
+    #15624, and hopefully doesn't break anything else.
+  * A side effect of this (of interest only to the debhelper programmer) is
+    that doit() can no longer handle complex commands now. (ie, pipes, `;',
+    `&', etc separating multiple commands, or redirection)
+  * dh_makeshlibs, dh_md5sums, dh_installdebfiles, dh_du, dh_clean, 
+    dh_installdirs: don't pass complex commands to doit().
+
+ -- Joey Hess <joeyh@master.debian.org>  Thu,  4 Dec 1997 13:56:14 -0500
+
 debhelper (0.28) unstable; urgency=low
 
   * dh_makeshlibs: fixes type that caused the program to crash (#15536).

diff --git a/dh_du b/dh_du
index c06f9c27b7478cf9a69a56077fe0a930fbde186e..39c684eb2a864fc6191ce862245f49529134868e 100755 (executable)
--- a/dh_du
+++ b/dh_du
@@ -14,6 +14,6 @@ for PACKAGE in $DH_DOPACKAGES; do
        fi
 
        # Note that the tabs in this next line are important.
-       doit "du -k $TMP | sed 's:      $TMP/:  :' | grep -v '  DEBIAN$' | grep -v '    $TMP$' >$TMP/DEBIAN/du"
+       complex_doit "du -k $TMP | sed 's:      $TMP/:  :' | grep -v '  DEBIAN$' | grep -v '    $TMP$' >$TMP/DEBIAN/du"
        doit "chown root.root debian/tmp/DEBIAN/du"
 done

diff --git a/dh_installdirs b/dh_installdirs
index dbe1a0a8fda652a036626606eee8ac8d52965a29..cb38a4b3fa8af71d388dc8288ddf33f6775375dc 100755 (executable)
--- a/dh_installdirs
+++ b/dh_installdirs
@@ -31,6 +31,8 @@ for PACKAGE in $DH_DOPACKAGES; do
                        fi
                done
                # Create dirs.
-               doit "cd $TMP && install -d $dirs && cd ../.."
+               doit "cd $TMP"
+               doit "install -d $dirs"
+               doit "cd ../.."
        fi
 done

diff --git a/dh_makeshlibs b/dh_makeshlibs
index 24fef4ec36f1a74ad4d38fda3c19323fa49d92c8..0943ba57aa0e2ee71459cc10affa300755b317bc 100755 (executable)
--- a/dh_makeshlibs
+++ b/dh_makeshlibs
@@ -20,7 +20,7 @@ for PACKAGE in $DH_DOPACKAGES; do
                if [ ! -d "$TMP/DEBIAN" ] ; then
                        doit "install -d $TMP/DEBIAN"
                fi
-               doit "echo '$LIBRARY $MAJOR $PACKAGE' >>$TMP/DEBIAN/shlibs"
+               complex_doit "echo '$LIBRARY $MAJOR $PACKAGE' >>$TMP/DEBIAN/shlibs"
        done
 
        if [ -e "$TMP/DEBIAN/shlibs" ]; then

diff --git a/dh_md5sums b/dh_md5sums
index 5278ed517e78520a7809e5f08d35a4d43a72e3c5..f19b7ed5fab21729493475d50dff7a67579ef713 100755 (executable)
--- a/dh_md5sums
+++ b/dh_md5sums
@@ -13,13 +13,13 @@ for PACKAGE in $DH_DOPACKAGES; do
                doit "install -d $TMP/DEBIAN"
        fi
 
-       doit "find $TMP/* -type f ! -regex '^$TMP/DEBIAN/.*' | sed s:$TMP:: | sort > $TMP/DEBIAN/allfiles"
+       complex_doit "find $TMP/* -type f ! -regex '^$TMP/DEBIAN/.*' | sed s:$TMP:: | sort > $TMP/DEBIAN/allfiles"
        # Check if we should exclude conffiles.
        if [ ! "$DH_EXCLUDE" -a -r $TMP/DEBIAN/conffiles ]; then
-               doit "sort $TMP/DEBIAN/conffiles | comm -13 - $TMP/DEBIAN/allfiles > $TMP/DEBIAN/allfiles.new"
+               complex_doit "sort $TMP/DEBIAN/conffiles | comm -13 - $TMP/DEBIAN/allfiles > $TMP/DEBIAN/allfiles.new"
                doit "mv $TMP/DEBIAN/allfiles.new $TMP/DEBIAN/allfiles"
        fi
-       doit "cd $TMP ; sed 's:^/::' < DEBIAN/allfiles | xargs md5sum > DEBIAN/md5sums ; cd ../.."
+       complex_doit "cd $TMP ; sed 's:^/::' < DEBIAN/allfiles | xargs md5sum > DEBIAN/md5sums ; cd ../.."
        doit "chown root.root $TMP/DEBIAN/md5sums"
        doit "rm -f $TMP/DEBIAN/allfiles"
 done

diff --git a/dh_undocumented b/dh_undocumented
index fe1dbf2d7102dcf380a7f80d25d9a211899929b6..601669679b80b1cb7a35e5bfc80bbb771a8a75cc 100755 (executable)
--- a/dh_undocumented
+++ b/dh_undocumented
@@ -45,7 +45,7 @@ for PACKAGE in $DH_DOPACKAGES; do
                                doit "install -d $TMP/$dir"
                        fi
 
-                       doit ln -s $reldir/man7/undocumented.7.gz $TMP/$dir/$file.gz
+                       doit "ln -s $reldir/man7/undocumented.7.gz $TMP/$dir/$file.gz"
                done
        fi
 done