Merge commit 'micah/master'

diff --git a/packaging/debian/monkeysphere.preinst b/packaging/debian/monkeysphere.preinst
index 73c4169fbae14d443c569faf9d5215783604a701..fd22f6faca5e5ed685ca611eecd3abe3f2c93746 100755 (executable)
--- a/packaging/debian/monkeysphere.preinst
+++ b/packaging/debian/monkeysphere.preinst
@@ -5,6 +5,18 @@
 # Author: Jameson Rollins <jrollins@finestructure.net>
 # Copyright 2008-2009
 
+ETC="/etc/monkeysphere"
+
+# move the old server conf file to be the authentication conf file
+if [ -f "$ETC"/monkeysphere-server.conf -a \
+    ! -f "$ETC"/monkeysphere-authentication.conf ] ; then
+    mv "$ETC"/monkeysphere-server.conf "$ETC"/monkeysphere-authentication.conf
+fi
+
+# remove the old gpg-*.conf files
+rm -f "$ETC"/gpg-host.conf
+rm -f "$ETC"/gpg-authentication.conf
+
 # dh_installdeb will replace this with shell code automatically
 # generated by other debhelper scripts.