[debhelper-devel] [debhelper] 01/04: dh_clean: Drop -k in compat 11

[Niels Thykier]

This is an automated email from the git hooks/post-receive script.

nthykier pushed a commit to branch master
in repository debhelper.

commit 3c7cc22b3df96a5b322fa3c23b1ab656fd8bc5eb
Author: Niels Thykier <niels at thykier.net>
Date:   Sun Jun 19 07:08:39 2016 +0000

    dh_clean: Drop -k in compat 11
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 debhelper.pod | 9 +++++++++
 dh_clean      | 5 +++++
 2 files changed, 14 insertions(+)

diff --git a/debhelper.pod b/debhelper.pod
index 9bfea31..a134407 100644
--- a/debhelper.pod
+++ b/debhelper.pod
@@ -568,6 +568,15 @@ Changes from v10 are:
 B<dh_installmenu> no longer installs F<menu> files.  The
 F<menu-method> files are still installed.
 
+=item -
+
+The B<-s> (B<--same-arch>) option is removed.
+
+=item -
+
+Invoking B<dh_clean -k> now causes an error instead of a deprecation
+warning.
+
 =back
 
 =head1 NOTES
diff --git a/dh_clean b/dh_clean
index c58ec60..590ef3a 100755
--- a/dh_clean
+++ b/dh_clean
@@ -50,6 +50,8 @@ slash.  Any content in these directories will be removed as well.
 
 This is deprecated, use L<dh_prep(1)> instead.
 
+The option is removed in compat 11.
+
 =item B<-d>, B<--dirs-only>
 
 Only clean the package build directories, do not clean up any other files
@@ -79,6 +81,9 @@ inhibit_log();
 
 if ($dh{K_FLAG}) {
 	# dh_prep will be emulated (mostly) by the code below.
+	if (not compat(10)) {
+		error("The -k option is not supported in compat 11; use dh_prep instead");
+	}
 	warning("dh_clean -k is deprecated; use dh_prep instead");
 }
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debhelper/debhelper.git