diff options
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rwxr-xr-x | pre-install.d/50uncommitted-changes | 5 |
3 files changed, 13 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 53c32c6..54a541f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -31,7 +31,13 @@ etckeeper (0.7) UNRELEASED; urgency=low * Basque. Closes: #457830 * Russian. Closes: #457871 - -- Christian Perrier <bubulle@debian.org> Wed, 02 Jan 2008 15:36:33 +0100 + [ Joey Hess ] + * Commit removed files in the pre-install hook to git, as was already done + for hg. Avoided changing the debconf template so bubulle doesn't murder + me; the current wording is just vague enough to still work with the + current behavior. + + -- Joey Hess <joeyh@debian.org> Fri, 04 Jan 2008 18:38:25 -0500 etckeeper (0.6) unstable; urgency=low diff --git a/debian/control b/debian/control index 8a03771..2a8cb30 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: admin Priority: optional Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.9.0) Maintainer: Joey Hess <joeyh@debian.org> -Standards-Version: 3.7.2 +Standards-Version: 3.7.3 Vcs-Git: git://git.kitenet.net/etckeeper Homepage: http://kitenet.net/~joey/code/etckeeper/ diff --git a/pre-install.d/50uncommitted-changes b/pre-install.d/50uncommitted-changes index 3bfc037..f4c0f0f 100755 --- a/pre-install.d/50uncommitted-changes +++ b/pre-install.d/50uncommitted-changes @@ -22,6 +22,11 @@ commit() { if [ "$VCS" = git ]; then git add . + for file in $(git ls-files --deleted); do + if [ ! -d "$file" ]; then + git rm --quiet "$file" + fi + done git commit $GIT_COMMIT_OPTIONS -m "$message" elif [ "$VCS" = hg ]; then hg addremove . |