r36: Initial Import

diff --git a/debian/changelog b/debian/changelog
index 249f8f28579b6731a1bcd99dd1f5076d15561406..d2f17f96c765f3be8fb8b385d82306a2f6c1d83c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+debhelper (0.30) unstable; urgency=low
+
+  * dh_md5sumes, dh_installdirs, dh_compress: fixed assorted cd bugs.
+
+ -- Joey Hess <joeyh@master.debian.org>  Fri,  5 Dec 1997 15:08:36 -0500
+
 debhelper (0.29) unstable; urgency=low
 
   * dh_lib: don't expand text passed to doit() a second time. This fixes

diff --git a/dh_compress b/dh_compress
index fd07de040139702808f650c8bd9350f5e6d53002..fe16b6cbf2fe0405526a5952653e632c5f266cb5 100755 (executable)
--- a/dh_compress
+++ b/dh_compress
@@ -13,12 +13,12 @@ for PACKAGE in $DH_DOPACKAGES; do
        # Run the file name gatering commands from within the directory
        # structure that will be effected.
        olddir=`pwd`
-       cd $TMP
+       doit "cd $TMP"
 
-       if [ -f ../${EXT}compress ]; then
+       if [ -f $olddir/${EXT}compress ]; then
                # The config file is a sh script that outputs the files to be compressed
                # (typically using find).
-               files=`sh ../${EXT}compress 2>/dev/null`
+               files=`sh $olddir/${EXT}compress 2>/dev/null`
        else
                # By default fall back on what the policy manual says to compress.
                files=`
@@ -26,7 +26,7 @@ for PACKAGE in $DH_DOPACKAGES; do
                        find usr/doc -type f \( -size +4k -or -name "changelog*" \) \
                                ! -name "*.htm*" ! -name "*.gif" \
                                ! -name "copyright" 2>/dev/null
-               `
+                       `
        fi
 
        if [ "$files" ]; then
@@ -37,7 +37,7 @@ for PACKAGE in $DH_DOPACKAGES; do
        fi
 
        # Change back to old pwd.
-       cd $olddir
+       doit "cd $olddir"
 
        # Fix up symlinks that were pointing to the uncompressed files.
        for file in `find $TMP -type l`; do

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

diff --git a/dh_installinit.1 b/dh_installinit.1
index 4eb4ee07fd3ad1e42e476686d87cf3c56a4563bc..f87c0c58264ce93d20b360286a5fa9082c6e7d1d 100644 (file)
--- a/dh_installinit.1
+++ b/dh_installinit.1
@@ -5,7 +5,7 @@ dh_installinit \- install init scripts into package build directories
 .B dh_installinit
 .I "[-v] [-a] [-i] [-ppackage] [-Ptmpdir] [-n] [-r] [-d] [-u params]"
 .SH "DESCRIPTION"
-dh_installmenu is a debhelper program that is responsible for installing
+dh_installinit is a debhelper program that is responsible for installing
 init scripts into package build directories. 
 .P
 It also automatically generates the postinst and postrm and prerm commands 

diff --git a/dh_md5sums b/dh_md5sums
index f19b7ed5fab21729493475d50dff7a67579ef713..ae4709265a5766f59d7440abd278f4558ffa666e 100755 (executable)
--- a/dh_md5sums
+++ b/dh_md5sums
@@ -19,7 +19,8 @@ for PACKAGE in $DH_DOPACKAGES; do
                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
-       complex_doit "cd $TMP ; sed 's:^/::' < DEBIAN/allfiles | xargs md5sum > DEBIAN/md5sums ; cd ../.."
+       olddir=`pwd`
+       complex_doit "cd $TMP ; sed 's:^/::' < DEBIAN/allfiles | xargs md5sum > DEBIAN/md5sums ; cd $olddir"
        doit "chown root.root $TMP/DEBIAN/md5sums"
        doit "rm -f $TMP/DEBIAN/allfiles"
 done