diff -Nru sbuild-0.67.0/debian/changelog sbuild-0.67.0/debian/changelog --- sbuild-0.67.0/debian/changelog 2016-04-07 11:47:55.000000000 +0000 +++ sbuild-0.67.0/debian/changelog 2016-04-19 13:52:52.000000000 +0000 @@ -1,3 +1,9 @@ +sbuild (0.67.0-2ubuntu7) xenial; urgency=medium + + * utf-8-by-default.patch: Switch to C.UTF-8 by default (LP: #1566590) + + -- Adam Conrad Tue, 19 Apr 2016 07:51:15 -0600 + sbuild (0.67.0-2ubuntu6) xenial; urgency=medium * dummy-archive-sha512.patch: Sbuild::ResolverBase: sign dummy archive diff -Nru sbuild-0.67.0/debian/patches/series sbuild-0.67.0/debian/patches/series --- sbuild-0.67.0/debian/patches/series 2016-04-07 11:46:30.000000000 +0000 +++ sbuild-0.67.0/debian/patches/series 2016-04-19 14:12:56.000000000 +0000 @@ -7,3 +7,4 @@ copy-dummy-archive.patch apt-conf-quotes.patch dummy-archive-sha512.patch +utf-8-by-default.patch diff -Nru sbuild-0.67.0/debian/patches/utf-8-by-default.patch sbuild-0.67.0/debian/patches/utf-8-by-default.patch --- sbuild-0.67.0/debian/patches/utf-8-by-default.patch 1970-01-01 00:00:00.000000000 +0000 +++ sbuild-0.67.0/debian/patches/utf-8-by-default.patch 2016-04-19 14:13:18.000000000 +0000 @@ -0,0 +1,35 @@ +Description: utf-8-by-default.patch: Switch to C.UTF-8 by default (LP: #1566590) +Author: Adam Conrad +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1566590 + +--- sbuild-0.67.0.orig/lib/Sbuild/Build.pm ++++ sbuild-0.67.0/lib/Sbuild/Build.pm +@@ -100,7 +100,7 @@ sub new { + $host_defaults->{'USER'} = $self->get_conf('USERNAME'); + $host_defaults->{'DIR'} = $self->get_conf('HOME'); + $host_defaults->{'STREAMIN'} = $devnull; +- $host_defaults->{'ENV'}->{'LC_ALL'} = 'POSIX'; ++ $host_defaults->{'ENV'}->{'LC_ALL'} = 'C.UTF-8'; + $host_defaults->{'ENV'}->{'SHELL'} = '/bin/sh'; + $host_defaults->{'ENV_FILTER'} = $self->get_conf('ENVIRONMENT_FILTER'); + # Note, this should never fail. But, we should handle failure anyway. +@@ -506,7 +506,7 @@ sub run_chroot_session { + $chroot_defaults->{'STREAMIN'} = $devnull; + $chroot_defaults->{'STREAMOUT'} = $self->get('Log Stream'); + $chroot_defaults->{'STREAMERR'} = $self->get('Log Stream'); +- $chroot_defaults->{'ENV'}->{'LC_ALL'} = 'POSIX'; ++ $chroot_defaults->{'ENV'}->{'LC_ALL'} = 'C.UTF-8'; + $chroot_defaults->{'ENV'}->{'SHELL'} = '/bin/sh'; + $chroot_defaults->{'ENV'}->{'HOME'} = '/sbuild-nonexistent'; + $chroot_defaults->{'ENV_FILTER'} = $self->get_conf('ENVIRONMENT_FILTER'); +--- sbuild-0.67.0.orig/lib/Sbuild/Utility.pm ++++ sbuild-0.67.0/lib/Sbuild/Utility.pm +@@ -25,7 +25,7 @@ use Sbuild::ChrootInfoSchroot; + use Sbuild::ChrootInfoSudo; + use Sbuild::Sysconfig; + +-$ENV{'LC_ALL'} = "POSIX"; ++$ENV{'LC_ALL'} = "C.UTF-8"; + $ENV{'SHELL'} = '/bin/sh'; + + # avoid intermixing of stdout and stderr