From 077745cf261d9b4a57b6c1a080c8d97a01db1694 Mon Sep 17 00:00:00 2001
From: thijs <thijs@b513b33f-fedd-0310-b452-c3deb5f4c849>
Date: Wed, 2 Nov 2011 17:18:35 +0000
Subject: [PATCH] =?utf8?q?Apply=20patch=20from=20Uwe=20Kleine-K=C3=B6nig?=
 =?utf8?q?=20to=20deal=20with=20latin1=20characters=20(partially=20address?=
 =?utf8?q?es=20#596377).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

git-svn-id: svn://svn.debian.org/pgp-tools/trunk@489 b513b33f-fedd-0310-b452-c3deb5f4c849
---
 debian/changelog      |  6 ++++--
 gpg-key2ps/gpg-key2ps | 16 +++++++++++++++-
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fff1d4d..fb0a33e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,9 +4,11 @@ signing-party (1.1.4-1) UNRELEASED; urgency=low
   * caff:
     + Correct path of ~/.caffrc in informational messages (Closes: #582603).
     + Be more verbose on unexpected key ID (Closes: #645792).
+  * gpg-key2ps:
+    + Apply patch from Uwe Kleine-König to deal with latin1 characters
+      (partially addresses #596377).
   * Debian package:
     + Import dpkg build flags, plus small cleanups.
-  
 
   [ Franck Joncourt ]
   * Debian package:
@@ -45,7 +47,7 @@ signing-party (1.1.4-1) UNRELEASED; urgency=low
     + Create the mail files in ~/.caff/keys even if mail is not sent
       (closes: #590666).
 
- -- Thijs Kinkhorst <thijs@debian.org>  Tue, 01 Nov 2011 20:35:10 +0100
+ -- Thijs Kinkhorst <thijs@debian.org>  Wed, 02 Nov 2011 18:17:25 +0100
 
 signing-party (1.1.3-1) unstable; urgency=low
 
diff --git a/gpg-key2ps/gpg-key2ps b/gpg-key2ps/gpg-key2ps
index 9351707..4fbafad 100755
--- a/gpg-key2ps/gpg-key2ps
+++ b/gpg-key2ps/gpg-key2ps
@@ -121,7 +121,21 @@ print <<EOF;
 /w $w def
 /h $h def
 
-/Times-Roman findfont 9 scalefont setfont 
+/reencode {
+	exch findfont
+	dup length dict
+	begin {
+		1 index /FID eq
+		{ pop pop }
+		{ def } ifelse
+	} forall
+	/Encoding ISOLatin1Encoding def
+	currentdict
+	end
+	definefont
+} bind def
+
+/Times-Roman /trlatin1 reencode 9 scalefont setfont
 
 /newline {
 	/y y 10 sub def
-- 
2.39.5