Merge branch 'master' into buildsystems

[debhelper.git] / dh_clean

diff --git a/dh_clean b/dh_clean
index 2ef3ba38a9c56f29465a11f2320e1a8d801a4e58..1213f6ca82355f887c9f9a7995ff4b15c7835b46 100755 (executable)
--- a/dh_clean
+++ b/dh_clean
@@ -22,10 +22,13 @@ debhelper commands. It also removes common files that should not appear in a
 debian diff:
   #*# *~ DEADJOE *.orig *.rej *.SUMS TAGS .deps/* *.P *-stamp
 
+The debian/clean file can list other files to be removed.
+
 It does not run "make clean" to clean up after the build process. Use
-L<dh_auto_clean(1)> to do that.
+L<dh_auto_clean(1)> to do things like that.
 
-The debian/clean file can list other files to be removed.
+dh_clean (or "dh clean") should be the last debhelper command run in the
+clean target in debian/rules.
 
 =head1 OPTIONS
 
@@ -33,8 +36,7 @@ The debian/clean file can list other files to be removed.
 
 =item B<-k>, B<--keep>
 
-This causes L<dh_prep(1)> to be run instead of dh_clean, for backwards
-compatibility.
+This is deprecated, use L<dh_prep(1)> instead.
 
 =item B<-d>, B<--dirs-only>
 
@@ -55,7 +57,9 @@ Delete these files too.
 
 =cut
 
-init();
+init(options => {
+       "dirs-only" => \$dh{D_FLAG},
+});
 inhibit_log();
 
 if ($dh{K_FLAG}) {
@@ -119,7 +123,7 @@ if (! $dh{D_FLAG}) {
 doit('rm', '-rf', 'debian/tmp') if -x 'debian/tmp' && ! compat(1) &&
                                    ! excludefile("debian/tmp");
 
-if (!compat(6)) {
+if (!compat(6) && !$dh{K_FLAG}) {
        complex_doit('rm -f *-stamp');
 }