r6441 - in glibc-package/branches/glibc-2.21/debian: . debhelper.in
Author: aurel32
Date: 2015-04-14 19:25:18 +0000 (Tue, 14 Apr 2015)
New Revision: 6441
Modified:
glibc-package/branches/glibc-2.21/debian/changelog
glibc-package/branches/glibc-2.21/debian/debhelper.in/locales.templates
Log:
merge from unstable
Modified: glibc-package/branches/glibc-2.21/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.21/debian/changelog 2015-04-14 19:21:13 UTC (rev 6440)
+++ glibc-package/branches/glibc-2.21/debian/changelog 2015-04-14 19:25:18 UTC (rev 6441)
@@ -212,6 +212,14 @@
-- Adam Conrad <adconrad@0c3.net> Fri, 06 Mar 2015 13:47:43 -0700
+glibc (2.19-18) unstable; urgency=medium
+
+ [ Aurelien Jarno ]
+ * debhelper.in/locales.templates: allow the C.UTF-8 locale to be
+ selected as the default locale. Closes: #782241.
+
+ -- Aurelien Jarno <aurel32@debian.org> Tue, 14 Apr 2015 19:50:11 +0200
+
glibc (2.19-17) unstable; urgency=medium
[ Adam Conrad ]
Modified: glibc-package/branches/glibc-2.21/debian/debhelper.in/locales.templates
===================================================================
--- glibc-package/branches/glibc-2.21/debian/debhelper.in/locales.templates 2015-04-14 19:21:13 UTC (rev 6440)
+++ glibc-package/branches/glibc-2.21/debian/debhelper.in/locales.templates 2015-04-14 19:25:18 UTC (rev 6441)
@@ -15,7 +15,7 @@
Template: locales/default_environment_locale
Type: select
#flag:translate:1
-__Choices: None, ${locales}
+__Choices: None, C.UTF-8, ${locales}
Default: None
_Description: Default locale for the system environment:
Many packages in Debian use locales to display text in the correct
Reply to: