Merge branch 'master' into buildsystems

[debhelper.git] / dh_clean

diff --git a/dh_clean b/dh_clean
index 96b8113a8f1e9ca13ae465d0fe3b24fb386e2c9f..1213f6ca82355f887c9f9a7995ff4b15c7835b46 100755 (executable)
--- a/dh_clean
+++ b/dh_clean
@@ -20,12 +20,15 @@ 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
+
+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,13 +36,7 @@ The debian/clean file can list other files to be removed.
 
 =item B<-k>, B<--keep>
 
-Do not delete debian/files. When do you want to use this? Anytime you have a
-debian/rules that has 2 binary targets that build different .deb packages;
-for example, one target is binary-arch, and the other is binary-indep, or
-one target builds the shared library, and the other the -dev package. If you
-didn't use -k in these cases, then debian/files would be deleted in the
-middle, and your changes file will only contain the last binary package that
-was built.
+This is deprecated, use L<dh_prep(1)> instead.
 
 =item B<-d>, B<--dirs-only>
 
@@ -60,7 +57,15 @@ Delete these files too.
 
 =cut
 
-init();
+init(options => {
+       "dirs-only" => \$dh{D_FLAG},
+});
+inhibit_log();
+
+if ($dh{K_FLAG}) {
+       # dh_prep will be emulated (mostly) by the code below.
+       # TODO deprecation warning
+}
 
 foreach my $package (@{$dh{DOPACKAGES}}) {
        my $tmp=tmpdir($package);
@@ -73,6 +78,10 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
                # These are all debhelper temp files, and so it is safe to 
                # wildcard them.
                complex_doit("rm -f debian/$ext*.debhelper");
+               
+               if (! $dh{K_FLAG}) {
+                       doit("rm","-f","debian/${ext}debhelper.log");
+               }
        }
        
        doit ("rm","-rf",$tmp."/")
@@ -83,14 +92,14 @@ if (! $dh{D_FLAG}) {
        if (@ARGV) {
                doit("rm","-f","--",@ARGV);
        }
-       
-       if (!compat(6) && -e "debian/clean") {
-               my @clean=grep { ! excludefile($_) }
-                       filearray("debian/clean", ".");
-               doit("rm","-f","--",@clean) if @clean;
-       }
 
        if (! $dh{K_FLAG}) {
+               if (!compat(6) && -e "debian/clean") {
+                       my @clean=grep { ! excludefile($_) }
+                               filearray("debian/clean", ".");
+                       doit("rm","-f","--",@clean) if @clean;
+               }
+
                doit("rm","-f","debian/files")
                        unless excludefile("debian/files");
        }
@@ -114,6 +123,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)>