diff options
| -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' \\ |