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
---
 debian/postinst | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'debian/postinst')

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.
-- 
cgit v1.2.3