Fix build system auto-selection breakage.

[debhelper.git] / dh_clean

diff --git a/dh_clean b/dh_clean
index 78e43c36f6819499a90421f4eae12adda8ac6d28..bc5bc579074873f3fcc3fb3f6c9b4887a3818277 100755 (executable)
--- a/dh_clean
+++ b/dh_clean
@@ -20,12 +20,23 @@ package is built. It removes the package build directories, and removes some
 other files including debian/files, and any detritus left behind by other
 debhelper commands. It also removes common files that should not appear in a
 debian diff:
-  #*# *~ DEADJOE *.orig *.rej *.SUMS TAGS .deps/* *.P
+  #*# *~ DEADJOE *.orig *.rej *.SUMS TAGS .deps/* *.P *-stamp
 
 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 FILES
+
+=over 4
+
+=item debian/clean
+
+Can list other files to be removed.
+
+=back
 
 =head1 OPTIONS
 
@@ -33,8 +44,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 +65,9 @@ Delete these files too.
 
 =cut
 
-init();
+init(options => {
+       "dirs-only" => \$dh{D_FLAG},
+});
 inhibit_log();
 
 if ($dh{K_FLAG}) {
@@ -119,6 +131,10 @@ if (! $dh{D_FLAG}) {
 doit('rm', '-rf', 'debian/tmp') if -x 'debian/tmp' && ! compat(1) &&
                                    ! excludefile("debian/tmp");
 
+if (!compat(6) && !$dh{K_FLAG}) {
+       complex_doit('rm -f *-stamp');
+}
+
 =head1 SEE ALSO
 
 L<debhelper(7)>