Move many command-specific options to only be accepted by the command that uses them.

Affected options are: -x, -r, -R, -l, -L, -m, --include-conffiles,
--no-restart-on-upgrade, --no-start, --restart-after-upgrade,
--init-script, --filename, --flavor, --autodest, --libpackage, --add-udeb,
--dpkg-shlibdeps-params, --dpkg-gencontrol-params, --update-rcd-params,
--major, --remove-d, --dirs-only, --keep-debug, --version-info,
--list-missing, --fail-missing, --language, --until, --after, --before,
--remaining, --with

* If any third-party debhelper commands use any of the above options,
  they will be broken, and need to be changed to pass options to init().
* To avoid breaking rules files that pass options to commands that do not
  use them, debhelper will now only warn if it encounters an unknown
  option. This will be converted back to an error later.

1 files changed, 9 insertions, 1 deletions

diff --git a/dh_installinit b/dh_installinit
index 7dde3631..2f32b46b 100755
--- a/dh_installinit
+++ b/dh_installinit
@@ -115,7 +115,15 @@ instances of the same text to be added to maintainer scripts.
 
 =cut
 
-init();
+init(options => {
+	"r" => \$dh{R_FLAG},
+	"no-restart-on-upgrade" => \$dh{R_FLAG},
+	"no-start" => \$dh{NO_START},
+	"R|restart-after-upgrade" => \$dh{RESTART_AFTER_UPGRADE},
+	"init-script=s" => \$dh{INIT_SCRIPT},
+	"update-rcd-params=s", => \$dh{U_PARAMS},
+	"remove-d" => \$dh{D_FLAG},
+});
 
 foreach my $package (@{$dh{DOPACKAGES}}) {
 	my $tmp=tmpdir($package);