diff options
author | Joey Hess <joey@kodama.kitenet.net> | 2008-07-08 13:51:02 -0400 |
---|---|---|
committer | Joey Hess <joey@kodama.kitenet.net> | 2008-07-08 13:51:02 -0400 |
commit | 2b71b515b540da977d6cdf2c0f5995d5934ac005 (patch) | |
tree | 17cdb3a536348a7670259d6f5635762ee222a25e | |
parent | e8324ce00e7f5fe6c1a4485203ae43db484e5b48 (diff) |
dh_clean: Do not delete *-stamp files in -k mode in v7. Closes: #489918
-rw-r--r-- | debian/changelog | 6 | ||||
-rwxr-xr-x | dh_clean | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index 63d3cd62..b97d5d2f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +debhelper (7.0.15) UNRELEASED; urgency=low + + * dh_clean: Do not delete *-stamp files in -k mode in v7. Closes: #489918 + + -- Joey Hess <joeyh@debian.org> Tue, 08 Jul 2008 13:50:07 -0400 + debhelper (7.0.14) unstable; urgency=low * Load python-support sequence file first, to allow ones loaded later to @@ -36,8 +36,7 @@ clean target in debian/rules. =item B<-k>, B<--keep> -This causes L<dh_prep(1)> to be run instead of dh_clean, for backwards -compatibility. +This is deprecated, use L<dh_prep(1)> instead. =item B<-d>, B<--dirs-only> @@ -122,7 +121,7 @@ if (! $dh{D_FLAG}) { doit('rm', '-rf', 'debian/tmp') if -x 'debian/tmp' && ! compat(1) && ! excludefile("debian/tmp"); -if (!compat(6)) { +if (!compat(6) && !$dh{K_FLAG}) { complex_doit('rm -f *-stamp'); } |