[debhelper-devel] [debhelper] 01/01: dh_prep: Clean up debian/.debhelper/generated/$pkg

[Niels Thykier]

This is an automated email from the git hooks/post-receive script.

nthykier pushed a commit to branch master
in repository debhelper.

commit 1eaff5640a44deb03b441da7db51c03b0e06a444
Author: Niels Thykier <niels at thykier.net>
Date:   Sat Apr 8 10:44:15 2017 +0000

    dh_prep: Clean up debian/.debhelper/generated/$pkg
    
    That way, the generated files behave like other temporary debhelper
    files (which is what they are designed to be).
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 Debian/Debhelper/Dh_Lib.pm | 1 +
 debian/changelog           | 2 ++
 dh_prep                    | 2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Debian/Debhelper/Dh_Lib.pm b/Debian/Debhelper/Dh_Lib.pm
index e96c814..8f97401 100644
--- a/Debian/Debhelper/Dh_Lib.pm
+++ b/Debian/Debhelper/Dh_Lib.pm
@@ -704,6 +704,7 @@ sub autoscript_sed {
 	}
 }
 
+# Generated files are cleaned by dh_clean AND dh_prep
 sub generated_file {
 	my ($package, $filename, $mkdirs) = @_;
 	my $dir = "debian/.debhelper/generated/${package}";
diff --git a/debian/changelog b/debian/changelog
index 98292e6..f9f5d89 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,8 @@ debhelper (10.3) UNRELEASED; urgency=medium
   * dh_install: Deprecate --list-missing/--fail-missing in favor of the
     new dh_missing tool.  The options will be removed in compat 11.
   * dh: Run dh_missing by default (in no op mode).
+  * dh_prep: Clean up generated files so they work like other temporary
+    debhelper files.
 
   [ Steven Chamberlain ]
   * When cross-compiling for GNU/kFreeBSD host systems, set
diff --git a/dh_prep b/dh_prep
index bece476..80b9dd3 100755
--- a/dh_prep
+++ b/dh_prep
@@ -50,7 +50,7 @@ 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");
-	
+	doit('rm', '-rf', "debian/.debhelper/generated/${package}/");
 	doit ("rm","-rf",$tmp."/")
 		unless excludefile($tmp);
 }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debhelper/debhelper.git