From: joey <joey>
Date: Tue, 17 Aug 1999 04:39:06 +0000 (+0000)
Subject: r35: Initial Import
X-Git-Tag: debian_version_0_1~193
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=b21daac4b8ae57bc61647076774d1370827531e2;p=debhelper.git

r35: Initial Import
---

diff --git a/BUGS b/BUGS
index 51a7b61..e69de29 100644
--- 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 7badab5..249f8f2 100644
--- 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 c06f9c2..39c684e 100755
--- 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 dbe1a0a..cb38a4b 100755
--- 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 24fef4e..0943ba5 100755
--- 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 5278ed5..f19b7ed 100755
--- 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 fe1dbf2..6016696 100755
--- 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