[debhelper-devel] [debhelper] 01/01: dh_clean: Preserve debian/.debhelper with -d

[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 d1d1d76bb014dcf6b3c6e8e642c26823584a05b4
Author: Niels Thykier <niels at thykier.net>
Date:   Sat Oct 24 19:17:33 2015 +0200

    dh_clean: Preserve debian/.debhelper with -d
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 debian/changelog | 2 ++
 dh_clean         | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index f529999..eb7e145 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ debhelper (9.20151005) unstable; urgency=medium
     the issue.  (Closes: #800919)
   * Fix typos in various manpages.  Thanks to Chris Leick
     for reporting them.
+  * dh_clean: Avoid cleaning up debian/.debhelper when
+    passed the "-d" flag.
 
   [ Translations ]
   * Update German translation (Chris Leick)
diff --git a/dh_clean b/dh_clean
index acb23db..cd337ac 100755
--- a/dh_clean
+++ b/dh_clean
@@ -94,7 +94,8 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 }
 
 # Remove internal state data
-doit('rm', '-rf', 'debian/.debhelper/');
+doit('rm', '-rf', 'debian/.debhelper/') if not $dh{D_FLAG};
+
 
 # Remove all debhelper logs.
 if (! $dh{D_FLAG} && ! $dh{K_FLAG}) {

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