Make -k/--keep a per helper option

6 files changed, 14 insertions, 7 deletions

diff --git a/debian/changelog b/debian/changelog
index eb0c3e6d..baac967c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -50,6 +50,14 @@ debhelper (11.4) UNRELEASED; urgency=medium
     auto-generated postrm script.  The systemd package has a trigger for
     handling sysvinit scripts and dh_installsystemd handles the requirement
     for native systemd unit files.
+  * dh_clean: Explicitly declare the -k/--keep parameter with the intend
+    to remove it from the default debhelper options.
+  * dh_installchangelogs: Ditto.
+  * dh_strip: Ditto.
+  * Dh_Getopt.pm: Remove -k/--keep from the list of options supported by all
+    debhelper tools.  The only external consumer was dh_gtkmodules which is now
+    deprecated and a "noop" dh_installtex.  No consumers of dh_gtkmodules
+    appear to pass -k/--keep to dh_gtkmodules any longer.
 
   [ Juhani Numminen ]
   * dh_installsystemd.1: Fix typo in manpage.
diff --git a/dh_clean b/dh_clean
index 15466a9b..192ace29 100755
--- a/dh_clean
+++ b/dh_clean
@@ -78,6 +78,7 @@ slash.  Any content in these directories will be removed as well.
 
 init(options => {
 	"dirs-only" => \$dh{D_FLAG},
+	"keep|k" => \$dh{K_FLAG},
 });
 inhibit_log();
 
diff --git a/dh_installchangelogs b/dh_installchangelogs
index 8eb9e190..5dcbaf5f 100755
--- a/dh_installchangelogs
+++ b/dh_installchangelogs
@@ -147,7 +147,9 @@ sub install_binNMU_changelog {
 	}
 }
 
-init();
+init(options => {
+	'keep|k'  => \$dh{K_FLAG},
+});
 
 my $news_name="NEWS.Debian";
 my $changelog_name="changelog.Debian";
diff --git a/dh_strip b/dh_strip
index d345c696..070f9ead 100755
--- a/dh_strip
+++ b/dh_strip
@@ -137,7 +137,7 @@ Debian policy, version 3.0.1
 =cut
 
 init(options => {
-	"keep-debug"         => \$dh{K_FLAG},
+	'keep-debug|keep|k'  => \$dh{K_FLAG},
 	'dbgsym-migration=s' => \$dh{MIGRATE_DBGSYM},
 	'automatic-dbgsym!'  => \$dh{ENABLE_DBGSYM},
     # Deprecated variants
diff --git a/doc/PROGRAMMING b/doc/PROGRAMMING
index 5d15b41e..3671f949 100644
--- a/doc/PROGRAMMING
+++ b/doc/PROGRAMMING
@@ -114,7 +114,6 @@ switch		variable	description
 				only be used inside complex_doit(), not in
 				doit().
 -d		D_FLAG		you decide what this means to your program
--k		K_FLAG		used to turn on keeping of something
 -P		TMPDIR		package build directory (implies only one
 				package is being acted on)
 -u		U_PARAMS	will be set to a string, that is typically
diff --git a/lib/Debian/Debhelper/Dh_Getopt.pm b/lib/Debian/Debhelper/Dh_Getopt.pm
index dd96480b..8afdd308 100644
--- a/lib/Debian/Debhelper/Dh_Getopt.pm
+++ b/lib/Debian/Debhelper/Dh_Getopt.pm
@@ -107,7 +107,7 @@ sub getoptions {
 		"arch" => \&AddPackage,
 	
 		"p=s" => \&AddPackage,
-	        "package=s" => \&AddPackage,
+		"package=s" => \&AddPackage,
 		
 		"N=s" => \&ExcludePackage,
 		"no-package=s" => \&ExcludePackage,
@@ -131,9 +131,6 @@ sub getoptions {
 		
 		"d" => \$dh{D_FLAG},
 	
-		"k" => \$dh{K_FLAG},
-		"keep" => \$dh{K_FLAG},
-
 		"P=s" => \$dh{TMPDIR},
 		"tmpdir=s" => \$dh{TMPDIR},