[debhelper-devel] [Git][debian/debhelper][master] meson.pm: Fix locale name

[Niels Thykier]

Niels Thykier pushed to branch master at Debian / debhelper


Commits:
09f9ec36 by Jakub Wilk at 2018-02-12T18:18:26+00:00
meson.pm: Fix locale name

Signed-off-by: Niels Thykier <niels at thykier.net>

- - - - -


2 changed files:

- debian/changelog
- lib/Debian/Debhelper/Buildsystem/meson.pm


Changes:

=====================================
debian/changelog
=====================================
--- 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 at thykier.net>  Sun, 04 Feb 2018 18:03:34 +0000
 


=====================================
lib/Debian/Debhelper/Buildsystem/meson.pm
=====================================
--- 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, @_);
 	};



View it on GitLab: https://salsa.debian.org/debian/debhelper/commit/09f9ec367aead12b46a5a05885cdd0d34a83451d

---
View it on GitLab: https://salsa.debian.org/debian/debhelper/commit/09f9ec367aead12b46a5a05885cdd0d34a83451d
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/debhelper-devel/attachments/20180212/8ca55a91/attachment-0001.html>