r487: * dh_movefiles: Typo, Closes: #106532

   * Use -x to test for existance of init scripts, rather then -e since
     we'll be running them, Closes: #109692
   * dh_clean: remove debian/*.debhelper. No need to name files
     specifically; any file matching that is a debhelper temp file.
     Closes: #106514, #85520

1 files changed, 6 insertions, 16 deletions

diff --git a/dh_clean b/dh_clean
index 570179b9..388f913c 100755
--- a/dh_clean
+++ b/dh_clean
@@ -18,8 +18,8 @@ use Debian::Debhelper::Dh_Lib;
 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,12 +62,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 	my $ext=pkgext($package);
 
 	if (! $dh{D_FLAG}) {
-		doit("rm","-f","debian/${ext}substvars",
-			"debian/${ext}substvars.debhelper",
-			"debian/${ext}postinst.debhelper",
-			"debian/${ext}postrm.debhelper",
-			"debian/${ext}preinst.debhelper",
-			"debian/${ext}prerm.debhelper");
+		doit("rm","-f","debian/${ext}substvars");
 	}
 	
 	doit ("rm","-rf",$tmp);
@@ -82,14 +77,9 @@ if (! $dh{D_FLAG}) {
 		doit("rm","-f","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");
 
 	# See if some files that would normally be deleted are excluded.
 	my $find_options='';