r69: Initial Import

diff --git a/PROGRAMMING b/PROGRAMMING
index 43e1554c038f253ed91eb0febf54c87440b23647..dcef3edfac29ed53517dae07371ebcc32e847cbe 100644 (file)
--- a/PROGRAMMING
+++ b/PROGRAMMING
@@ -97,6 +97,9 @@ switch                variable        description
                                those processed here), will apply to all 
                                binary packages the program acts on, not just
                                the first
+--init-script  DH_INIT_SCRIPT  will be set to a string, which specifies an
+                               init script name (probably only
+                               dh_installinit will ever use this)
 
 Any additional command line parameters that do not start with "-" will be 
 ignored, and you can access them later just as you normally would ($1, $2,

diff --git a/debian/changelog b/debian/changelog
index 86b7f4ace66156fef2b9b3b55a5db4e5a93ff613..0462cc44a721053e3bf06f14d9611240307ebeb8 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+debhelper (0.71) unstable; urgency=low
+
+  * dh_makeshlibs: -V flag was broken: if just -V was specified,
+    dh_makeshlibs would die. Corrected this.
+  * dh_lib: removed warning if the arguments passed to a debhelper command
+    do not apply to the main package. It's been long enough so I'm 100% sure
+    no packages use the old behavior.
+
+ -- Joey Hess <joeyh@master.debian.org>  Mon,  9 Mar 1998 11:46:59 -0800
+
 debhelper (0.70) unstable; urgency=low
 
   * dh_lib: autoscript(): no longer add the modification date to the

diff --git a/dh_getopt.pl b/dh_getopt.pl
index e877a5513113440bfa4cee5a3f74406cfe14d488..f91a42e0aa4daa25fa68580e656397b0a064eb30 100755 (executable)
--- a/dh_getopt.pl
+++ b/dh_getopt.pl
@@ -109,6 +109,8 @@ GetOptions(
        "all" => \$all,
 
        "no-act" => \$no_act,
+
+       "init-script=s" => \$init_script,
 );
 
 # Check to see if -V was specified. If so, but no parameters were passed,
@@ -147,6 +149,7 @@ DH_M_PARAMS='$major'
 DH_V_FLAG='$version_info'
 DH_V_FLAG_SET='$version_info_set'
 DH_PARAMS_ALL='$all'
+DH_INIT_SCRIPT='$init_script'
 DH_PARSE_ERROR='$parse_error'
 set -- @ARGV
 };

diff --git a/dh_installinit b/dh_installinit
index 803ef81f59548717b2f45b60520ba9dcf9275279..66ebfc574182017ae153f9e5e54d8761d27bd91b 100755 (executable)
--- a/dh_installinit
+++ b/dh_installinit
@@ -25,6 +25,8 @@ for PACKAGE in $DH_DOPACKAGES; do
                                echo `basename $0`" warning: \"$PACKAGE\" has no final -d, but -d was specified."
                                script=$PACKAGE
                        fi
+               elif [ "$DH_INIT_SCRIPT" != "" ]; then
+                       script=$DH_INIT_SCRIPT
                else
                        script=$PACKAGE
                fi