We don't need subkey info on a fingerprint slip, so don't include it by

default anymore, but can be reenabled with --show-subkeys. Update gpg-key2ps
man page & copyright info.

git-svn-id: svn://svn.debian.org/pgp-tools/trunk@393 b513b33f-fedd-0310-b452-c3deb5f4c849

diff --git a/debian/changelog b/debian/changelog
index 542f8034dc715489f5fcb440755c2d5d6875f703..aeeadb1e1e354d3602e39a2fb80a1bfac5655efe 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,10 @@ signing-party (1.1-1) UNRELEASED; urgency=low
 
   [ Thijs Kinkhorst ]
   * Checked for policy 3.8.0, no changes.
-  * Fix pod syntax problems in caff (Closes: #485653).
+  * caff: Fix pod syntax problems (Closes: #485653).
+  * gpg-key2ps: no longer waste paper on the subkey information by
+    default. It's not relevant to the keysigning process, but added
+    option to enable if you want it.
 
   [ Christoph Berg ]
   * Import keyanalyze into signing-party. Thanks to Matthew Wilcox for the
@@ -16,7 +19,7 @@ signing-party (1.1-1) UNRELEASED; urgency=low
   * Put examples in .../examples/$prog, not the other way round.
   * Use dh_lintian.
 
- -- Christoph Berg <myon@debian.org>  Fri, 18 Jul 2008 15:41:28 +0200
+ -- Thijs Kinkhorst <thijs@debian.org>  Sat, 19 Jul 2008 10:01:19 +0200
 
 signing-party (1.0-2) unstable; urgency=low
 

diff --git a/debian/copyright b/debian/copyright
index a72765459ec9b6350886f61cf8b1429b6ea9ff56..fb546715b44536c5673a2a42aded98c466bd0734 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -12,8 +12,8 @@ Authors and Copyright:
   (c) 2004  Uli Martens <uli@youam.net>
   (c) 2004-2008  Christoph Berg <cb@df7cb.de>
   (c) 2001-2005  Simon Richter <sjr@debian.org>
-  (c) 2005, 2006, 2007  Thijs Kinkhorst <thijs@debian.org>
-  (c) 2000, 2002  Christian Kurz <shorty@debian.org>
+  (c) 2005-2008  Thijs Kinkhorst <thijs@debian.org>
+  (c) 2000, 2002 Christian Kurz <shorty@debian.org>
 
   sig2dot and springgraph were originally written by:
   (c) 2002 Darxus@ChaosReigns.com

diff --git a/gpg-key2ps/README b/gpg-key2ps/README
index 58f1dd59f6ba58a23939c540e1210cf60204a12c..eaa4ddb86d105f8d3a6f4e4a2ba4ba0861044591 100644 (file)
--- a/gpg-key2ps/README
+++ b/gpg-key2ps/README
@@ -1,7 +1,7 @@
 gpg-key2ps
 ----------
 
-Usage: gpg-key2ps [-p papersize] [-r revoked-style] [-1] keyid-or-name
+Usage: gpg-key2ps [-p papersize] [-r revoked-style] [-1] [-s] keyid-or-name
 
 revoked-style is one of:
   grey   - Print text in grey
@@ -25,7 +25,7 @@ Thijs Kinkhorst <thijs@debian.org>.
 COPYRIGHT & LICENSE
 -------------------
 
-Copyright (C) 2001-2007  Simon Richter and Thijs Kinkhorst
+Copyright (C) 2001-2008  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 da3231c7dd8f224ac84629af26de5a3250f94018..e73d9a6d17d3e21d89ae45b9cbe325338ed0991e 100755 (executable)
--- 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-2007  Thijs Kinkhorst
+# Copyright (C) 2005-2008  Thijs Kinkhorst
 # Copyright (C) 2005-2008  Christoph Berg <cb@df7cb.de>
 # Licenced under the GNU General Public License,
 # version 2 or later.
@@ -14,6 +14,7 @@ use Getopt::Long;
 
 my $version = '$Rev$';
 $version =~ s/\$Rev:\s*(\d+)\s*\$/$1/;
+my $showsubkeys = 0;
 my $revokestyle = "hide";
 my $columns = 2;
 my $creationdate = scalar(localtime);
@@ -27,9 +28,10 @@ sub usage($$) {
        my ($fd, $exitcode) = @_;
        version ($fd);
        print $fd <<EOF;
-Usage: $0 [-p papersize] [-r revoked-style] [-1] keyid-or-name ...
+Usage: $0 [-p papersize] [-r revoked-style] [-1] [-s] keyid-or-name ...
 Options:
  -p --paper-size
+ -s --show-subkeys
  -r --revoked-style
         hide   - Don't show revoked uids and subkeys (default)
         grey   - Print text in grey
@@ -51,6 +53,8 @@ if (!GetOptions (
        '--help'            => \$opts->{help},
        '-v'                => \$opts->{version},
        '--version'         => \$opts->{version},
+       '-s'                => \$opts->{showsubkeys},
+       '--show-subkeys'    => \$opts->{showsubkeys},
        '-p=s'              => \$opts->{papersize},
        '--paper-size=s'    => \$opts->{papersize},
        '-r=s'              => \$opts->{revokestyle},
@@ -69,8 +73,9 @@ if ($opts->{version}) {
        exit 0;
 }
 
-if ( $opts->{revokestyle} ) { $revokestyle = $opts->{revokestyle}; }
 if ( $opts->{papersize} ) { $ENV{'PAPERSIZE'} = $opts->{papersize}; }
+if ( $opts->{showsubkeys} ) { $showsubkeys = 1; }
+if ( $opts->{revokestyle} ) { $revokestyle = $opts->{revokestyle}; }
 
 if ( $revokestyle !~ /^(grey|hide|note|show|strike)$/ ) {
        print STDERR "Unknown revoked-style \"$revokestyle\".\n";
@@ -255,9 +260,11 @@ while(<GPG>) {
                next if $revokestyle eq "hide";
        }
        # subkey
-       s/^sub:[^r:]*:([^:]*):([0-9]*):.{8,8}(.{8,8}):([^:]*):[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:.*/   ($4) ($3) $2 ($1) sbk/;
+       if (s/^sub:[^r:]*:([^:]*):([0-9]*):.{8,8}(.{8,8}):([^:]*):[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:.*/       ($4) ($3) $2 ($1) sbk/) {
+               next if ! $showsubkeys;
+       }
        if (s/^sub:r[^:]*:([^:]*):([0-9]*):.{8,8}(.{8,8}):([^:]*):[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:.*/       ($4) ($3) $2 ($1) revsbk/) {
-               next if $revokestyle eq "hide";
+               next if (!$showsubkeys) || $revokestyle eq "hide";
        }
        $numlines++;
        # print this line
@@ -323,7 +330,7 @@ B<gpg-key2ps> - generates a PS file from a GnuPG keyring
 
 =head1 SYNOPSIS
 
-B<gpg-key2ps> [B<-r> I<revoked-style>] [B<-p> I<papersize>] I<keyid-or-name> [ I<...> ]
+B<gpg-key2ps> [B<-r> I<revoked-style>] [B<-p> I<papersize>] [B<-1>] [B<-s>] I<keyid-or-name> [ I<...> ]
 
 =head1 DESCRIPTION
 
@@ -341,6 +348,11 @@ The PS data is written to stdout.
 Select the output paper size. Default is to look into /etc/papersize or A4 if
 libpaper isn't installed.
 
+=item B<-s> B<--show-subkeys>
+
+Enable subkey information to be printed on the slips. Subkey information is
+normally not relevant to the key signing process.
+
 =item B<-r> B<--revoked-style> I<revoked-style>
 
 Select how to mark revoked UIDs and subkeys. Five styles are available:
@@ -350,6 +362,11 @@ Select how to mark revoked UIDs and subkeys. Five styles are available:
  B<note> add "[revoked]", and
  B<strike> strike through.
 
+=item B<-1>
+
+Print only one column of paper slips instead of the default two. Useful for keys
+with long UIDs that otherwise won't fit.
+
 =item I<keyid>
 
 Keyids to print. Multiple can be separated by spaces.
@@ -390,7 +407,7 @@ include fingerprints.
 
 =item (c) 2001-2005 Simon Richter <sjr@debian.org>
 
-=item (c) 2005-2007 Thijs Kinkhorst <thijs@kinkhorst.com>
+=item (c) 2005-2008 Thijs Kinkhorst <thijs@kinkhorst.com>
 
 =item (c) 2005-2008 Christoph Berg <cb@df7cb.de>