r37: Initial Import

7 files changed, 28 insertions, 67 deletions

diff --git a/README b/README
index e192504d..280da781 100644
--- a/README
+++ b/README
@@ -35,7 +35,9 @@ Remove that and replace it with something like:
 	dh_compress
 	dh_fixperms
 	dh_suidregister
-	dh_installdebfiles
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
 	dh_makeshlibs
 	dh_md5sums
 	dh_builddeb
@@ -68,7 +70,7 @@ Some debhelper commands will automatically generate parts of debian install
 scripts. If you want these automatically generated things included in your
 debian install scripts, then you need to add "#DEBHELPER#" to your scripts,
 in the place the code should be added. "#DEBHELPER#" will be replaced by any 
-autogenerated code when you run dh_installdebfiles.
+autogenerated code when you run dh_installdeb.
 
 All scripts that automatically generate code in this way let it be disabled
 by the -n parameter.
diff --git a/debian/changelog b/debian/changelog
index d2f17f96..96c4971b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+debhelper (0.31) unstable; urgency=low
+
+  * Fixed man page typos #15685.
+
+ -- Joey Hess <joeyh@master.debian.org>  Sat,  6 Dec 1997 21:44:58 -0500
+
 debhelper (0.30) unstable; urgency=low
 
   * dh_md5sumes, dh_installdirs, dh_compress: fixed assorted cd bugs.
diff --git a/dh_installdebfiles b/dh_installdebfiles
index 825c9ee5..8b1e0962 100755
--- a/dh_installdebfiles
+++ b/dh_installdebfiles
@@ -1,64 +1,12 @@
 #!/bin/sh -e
 #
-# Install files from debian/ into the package's DEBIAN directory.
-# Also generates the control file.
+# This program is depricated, but left in the package for backwards
+# compatability. It simply calls the 3 programs that replaced it.
 
 PATH=debian:$PATH:/usr/lib/debhelper
-. dh_lib
 
-for PACKAGE in $DH_DOPACKAGES; do
-	TMP=`tmpdir $PACKAGE`
-	EXT=`pkgext $PACKAGE`
+echo "* Note: dh_installdebfiles is depricated." >&2
 
-	if [ ! -d $TMP/DEBIAN ]; then
-		doit "install -o root -g root -d $TMP/DEBIAN"
-	fi
-
-	# Install debian install scripts.
-	# If any .debhelper files exist, add them into the scripts.
-	for file in postinst preinst prerm postrm; do
-		if [ -f debian/$EXT$file ]; then
-			# Add this into the script, where it has #DEBHELPER#
-			if [ -f debian/$EXT$file.debhelper ]; then
-				complex_doit "perl -pe 's~#DEBHELPER#~qx{cat debian/$EXT$file.debhelper}~eg' < debian/$EXT$file > $TMP/DEBIAN/$file"
-				doit "chown root.root $TMP/DEBIAN/$file"
-				doit "chmod 755 $TMP/DEBIAN/$file"
-			else
-				doit "install -o root -g root -p debian/$EXT$file $TMP/DEBIAN/$file"
-			fi
-		else
-			# Auto-generate script header and add .debhelper
-			# content to it.
-			if [ -f debian/$EXT$file.debhelper ]; then
-				complex_doit "echo '#!/bin/sh -e' > $TMP/DEBIAN/$file"
-				complex_doit "cat debian/$EXT$file.debhelper >> $TMP/DEBIAN/$file"
-				doit "chown root.root $TMP/DEBIAN/$file"
-				doit "chmod 755 $TMP/DEBIAN/$file"
-			fi
-		fi
-	done
-
-	# Install non-executable files
-	for file in shlibs conffiles; do
-		if [ -f debian/$EXT$file ]; then
-			doit "install -o root -g root -m 644 -p debian/$EXT$file $TMP/DEBIAN/$file"
-		fi                                               
-	done
-
-	# Run dpkg-shlibdeps to generate dependancies.
-	filelist=""
-	for file in `find $TMP -type f \( -perm +111 -or -name "*.so*" \) | tr "\n" " "` ; do
-		case "`file $file`" in
-			*ELF*)
-				filelist="$file $filelist"
-			;;
-		esac
-	done
-	if [ "$filelist" ]; then
-		doit "dpkg-shlibdeps -Tdebian/${EXT}substvars $filelist"
-	fi
-
-	# Generate and install control file.
-	doit "dpkg-gencontrol -p$PACKAGE -Tdebian/${EXT}substvars -P$TMP"
-	doit "chown root.root $TMP/DEBIAN/control"
-done
+dh_installdeb $*
+dh_shlibdeps $*
+dh_gencontrol $*
diff --git a/dh_installdebfiles.1 b/dh_installdebfiles.1
index 429481f4..8b34b910 100644
--- a/dh_installdebfiles.1
+++ b/dh_installdebfiles.1
@@ -2,7 +2,7 @@
 .SH NAME
 dh_installdebfiles \- install files into the DEBIAN directory
 .SH SYNOPSIS
-.B dh_installdebfils
+.B dh_installdebfiles
 .I "[-v] [-a] [-i] [-ppackage] [-Ptmpdir]"
 .SH "DESCRIPTION"
 dh_installdebfiles is a debhelper program that is responsible for installing
diff --git a/dh_installinit.1 b/dh_installinit.1
index f87c0c58..e0daac42 100644
--- a/dh_installinit.1
+++ b/dh_installinit.1
@@ -3,7 +3,7 @@
 dh_installinit \- install init scripts into package build directories
 .SH SYNOPSIS
 .B dh_installinit
-.I "[-v] [-a] [-i] [-ppackage] [-Ptmpdir] [-n] [-r] [-d] [-u params]"
+.I "[-v] [-a] [-i] [-ppackage] [-Ptmpdir] [-n] [-r] [-d] [-uparams]"
 .SH "DESCRIPTION"
 dh_installinit is a debhelper program that is responsible for installing
 init scripts into package build directories. 
@@ -47,7 +47,7 @@ Remove trailing "d" from the name of the package, and use the result for the
 filename the init script is installed as in etc/init.d/ . This may be useful
 for daemons with named ending in "d".
 .TP
-.B \-u params
+.B \-uparams
 Pass "params" to 
 .BR update-rc.d (8)
 If not specified, "default" will be passed to
diff --git a/examples/rules b/examples/rules
index 10661223..87692ccd 100755
--- a/examples/rules
+++ b/examples/rules
@@ -43,7 +43,9 @@ binary-arch: build
 	dh_compress
 	dh_fixperms
 	dh_suidregister
-	dh_installdebfiles
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
 #	dh_makeshlibs
 	dh_du
 	dh_md5sums
diff --git a/examples/rules.multi b/examples/rules.multi
index 496c3366..f0bd78a6 100755
--- a/examples/rules.multi
+++ b/examples/rules.multi
@@ -41,8 +41,9 @@ binary-indep: build
 	dh_compress -i
 	dh_fixperms -i
 	dh_suidregister -i
-	dh_installdebfiles -i
-	dh_du -a
+	dh_installdeb -i
+	dh_gencontrol -i
+	dh_du -i
 	dh_md5sums -i
 	dh_builddeb -i
 
@@ -66,7 +67,9 @@ binary-arch: build
 	dh_compress -a
 	dh_fixperms -a
 	dh_suidregister -a
-	dh_installdebfiles -a
+	dh_installdeb -a
+	dh_shlibdeps -a
+	dh_gencontrol -a
 #	dh_makeshlibs -a
 	dh_du -a
 	dh_md5sums -a