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

diff --git a/debian/changelog b/debian/changelog
index 89e239eab27e7497916736d6c4de7ed41156fd5c..7aa8105e72d3e7eeaa4cb32e6e9600df2d998fbc 100644 (file)
--- 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 e73d9a6d17d3e21d89ae45b9cbe325338ed0991e..9351707776d6546ecf2c96e48e5e4aa2abaf30b8 100755 (executable)
--- 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/) {