Merge commit 'dkg/master'

diff --git a/Makefile b/Makefile
index 1e0b649efe0e9e72ee6f5ec892e06b4006bfe05a..ff0ee0c86dc2abe60a44d55e34413955d1dfd7bf 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,23 +5,20 @@ all: keytrans
 keytrans:
        $(MAKE) -C src/keytrans
 
-release: clean
+tarball: clean
        rm -rf monkeysphere-$(MONKEYSPHERE_VERSION)
        mkdir -p monkeysphere-$(MONKEYSPHERE_VERSION)/doc
        ln -s ../../website/getting-started-user.mdwn ../../website/getting-started-admin.mdwn ../../doc/TODO ../../doc/MonkeySpec monkeysphere-$(MONKEYSPHERE_VERSION)/doc
        ln -s ../COPYING ../etc ../Makefile ../man ../src  monkeysphere-$(MONKEYSPHERE_VERSION)
-       tar -ch monkeysphere-$(MONKEYSPHERE_VERSION) | gzip -n > monkeysphere_$(MONKEYSPHERE_VERSION).orig.tar.gz
+       tar -ch monkeysphere-$(MONKEYSPHERE_VERSION) | gzip -n > monkeysphere_$(MONKEYSPHERE_VERSION).tar.gz
        rm -rf monkeysphere-$(MONKEYSPHERE_VERSION)
 
-debian-package: release
-       tar xzf monkeysphere_$(MONKEYSPHERE_VERSION).orig.tar.gz
-       cp -a debian monkeysphere-$(MONKEYSPHERE_VERSION)
-       (cd monkeysphere-$(MONKEYSPHERE_VERSION) && debuild -uc -us)
-       rm -rf monkeysphere-$(MONKEYSPHERE_VERSION)
+debian-package: 
+       debuild -uc -us
 
 clean:
        $(MAKE) -C src/keytrans clean
        # clean up old monkeysphere packages lying around as well.
        rm -f monkeysphere_*
 
-.PHONY: all clean release debian-package
+.PHONY: all clean tarball debian-package

diff --git a/debian/changelog b/debian/changelog
index 773acce6cafea4ebba5fde5ef3ceffe15e71d826..8688b956929751a0d734534929061fd0448d6b25 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,14 @@
-monkeysphere (0.13~pre-1) UNRELEASED; urgency=low
+monkeysphere (0.13-1) experimental; urgency=low
 
   [ Daniel Kahn Gillmor ]
   * tweaks in /usr/bin/monkeysphere to handle odd secret keyrings.
+  * updated makefile to reflect the package building technique we've been
+    using for a month now.
 
   [ Jameson Graef Rollins ]
   * move location of user config directory to ~/.monkeysphere.
 
- -- Jameson Graef Rollins <jrollins@phys.columbia.edu>  Wed, 03 Sep 2008 13:35:23 -0700
+ -- Daniel Kahn Gillmor <dkg@fifthhorseman.net>  Wed, 03 Sep 2008 17:26:10 -0400
 
 monkeysphere (0.12-1) experimental; urgency=low
 

diff --git a/doc/george/changelog b/doc/george/changelog
index 8b03a7f98fd55ba422621edf962c646c482af640..002a46b8d9f5eb96d88cd124bea06ff855d329e3 100644 (file)
--- a/doc/george/changelog
+++ b/doc/george/changelog
@@ -7,6 +7,25 @@
 *  changes to this system (first command at top, last at bottom)             *
 ******************************************************************************
 
+2008-09-03 - micah
+       * migrated /home/*/.config/monkeysphere/authorized_user_ids to new
+       agreed location: /home/*/.monkeysphere/authorized_user_ids and created
+       a symlink in the original location for transition purposes. Also,
+       did /root's as well. I used this hackish mechanism:
+       $ for user in `find . -wholename './*/.config/monkeysphere/authorized_user_ids' \
+       | cut -d/ -f2`; do mkdir -v ${user}/.monkeysphere; chown ${user}:${user} \
+       ${user}/.monkeysphere; mv -v ${user}/.config/monkeysphere/authorized_user_ids \
+       ${user}/.monkeysphere; ln -s /home/${user}/.monkeysphere/authorized_user_ids \
+       ${user}/.config/monkeysphere/authorized_user_ids; done
+
+          - dkg
+       * added the monkeysphere archive repository signing key
+       * aptitude update && aptitude full-upgrade (brings in monkeysphere 0.13-1)
+       * cleaned up /etc/skel to reflect correct location of the
+         monkeysphere config directory.
+       * micah moved all the existing config stuff over, and left
+         symlinks so people aren't disoriented.
+       
 2008-09-01 - dkg
        * set up http://dkg.monkeysphere.info so that i could play around
          with ikiwiki updates

diff --git a/website/bugs/monkeysphere-should-respect-keyserver-settings-in-gpg.mdwn b/website/bugs/monkeysphere-should-respect-keyserver-settings-in-gpg.mdwn
index 85f79f1b1292c0eecf3ca7912ace2c7437409936..0630cc481510b29347b6691e6cffeffdb3dd609a 100644 (file)
--- a/website/bugs/monkeysphere-should-respect-keyserver-settings-in-gpg.mdwn
+++ b/website/bugs/monkeysphere-should-respect-keyserver-settings-in-gpg.mdwn
@@ -4,14 +4,14 @@ Currently, monkeysphere-ssh-proxycommand checks the following places to
 determine which keyserver to use (in order of priority):
 
  * environment variable (MONKEYSPHERE_KEYSERVER)
- * KEYSERVER variable in ~/.config/monkeysphere/monkeysphere.conf
+ * KEYSERVER variable in ~/.monkeysphere/monkeysphere.conf
  * default value of subkeys.pgp.net
 
 It would be useful if monkeysphere also consulted ~/.gnupg/gpg.conf, using the
 following order instead:
 
  * environment variable (MONKEYSPHERE_KEYSERVER)
- * KEYSERVER variable in ~/.config/monkeysphere/monkeysphere.conf
+ * KEYSERVER variable in ~/.monkeysphere/monkeysphere.conf
  * keyserver variable in ~/.gnupg/gpg.conf
  * default value of subkeys.pgp.net
 

diff --git a/website/bugs/setup-test-server-for-public.mdwn b/website/bugs/setup-test-server-for-public.mdwn
index 5b057595aa454131445ce43771664cc257ffd469..65fa893ab49886ef0fa62d2656b89afcfe8a8f96 100644 (file)
--- a/website/bugs/setup-test-server-for-public.mdwn
+++ b/website/bugs/setup-test-server-for-public.mdwn
@@ -63,7 +63,7 @@ I envision a script you'd invoke like:
        root@george# addmsuser foo 'Foo T. Bar <foo@example.org>'
 
 Which would create the `foo` account, populate
-`~foo/.config/monkeysphere/authorized_user_ids`, make a note in a log
+`~foo/.monkeysphere/authorized_user_ids`, make a note in a log
 someplace, and send a welcome letter.
 
 --dkg