r556: * Depend on po-debconf, and I hope I can drop the debconf-utils dep soon.

[debhelper.git] / dh_clean

diff --git a/dh_clean b/dh_clean
index d86743a5ab775ea614ded0b112832902d8fccc70..fd9f86f126daafbcf4ca243e90efe2f37dc549d5 100755 (executable)
--- a/dh_clean
+++ b/dh_clean
@@ -11,15 +11,15 @@ use Debian::Debhelper::Dh_Lib;
 
 =head1 SYNOPSIS
 
-  dh_clean [debhelper options] [-k] [-d] [file ...] [-Xitem]
+B<dh_clean> [S<I<debhelper options>>] [B<-k>] [B<-d>] [B<-X>I<item>] [S<I<file ...>>]
 
 =head1 DESCRIPTION
 
 dh_clean is a debhelper program that is responsible for cleaning up after a
 package is built. It removes the package build directories, and removes some
 other files, such as debian/substvars, debian/files, and any detritus left
-behind by other debhelper commands. It also removes common files that
-should not appear in a debian diff:
+behind by other debhelper commands (debian/*.debhelper). It also removes
+common files that should not appear in a debian diff:
   #*# *~ DEADJOE *.orig *.rej *.SUMS TAGS core .deps/* *.P
 
 =head1 OPTIONS
@@ -62,14 +62,12 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
        my $ext=pkgext($package);
 
        if (! $dh{D_FLAG}) {
-               doit("rm","-f","debian/${ext}substvars",
-                       "debian/${ext}postinst.debhelper",
-                       "debian/${ext}postrm.debhelper",
-                       "debian/${ext}preinst.debhelper",
-                       "debian/${ext}prerm.debhelper");
+               doit("rm","-f","debian/${ext}substvars")
+                       unless excludefile("debian/${ext}substvars");
        }
        
-       doit ("rm","-rf",$tmp);
+       doit ("rm","-rf",$tmp)
+               unless excludefile($tmp);
 }
 
 if (! $dh{D_FLAG}) {
@@ -78,18 +76,18 @@ if (! $dh{D_FLAG}) {
        }
 
        if (! $dh{K_FLAG}) {
-               doit("rm","-f","debian/files");
+               doit("rm","-f","debian/files")
+                       unless excludefile("debian/files");
        }
 
-       # Remove some files that were left around by older versions of
-       # debhelper, just in case someone upgrades in the middle of a
-       # build.
-       doit("rm","-f","debian/substvars",
-               "debian/postinst.debhelper",
-               "debian/postrm.debhelper",
-               "debian/preinst.debhelper",
-               "debian/prerm.debhelper");
+       # These are all debhelper temp files, and so it is safe to 
+       # wildcard them.
+       complex_doit("rm -f debian/*.debhelper");
 
+       # Remove some files that were left around by older versions of
+       # debhelper.
+       doit("rm","-f","debian/substvars");
+       
        # See if some files that would normally be deleted are excluded.
        my $find_options='';
        if (defined($dh{EXCLUDE_FIND}) && $dh{EXCLUDE_FIND} ne '') {
@@ -101,11 +99,15 @@ if (! $dh{D_FLAG}) {
        # parameters). Note that you _don't_ quote wildcards used by find
        # in here.
        doit(split(/\s+/,"find . -type f -a
-               ( -name #*# -o -name *~ -o -name DEADJOE
+               ( -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 )
                ) $find_options -exec rm -f {} ;"));
+
+       # Stupid autoconf cache directory.
+       doit("rm", "-rf", "autom4te.cache")
+               unless excludefile("autom4te.cache");
 }
 
 doit('rm', '-rf', 'debian/tmp') if -x 'debian/tmp' && ! compat(1);