From: thijs Date: Fri, 2 Mar 2007 13:12:47 +0000 (+0000) Subject: * gpg-key2ps: X-Git-Url: https://git.sthu.org/?a=commitdiff_plain;h=da28c2625b93e9efe06e68b95fba1f7b2ffb1709;p=pgp-tools.git * gpg-key2ps: + Add '-1' option to only display one column of slips, for extra wide keys (Closes: #399474). git-svn-id: svn://svn.debian.org/pgp-tools/trunk@315 b513b33f-fedd-0310-b452-c3deb5f4c849 --- diff --git a/debian/changelog b/debian/changelog index 34d803a..397b139 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,11 @@ signing-party (0.4.9-2) unstable; urgency=low * caff: + Fix syntax error in example config variables (Closes: #413020). + * gpg-key2ps: + + Add '-1' option to only display one column of slips, for extra + wide keys (Closes: #399474). - -- Thijs Kinkhorst Fri, 2 Mar 2007 13:04:36 +0100 + -- Thijs Kinkhorst Fri, 2 Mar 2007 14:12:03 +0100 signing-party (0.4.9-1) unstable; urgency=low diff --git a/gpg-key2ps/README b/gpg-key2ps/README index a887c2b..58f1dd5 100644 --- a/gpg-key2ps/README +++ b/gpg-key2ps/README @@ -1,7 +1,7 @@ gpg-key2ps ---------- -Usage: gpg-key2ps [-p papersize] [-r revoked-style] keyid-or-name +Usage: gpg-key2ps [-p papersize] [-r revoked-style] [-1] keyid-or-name revoked-style is one of: grey - Print text in grey @@ -25,7 +25,7 @@ Thijs Kinkhorst . COPYRIGHT & LICENSE ------------------- -Copyright (C) 2001-2006 Simon Richter and Thijs Kinkhorst +Copyright (C) 2001-2007 Simon Richter and Thijs Kinkhorst This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gpg-key2ps/gpg-key2ps b/gpg-key2ps/gpg-key2ps index 302381b..2dfdc17 100755 --- a/gpg-key2ps/gpg-key2ps +++ b/gpg-key2ps/gpg-key2ps @@ -2,7 +2,7 @@ # # gpg-key2ps: convert a PGP/GnuPG key into paper slips. # Copyright (C) 2001-2005 Simon Richter -# Copyright (C) 2005-2006 Thijs Kinkhorst +# Copyright (C) 2005-2007 Thijs Kinkhorst # Copyright (C) 2005-2006 Christoph Berg # Licenced under the GNU General Public License, # version 2 or later. @@ -15,18 +15,19 @@ use Getopt::Long; my $version = '$Rev$'; $version =~ s/\$Rev:\s*(\d+)\s*\$/$1/; my $revokestyle = "hide"; +my $columns = 2; my $creationdate = scalar(localtime); sub version($) { my $fd = shift; - print $fd "gpg-key2ps $version - (c) 2001-2006 Simon Richter, Thijs Kinkhorst, Christoph Berg\n"; + print $fd "gpg-key2ps $version - (c) 2001-2007 Simon Richter, Thijs Kinkhorst, Christoph Berg\n"; } sub usage($$) { my ($fd, $exitcode) = @_; version ($fd); print $fd < \$opts->{papersize}, '--paper-size=s' => \$opts->{papersize}, '-r=s' => \$opts->{revokestyle}, - '--revoked-style=s' => \$opts->{revokestyle}, + '-1' => \$opts->{1}, )) { usage(\*STDERR, 1); } @@ -74,6 +76,8 @@ if ( $revokestyle !~ /^(grey|hide|note|show|strike)$/ ) { usage (\*STDERR, 1); } +if ( $opts->{1} ) { $columns = 1; } + usage(\*STDERR, 1) unless scalar @ARGV >= 1; # determine the paper size through the paperconf tool @@ -119,7 +123,7 @@ print <