intl: Update locale.alias

* locale.alias: Update from glibc:
2015-05-22  Paul Eggert  <eggert@cs.ucla.edu>
  Remove obsolete aliases that broke 'locale -a'
  [BZ #18412]
  * intl/locale.alias: Remove obsolete aliases "bokmål" and "français"
  which caused 'locale -a' to output Latin-1 data in UTF-8 locales,
  breaking some applications that use 'locale -a' output.
  Change the encoding of this file from Latin-1 to ASCII to avoid
  other potential problems with people grepping this file.

diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog
index 3acba6eeaff57d07eaaf7a7c371c4eecbd60c6e2..b7f66a224f254e109413363826c228ea039cc1ea 100644 (file)
--- a/gettext-runtime/intl/ChangeLog
+++ b/gettext-runtime/intl/ChangeLog
@@ -1,3 +1,15 @@
+2015-06-23  Daiki Ueno  <ueno@gnu.org>
+
+       * locale.alias: Update from glibc:
+       2015-05-22  Paul Eggert  <eggert@cs.ucla.edu>
+         Remove obsolete aliases that broke 'locale -a'
+         [BZ #18412]
+         * intl/locale.alias: Remove obsolete aliases "bokmål" and "français"
+         which caused 'locale -a' to output Latin-1 data in UTF-8 locales,
+         breaking some applications that use 'locale -a' output.
+         Change the encoding of this file from Latin-1 to ASCII to avoid
+         other potential problems with people grepping this file.
+
 2015-03-12  Daiki Ueno  <ueno@gnu.org>
 
        intl: Update from gnulib

diff --git a/gettext-runtime/intl/locale.alias b/gettext-runtime/intl/locale.alias
index 5d289348cf04e418e22dec4f91d40b644c3f4185..f5da18292227fe9f9fa71213f4f4cfed186de91e 100644 (file)
--- a/gettext-runtime/intl/locale.alias
+++ b/gettext-runtime/intl/locale.alias
@@ -25,10 +25,20 @@
 # backward compatibility.  Nobody should rely on the names defined here.
 # Locales should always be specified by their full name.
 
+# Note: This file used to contain the following lines:
+#      bokmaal         nb_NO.ISO-8859-1
+#      franc,ais       fr_FR.ISO-8859-1
+# except that the "aa" was actually the byte '\0xE5' (the Latin-1
+# encoding for U+00E5 LATIN SMALL LETTER A WITH RING ABOVE) and the
+# "c," was actually the byte '\xE7' (the Latin-1 encoding for U+00E7
+# LATIN SMALL LETTER C WITH CEDILLA).  These lines were removed
+# because they caused 'locale -a' to output text encoded in Latin-1,
+# which broke applications in UTF-8 locales.  See:
+# https://sourceware.org/bugzilla/show_bug.cgi?id=18412
+
 # Packages using this file: 
 
 bokmal         nb_NO.ISO-8859-1
-bokm�l               nb_NO.ISO-8859-1
 catalan                ca_ES.ISO-8859-1
 croatian       hr_HR.ISO-8859-2
 czech          cs_CZ.ISO-8859-2
@@ -39,7 +49,6 @@ dutch         nl_NL.ISO-8859-1
 eesti          et_EE.ISO-8859-1
 estonian       et_EE.ISO-8859-1
 finnish         fi_FI.ISO-8859-1
-fran�ais     fr_FR.ISO-8859-1
 french         fr_FR.ISO-8859-1
 galego         gl_ES.ISO-8859-1
 galician       gl_ES.ISO-8859-1