dpkg-buildpackage: Call gpg with --utf8-strings

(signfile): Call gpg with --utf8-strings since otherwise the key
lookup fails with non-ASCII UTF8-encoded names. Since Debian
changelogs should be UTF8 encoded, this is probably the more sane
default.

diff --git a/ChangeLog b/ChangeLog
index e2f29810fb3d6a84eaf7563f13478028bec5cb62..1eef0d535ff64ebe6946174d8db5d696c0566419 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2007-09-29  Frank Lichtenheld  <djpig@debian.org>
+
+       * scripts/dpkg-buildpackage.pl (signfile): Call
+       gpg with --utf8-strings since otherwise the key
+       lookup fails with non-ASCII UTF8-encoded names.
+       Since Debian changelogs should be UTF8 encoded,
+       this is probably the more sane default. This
+       will probably break if one uses a non-UTF8 locale
+       and tries to give a uid on the commandline that
+       contains non-ASCII chars. I think we can live with
+       that.
+
 2007-09-28  Frank Lichtenheld  <djpig@debian.org>
 
        * scripts/dpkg-buildpackage.pl (withecho): Remove

diff --git a/debian/changelog b/debian/changelog
index 410c703e5eb29df61277f04de0eefb22b9100188..c18f59d0be91cf81ef8c8de256863e4844f30941 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,6 +30,9 @@ dpkg (1.14.7) UNRELEASED; urgency=low
     Jari Aalto. Closes: #440972
   * Rework documentation of dpkg-source's -i and -I options.
     Closes: #323911, #440956
+  * Add --utf8-strings to gpg call in dpkg-buildpackage since
+    that seems to be the better default. Suggested by Székelyi Szabolcs.
+    Closes: #379418
 
   [ Updated dpkg translations ]
   * Basque (Piarres Beobide). Closes: #440859

diff --git a/scripts/dpkg-buildpackage.pl b/scripts/dpkg-buildpackage.pl
index 73beaced85d0be231aa7ebdbf568de43e14fb397..88b3d12324dba8cbece18694ea049fd07a06db72 100644 (file)
--- a/scripts/dpkg-buildpackage.pl
+++ b/scripts/dpkg-buildpackage.pl
@@ -300,7 +300,8 @@ sub signfile {
 
     if ($signinterface eq 'gpg') {
        system("(cat ../$qfile ; echo '') | ".
-              "$signcommand --local-user ".quotemeta($signkey||$maintainer).
+              "$signcommand --utf8-strings --local-user "
+              .quotemeta($signkey||$maintainer).
               " --clearsign --armor --textmode  > ../$qfile.asc");
     } else {
        system("$signcommand -u ".quotemeta($signkey||$maintainer).