summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJameson Graef Rollins <jrollins@finestructure.net>2009-02-19 02:24:40 -0500
committerJameson Graef Rollins <jrollins@finestructure.net>2009-02-19 02:24:40 -0500
commit4bf3771e74fbc352cf385afd6c2ee897e702e45b (patch)
treeb6fefc0924d908d7d85432696d152a8400003232
parentc02230bbe0112a1dea639a5c52ee6db6d446dfea (diff)
parent4bec9e4ddb9ff67d9d0bf3da2f906496e43e0742 (diff)
Merge commit 'dkg/master'
-rwxr-xr-xMakefile2
-rw-r--r--packaging/debian/changelog4
2 files changed, 4 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 782bad9..fc608d2 100755
--- a/Makefile
+++ b/Makefile
@@ -53,7 +53,7 @@ install: all installman
install src/monkeysphere src/keytrans/openpgp2ssh src/keytrans/pem2openpgp $(DESTDIR)$(PREFIX)/bin
install src/monkeysphere-host src/monkeysphere-authentication $(DESTDIR)$(PREFIX)/sbin
install -m 0644 src/share/common $(DESTDIR)$(PREFIX)/share/monkeysphere
- install -m 0644 src/transitions/* $(DESTDIR)$(PREFIX)/share/monkeysphere/transitions
+ install -m 0744 src/transitions/* $(DESTDIR)$(PREFIX)/share/monkeysphere/transitions
install -m 0644 src/share/m/* $(DESTDIR)$(PREFIX)/share/monkeysphere/m
install -m 0644 src/share/mh/* $(DESTDIR)$(PREFIX)/share/monkeysphere/mh
install -m 0644 src/share/ma/* $(DESTDIR)$(PREFIX)/share/monkeysphere/ma
diff --git a/packaging/debian/changelog b/packaging/debian/changelog
index c825b64..6a9ea18 100644
--- a/packaging/debian/changelog
+++ b/packaging/debian/changelog
@@ -18,8 +18,10 @@ monkeysphere (0.23~pre-1) UNRELEASED; urgency=low
* added version output option
* check that existing authentication keys are valid in gen_key
function.
+ * add transition infrastructure for major changes between releases (see
+ transitions/README.txt)
- -- Jameson Graef Rollins <jrollins@finestructure.net> Thu, 12 Feb 2009 21:50:54 -0500
+ -- Daniel Kahn Gillmor <dkg@fifthhorseman.net> Thu, 19 Feb 2009 02:14:44 -0500
monkeysphere (0.22-1) unstable; urgency=low