From: joey <joey>
Date: Tue, 17 Aug 1999 04:53:30 +0000 (+0000)
Subject: r94: Initial Import
X-Git-Tag: debian_version_0_1~139
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=94daae34cb1be6ed6a4591604af22c5d43542475;p=debhelper.git

r94: Initial Import
---

diff --git a/debian/changelog b/debian/changelog
index 873cfa6..180a642 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+debhelper (0.97) unstable; urgency=low
+
+  * doc/from-debstd: fixed a typo.
+  * examples/*: install-stamp no longer depends on phony build targey; now 
+    install-stamp depends on build-stamp instead (#24234).
+  * dh_fixperms: applied patch from Herbert Xu <herbert@gondor.apana.org.au>
+    to fix bad uses of the find command, so it should now work on packages 
+    with files with spaces in them (#22005). It's also much cleaner. Thanks,
+    Herbert!
+  * dh_getopt.pl, doc/PROGRAMMING: added DH_EXCLUDE_FIND, to make the above
+    fix work.
+
+ -- Joey Hess <joeyh@master.debian.org>  Sun,  5 Jul 1998 18:09:25 -0700
+
 debhelper (0.96) unstable; urgency=low
 
   * dh_movefiles: fixed serious breakage introduced in the last version.
diff --git a/dh_lib b/dh_lib
index 9e82649..7ebc8be 100644
--- a/dh_lib
+++ b/dh_lib
@@ -82,13 +82,18 @@ pkgext() {
 # Caches return code so it only needs to run dpkg-parsechangelog once.
 isnative() {
 	if [ -z "$DH_ISNATIVE" ]; then
+		# Make sure we look at the correct changelog.
+		isnative_changelog=`pkgfile $PACKAGE changelog`
+		if [ ! "$isnative_changelog" ]; then
+			isnative_changelog=debian/changelog
+		fi
 		# Get the package version.
 		# Note that the 2>/dev/null is because a bug in dpkg-parsechangelog makes it
 		# output a bogus error message to stderr.
 		# If it actually has a real error, then the expr will fail, and this whole
 		# script will come crashing to a halt, which is good enough to inform
 		# the user something's wrong. :-)
-		VERSION=`expr "\`dpkg-parsechangelog 2>/dev/null\`" : \
+		VERSION=`expr "\`dpkg-parsechangelog -l$isnative_changelog 2>/dev/null\`" : \
 			'.*Version: \(.*\).*Distribution:'`
 		# Is this a native Debian package?
 		if expr "$VERSION" : '.*-' >/dev/null; then
diff --git a/doc/PROGRAMMING b/doc/PROGRAMMING
index 7dc0c63..faaa936 100644
--- a/doc/PROGRAMMING
+++ b/doc/PROGRAMMING
@@ -81,6 +81,8 @@ switch		variable	description
 		DH_EXCLUDE_GREP	same as DH_EXCLUDE, except all items are
 				separated by '|' characters, instead of spaces,
 				handy for egrep -v
+                DH_EXCLUDE_FIND same as DH_EXCLUDE, except all items are
+                                separated by " -or " 
 -x		DH_INCLUDE_CONFFILES
 				include conffiles. It's -x for obscure
 				historical reasons.
diff --git a/doc/from-debstd b/doc/from-debstd
index 31fd0cd..50bf4ff 100644
--- a/doc/from-debstd
+++ b/doc/from-debstd
@@ -20,10 +20,10 @@ your package you are converting, run:
 
 	dh_debstd CHANGES TODO README --verbose --no-act
 
-Notice the parallel to the debstd command above, I just added "--verbose --act"
-to the end. This will make dh_debstd output a list of commands that it thinks
-will emulate what debstd would have done, without actually doing anything to
-your package. The list will look similar to this:
+Notice the parallel to the debstd command above, I just added
+"--verbose --noact" to the end. This will make dh_debstd output a list of
+commands that it thinks will emulate what debstd would have done, without 
+actually doing anything to your package. The list will look similar to this:
 
         dh_installdirs
 	dh_installdocs TODO README
diff --git a/examples/rules b/examples/rules
index 7f339dc..e3e6c3b 100755
--- a/examples/rules
+++ b/examples/rules
@@ -25,7 +25,7 @@ clean:
 	dh_clean
 
 install: install-stamp
-install-stamp: build
+install-stamp: build-stamp
 	dh_testdir
 	dh_testroot
 	dh_clean -k
diff --git a/examples/rules.indep b/examples/rules.indep
index d0cce46..bb2e00b 100755
--- a/examples/rules.indep
+++ b/examples/rules.indep
@@ -26,7 +26,7 @@ clean:
 	dh_clean
 
 install: install-stamp
-install-stamp: build
+install-stamp: build-stamp
 	dh_testdir
 	dh_testroot
 	dh_clean -k
diff --git a/examples/rules.multi b/examples/rules.multi
index 32eeddf..42e4052 100755
--- a/examples/rules.multi
+++ b/examples/rules.multi
@@ -28,7 +28,7 @@ clean:
 	dh_clean
 
 install: install-stamp
-install-stamp: build
+install-stamp: build-stamp
 	dh_testdir
 	dh_testroot
 	dh_clean -k