r70: Initial Import

diff --git a/debian/changelog b/debian/changelog
index 0462cc44a721053e3bf06f14d9611240307ebeb8..f3219bed00605f168ef1242460e399b6ebb4c5f8 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+debhelper (0.72) unstable; urgency=low
+
+  * Applied patch from Yann Dirson <ydirson@a2points.com> to add a
+    --init-script parameter to dh_installinit. (#19227)
+  * Documented this new switch.
+
+ -- Joey Hess <joeyh@master.debian.org>  Mon,  9 Mar 1998 17:12:04 -0800
+
 debhelper (0.71) unstable; urgency=low
 
   * dh_makeshlibs: -V flag was broken: if just -V was specified,

diff --git a/dh_installinit.1 b/dh_installinit.1
index 89c34c3a26f3a88ba4d990bf3e08bd6b27e8717e..156867e5ec4651d565c9eafcbcdff1398b75027a 100644 (file)
--- 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] [--no-act] [-ppackage] [-Ptmpdir] [-n] [-r] [-d] [-uparams]"
+.I "[-v] [-a] [-i] [--no-act] [--init-script=scriptname] [-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. 
@@ -46,13 +46,19 @@ Do not restart daemon on upgrade.
 .B \-d, \--remove-d
 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".
+for daemons with named ending in "d". (Note: this takes precidence over
+the --init-script parameter described below.)
 .TP
 .B \-uparams, \--update-rcd-params=params
 Pass "params" to 
 .BR update-rc.d (8)
 If not specified, "default" will be passed to
 .BR update-rc.d (8)
+.TP
+.B \--init-script=scriptname
+Use "scriptname" as for the filename the init script is installed as in
+etc/init.d/ . This is useful if you need to have an init script with a name
+different from the package's name.
 .SH NOTES
 The
 .B \-a

diff --git a/dh_suidregister.1 b/dh_suidregister.1
index e9563a891fa20a4828fb7208756db573b13e4762..5769495646a09844a4c2d827e0cbcdb7af1b555a 100644 (file)
--- a/dh_suidregister.1
+++ b/dh_suidregister.1
@@ -12,7 +12,7 @@ with
 when it is installed.
 .P
 Any filenames specified as parameters will be registered in the first 
-package dh_installdocs is told to act on. By default, this is the first 
+package dh_suidregister is told to act on. By default, this is the first 
 binary package in debian/control, but if you use -p, -i, or -a flags, 
 it will be the first package specified by those flags.
 .P