summaryrefslogtreecommitdiff
path: root/packaging
diff options
context:
space:
mode:
authorJameson Rollins <jrollins@finestructure.net>2010-01-10 18:48:59 -0500
committerJameson Rollins <jrollins@finestructure.net>2010-01-10 18:48:59 -0500
commitcf7d2f1e843e429a462d2dd11430fd48b0281cb2 (patch)
tree4555db56e328273af485acdd6c0799cc4f612e4d /packaging
parent9a3c85827f90722036a8f6a2b81a2926ea088ff3 (diff)
Fix patch for gen_key to test gpg version.
This patch checks the version of gpg (for v1 and v2) and sets the key type command for the gen_subkey gpg edit-key script appropriately.
Diffstat (limited to 'packaging')
-rw-r--r--packaging/debian/changelog4
-rw-r--r--packaging/debian/control4
2 files changed, 4 insertions, 4 deletions
diff --git a/packaging/debian/changelog b/packaging/debian/changelog
index df28da4..f7e6032 100644
--- a/packaging/debian/changelog
+++ b/packaging/debian/changelog
@@ -3,14 +3,14 @@ monkeysphere (0.27-1~pre1) UNRELEASED; urgency=low
* New upstream release:
- fixed monkeysphere gen-subkey subcommand that was erroneously
creating DSA subkeys due to unannounced change in gpg edit-key UI.
+ Now tests for gpg version.
- add new monkeysphere keys-from-userid subcommand to output all
acceptable keys for a given user ID literal
* updated debian/copyright to match the latest revision of DEP5.
* updated standards version to 3.8.3 (no changes needed)
- * updated Depends to require >=1.4.10 due to gpg UI change.
* add cpio to Build-Depends (used in test suite) (Closes: #562444)
- -- Jameson Graef Rollins <jrollins@finestructure.net> Sun, 10 Jan 2010 16:52:54 -0500
+ -- Jameson Rollins <jrollins@finestructure.net> Sun, 10 Jan 2010 18:45:37 -0500
monkeysphere (0.26-1) unstable; urgency=low
diff --git a/packaging/debian/control b/packaging/debian/control
index df00ed0..f1341d4 100644
--- a/packaging/debian/control
+++ b/packaging/debian/control
@@ -3,7 +3,7 @@ Section: net
Priority: extra
Maintainer: Jameson Graef Rollins <jrollins@finestructure.net>
Uploaders: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-Build-Depends: debhelper (>= 7.0), cpio, socat, openssh-server, gnupg (>=1.4.10), libcrypt-openssl-rsa-perl, libdigest-sha-perl, lockfile-progs | procmail
+Build-Depends: debhelper (>= 7.0), cpio, socat, openssh-server, gnupg, libcrypt-openssl-rsa-perl, libdigest-sha-perl, lockfile-progs | procmail
Standards-Version: 3.8.3
Homepage: http://web.monkeysphere.info/
Vcs-Git: git://git.monkeysphere.info/monkeysphere
@@ -11,7 +11,7 @@ Dm-Upload-Allowed: yes
Package: monkeysphere
Architecture: all
-Depends: openssh-client, gnupg (>=1.4.10), libcrypt-openssl-rsa-perl, libdigest-sha-perl, lockfile-progs | procmail, adduser, ${misc:Depends}
+Depends: openssh-client, gnupg, libcrypt-openssl-rsa-perl, libdigest-sha-perl, lockfile-progs | procmail, adduser, ${misc:Depends}
Recommends: netcat | socat, ssh-askpass, cron
Enhances: openssh-client, openssh-server
Description: use the OpenPGP web of trust to verify ssh connections