From 2c6cf47b590c157946d62025facda7a4de5ba4dc Mon Sep 17 00:00:00 2001
From: myon <myon@b513b33f-fedd-0310-b452-c3deb5f4c849>
Date: Tue, 10 Mar 2009 16:19:07 +0000
Subject: [PATCH] gpg-key2ps: assume gpg output to be in utf-8, instead of
depending on the current locale.
git-svn-id: svn://svn.debian.org/pgp-tools/trunk@421 b513b33f-fedd-0310-b452-c3deb5f4c849
---
debian/changelog | 7 +++++++
gpg-key2ps/gpg-key2ps | 2 +-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 89e239e..7aa8105 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+signing-party (1.1-3) unstable; urgency=low
+
+ * gpg-key2ps: assume gpg output to be in utf-8, instead of depending on the
+ current locale.
+
+ -- Christoph Berg <myon@debian.org> Tue, 10 Mar 2009 17:18:21 +0100
+
signing-party (1.1-2) unstable; urgency=low
* Fix build error when only building the binary package
diff --git a/gpg-key2ps/gpg-key2ps b/gpg-key2ps/gpg-key2ps
index e73d9a6..9351707 100755
--- a/gpg-key2ps/gpg-key2ps
+++ b/gpg-key2ps/gpg-key2ps
@@ -253,7 +253,7 @@ while(<GPG>) {
}
# user ids
s/\\x([0-9a-f][0-9a-f])/ chr(hex($1)) /gie;
- $_ = `echo "$_" | iconv -ct latin1`;
+ $_ = `echo "$_" | iconv -c -f utf-8 -t latin1`;
s/^uid:[^:r]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:([^:]*):.*/ ($1) uid/;
# revoked user id
if (s/^uid:r[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:([^:]*):.*/ ($1) revuid/) {
--
2.39.5