dh_clean: In v7 mode, automatically delete *-stamp files.

diff --git a/debhelper.pod b/debhelper.pod
index 480db344fd4104748258127a9c2e0b30421faeff..f81234d08a5b6401ef200bde1d124fb10d1efd41 100644 (file)
--- a/debhelper.pod
+++ b/debhelper.pod
@@ -407,6 +407,10 @@ parameters.
 
 dh_clean will read debian/clean and delete files listed there.
 
+=item -
+
+dh_clean will delete toplevel *-stamp files.
+
 =back
 
 =back

diff --git a/debian/changelog b/debian/changelog
index 6b91af5d7457b470d0f4b0fe4a90be3c8b19e460..f67c35faf8e0c08bdb66191f3fec7e6207718dde 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,7 +18,7 @@ debhelper (7.0.0) UNRELEASED; urgency=low
     setup.py to install. Supports the PREFIX=/usr special case needed by
     MakeMaker Makefiles. (Support for cmake and other build systems planned
     but not yet implemented.)
-  * New v7 mode, which only has two changes from v6, and is the new
+  * New v7 mode, which only has three changes from v6, and is the new
     recommended default, especially when using dh.
   * dh_install: In v7 mode, if --sourcedir is not specified, first look for
     files in debian/tmp, and then will look in the current directory. This
@@ -26,6 +26,7 @@ debhelper (7.0.0) UNRELEASED; urgency=low
     special parameters.
   * dh_clean: In v7 mode, read debian/clean and delete all files listed
     therein.
+  * dh_clean: In v7 mode, automatically delete *-stamp files.
   * Add a Makefile and simplify this package's own rules file using
     all the new toys.
   * dh_clean: Don't delete core dumps. (Too DWIM, and "core" is not

diff --git a/dh_clean b/dh_clean
index 78e43c36f6819499a90421f4eae12adda8ac6d28..2ef3ba38a9c56f29465a11f2320e1a8d801a4e58 100755 (executable)
--- a/dh_clean
+++ b/dh_clean
@@ -20,7 +20,7 @@ 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.
@@ -119,6 +119,10 @@ if (! $dh{D_FLAG}) {
 doit('rm', '-rf', 'debian/tmp') if -x 'debian/tmp' && ! compat(1) &&
                                    ! excludefile("debian/tmp");
 
+if (!compat(6)) {
+       complex_doit('rm -f *-stamp');
+}
+
 =head1 SEE ALSO
 
 L<debhelper(7)>