From b3be3738c766ad9420551594e084db93e5b17b3d Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Tue, 15 Jan 2008 14:34:55 -0500
Subject: move, don't delete

---
 debian/preinst | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

(limited to 'debian/preinst')

diff --git a/debian/preinst b/debian/preinst
index 7caa62d..3b927e4 100644
--- a/debian/preinst
+++ b/debian/preinst
@@ -18,23 +18,23 @@ prep_mv_conffile() {
 }
 
 # Remove a no-longer used conffile
-rm_conffile() {
-	PKGNAME="$1"
-	CONFFILE="$2"
-
-	if [ -e "$CONFFILE" ]; then
-		md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`"
-		old_md5sum="`dpkg-query -W -f='${Conffiles}' $PKGNAME | sed -n -e \"\\\\' $CONFFILE'{s/ obsolete$//;s/.* //p}\"`"
-		if [ "$md5sum" != "$old_md5sum" ]; then
-			echo "Obsolete conffile $CONFFILE has been modified by you."
-			echo "Saving as $CONFFILE.dpkg-bak ..."
-			mv -f "$CONFFILE" "$CONFFILE".dpkg-bak
-		else
-			echo "Removing obsolete conffile $CONFFILE ..."
-			rm -f "$CONFFILE"
-		fi
-	fi
-}
+#rm_conffile() {
+#	PKGNAME="$1"
+#	CONFFILE="$2"
+#
+#	if [ -e "$CONFFILE" ]; then
+#		md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`"
+#		old_md5sum="`dpkg-query -W -f='${Conffiles}' $PKGNAME | sed -n -e \"\\\\' $CONFFILE'{s/ obsolete$//;s/.* //p}\"`"
+#		if [ "$md5sum" != "$old_md5sum" ]; then
+#			echo "Obsolete conffile $CONFFILE has been modified by you."
+#			echo "Saving as $CONFFILE.dpkg-bak ..."
+#			mv -f "$CONFFILE" "$CONFFILE".dpkg-bak
+#		else
+#			echo "Removing obsolete conffile $CONFFILE ..."
+#			rm -f "$CONFFILE"
+#		fi
+#	fi
+#}
 
 case "$1" in
 install|upgrade)
@@ -52,7 +52,7 @@ install|upgrade)
 	fi
 	if dpkg --compare-versions "$2" le "0.10"; then
         	for c in 10vcs-test 30git-add 30hg-addremove 40git-rm; do
-			rm_conffile etckeeper "/etc/etckeeper/post-install.d/$c"
+			prep_mv_conffile etckeeper "/etc/etckeeper/post-install.d/$c"
 
 		done
 	fi
-- 
cgit v1.2.3