From e247870a3e132e19cbc0bc615587b4dc32971d60 Mon Sep 17 00:00:00 2001 From: weasel Date: Tue, 16 Aug 2005 15:32:09 +0000 Subject: [PATCH 01/16] Nobody cares which language a tool in an empty package is written in... git-svn-id: svn://svn.debian.org/pgp-tools/trunk@198 b513b33f-fedd-0310-b452-c3deb5f4c849 --- debian/control | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/debian/control b/debian/control index b58f671..1bd012b 100644 --- a/debian/control +++ b/debian/control @@ -30,8 +30,7 @@ Package: keylookup Architecture: all Depends: signing-party (>= 0.4.2) Description: transitional package to pull in signing-party - A nice console tool written in perl to fetch public keys from - keyservers. + A nice console tool to fetch public keys from keyservers. . keylookup has been merged with signing-party as of 0.4.2. . -- 2.30.2 From 11acce3def2b8b0f7310b13e730713ddf263847f Mon Sep 17 00:00:00 2001 From: weasel Date: Tue, 16 Aug 2005 15:39:06 +0000 Subject: [PATCH 02/16] Revert empty lines removal git-svn-id: svn://svn.debian.org/pgp-tools/trunk@199 b513b33f-fedd-0310-b452-c3deb5f4c849 --- keylookup/keylookup.1 | 38 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 36 insertions(+), 2 deletions(-) diff --git a/keylookup/keylookup.1 b/keylookup/keylookup.1 index b65df48..4c26eca 100644 --- a/keylookup/keylookup.1 +++ b/keylookup/keylookup.1 @@ -1,75 +1,109 @@ -.TH keylookup 1 "" 2005-08-16 "" +.TH keylookup 1 "" Jun-2002 "" .\" manual page (c) 2000, 2001, 2002 Christian Kurz, Peter Palfrader -.\" manual page (c) 2005 Christoph Berg .\" $Id$ + .SH NAME .LP keylookup \- Fetch and Import GnuPG keys from keyservers. + .SH SYNOPSIS \fBkeylookup\fP [\fIoptions\fP] \fIsearch-string\fP + .SH DESCRIPTION .LP \fBkeylookup\fR is a perl script that queries a keyserver for keys matching the \fIsearch-string\fP. It shows a list to the user and offers her/him to select the keys for importing into her/his GnuPG keyring. + For the actual import of keys GnuPG itself is called. + + .SH OPTIONS .IP "\fB--keyserver\fP=\fIkeyserver\fP" 8 Specify the keyserver to use. If no keyserver is specified, it will parse the GnuPG options file for a default keyserver to use. If no keyserver can be found, \fBkeylookup\fP will abort. + .IP "\fB--port\fP=\fIport\fP" 8 Use a port other than 11371. + .IP "\fB--frontend\fP=\fIfrontend\fP" 8 \fBkeylookup\fP supports displaying the search results with 3 different frondends. Both \fBwhiptail\fP and \fBdialog\fP are interactive and allow the user to select the keys to import. The third frontend \fBplain\fP is non\-interactive and just prints the keys to STDOUT. The user must then call GnuPG him/herself. + If available, \fB/usr/bin/dialog\fP is the default. If it is not available but \fB/usr/bin/whiptail\fP is installed, then this is used instead. If nothing else works, we'll fall back to \fBplain\fP. + .IP "\fB--importall\fP" 8 Don't ask the user which keys to import, but instead import all keys matching the \fIsearch-string\fP. If this is given no frontend is needed. + .IP "\fB--honor-http-proxy\fP" 8 Similar to GnuP \fBkeylookup\fP will only honor the \fBhttp_proxy\fP environment variable if this option is given. If it is not given but your GnuPG options file includes it, then \fBkeylookup\fP will use it. + .IP "\fB--help\fP" 8 Print a brief help message and exit succesfully. + + + .SH ENVIRONMENT + .IP "HOME" 10 Used to locate the default home directory. + .IP "GNUPGHOME" 10 If set directory used instead of "~/.gnupg". + .IP "http_proxy" 10 Only honored when the option --honor-http-proxy is set or honor-http-proxy is set in GnuPG's config file. + + + .SH EXAMPLES + .IP "keylookup Christian Kurz" will query your default keyserver for Christian's keys and offer you to import them into your keyring with the dialog frontend (if available). + .IP "keylookup --honor-http-proxy --frontend plain wk@gnupg" will query the default keyserver again, now using the http_proxy if the environment variable is defined and list wk@gnupg's (Werner Koch)'s key on STDOUT. + .IP "keylookup --keyserver pgp.mit.edu Peter Palfrader" will now ask the keyserver pgp.mit.edu for my (Peter's) keys and display them for import in dialog. + + .SH FILES + .IP "~/.gnupg/options" 10 GnuPG's options file where \fBkeylookup\fP will take the keyserver and honor-http-proxy values from if it exists. + + .SH "SEE ALSO" + \fBgpg\fP(1) + .SH BUGS + .LP Please report bugs using the Debian bug tracking system at http://bugs.debian.org/. + + .SH AUTHORS + .LP Christian Kurz .br -- 2.30.2 From 15cfe120110ec384f3837d8e945bb7f8bdab9b60 Mon Sep 17 00:00:00 2001 From: weasel Date: Tue, 16 Aug 2005 15:40:52 +0000 Subject: [PATCH 03/16] Update docs to describe it is a wrapper now git-svn-id: svn://svn.debian.org/pgp-tools/trunk@200 b513b33f-fedd-0310-b452-c3deb5f4c849 --- keylookup/keylookup.1 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/keylookup/keylookup.1 b/keylookup/keylookup.1 index 4c26eca..3fde160 100644 --- a/keylookup/keylookup.1 +++ b/keylookup/keylookup.1 @@ -11,11 +11,11 @@ keylookup \- Fetch and Import GnuPG keys from keyservers. .SH DESCRIPTION .LP -\fBkeylookup\fR is a perl script that queries a keyserver for keys -matching the \fIsearch-string\fP. It shows a list to the user and offers -her/him to select the keys for importing into her/his GnuPG keyring. +\fBkeylookup\fR is a wrapper around gpg --search, allowing you to search +for keys on a keyserver. It presents the list of matching keys to the user +and allows her to select the keys for importing into the GnuPG keyring. -For the actual import of keys GnuPG itself is called. +For the search and actual import of keys GnuPG itself is called. .SH OPTIONS -- 2.30.2 From 4f39d2986ad5bab806830f2aed115fc2acfde33f Mon Sep 17 00:00:00 2001 From: myon-guest Date: Tue, 16 Aug 2005 15:46:54 +0000 Subject: [PATCH 04/16] get the empty lines right this time, sorry for the mess before git-svn-id: svn://svn.debian.org/pgp-tools/trunk@201 b513b33f-fedd-0310-b452-c3deb5f4c849 --- keylookup/keylookup.1 | 35 +---------------------------------- 1 file changed, 1 insertion(+), 34 deletions(-) diff --git a/keylookup/keylookup.1 b/keylookup/keylookup.1 index 3fde160..14facb6 100644 --- a/keylookup/keylookup.1 +++ b/keylookup/keylookup.1 @@ -1,14 +1,11 @@ -.TH keylookup 1 "" Jun-2002 "" +.TH keylookup 1 "" Aug-2005 "" .\" manual page (c) 2000, 2001, 2002 Christian Kurz, Peter Palfrader .\" $Id$ - .SH NAME .LP keylookup \- Fetch and Import GnuPG keys from keyservers. - .SH SYNOPSIS \fBkeylookup\fP [\fIoptions\fP] \fIsearch-string\fP - .SH DESCRIPTION .LP \fBkeylookup\fR is a wrapper around gpg --search, allowing you to search @@ -16,17 +13,13 @@ for keys on a keyserver. It presents the list of matching keys to the user and allows her to select the keys for importing into the GnuPG keyring. For the search and actual import of keys GnuPG itself is called. - - .SH OPTIONS .IP "\fB--keyserver\fP=\fIkeyserver\fP" 8 Specify the keyserver to use. If no keyserver is specified, it will parse the GnuPG options file for a default keyserver to use. If no keyserver can be found, \fBkeylookup\fP will abort. - .IP "\fB--port\fP=\fIport\fP" 8 Use a port other than 11371. - .IP "\fB--frontend\fP=\fIfrontend\fP" 8 \fBkeylookup\fP supports displaying the search results with 3 different frondends. Both \fBwhiptail\fP and \fBdialog\fP are @@ -37,73 +30,47 @@ prints the keys to STDOUT. The user must then call GnuPG him/herself. If available, \fB/usr/bin/dialog\fP is the default. If it is not available but \fB/usr/bin/whiptail\fP is installed, then this is used instead. If nothing else works, we'll fall back to \fBplain\fP. - .IP "\fB--importall\fP" 8 Don't ask the user which keys to import, but instead import all keys matching the \fIsearch-string\fP. If this is given no frontend is needed. - .IP "\fB--honor-http-proxy\fP" 8 Similar to GnuP \fBkeylookup\fP will only honor the \fBhttp_proxy\fP environment variable if this option is given. If it is not given but your GnuPG options file includes it, then \fBkeylookup\fP will use it. - .IP "\fB--help\fP" 8 Print a brief help message and exit succesfully. - - - .SH ENVIRONMENT - .IP "HOME" 10 Used to locate the default home directory. - .IP "GNUPGHOME" 10 If set directory used instead of "~/.gnupg". - .IP "http_proxy" 10 Only honored when the option --honor-http-proxy is set or honor-http-proxy is set in GnuPG's config file. - - - .SH EXAMPLES - .IP "keylookup Christian Kurz" will query your default keyserver for Christian's keys and offer you to import them into your keyring with the dialog frontend (if available). - .IP "keylookup --honor-http-proxy --frontend plain wk@gnupg" will query the default keyserver again, now using the http_proxy if the environment variable is defined and list wk@gnupg's (Werner Koch)'s key on STDOUT. - .IP "keylookup --keyserver pgp.mit.edu Peter Palfrader" will now ask the keyserver pgp.mit.edu for my (Peter's) keys and display them for import in dialog. - - .SH FILES - .IP "~/.gnupg/options" 10 GnuPG's options file where \fBkeylookup\fP will take the keyserver and honor-http-proxy values from if it exists. - - .SH "SEE ALSO" - \fBgpg\fP(1) - .SH BUGS - .LP Please report bugs using the Debian bug tracking system at http://bugs.debian.org/. - - .SH AUTHORS - .LP Christian Kurz .br -- 2.30.2 From bafc2c4bab1e0eab8abc124f4d7c703aa1fa43c1 Mon Sep 17 00:00:00 2001 From: weasel Date: Tue, 16 Aug 2005 17:39:27 +0000 Subject: [PATCH 05/16] Revert empty lines removal. Again. git-svn-id: svn://svn.debian.org/pgp-tools/trunk@202 b513b33f-fedd-0310-b452-c3deb5f4c849 --- keylookup/keylookup.1 | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/keylookup/keylookup.1 b/keylookup/keylookup.1 index 14facb6..3fde160 100644 --- a/keylookup/keylookup.1 +++ b/keylookup/keylookup.1 @@ -1,11 +1,14 @@ -.TH keylookup 1 "" Aug-2005 "" +.TH keylookup 1 "" Jun-2002 "" .\" manual page (c) 2000, 2001, 2002 Christian Kurz, Peter Palfrader .\" $Id$ + .SH NAME .LP keylookup \- Fetch and Import GnuPG keys from keyservers. + .SH SYNOPSIS \fBkeylookup\fP [\fIoptions\fP] \fIsearch-string\fP + .SH DESCRIPTION .LP \fBkeylookup\fR is a wrapper around gpg --search, allowing you to search @@ -13,13 +16,17 @@ for keys on a keyserver. It presents the list of matching keys to the user and allows her to select the keys for importing into the GnuPG keyring. For the search and actual import of keys GnuPG itself is called. + + .SH OPTIONS .IP "\fB--keyserver\fP=\fIkeyserver\fP" 8 Specify the keyserver to use. If no keyserver is specified, it will parse the GnuPG options file for a default keyserver to use. If no keyserver can be found, \fBkeylookup\fP will abort. + .IP "\fB--port\fP=\fIport\fP" 8 Use a port other than 11371. + .IP "\fB--frontend\fP=\fIfrontend\fP" 8 \fBkeylookup\fP supports displaying the search results with 3 different frondends. Both \fBwhiptail\fP and \fBdialog\fP are @@ -30,47 +37,73 @@ prints the keys to STDOUT. The user must then call GnuPG him/herself. If available, \fB/usr/bin/dialog\fP is the default. If it is not available but \fB/usr/bin/whiptail\fP is installed, then this is used instead. If nothing else works, we'll fall back to \fBplain\fP. + .IP "\fB--importall\fP" 8 Don't ask the user which keys to import, but instead import all keys matching the \fIsearch-string\fP. If this is given no frontend is needed. + .IP "\fB--honor-http-proxy\fP" 8 Similar to GnuP \fBkeylookup\fP will only honor the \fBhttp_proxy\fP environment variable if this option is given. If it is not given but your GnuPG options file includes it, then \fBkeylookup\fP will use it. + .IP "\fB--help\fP" 8 Print a brief help message and exit succesfully. + + + .SH ENVIRONMENT + .IP "HOME" 10 Used to locate the default home directory. + .IP "GNUPGHOME" 10 If set directory used instead of "~/.gnupg". + .IP "http_proxy" 10 Only honored when the option --honor-http-proxy is set or honor-http-proxy is set in GnuPG's config file. + + + .SH EXAMPLES + .IP "keylookup Christian Kurz" will query your default keyserver for Christian's keys and offer you to import them into your keyring with the dialog frontend (if available). + .IP "keylookup --honor-http-proxy --frontend plain wk@gnupg" will query the default keyserver again, now using the http_proxy if the environment variable is defined and list wk@gnupg's (Werner Koch)'s key on STDOUT. + .IP "keylookup --keyserver pgp.mit.edu Peter Palfrader" will now ask the keyserver pgp.mit.edu for my (Peter's) keys and display them for import in dialog. + + .SH FILES + .IP "~/.gnupg/options" 10 GnuPG's options file where \fBkeylookup\fP will take the keyserver and honor-http-proxy values from if it exists. + + .SH "SEE ALSO" + \fBgpg\fP(1) + .SH BUGS + .LP Please report bugs using the Debian bug tracking system at http://bugs.debian.org/. + + .SH AUTHORS + .LP Christian Kurz .br -- 2.30.2 From 6a2804f869ec2de8e1dc3b10e1c65e4a2952b0a5 Mon Sep 17 00:00:00 2001 From: kink-guest Date: Tue, 16 Aug 2005 18:19:32 +0000 Subject: [PATCH 06/16] Since we can't count anymore on libpaper being installed, warn people that we're not using the papersize they've specified. git-svn-id: svn://svn.debian.org/pgp-tools/trunk@203 b513b33f-fedd-0310-b452-c3deb5f4c849 --- gpg-key2ps/gpg-key2ps | 1 + 1 file changed, 1 insertion(+) diff --git a/gpg-key2ps/gpg-key2ps b/gpg-key2ps/gpg-key2ps index c8e58fa..5b87585 100755 --- a/gpg-key2ps/gpg-key2ps +++ b/gpg-key2ps/gpg-key2ps @@ -85,6 +85,7 @@ if ( -x "/usr/bin/paperconf" ) { chomp($h); } else { # Default to A4. + print STDERR "Warning: libpaper-utils is not installed, defaulting to A4.\n"; $w=596; $h=842; } -- 2.30.2 From 9ee0a7c846c2593583bf997c0c948d7cde0f8def Mon Sep 17 00:00:00 2001 From: kink-guest Date: Tue, 16 Aug 2005 18:22:36 +0000 Subject: [PATCH 07/16] Also mention libpaper in readme. git-svn-id: svn://svn.debian.org/pgp-tools/trunk@204 b513b33f-fedd-0310-b452-c3deb5f4c849 --- gpg-key2ps/README | 1 + 1 file changed, 1 insertion(+) diff --git a/gpg-key2ps/README b/gpg-key2ps/README index 0f3befb..608740a 100644 --- a/gpg-key2ps/README +++ b/gpg-key2ps/README @@ -11,6 +11,7 @@ revoked-style is one of: strike - Strike through lines Output is PostScript which can be sent to e.g. the lpr command. +Specifying the paper size only works when libpaper is installed. CREDITS -- 2.30.2 From 6725863476904bf41b16ef3b39fa8af507d4add5 Mon Sep 17 00:00:00 2001 From: kink-guest Date: Tue, 16 Aug 2005 18:25:47 +0000 Subject: [PATCH 08/16] While rewriting I corrected the too-few-slips-per-page bug. Closes: #320785 git-svn-id: svn://svn.debian.org/pgp-tools/trunk@205 b513b33f-fedd-0310-b452-c3deb5f4c849 --- debian/changelog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index b49ef54..1acbe26 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,7 @@ signing-party (0.4.2-1) UNRELEASED; urgency=low [ Thijs Kinkhorst ] * gpg-key2ps: + Convert from shell script to perl. + + Fix too few slips on a page (Closes: #320785). [ Peter Palfrader ] * Add keylookup: ncurses wrapper around gpg --search @@ -25,7 +26,7 @@ signing-party (0.4.2-1) UNRELEASED; urgency=low * Do not ship useless README file in the binary package. It's more or less the same as the long description - -- Peter Palfrader Tue, 16 Aug 2005 17:29:08 +0200 + -- Thijs Kinkhorst Tue, 16 Aug 2005 20:25:01 +0200 signing-party (0.4.1-1) unstable; urgency=low -- 2.30.2 From f8e0fd5cb59c78a036d215c611a269bb92bb2c37 Mon Sep 17 00:00:00 2001 From: weasel Date: Wed, 17 Aug 2005 21:08:26 +0000 Subject: [PATCH 09/16] Prepare release git-svn-id: svn://svn.debian.org/pgp-tools/trunk@206 b513b33f-fedd-0310-b452-c3deb5f4c849 --- debian/changelog | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1acbe26..fcccdb5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,10 @@ -signing-party (0.4.2-1) UNRELEASED; urgency=low +signing-party (0.4.2-1) unstable; urgency=low - [ Christoph Berg ] + * New upstream release. + * debian/control: move libpaper-utils to Recommends, remove redundant perl + dependency. + * Do not ship useless README file in the binary package. It's more or + less the same as the long description * caff: + create configfile on first use (Closes: #316611). + note use of ~/.caff/gnupghome/gpg.conf in manpage (Closes: #321235). @@ -10,23 +14,14 @@ signing-party (0.4.2-1) UNRELEASED; urgency=low + install README.*. * gpglist: added new script, thanks to Uli Martens. * gpg-key2ps: - + use Getopt::Long, general code cleanup. - + gpg-key2ps "my name" works now. - * debian/control: move libpaper-utils to Recommends, remove redundant perl - dependency. - - [ Thijs Kinkhorst ] - * gpg-key2ps: + + use Getopt::Long, general code cleanup. + + gpg-key2ps "my name" works now. + Convert from shell script to perl. + Fix too few slips on a page (Closes: #320785). - - [ Peter Palfrader ] * Add keylookup: ncurses wrapper around gpg --search + Recommend dialog | whiptail - * Do not ship useless README file in the binary package. It's more or - less the same as the long description - -- Thijs Kinkhorst Tue, 16 Aug 2005 20:25:01 +0200 + -- Peter Palfrader Wed, 17 Aug 2005 23:06:15 +0200 signing-party (0.4.1-1) unstable; urgency=low -- 2.30.2 From 8bb00be0f8bc02861a3d6655651978076626a687 Mon Sep 17 00:00:00 2001 From: weasel Date: Wed, 17 Aug 2005 22:00:29 +0000 Subject: [PATCH 10/16] Fix leading spaces in description git-svn-id: svn://svn.debian.org/pgp-tools/trunk@211 b513b33f-fedd-0310-b452-c3deb5f4c849 --- debian/control | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/debian/control b/debian/control index 1bd012b..69e8715 100644 --- a/debian/control +++ b/debian/control @@ -30,8 +30,8 @@ Package: keylookup Architecture: all Depends: signing-party (>= 0.4.2) Description: transitional package to pull in signing-party - A nice console tool to fetch public keys from keyservers. - . - keylookup has been merged with signing-party as of 0.4.2. - . - This package is empty to facilitate upgrades and can safely be removed. + A nice console tool to fetch public keys from keyservers. + . + keylookup has been merged with signing-party as of 0.4.2. + . + This package is empty to facilitate upgrades and can safely be removed. -- 2.30.2 From 64c7633d8aaa00225faad9130bf0ec1a047a3242 Mon Sep 17 00:00:00 2001 From: weasel Date: Wed, 17 Aug 2005 22:00:47 +0000 Subject: [PATCH 11/16] Set version using -v to dh_gencontrol git-svn-id: svn://svn.debian.org/pgp-tools/trunk@212 b513b33f-fedd-0310-b452-c3deb5f4c849 --- debian/keylookup.changelog | 2 +- debian/rules | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/keylookup.changelog b/debian/keylookup.changelog index 9244412..6a94bc7 100644 --- a/debian/keylookup.changelog +++ b/debian/keylookup.changelog @@ -1,4 +1,4 @@ -signing-party (3.0-1) unstable; urgency=low +signing-party (0.4.2-1) unstable; urgency=low * Merged with signing-party in 0.4.2-1. This package is now empty and can safely be removed. diff --git a/debian/rules b/debian/rules index 18e14bd..006dd57 100755 --- a/debian/rules +++ b/debian/rules @@ -47,7 +47,8 @@ binary-indep: build install dh_fixperms dh_installdeb dh_shlibdeps - dh_gencontrol + dh_gencontrol -psigning-party + dh_gencontrol -pkeylookup -- -v3.0-1 dh_md5sums dh_builddeb -- 2.30.2 From 96d7463687afb202bfe5872c67debc7635fa7ffa Mon Sep 17 00:00:00 2001 From: myon-guest Date: Thu, 18 Aug 2005 14:24:49 +0000 Subject: [PATCH 12/16] add missing changelog entry for #321496 git-svn-id: svn://svn.debian.org/pgp-tools/trunk@215 b513b33f-fedd-0310-b452-c3deb5f4c849 --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index fcccdb5..08269be 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +signing-party (0.4.2-2) UNRELEASED; urgency=low + + * + + -- Christoph Berg Thu, 18 Aug 2005 16:22:58 +0200 + signing-party (0.4.2-1) unstable; urgency=low * New upstream release. @@ -10,6 +16,7 @@ signing-party (0.4.2-1) unstable; urgency=low + note use of ~/.caff/gnupghome/gpg.conf in manpage (Closes: #321235). + allow adding a Reply-To: header (Closes: #321007, thanks to Joost van Baal for the patch). + + parse IMPORT_OK correctly (Closes: #321496). + be more verbose when user tries to sign obsolete v3 crap. + install README.*. * gpglist: added new script, thanks to Uli Martens. -- 2.30.2 From 42f4963b82cab9e8ebd2f88dee7b3574d7476577 Mon Sep 17 00:00:00 2001 From: myon-guest Date: Thu, 18 Aug 2005 14:55:43 +0000 Subject: [PATCH 13/16] use 1:$(VERSION) for keylookup git-svn-id: svn://svn.debian.org/pgp-tools/trunk@216 b513b33f-fedd-0310-b452-c3deb5f4c849 --- debian/rules | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 006dd57..d4a3c4d 100755 --- a/debian/rules +++ b/debian/rules @@ -1,5 +1,7 @@ #!/usr/bin/make -f +VERSION := $(shell dpkg-parsechangelog | grep ^Version | cut -d' ' -f2) + configure: configure-stamp configure-stamp: dh_testdir @@ -48,7 +50,7 @@ binary-indep: build install dh_installdeb dh_shlibdeps dh_gencontrol -psigning-party - dh_gencontrol -pkeylookup -- -v3.0-1 + dh_gencontrol -pkeylookup -- -v1:$(VERSION) dh_md5sums dh_builddeb -- 2.30.2 From c0f6b0ce3bb264e161671011feae401dceeb3937 Mon Sep 17 00:00:00 2001 From: weasel Date: Fri, 19 Aug 2005 15:09:46 +0000 Subject: [PATCH 14/16] Install caff's pgp-fixkey. git-svn-id: svn://svn.debian.org/pgp-tools/trunk@217 b513b33f-fedd-0310-b452-c3deb5f4c849 --- debian/changelog | 8 ++++++-- debian/install | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 08269be..226c8bf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,12 @@ signing-party (0.4.2-2) UNRELEASED; urgency=low - * + [ Christoph Berg ] + * - -- Christoph Berg Thu, 18 Aug 2005 16:22:58 +0200 + [ Peter Palfrader ] + * Install caff's pgp-fixkey. + + -- Peter Palfrader Fri, 19 Aug 2005 17:08:47 +0200 signing-party (0.4.2-1) unstable; urgency=low diff --git a/debian/install b/debian/install index 4d334af..4d18ef9 100644 --- a/debian/install +++ b/debian/install @@ -1,5 +1,6 @@ caff/caff usr/bin caff/pgp-clean usr/bin +caff/pgp-fixkey usr/bin gpglist/gpglist usr/bin gpgsigs/gpgsigs usr/bin gpg-key2ps/gpg-key2ps usr/bin -- 2.30.2 From 4a7f8a7988a5fbf3a1884ee121c8b87d4c547803 Mon Sep 17 00:00:00 2001 From: weasel Date: Fri, 19 Aug 2005 15:11:01 +0000 Subject: [PATCH 15/16] epochs are ugly, we should rather stay with 3.0.* git-svn-id: svn://svn.debian.org/pgp-tools/trunk@218 b513b33f-fedd-0310-b452-c3deb5f4c849 --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index d4a3c4d..6894605 100755 --- a/debian/rules +++ b/debian/rules @@ -50,7 +50,7 @@ binary-indep: build install dh_installdeb dh_shlibdeps dh_gencontrol -psigning-party - dh_gencontrol -pkeylookup -- -v1:$(VERSION) + dh_gencontrol -pkeylookup -- -v3.0.$(VERSION) dh_md5sums dh_builddeb -- 2.30.2 From f1073482adc7c4989676dfc098dc8fb80864bebe Mon Sep 17 00:00:00 2001 From: myon-guest Date: Sun, 21 Aug 2005 17:28:13 +0000 Subject: [PATCH 16/16] handle revoked uids in perl to get linecount right git-svn-id: svn://svn.debian.org/pgp-tools/trunk@219 b513b33f-fedd-0310-b452-c3deb5f4c849 --- debian/changelog | 3 ++- gpg-key2ps/gpg-key2ps | 8 +++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 226c8bf..e5fb00f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,8 @@ signing-party (0.4.2-2) UNRELEASED; urgency=low [ Christoph Berg ] - * + * gpg-key2ps: + + handle revoked uids in perl to get linecount right (Closes: #320785). [ Peter Palfrader ] * Install caff's pgp-fixkey. diff --git a/gpg-key2ps/gpg-key2ps b/gpg-key2ps/gpg-key2ps index 5b87585..9498e6b 100755 --- a/gpg-key2ps/gpg-key2ps +++ b/gpg-key2ps/gpg-key2ps @@ -165,8 +165,6 @@ if ( $revokestyle eq "grey" ) { print " uid\n"; print " 0 setgray\n"; print "} def\n"; -} elsif ( $revokestyle eq "hide" ) { - print "/revuid {} def\n"; } elsif ( $revokestyle eq "note" ) { print "/revuid {\n"; print " 50 y moveto (uid) show\n"; @@ -223,7 +221,9 @@ while() { # user ids s/^uid:[^:r]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:([^:]*):.*/ ($1) uid/; # revoked user id - s/^uid:r[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:([^:]*):.*/ ($1) revuid/; + if (s/^uid:r[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:([^:]*):.*/ ($1) revuid/) { + next if $revokestyle eq "hide"; + } # subkey s/^sub:[^:]*:([^:]*):([0-9]*):.{8,8}(.{8,8}):([^:]*):[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:.*/ ($4) ($3) $2 ($1) sbk/; $numlines++; @@ -237,6 +237,8 @@ unless ($started) { exit 1; } +print STDERR "numlines $numlines\n"; + # output the remaining postscript print <