Add deprecation warning for dh_clean -k.

3 files changed, 8 insertions, 6 deletions

diff --git a/debian/changelog b/debian/changelog
index fa04d078..8e68e130 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ debhelper (7.4.21) UNRELEASED; urgency=low
   * dh_installman: Avoid converting .so links to symlinks if the link
     target is not present in the same binary package, on advice of 
     Colin Watson. (To support eventual so search paths.)
+  * Add deprecation warning for dh_clean -k.
 
  -- Joey Hess <joeyh@debian.org>  Mon, 17 May 2010 20:01:19 -0400
 
diff --git a/dh_clean b/dh_clean
index bc5bc579..2fca7815 100755
--- a/dh_clean
+++ b/dh_clean
@@ -72,7 +72,7 @@ inhibit_log();
 
 if ($dh{K_FLAG}) {
 	# dh_prep will be emulated (mostly) by the code below.
-	# TODO deprecation warning
+	warning("dh_clean -k is deprecated; use dh_prep instead");
 }
 
 foreach my $package (@{$dh{DOPACKAGES}}) {
diff --git a/doc/TODO b/doc/TODO
index ae526968..42a25e38 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -23,10 +23,6 @@ Deprecated:
 * DH_COMPAT 1, 2, 3, 4. Can be removed once all packages are seen to be using
   a newer version. I won't hold my breath. Now with evil warning messages
   though.
-* Also, grep the entire archive for all dh_* command lines,
-  and check to see what other switches are not being used, and maybe remove
-  some of them. I'd also like to deprecate/remove debian/compress files, -X is
-  a better idea.
 * dh_suidregister. Once nothing in the archive uses it.
 * dh_installmanpages.
 * dh_testversion. Remove as soon as nothing uses it.
@@ -35,10 +31,15 @@ Deprecated:
 * dh_undocumented
 * dh_installinit --init-script (make it warn)
 * dh_python
-* dh_clean -k (make it warn (need to make alien not use it 1st!))
+* dh_clean -k
 * dh_desktop, dh_scrollkeeper. Remove eventually..
 * -s flag, not formally deprecated yet; remove eventually
 * -u flag; add a warning on use and remove eventually
 * delsubstvar() and the last parameter to addsubstvar that makes it remove
   a string are not used in debhelper itself, but have been left in the
   library in case other things use them. Deprecate and remove.
+
+Also, grep the entire archive for all dh_* command lines,
+and check to see what other switches are not being used, and maybe remove
+some of them. I'd also like to deprecate/remove debian/compress files, -X is
+a better idea.