From 144c438e8e74113dd4c29e38a45eb6481a3271d3 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 14 Jan 2012 12:42:46 -0400
Subject: Fix up botched git-rm conffile removal from 0.58.

The file could be in any of three states; absent, present, or .dpkg-dist.

Finish fully removing it. Closes: #655836
---
 commit.d/40git-rm | 8 --------
 debian/changelog  | 8 ++++++++
 debian/postinst   | 4 ++++
 debian/preinst    | 2 +-
 etckeeper.spec    | 2 +-
 5 files changed, 14 insertions(+), 10 deletions(-)
 delete mode 100755 commit.d/40git-rm

diff --git a/commit.d/40git-rm b/commit.d/40git-rm
deleted file mode 100755
index ae70e1f..0000000
--- a/commit.d/40git-rm
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-set -e
-
-if [ "$VCS" = git ] && [ -d .git ]; then
-	if ! git add . -u; then
-		echo "etckeeper warning: git add -u failed" >&2
-	fi
-fi
diff --git a/debian/changelog b/debian/changelog
index 61c3556..65b07c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+etckeeper (0.61) UNRELEASED; urgency=low
+
+  * Fix up botched git-rm conffile removal from 0.58.
+    The file could be in any of three states; absent, present, or .dpkg-dist.
+    Finish fully removing it. Closes: #655836
+
+ -- Joey Hess <joeyh@debian.org>  Sat, 14 Jan 2012 12:30:07 -0400
+
 etckeeper (0.60) unstable; urgency=low
 
   * Updated Dutch translation of debconf templates. Closes: #654244
diff --git a/debian/postinst b/debian/postinst
index 496a5d8..59e9f4a 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -72,6 +72,10 @@ configure)
 			fi
 		done
 	fi
+	if dpkg --compare-versions "$2" le "0.61"; then
+		# may be left over from a botched conffile removal
+		rm -f /etc/etckeeper/commit.d/40git-rm.dpkg-dist
+	fi
 
 	if [ "$2" = "" ] && [ -e "/etc/etckeeper/etckeeper.conf" ]; then
 		# Fresh install.
diff --git a/debian/preinst b/debian/preinst
index 029ae31..4dda427 100644
--- a/debian/preinst
+++ b/debian/preinst
@@ -74,7 +74,7 @@ install|upgrade)
 			rm_conffile etckeeper "/etc/etckeeper/pre-commit.d/$c"
 		done
 	fi
-	if dpkg --compare-versions "$2" le "0.58"; then
+	if dpkg --compare-versions "$2" le "0.61"; then
 		rm_conffile etckeeper "/etc/etckeeper/commit.d/40git-rm"
 	fi
 
diff --git a/etckeeper.spec b/etckeeper.spec
index 25b0666..1a95deb 100644
--- a/etckeeper.spec
+++ b/etckeeper.spec
@@ -1,5 +1,5 @@
 Name: etckeeper
-Version: 0.60
+Version: 0.61
 Release: 4%{?dist}
 Summary: store /etc in git, mercurial, bzr or darcs
 
-- 
cgit v1.2.3