r475: * dh_gencontrol: Added a documented interface for specifying substvars

[debhelper.git] / dh_clean

diff --git a/dh_clean b/dh_clean
index 341d1fbf6b6c140b82da5d8aaa886eb283e9a458..bd3b72cac5a15f98f664ab1626e2182f187a9911 100755 (executable)
--- a/dh_clean
+++ b/dh_clean
@@ -62,7 +62,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
        my $ext=pkgext($package);
 
        if (! $dh{D_FLAG}) {
-               doit("rm","-f","debian/${ext}substvars",
+               doit("rm","-f","debian/${ext}substvars.debhelper",
                        "debian/${ext}postinst.debhelper",
                        "debian/${ext}postrm.debhelper",
                        "debian/${ext}preinst.debhelper",
@@ -81,6 +81,15 @@ 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");
+
        # See if some files that would normally be deleted are excluded.
        my $find_options='';
        if (defined($dh{EXCLUDE_FIND}) && $dh{EXCLUDE_FIND} ne '') {