Regenerate locales (common.UTF-8 => xx_Comm_US.UTF-8)
authorJohn Marino <draco@marino.st>
Thu, 13 Aug 2015 10:57:40 +0000 (12:57 +0200)
committerJohn Marino <draco@marino.st>
Thu, 13 Aug 2015 11:03:25 +0000 (13:03 +0200)
A rename is required because some applications check the format of the
locale name, so we need to use a legal one (e.g. xx_Yyyy_ZZ.<encoding>)

Makefile_upgrade.inc
etc/mtree/BSD.local.dist
etc/mtree/BSD.usr.dist
share/colldef/Makefile
share/ctypedef/Makefile
share/ctypedef/xx_Comm_US.UTF-8.src [moved from share/ctypedef/common.UTF-8.src with 100% similarity]
share/monetdef/Makefile
share/msgdef/Makefile
share/numericdef/Makefile
share/timedef/Makefile

index 3d108b5..e9e9625 100644 (file)
@@ -2199,6 +2199,7 @@ TO_REMOVE+=/usr/share/locale/nl_??.ISO8859-1
 TO_REMOVE+=/usr/share/locale/pt_PT.ISO8859-1
 TO_REMOVE+=/usr/share/locale/sv_??.ISO8859-1
 TO_REMOVE+=/boot/kernel/glxsb.ko
+TO_REMOVE+=/usr/share/locale/common.UTF-8
 
 .if ${MACHINE_ARCH} == "x86_64"
 TO_REMOVE+=/usr/sbin/kgzip
index 7fa3e3e..34d315c 100644 (file)
             ..
             ca_ES.UTF-8
             ..
-            common.UTF-8
-            ..
             cs_CZ.ISO8859-2
             ..
             cs_CZ.UTF-8
             ..
             uk_UA.UTF-8
             ..
+            xx_Comm_US.UTF-8
+            ..
             zh_Hans_CN.GB18030
             ..
             zh_Hans_CN.GB2312
index 7bc3ac8..ba59336 100644 (file)
             ..
             ca_IT.UTF-8
             ..
-            common.UTF-8
-            ..
             cs_CZ.ISO8859-2
             ..
             cs_CZ.UTF-8
             ..
             uk_UA.UTF-8
             ..
+            xx_Comm_US.UTF-8
+            ..
             zh_Hans_CN.GB18030
             ..
             zh_Hans_CN.GB2312
index 6e8d4f0..15034ed 100644 (file)
@@ -67,6 +67,7 @@ SAME+=                ca_AD.UTF-8:ca_ES.ISO8859-15
 SAME+=         ca_AD.UTF-8:ca_AD.ISO8859-15
 SAME+=         cs_CZ.UTF-8:cs_CZ.ISO8859-2
 SAME+=         da_DK.UTF-8:da_DK.ISO8859-15
+SAME+=         en_US.UTF-8:xx_Comm_US.UTF-8
 SAME+=         en_US.UTF-8:sr_Latn_RS.UTF-8
 SAME+=         en_US.UTF-8:sr_Latn_RS.ISO8859-2
 SAME+=         en_US.UTF-8:pt_PT.UTF-8
@@ -111,7 +112,6 @@ SAME+=              en_US.UTF-8:en_HK.ISO8859-1
 SAME+=         en_US.UTF-8:en_GB.UTF-8
 SAME+=         en_US.UTF-8:en_GB.US-ASCII
 SAME+=         en_US.UTF-8:en_GB.ISO8859-15
-SAME+=         en_US.UTF-8:common.UTF-8
 SAME+=         en_US.UTF-8:en_CA.UTF-8
 SAME+=         en_US.UTF-8:en_CA.US-ASCII
 SAME+=         en_US.UTF-8:en_CA.ISO8859-1
index 2c74264..71db4ce 100644 (file)
@@ -17,7 +17,6 @@ LOCALES+=     ca_IT.ISO8859-15
 LOCALES+=      ca_IT.UTF-8
 LOCALES+=      el_GR.ISO8859-7
 LOCALES+=      el_GR.UTF-8
-LOCALES+=      common.UTF-8
 LOCALES+=      en_GB.ISO8859-15
 LOCALES+=      en_US.ISO8859-1
 LOCALES+=      en_US.US-ASCII
@@ -44,6 +43,7 @@ LOCALES+=     uk_UA.CP1251
 LOCALES+=      uk_UA.ISO8859-5
 LOCALES+=      uk_UA.KOI8-U
 LOCALES+=      uk_UA.UTF-8
+LOCALES+=      xx_Comm_US.UTF-8
 LOCALES+=      zh_Hans_CN.GB18030
 LOCALES+=      zh_Hans_CN.GB2312
 LOCALES+=      zh_Hans_CN.GBK
