35 files changed, 35 insertions, 36 deletions
diff --git a/dh_auto_build b/dh_auto_build
index a52ef98b..6321e191 100755
--- a/dh_auto_build
+++ b/dh_auto_build
@@ -45,7 +45,7 @@ B<dh_auto_build> usually passes.
 
 =cut
 
-# PROMISE: DH NOOP WITHOUT buildsystem(build)
+# PROMISE: DH NOOP WITHOUT cli-options(BUILDSYSTEM) buildsystem(build)
 
 buildsystems_init();
 buildsystems_do();
diff --git a/dh_auto_clean b/dh_auto_clean
index 60f32ce5..828f2efb 100755
--- a/dh_auto_clean
+++ b/dh_auto_clean
@@ -46,7 +46,7 @@ B<dh_auto_clean> usually passes.
 
 =cut
 
-# PROMISE: DH NOOP WITHOUT buildsystem(clean)
+# PROMISE: DH NOOP WITHOUT cli-options(BUILDSYSTEM) buildsystem(clean)
 
 inhibit_log();
 buildsystems_init();
diff --git a/dh_auto_configure b/dh_auto_configure
index 9e10a169..5cdcfa06 100755
--- a/dh_auto_configure
+++ b/dh_auto_configure
@@ -50,7 +50,7 @@ B<dh_auto_configure> usually passes. For example:
 
 =cut
 
-# PROMISE: DH NOOP WITHOUT buildsystem(configure)
+# PROMISE: DH NOOP WITHOUT cli-options(BUILDSYSTEM) buildsystem(configure)
 
 buildsystems_init();
 buildsystems_do();
diff --git a/dh_auto_install b/dh_auto_install
index 7080cc6b..1b692230 100755
--- a/dh_auto_install
+++ b/dh_auto_install
@@ -71,7 +71,7 @@ buildsystems_init(options => {
 	"destdir=s" => \$destdir,
 });
 
