Merge branch 'master' into buildsystems

[debhelper.git] / dh_clean

diff --git a/dh_clean b/dh_clean
index 21114df895d29a2d68394bdaa913fd991b198e57..1213f6ca82355f887c9f9a7995ff4b15c7835b46 100755 (executable)
--- a/dh_clean
+++ b/dh_clean
@@ -20,7 +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 core .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 things like that.
+
+dh_clean (or "dh clean") should be the last debhelper command run in the
+clean target in debian/rules.
 
 =head1 OPTIONS
 
@@ -28,13 +36,7 @@ debian diff:
 
 =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>
 
@@ -55,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);
@@ -68,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."/")
@@ -80,6 +94,12 @@ if (! $dh{D_FLAG}) {
        }
 
        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");
        }
@@ -95,7 +115,7 @@ if (! $dh{D_FLAG}) {
                \\( -name '#*#' -o -name '.*~' -o -name '*~' -o -name DEADJOE \\
                 -o -name '*.orig' -o -name '*.rej' -o -name '*.bak' \\
                 -o -name '.*.orig' -o -name .*.rej -o -name '.SUMS' \\
-                -o -name TAGS -o -name core -o \\( -path '*/.deps/*' -a -name '*.P' \\) \\
+                -o -name TAGS -o \\( -path '*/.deps/*' -a -name '*.P' \\) \\
                \\) -exec rm -f {} \\; \\) -o \\
                \\( -type d -a -name autom4te.cache -prune -exec rm -rf {} \\; \\) \\)");
 }
@@ -103,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)>