X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=dh_clean;h=2fca78159f8c12910ee2727e0f9327dde9d11b46;hb=653fb43cfa731d047deaf19b61aef2ebbeb00990;hp=d0af17d1d9a73532ea35ffcc06a61c86f86e7f57;hpb=1d299f2f393badc38580465711f01cfa37ad4cf2;p=debhelper.git

diff --git a/dh_clean b/dh_clean
index d0af17d..2fca781 100755
--- a/dh_clean
+++ b/dh_clean
@@ -17,10 +17,26 @@ B<dh_clean> [S<I<debhelper options>>] [B<-k>] [B<-d>] [B<-X>I<item>] [S<I<file .
 
 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 (debian/*.debhelper). It also removes
-common files that should not appear in a debian diff:
-  #*# *~ DEADJOE *.orig *.rej *.SUMS TAGS core .deps/* *.P
+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 *-stamp
+
+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 FILES
+
+=over 4
+
+=item debian/clean
+
+Can list other files to be removed.
+
+=back
 
 =head1 OPTIONS
 
@@ -28,13 +44,7 @@ common files that should not appear in a 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 +65,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.
+	warning("dh_clean -k is deprecated; use dh_prep instead");
+}
 
 foreach my $package (@{$dh{DOPACKAGES}}) {
 	my $tmp=tmpdir($package);
@@ -64,9 +82,17 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 	if (! $dh{D_FLAG}) {
 		doit("rm","-f","debian/${ext}substvars")
 			unless excludefile("debian/${ext}substvars");
+		
+		# 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)
+	doit ("rm","-rf",$tmp."/")
 		unless excludefile($tmp);
 }
 
@@ -76,41 +102,42 @@ 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");
 	}
 
-	# 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 '') {
-		$find_options="-a ! ( $dh{EXCLUDE_FIND} )";
+		$find_options="! \\( $dh{EXCLUDE_FIND} \\) -a";
 	}
 
 	# Remove other temp files.
-	# (The \s+ is important, \s won't work because find would get null
-	# 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 *~ -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 {} ;"));
+	complex_doit("find . $find_options \\( \\( -type f -a \\
+	        \\( -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 \\( -path '*/.deps/*' -a -name '*.P' \\) \\
+		\\) -exec rm -f {} \\; \\) -o \\
+		\\( -type d -a -name autom4te.cache -prune -exec rm -rf {} \\; \\) \\)");
 }
 
-doit('rm', '-rf', 'debian/tmp') if -x 'debian/tmp' && ! compat(1);
+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(1)>
+L<debhelper(7)>
 
 This program is a part of debhelper.