index dbb0296..1b78b37 100644 (file)
@@ -130,15 +130,15 @@ SAME+=            en_AU.UTF-8:en_AU.US-ASCII
 SAME+=         en_AU.UTF-8:en_AU.ISO8859-1
 SAME+=         en_CA.UTF-8:en_CA.US-ASCII
 SAME+=         en_CA.UTF-8:en_CA.ISO8859-1
-SAME+=         en_US.UTF-8:en_US.US-ASCII
-SAME+=         en_US.UTF-8:en_US.ISO8859-1
-SAME+=         en_US.UTF-8:common.UTF-8
 SAME+=         zh_Hant_HK.UTF-8:zh_Hant_HK.Big5HKSCS
 SAME+=         zh_Hant_HK.UTF-8:en_HK.UTF-8
 SAME+=         zh_Hant_HK.UTF-8:en_HK.ISO8859-1
 SAME+=         en_NZ.UTF-8:en_NZ.US-ASCII
 SAME+=         en_NZ.UTF-8:en_NZ.ISO8859-1
 SAME+=         en_SG.UTF-8:en_SG.ISO8859-1
+SAME+=         en_US.UTF-8:en_US.US-ASCII
+SAME+=         en_US.UTF-8:en_US.ISO8859-1
+SAME+=         en_US.UTF-8:xx_Comm_US.UTF-8
 SAME+=         es_AR.UTF-8:es_AR.ISO8859-1
 SAME+=         es_MX.UTF-8:es_MX.ISO8859-1
 SAME+=         sv_FI.ISO8859-15:pt_PT.ISO8859-15
index 85fde74..e438b12 100644 (file)
@@ -134,7 +134,7 @@ SAME+=              en_US.UTF-8:en_CA.ISO8859-1
 SAME+=         en_US.UTF-8:en_AU.UTF-8
 SAME+=         en_US.UTF-8:en_AU.US-ASCII
 SAME+=         en_US.UTF-8:en_AU.ISO8859-1
-SAME+=         en_US.UTF-8:common.UTF-8
+SAME+=         en_US.UTF-8:xx_Comm_US.UTF-8
 SAME+=         et_EE.UTF-8:et_EE.ISO8859-15
 SAME+=         eu_ES.UTF-8:eu_ES.ISO8859-15
 SAME+=         fr_FR.UTF-8:fr_FR.ISO8859-15
index c7f5bc9..88e3c36 100644 (file)
@@ -108,7 +108,7 @@ SAME+=              en_US.UTF-8:en_AU.UTF-8
 SAME+=         en_US.UTF-8:en_AU.US-ASCII
 SAME+=         en_US.UTF-8:en_AU.ISO8859-1
 SAME+=         en_US.UTF-8:am_ET.UTF-8
-SAME+=         en_US.UTF-8:common.UTF-8
+SAME+=         en_US.UTF-8:xx_Comm_US.UTF-8
 SAME+=         ru_RU.CP866:be_BY.CP1131
 SAME+=         tr_TR.UTF-8:tr_TR.ISO8859-9
 SAME+=         tr_TR.UTF-8:sl_SI.UTF-8
index 6dd2681..44d6703 100644 (file)
@@ -143,9 +143,6 @@ SAME+=              en_HK.UTF-8:en_AU.US-ASCII
 SAME+=         en_HK.UTF-8:en_AU.ISO8859-1
 SAME+=         en_CA.UTF-8:en_CA.US-ASCII
 SAME+=         en_CA.UTF-8:en_CA.ISO8859-1
-SAME+=         en_US.UTF-8:en_US.US-ASCII
-SAME+=         en_US.UTF-8:en_US.ISO8859-1
-SAME+=         en_US.UTF-8:common.UTF-8
 SAME+=         en_GB.UTF-8:en_GB.US-ASCII
 SAME+=         en_GB.UTF-8:en_GB.ISO8859-15
 SAME+=         en_IE.UTF-8:en_IE.ISO8859-15
@@ -153,6 +150,9 @@ SAME+=              en_SG.UTF-8:en_SG.ISO8859-1
 SAME+=         en_SG.UTF-8:en_NZ.UTF-8
 SAME+=         en_SG.UTF-8:en_NZ.US-ASCII
 SAME+=         en_SG.UTF-8:en_NZ.ISO8859-1
+SAME+=         en_US.UTF-8:en_US.US-ASCII
+SAME+=         en_US.UTF-8:en_US.ISO8859-1
+SAME+=         en_US.UTF-8:xx_Comm_US.UTF-8
 SAME+=         en_ZA.UTF-8:en_ZA.US-ASCII
 SAME+=         en_ZA.UTF-8:en_ZA.ISO8859-1
 SAME+=         es_CR.UTF-8:es_AR.UTF-8