[Pgp-tools-commit] r421 - in trunk: debian gpg-key2ps

[myon at alioth.debian.org]

Author: myon
Date: 2009-03-10 16:19:07 +0000 (Tue, 10 Mar 2009)
New Revision: 421

Modified:
   trunk/debian/changelog
   trunk/gpg-key2ps/gpg-key2ps
Log:
gpg-key2ps: assume gpg output to be in utf-8, instead of depending on the
current locale.

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2009-02-23 20:41:13 UTC (rev 420)
+++ trunk/debian/changelog	2009-03-10 16:19:07 UTC (rev 421)
@@ -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 at 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

Modified: trunk/gpg-key2ps/gpg-key2ps
===================================================================
--- trunk/gpg-key2ps/gpg-key2ps	2009-02-23 20:41:13 UTC (rev 420)
+++ trunk/gpg-key2ps/gpg-key2ps	2009-03-10 16:19:07 UTC (rev 421)
@@ -253,7 +253,7 @@
 	}
 	# 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/) {