-# PROMISE: DH NOOP WITHOUT buildsystem(install)
+# PROMISE: DH NOOP WITHOUT cli-options(BUILDSYSTEM) buildsystem(install)
 
 # If destdir is not specified, determine it automatically
 if (!$destdir) {
diff --git a/dh_auto_test b/dh_auto_test
index a59bc5dd..05acea80 100755
--- a/dh_auto_test
+++ b/dh_auto_test
@@ -52,7 +52,7 @@ tests will be performed.
 
 =cut
 
-# PROMISE: DH NOOP WITHOUT buildsystem(test)
+# PROMISE: DH NOOP WITHOUT cli-options(BUILDSYSTEM) buildsystem(test)
 
 if (get_buildoption("nocheck")) {
 	exit 0;
diff --git a/dh_bugfiles b/dh_bugfiles
index 552c1229..62229223 100755
--- a/dh_bugfiles
+++ b/dh_bugfiles
@@ -74,7 +74,7 @@ my %bugfile_types = (
 	"control" => "bug-control",
 	"presubj" => "bug-presubj",
 );
-# PROMISE: DH NOOP WITHOUT bug-script bug-control bug-presubj
+# PROMISE: DH NOOP WITHOUT bug-script bug-control bug-presubj cli-options()
 
 foreach my $package (@{$dh{DOPACKAGES}}) {
 	next if is_udeb($package);
diff --git a/dh_gconf b/dh_gconf
index 1860085e..23ca96c7 100755
--- a/dh_gconf
+++ b/dh_gconf
@@ -63,7 +63,7 @@ if (defined $dh{PRIORITY}) {
 	$priority=$dh{PRIORITY};
 }
 
-# PROMISE: DH NOOP WITHOUT gconf-mandatory gconf-defaults tmp(etc/gconf/schemas) tmp(usr/share/gconf/schemas)
+# PROMISE: DH NOOP WITHOUT gconf-mandatory gconf-defaults tmp(etc/gconf/schemas) tmp(usr/share/gconf/schemas) cli-options()
 
 foreach my $package (@{$dh{DOPACKAGES}}) {
 	my $tmp=tmpdir($package);
diff --git a/dh_icons b/dh_icons
index 73240ec4..2af68569 100755
--- a/dh_icons
+++ b/dh_icons
@@ -44,7 +44,7 @@ Do not modify maintainer scripts.
 
 init();
 
-# PROMISE: DH NOOP WITHOUT tmp(usr/share/icons)
+# PROMISE: DH NOOP WITHOUT tmp(usr/share/icons) cli-options()
 my $baseicondir="/usr/share/icons";
 
 foreach my $package (@{$dh{DOPACKAGES}}) {
diff --git a/dh_install b/dh_install
index f7326659..79c5a75c 100755
--- a/dh_install
+++ b/dh_install
@@ -138,7 +138,7 @@ if ($dh{EXCLUDE_FIND}) {
 	$exclude = '! \( '.$dh{EXCLUDE_FIND}.' \)';
 }
 
-# PROMISE: DH NOOP WITHOUT pkgfile-logged(install)
+# PROMISE: DH NOOP WITHOUT pkgfile-logged(install) cli-options()
 
 foreach my $package (getpackages()) {
 	my (@installed, %dest2sources);
diff --git a/dh_installcatalogs b/dh_installcatalogs
index d7ac9a68..1465eecf 100755
--- a/dh_installcatalogs
+++ b/dh_installcatalogs
@@ -71,7 +71,7 @@ multiple instances of the same text to be added to maintainer scripts.
 
 init();
 
-# PROMISE: DH NOOP WITHOUT sgmlcatalogs
+# PROMISE: DH NOOP WITHOUT sgmlcatalogs cli-options()
 
 foreach my $package (@{$dh{DOPACKAGES}}) {
 	my $tmpdir = tmpdir($package);
diff --git a/dh_installcron b/dh_installcron
index abfdefe2..41786c34 100755
--- a/dh_installcron
+++ b/dh_installcron
@@ -56,7 +56,7 @@ as the package name.
 
 init();
 
-# PROMISE: DH NOOP WITHOUT cron.hourly cron.daily cron.weekly cron.monthly cron.d
+# PROMISE: DH NOOP WITHOUT cron.hourly cron.daily cron.weekly cron.monthly cron.d cli-options()
 
 foreach my $package (@{$dh{DOPACKAGES}}) {
 	my $tmp=tmpdir($package);
diff --git a/dh_installdebconf b/dh_installdebconf
index a8cf0409..13dff7dc 100755
--- a/dh_installdebconf
+++ b/dh_installdebconf
@@ -84,7 +84,7 @@ if (defined($dh{U_PARAMS})) {
 	@extraparams=@{$dh{U_PARAMS}};
 }
 
-# PROMISE: DH NOOP WITHOUT config templates
+# PROMISE: DH NOOP WITHOUT config templates cli-options()
 
 foreach my $package (@{$dh{DOPACKAGES}}) {
 	my $tmp=tmpdir($package);
diff --git a/dh_installdirs b/dh_installdirs
index 97d31d47..06f522d4 100755
--- a/dh_installdirs
+++ b/dh_installdirs
@@ -81,7 +81,7 @@ init(options => {
 	'create-in-sourcedir!' => \$create_in_sourcedir,
 });
 
-# PROMISE: DH NOOP WITHOUT dirs
+# PROMISE: DH NOOP WITHOUT dirs cli-options()
 
 foreach my $package (@{$dh{DOPACKAGES}}) {
 	my $tmp=tmpdir($package);
diff --git a/dh_installemacsen b/dh_installemacsen
index 955eb291..bae900a4 100755
--- a/dh_installemacsen
+++ b/dh_installemacsen
@@ -92,7 +92,7 @@ if (! defined $dh{FLAVOR}) {
 	$dh{FLAVOR}='emacs';
 }
 
-# PROMISE: DH NOOP WITHOUT emacsen-common emacsen-install emacsen-remove emacsen-startup
+# PROMISE: DH NOOP WITHOUT emacsen-common emacsen-install emacsen-remove emacsen-startup cli-options()
 
 foreach my $package (@{$dh{DOPACKAGES}}) {
 	my $tmp=tmpdir($package);
diff --git a/dh_installexamples b/dh_installexamples
index 23de5d72..a4d32aea 100755
--- a/dh_installexamples
+++ b/dh_installexamples
@@ -99,7 +99,7 @@ init(options => {
 	'doc-main-package=s' => \$dh{DOC_MAIN_PACKAGE},
 });
 
-# PROMISE: DH NOOP WITHOUT pkgfile-logged(examples)
+# PROMISE: DH NOOP WITHOUT pkgfile-logged(examples) cli-options()
 
 my $pwd;
 my $default_error_handler = compat(10) ? \&glob_expand_error_handler_reject_nomagic_warn_discard : \&glob_expand_error_handler_reject;
diff --git a/dh_installgsettings b/dh_installgsettings
index 05fc9b1e..45b228eb 100755
--- a/dh_installgsettings
+++ b/dh_installgsettings
@@ -64,7 +64,7 @@ if (defined $dh{PRIORITY}) {
 	$priority=$dh{PRIORITY};
 }
 
-# PROMISE: DH NOOP WITHOUT gsettings-override tmp(usr/share/glib-2.0/schemas)
+# PROMISE: DH NOOP WITHOUT gsettings-override tmp(usr/share/glib-2.0/schemas) cli-options()
 
 foreach my $package (@{$dh{DOPACKAGES}}) {
 	my $tmp=tmpdir($package);
diff --git a/dh_installifupdown b/dh_installifupdown
index bd0aaf44..3d4cd93f 100755
--- a/dh_installifupdown
+++ b/dh_installifupdown
@@ -55,7 +55,7 @@ as the package name.
 
 init();
 
-# PROMISE: DH NOOP WITHOUT if-pre-up if-up if-down if-post-down
+# PROMISE: DH NOOP WITHOUT if-pre-up if-up if-down if-post-down cli-options()
 
 foreach my $package (@{$dh{DOPACKAGES}}) {
 	my $tmp=tmpdir($package);
diff --git a/dh_installinfo b/dh_installinfo
index 34bd478e..6153743c 100755
--- a/dh_installinfo
+++ b/dh_installinfo
@@ -67,7 +67,7 @@ init(options => {
 	"sourcedir=s" => \$dh{SOURCEDIR},
 });
 
-# PROMISE: DH NOOP WITHOUT info
+# PROMISE: DH NOOP WITHOUT info cli-options()
 
 my $default_error_handler = compat(10) ? \&glob_expand_error_handler_reject_nomagic_warn_discard : \&glob_expand_error_handler_reject;
 my $nodocs = is_build_profile_active('nodoc') || get_buildoption('nodoc') ? 1 : 0;
diff --git a/dh_installinit b/dh_installinit
index 9189b7a7..fca0a8af 100755
--- a/dh_installinit
+++ b/dh_installinit
@@ -228,7 +228,7 @@ init(options => {
 	"no-enable" => \$dh{NO_ENABLE},
 });
 
-# PROMISE: DH NOOP WITHOUT service tmpfile default upstart init init.d tmp(usr/lib/tmpfiles.d) tmp(etc/tmpfiles.d)
+# PROMISE: DH NOOP WITHOUT service tmpfile default upstart init init.d tmp(usr/lib/tmpfiles.d) tmp(etc/tmpfiles.d) cli-options(--init-script|-d|--remove-d|-o|--only-scripts)
 
 my %snippet_options = ('snippet-order' => 'service');
 
diff --git a/dh_installinitramfs b/dh_installinitramfs
index c6c9cb82..3d90d1ae 100755
--- a/dh_installinitramfs
+++ b/dh_installinitramfs
@@ -60,7 +60,7 @@ instances of the same text to be added to maintainer scripts.
 
 init();
 
-# PROMISE: DH NOOP WITHOUT initramfs-hook tmp(usr/share/initramfs-tools/hooks)
+# PROMISE: DH NOOP WITHOUT initramfs-hook tmp(usr/share/initramfs-tools/hooks) cli-options()
 
 foreach my $package (@{$dh{DOPACKAGES}}) {
 	my $tmp = tmpdir($package);
@@ -74,7 +74,6 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 		$has_hooks = 1;
 	} elsif (-d $hook_dir and not is_empty_dir($hook_dir)) {
 		$has_hooks = 1;
-		
 	}
 
 	if ($has_hooks && ! $dh{NOSCRIPTS}) {
diff --git a/dh_installlogcheck b/dh_installlogcheck
index 9b8473e8..bf1f779d 100755
--- a/dh_installlogcheck
+++ b/dh_installlogcheck
@@ -58,7 +58,7 @@ use the specified name instead of that of the package.
 
 init();
 
-# PROMISE: DH NOOP WITHOUT logcheck.cracking logcheck.violations logcheck.violations.ignore logcheck.ignore.workstation logcheck.ignore.server logcheck.ignore.paranoid
+# PROMISE: DH NOOP WITHOUT logcheck.cracking logcheck.violations logcheck.violations.ignore logcheck.ignore.workstation logcheck.ignore.server logcheck.ignore.paranoid cli-options()
 
 foreach my $package (@{$dh{DOPACKAGES}}) {
 	my $tmp=tmpdir($package);
diff --git a/dh_installlogrotate b/dh_installlogrotate
index ca561bd5..fc3d60a5 100755
--- a/dh_installlogrotate
+++ b/dh_installlogrotate
@@ -38,7 +38,7 @@ as the package name.
 
 init();
 
-# PROMISE: DH NOOP WITHOUT logrotate
+# PROMISE: DH NOOP WITHOUT logrotate cli-options()
 
 foreach my $package (@{$dh{DOPACKAGES}}) {
 	my $tmp=tmpdir($package);
diff --git a/dh_installman b/dh_installman
index 8fabf88b..a41d9c8e 100755
--- a/dh_installman
+++ b/dh_installman
@@ -140,7 +140,7 @@ init(options => {
 });
 
 
-# PROMISE: DH NOOP WITHOUT pkgfile-logged(manpages) tmp(usr/share/man)
+# PROMISE: DH NOOP WITHOUT pkgfile-logged(manpages) tmp(usr/share/man) cli-options()
 
 my (@sofiles, @sodests);
 my @all_packages = getpackages();
diff --git a/dh_installmenu b/dh_installmenu
index 475b58f6..c30e90f8 100755
--- a/dh_installmenu
+++ b/dh_installmenu
@@ -55,7 +55,7 @@ Do not modify F<postinst>/F<postrm> scripts.
 
 init();
 
-# PROMISE: DH NOOP WITHOUT menu menu-method
+# PROMISE: DH NOOP WITHOUT menu menu-method cli-options()
 
 foreach my $package (@{$dh{DOPACKAGES}}) {
 	my $tmp=tmpdir($package);
diff --git a/dh_installmime b/dh_installmime
index eb447869..5ad61903 100755
--- a/dh_installmime
+++ b/dh_installmime
@@ -41,7 +41,7 @@ directory.
 
 init();
 
-# PROMISE: DH NOOP WITHOUT mime sharedmimeinfo
+# PROMISE: DH NOOP WITHOUT mime sharedmimeinfo cli-options()
 
 foreach my $package (@{$dh{DOPACKAGES}}) {
 	my $tmp=tmpdir($package);
diff --git a/dh_installmodules b/dh_installmodules
index 46ef0241..f866eaf4 100755
--- a/dh_installmodules
+++ b/dh_installmodules
@@ -86,7 +86,7 @@ sub find_kernel_modules {
 	return sort(keys(%versions));
 }
 
-# PROMISE: DH NOOP WITHOUT modprobe tmp(lib/modules)
+# PROMISE: DH NOOP WITHOUT modprobe tmp(lib/modules) cli-options()
 
 foreach my $package (@{$dh{DOPACKAGES}}) {
 	my $tmp=tmpdir($package);
diff --git a/dh_installpam b/dh_installpam
index 256f7ab8..54f670a0 100755
--- a/dh_installpam
+++ b/dh_installpam
@@ -47,7 +47,7 @@ using the package name.
 
 init();
 
-# PROMISE: DH NOOP WITHOUT pam
+# PROMISE: DH NOOP WITHOUT pam cli-options()
 
 foreach my $package (@{$dh{DOPACKAGES}}) {
 	my $tmp=tmpdir($package);
diff --git a/dh_installppp b/dh_installppp
index 9eb09051..68784a6b 100755
--- a/dh_installppp
+++ b/dh_installppp
@@ -51,7 +51,7 @@ as the package name.
 
 init();
 
-# PROMISE: DH NOOP WITHOUT ppp.ip-up ppp.ip-down
+# PROMISE: DH NOOP WITHOUT ppp.ip-up ppp.ip-down cli-options()
 
 foreach my $package (@{$dh{DOPACKAGES}}) {
 	my $tmp=tmpdir($package);
diff --git a/dh_installsystemd b/dh_installsystemd
index 39b9f6d9..d052037e 100755
--- a/dh_installsystemd
+++ b/dh_installsystemd
@@ -238,7 +238,7 @@ sub list_installed_units {
 }
 
 
-# PROMISE: DH NOOP WITHOUT tmp(lib/systemd/system) tmp(usr/lib/tmpfiles.d) tmp(etc/tmpfiles.d) mount path service socket target tmpfile timer
+# PROMISE: DH NOOP WITHOUT tmp(lib/systemd/system) tmp(usr/lib/tmpfiles.d) tmp(etc/tmpfiles.d) mount path service socket target tmpfile timer cli-options()
 
 
 # Install package maintainer supplied unit files
diff --git a/dh_installudev b/dh_installudev
index 1f1168be..8e491d1f 100755
--- a/dh_installudev
+++ b/dh_installudev
@@ -78,7 +78,7 @@ if ($dh{PRIORITY}) {
 	$old_priority.="_";
 }
 
-# PROMISE: DH NOOP WITHOUT udev
+# PROMISE: DH NOOP WITHOUT udev cli-options()
 
 foreach my $package (@{$dh{DOPACKAGES}}) {
 	my $tmp=tmpdir($package);
diff --git a/dh_installwm b/dh_installwm
index b23e47e6..b57a40f5 100755
--- a/dh_installwm
+++ b/dh_installwm
@@ -86,7 +86,7 @@ if (@ARGV) {
 
 my $nodocs = is_build_profile_active('nodoc') || get_buildoption('nodoc') ? 1 : 0;
 
-# PROMISE: DH NOOP WITHOUT wm
+# PROMISE: DH NOOP WITHOUT wm cli-options()
 
 foreach my $package (@{$dh{DOPACKAGES}}) {
 	my $tmp=tmpdir($package);
diff --git a/dh_installxfonts b/dh_installxfonts
index cee3c279..91887728 100755
--- a/dh_installxfonts
+++ b/dh_installxfonts
@@ -49,7 +49,7 @@ way.
 
 init();
 
-# PROMISE: DH NOOP WITHOUT tmp(usr/share/fonts/X11)
+# PROMISE: DH NOOP WITHOUT tmp(usr/share/fonts/X11) cli-options()
 
 foreach my $package (@{$dh{DOPACKAGES}}) {
 	my $tmp=tmpdir($package);
diff --git a/dh_lintian b/dh_lintian
index fb3bdbf3..9fb2ed4c 100755
--- a/dh_lintian
+++ b/dh_lintian
@@ -42,7 +42,7 @@ overrides for the source package.
 
 init();
 
-# PROMISE: DH NOOP WITHOUT lintian-overrides
+# PROMISE: DH NOOP WITHOUT lintian-overrides cli-options()
 
 foreach my $package (@{$dh{DOPACKAGES}}) {
 	next if is_udeb($package);
diff --git a/dh_ucf b/dh_ucf
index 459328a4..34a51d8c 100755
--- a/dh_ucf
+++ b/dh_ucf
@@ -67,7 +67,7 @@ instances of the same text to be added to maintainer scripts.
 
 init();
 
-# PROMISE: DH NOOP WITHOUT ucf
+# PROMISE: DH NOOP WITHOUT ucf cli-options()
 
 foreach my $package (@{$dh{DOPACKAGES}}) {
 	my $file=pkgfile($package,"ucf");
diff --git a/dh_usrlocal b/dh_usrlocal
index 5ee1fc28..34be4941 100755
--- a/dh_usrlocal
+++ b/dh_usrlocal
@@ -71,7 +71,7 @@ Debian policy, version 2.2
 
 init();
 
-# PROMISE: DH NOOP WITHOUT tmp(usr/local)
+# PROMISE: DH NOOP WITHOUT tmp(usr/local) cli-options()
 
 foreach my $package (@{$dh{DOPACKAGES}}) {
 	my $tmp = tmpdir($package);