diff options
| author | Jakub Wilk <jwilk@jwilk.net> | 2018-02-12 13:09:31 +0100 |
|---|---|---|
| committer | Niels Thykier <niels@thykier.net> | 2018-02-12 18:18:26 +0000 |
| commit | 09f9ec367aead12b46a5a05885cdd0d34a83451d (patch) | |
| tree | 174af99ba5faab3ff4da2f16539ad53bdd0b3c79 | |
| parent | 7d61a59ff0135e50c955a3b3162686f1d50d6ed3 (diff) | |
| download | debhelper-09f9ec367aead12b46a5a05885cdd0d34a83451d.tar.gz | |
meson.pm: Fix locale name
Signed-off-by: Niels Thykier <niels@thykier.net>
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | lib/Debian/Debhelper/Buildsystem/meson.pm | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 20b7c7b1..e035e67c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,8 @@ debhelper (11.1.5) UNRELEASED; urgency=medium * dh_installexamples: Ditto. * dh_installinfo: Ditto. * dh_installman: Ditto. + * meson.pm: Apply patch from Jakub Wilk to fix typo in the name + of the "C.UTF-8" locale. -- Niels Thykier <niels@thykier.net> Sun, 04 Feb 2018 18:03:34 +0000 diff --git a/lib/Debian/Debhelper/Buildsystem/meson.pm b/lib/Debian/Debhelper/Buildsystem/meson.pm index 8d710da6..f157296f 100644 --- a/lib/Debian/Debhelper/Buildsystem/meson.pm +++ b/lib/Debian/Debhelper/Buildsystem/meson.pm @@ -59,7 +59,7 @@ sub configure { my $filename = generated_file('_source', 'meson-cross-file.conf'); my %options = ( stdout => '/dev/null', - update_env => { LC_ALL => 'C.UTC-8'}, + update_env => { LC_ALL => 'C.UTF-8'}, ); doit(\%options, $debcrossgen, "-o${filename}"); $cross_file = $filename; @@ -76,7 +76,7 @@ sub configure { $this->mkdir_builddir(); eval { my %options = ( - update_env => { LC_ALL => 'C.UTC-8'}, + update_env => { LC_ALL => 'C.UTF-8'}, ); $this->doit_in_builddir(\%options, "meson", $this->get_source_rel2builddir(), @opts, @_); }; |