diff options
author | Joey Hess <joey@kitenet.net> | 2014-10-03 15:14:32 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2014-10-03 15:15:15 -0400 |
commit | 14b2527835f75935fc47ab5c6f723269a5f57286 (patch) | |
tree | 46c53241a3bdd70108677c62d59b6a83eada0971 | |
parent | e56fb330555a175e20c2e5cce60fe8cfe4898b5d (diff) |
dh_clean: Skip over .git, .svn, .bzr, .hg, and CVS directories and avoid cleaning their contents. Closes: #760033
I don't much like debhelper needing to contain yet another copy of every
bit of vcs cruft known to man; at least this only needs to be the
directories and not other dotfiles.
-rw-r--r-- | debian/changelog | 7 | ||||
-rwxr-xr-x | dh_clean | 7 |
2 files changed, 13 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index d1d37fc0..5c32f2f3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +debhelper (9.20140818) UNRELEASED; urgency=medium + + * dh_clean: Skip over .git, .svn, .bzr, .hg, and CVS directories + and avoid cleaning their contents. Closes: #760033 + + -- Joey Hess <joeyh@debian.org> Fri, 03 Oct 2014 15:13:08 -0400 + debhelper (9.20140817) unstable; urgency=medium * Added Portuguese translation of the man pages, by Américo Monteiro. @@ -122,8 +122,13 @@ if (! $dh{D_FLAG}) { $find_options="! \\( $dh{EXCLUDE_FIND} \\) -a"; } + # vcs directories that should not have their contents cleaned + my $vcs_dirs=join " -o ", map { "-path .\\*/" . $_ } + (".git", ".svn", ".bzr", ".hg", "CVS"); + # Remove other temp files. - complex_doit("find . $find_options \\( \\( -type f -a \\ + complex_doit("find . $find_options \\( \\( \\ + \\( $vcs_dirs \\) -prune -o -type f -a \\ \\( -name '#*#' -o -name '.*~' -o -name '*~' -o -name DEADJOE \\ -o -name '*.orig' -o -name '*.rej' -o -name '*.bak' \\ -o -name '.*.orig' -o -name .*.rej -o -name '.SUMS' \\ |