Merge commit 'dkg/master'

diff --git a/debian/changelog b/debian/changelog
index d3d7d9be8cd856671edcad3fd3ae9168a5fc7f6c..9807c8ea099ca8f9ae4d6b1f571d6c381ad7ee4d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+monkeysphere (0.3-1) UNRELEASED; urgency=low
+
+  [ Daniel Kahn Gillmor ]
+  * new version (above: change UNRELEASED to experimental when releasing)
+
+ -- Daniel Kahn Gillmor <dkg-debian.org@fifthhorseman.net>  Mon, 23 Jun 2008 19:58:47 -0400
+
+monkeysphere (0.2-2) experimental; urgency=low
+
+  * added lockfile-progs dependency
+
+ -- Daniel Kahn Gillmor <dkg-debian.org@fifthhorseman.net>  Mon, 23 Jun 2008 19:34:05 -0400
+
 monkeysphere (0.2-1) experimental; urgency=low
 
   [ Daniel Kahn Gillmor ]

diff --git a/debian/control b/debian/control
index 85b2d3f9ebddfd07dcfc3e699660ea5c3e25ed44..4f0e5f5ef72a9ab5f593748fb7840374a2e264f6 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Dm-Upload-Allowed: yes
 
 Package: monkeysphere
 Architecture: any
-Depends: openssh-client, gnupg | gnupg2, coreutils (>= 6), moreutils, ${shlibs:Depends}
+Depends: openssh-client, gnupg | gnupg2, coreutils (>= 6), moreutils, lockfile-progs, ${shlibs:Depends}
 Recommends: netcat
 Enhances: openssh-client, openssh-server
 Description: use the OpenPGP web of trust to verify ssh connections

diff --git a/doc/george/changelog b/doc/george/changelog
index aefbf7fe7c87da22a9fb057862b6681f2affd025..e49a053f5820972173c25bc5431f49e3a3886a20 100644 (file)
--- a/doc/george/changelog
+++ b/doc/george/changelog
@@ -6,7 +6,14 @@
 *  Please add new entries in reverse chronological order whenever you make   *
 *  changes to this system                                                   *
 ******************************************************************************
-
+2008-06-23 - dkg
+       * added monkeysphere apt repository to /etc/apt/sources.list
+       * added dkg's key to apt's list of trusted keys.
+       * ran aptitude dist-upgrade
+       * upgraded to monkeysphere 0.2-1
+       * moved authorized_user_ids files into users' home directories.
+       * installed lockfile-progs
+       
 2008-06-22 - dkg
        * installed screen (mjgoins and i were collaborating)