Merge commit 'dkg/master'

diff --git a/Makefile b/Makefile
index 782bad9ccb962e3a287772f57d62a135ccac577e..fc608d2717f8453f5c3e3a4909932352c0a9fe90 100755 (executable)
--- 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 c825b646d95c41a80ed12e60aaec522db97f8e3c..6a9ea18f76e4f08c7612464edaa2cc80640f6bd9 100644 (file)
--- 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