r26: Initial Import

diff --git a/autoscripts/postrm-init b/autoscripts/postrm-init
index 9596dd977eb282ca5f365ab71769f56e814f3966..1c29298256bdcf9ca800b7214520cdf058a1d95d 100644 (file)
--- a/autoscripts/postrm-init
+++ b/autoscripts/postrm-init
@@ -1,3 +1,3 @@
 if [ "$1" = "purge" ] ; then
-       update-rc.d #SCRIPT# remove #INITPARMS# >/dev/null
+       update-rc.d #SCRIPT# remove >/dev/null
 fi

diff --git a/debian/changelog b/debian/changelog
index b66816d855bd7fd0cb827e12341c29b75310f8ae..c9a8a7c18d409ac06babdcd5cc11d39ea44c68c6 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debhelper (0.20) unstable; urgency=low
+
+  * Added dh_installinit, which installs an init.d script, and edits the
+    postinst, postrm, etc.
+
+ -- Joey Hess <joeyh@master.debian.org>  Fri, 14 Nov 1997 00:45:53 -0500
+
 debhelper (0.19) unstable; urgency=low
 
   * dh_installmenu.1: menufile is in section 5, not 1.

diff --git a/dh_installmenu.1 b/dh_installmenu.1
index 6dcffff272b927edf38837937525c84f2ea6f2ba..abbff8defe8b66e5d5dd1f8f24766b35868be702 100644 (file)
--- a/dh_installmenu.1
+++ b/dh_installmenu.1
@@ -3,10 +3,10 @@
 dh_installmenu \- install debian menu files into package build directories
 .SH SYNOPSIS
 .B dh_installmenu
-.I "[-v] [-a] [-i] [-ppackage] [-Ptmpdir]"
+.I "[-v] [-a] [-i] [-ppackage] [-Ptmpdir] [-n]"
 .SH "DESCRIPTION"
 dh_installmenu is a debhelper program that is responsible for installing
-fils used by the debian menu package into package build directories. 
+files used by the debian menu package into package build directories. 
 .P
 It also automatically generates the postinst and postrm commands needed to 
 interface with the debian menu package. See 
@@ -38,11 +38,11 @@ Install menu files into all architecture independent packages.
 .B \-ppackage
 Install menu files into the package named "package".
 .TP
-.B \-n
-Do not automatically generate code.
-.TP
 .B \-Ptmpdir
 Use "tmpdir" for package build directory. 
+.TP
+.B \-n
+Do not modify postinst/postrm scripts.
 .SH NOTES
 The
 .B \-a

diff --git a/dh_lib b/dh_lib
index 1b17151d79f2c653d515cb6a3be79a5fff7d1ff8..4aace52cd5dc9b7d03a98cdde5e585a728ef72f8 100644 (file)
--- a/dh_lib
+++ b/dh_lib
@@ -74,7 +74,7 @@ autoscript() {
 # Argument processing and global variable initialization is below.
 
 # Parse command line.
-set -- `getopt xvianp:P: $*`
+set -- `getopt xvidrnap:P:u: $*`
 
 for i; do
        case "$i"
@@ -104,11 +104,24 @@ for i; do
                        DH_EXCLUDE=1
                        shift
                        ;;
+               -d)
+                       DH_D_FLAG=1
+                       shift
+                       ;;
+               -r)
+                       DH_R_FLAG=1
+                       shift
+                       ;;
                -P)
                        DH_TMPDIR="$2"
                        shift
                        shift
                        ;;
+               -u)
+                       DH_U_PARAMS="$2"
+                       shift
+                       shift
+                       ;;
                --)
                        shift
                        break