From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Tue, 28 Oct 2008 22:01:21 +0000 (-0400)
Subject: make sure that the /etc/monkeysphere/gpg-*.conf are placed during package installation.
X-Git-Tag: monkeysphere_0.18-1~14
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d080f8c802e0ca929577abe70118fa765d473dc6;p=monkeysphere.git

make sure that the /etc/monkeysphere/gpg-*.conf are placed during package installation.
---

diff --git a/Makefile b/Makefile
index 057707a..dfeb3f1 100644
--- a/Makefile
+++ b/Makefile
@@ -46,6 +46,8 @@ install: all installman
 	install src/monkeysphere-server $(DESTDIR)$(PREFIX)/sbin
 	install -m 0644 src/common $(DESTDIR)$(PREFIX)/share/monkeysphere
 	install doc/* $(DESTDIR)$(PREFIX)/share/doc/monkeysphere
+	install -m 0644 etc/gnupg-host.conf $(DESTDIR)$(ETCPREFIX)/etc/monkeysphere/gnupg-host.conf$(ETCSUFFIX)
+	install -m 0644 etc/gnupg-authentication.conf $(DESTDIR)$(ETCPREFIX)/etc/monkeysphere/gnupg-authentication.conf$(ETCSUFFIX)
 	install -m 0644 etc/monkeysphere.conf $(DESTDIR)$(ETCPREFIX)/etc/monkeysphere/monkeysphere.conf$(ETCSUFFIX)
 	install -m 0644 etc/monkeysphere-server.conf $(DESTDIR)$(ETCPREFIX)/etc/monkeysphere/monkeysphere-server.conf$(ETCSUFFIX)
 
diff --git a/debian/changelog b/debian/changelog
index 3131902..05383d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
 monkeysphere (0.18-1) UNRELEASED; urgency=low
 
+  [ Jameson Graef Rollins ]
   * Fix bugs in authorized_{user_ids,keys} file permission checking.
+  
+  [ Daniel Kahn Gillmor ]
+  * update install to ensure placement of
+    /etc/monkeysphere/gnupg-{host,authentication}.conf 
 
- -- Jameson Graef Rollins <jrollins@phys.columbia.edu>  Tue, 28 Oct 2008 14:36:16 -0400
+ -- Daniel Kahn Gillmor <dkg@fifthhorseman.net>  Tue, 28 Oct 2008 17:58:25 -0400
 
 monkeysphere (0.17-1) experimental; urgency=low
 
diff --git a/packaging/freebsd/Makefile b/packaging/freebsd/Makefile
index 78ad0d3..f4bf0fe 100644
--- a/packaging/freebsd/Makefile
+++ b/packaging/freebsd/Makefile
@@ -34,6 +34,12 @@ post-patch:
 	find . -iname '*.orig' -delete
 
 post-install:
+	@if [ ! -f ${PREFIX}/etc/monkeysphere/gnupg-host.conf ]; then \
+		${CP} -p ${PREFIX}/etc/monkeysphere/gnupg-host.conf.sample ${PREFIX}/etc/monkeysphere/gnupg-host.conf ; \
+	fi
+	@if [ ! -f ${PREFIX}/etc/monkeysphere/gnupg-authentication.conf ]; then \
+		${CP} -p ${PREFIX}/etc/monkeysphere/gnupg-authentication.conf.sample ${PREFIX}/etc/monkeysphere/gnupg-authentication.conf ; \
+	fi
 	@if [ ! -f ${PREFIX}/etc/monkeysphere/monkeysphere.conf ]; then \
 		${CP} -p ${PREFIX}/etc/monkeysphere/monkeysphere.conf.sample ${PREFIX}/etc/monkeysphere/monkeysphere.conf ; \
 	fi