From a129e78367a93df262eb3bae368852c75e2d53dc Mon Sep 17 00:00:00 2001 From: Frank Lichtenheld Date: Sat, 29 Sep 2007 16:20:11 +0200 Subject: [PATCH] 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. --- ChangeLog | 12 ++++++++++++ debian/changelog | 3 +++ scripts/dpkg-buildpackage.pl | 3 ++- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index e2f29810..1eef0d53 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2007-09-29 Frank Lichtenheld + + * 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 * scripts/dpkg-buildpackage.pl (withecho): Remove diff --git a/debian/changelog b/debian/changelog index 410c703e..c18f59d0 100644 --- 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 73beaced..88b3d123 100644 --- 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). -- 2.39.5