Merge commit 'jrollins/master'

diff --git a/packaging/debian/changelog b/packaging/debian/changelog
index 39e4b33ca213fed5987cb9b9e1770b57a75de66c..a4b1f66e9aab96b28070db2597db9a50226866ed 100644 (file)
--- a/packaging/debian/changelog
+++ b/packaging/debian/changelog
@@ -13,8 +13,10 @@ monkeysphere (0.22~pre-1) UNRELEASED; urgency=low
     - automatically output two copies of the host's public key: one
     standard ssh public key file, and the other a minimal OpenPGP key with
     just the latest valid self-sig.
+    - debian/control: corrected alternate dependency from procfile to
+    procmail (which provides /usr/bin/lockfile)
 
- -- Jameson Graef Rollins <jrollins@finestructure.net>  Mon, 17 Nov 2008 18:15:43 -0500
+ -- Daniel Kahn Gillmor <dkg@fifthhorseman.net>  Tue, 25 Nov 2008 12:13:58 -0500
 
 monkeysphere (0.21-2) unstable; urgency=low
 

diff --git a/packaging/debian/control b/packaging/debian/control
index 4c836b4e77864de3c6d285bc066eee2ab4af3bb2..52eccf3f3da8b84a11deca72ab93e49ef5d8ddae 100644 (file)
--- a/packaging/debian/control
+++ b/packaging/debian/control
@@ -11,7 +11,7 @@ Dm-Upload-Allowed: yes
 
 Package: monkeysphere
 Architecture: any
-Depends: openssh-client, gnupg, coreutils (>= 6) | base64, lockfile-progs | procfile, adduser, ${shlibs:Depends}
+Depends: openssh-client, gnupg, coreutils (>= 6) | base64, lockfile-progs | procmail, adduser, ${shlibs:Depends}
 Recommends: netcat | socat, ssh-askpass
 Enhances: openssh-client, openssh-server
 Description: use the OpenPGP web of trust to verify ssh connections