Mercurial Mercurial > sustaining > oi_151a > xnv / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6941479 Some new locale entries are missing in locale.dir and compose.dir
authorAlan Coopersmith <Alan.Coopersmith@Oracle.COM>
Wed, 11 Aug 2010 14:38:03 -0700
changeset 996 3f017a99488d
parent 995 1c6d17c6e533
child 997 6b098463835a
6941479 Some new locale entries are missing in locale.dir and compose.dir
open-src/lib/libX11/Makefile file | annotate | diff | comparison | revisions
open-src/lib/libX11/compose.dir.patch file | annotate | diff | comparison | revisions
open-src/lib/libX11/locale.dir.patch file | annotate | diff | comparison | revisions 
--- a/open-src/lib/libX11/Makefile	Mon Aug 09 10:37:24 2010 -0700
+++ b/open-src/lib/libX11/Makefile	Wed Aug 11 14:38:03 2010 -0700
@@ -76,6 +76,7 @@
 	compose-zh_HK.UTF-8.patch \
 	compose-zh_TW.UTF-8.patch \
 	locale.aliases.patch \
+	locale.dir.patch \
 	locale.paths.patch \
 	locale-C.patch \
 	locale-iso8859-1.patch \
--- a/open-src/lib/libX11/compose.dir.patch	Mon Aug 09 10:37:24 2010 -0700
+++ b/open-src/lib/libX11/compose.dir.patch	Wed Aug 11 14:38:03 2010 -0700
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -23,8 +23,48 @@
 
 diff -urp -x '*~' -x '*.orig' nls/compose.dir.pre nls/compose.dir.pre
 --- nls/compose.dir.pre	2010-01-14 17:11:36.000000000 -0800
-+++ nls/compose.dir.pre	2010-06-07 18:01:10.730751798 -0700
-@@ -337,12 +337,12 @@ en_US.UTF-8/Compose:		is_IS.UTF-8
++++ nls/compose.dir.pre	2010-08-10 16:38:10.899093635 -0700
+@@ -239,6 +239,7 @@ XCOMM
+ XCOMM
+ en_US.UTF-8/Compose:		af_ZA.UTF-8
+ en_US.UTF-8/Compose:		ar_AA.UTF-8
++en_US.UTF-8/Compose:		ar_AE.UTF-8
+ en_US.UTF-8/Compose:		ar_BH.UTF-8
+ en_US.UTF-8/Compose:		ar_DZ.UTF-8
+ en_US.UTF-8/Compose:		ar_EG.UTF-8
+@@ -254,6 +255,7 @@ en_US.UTF-8/Compose:		ar_QA.UTF-8
+ en_US.UTF-8/Compose:		ar_SA.UTF-8
+ en_US.UTF-8/Compose:		ar_TN.UTF-8
+ en_US.UTF-8/Compose:		ar_YE.UTF-8
++en_US.UTF-8/Compose:		as_IN.UTF-8
+ en_US.UTF-8/Compose:		bo_IN.UTF-8
+ en_US.UTF-8/Compose:		bs_BA.UTF-8
+ en_US.UTF-8/Compose:		az_AZ.UTF-8
+@@ -279,17 +281,23 @@ en_US.UTF-8/Compose:		de_LU.UTF-8
+ el_GR.UTF-8/Compose:		el_CY.UTF-8
+ el_GR.UTF-8/Compose:		el_GR.UTF-8
+ en_US.UTF-8/Compose:		en_AU.UTF-8
++en_US.UTF-8/Compose:		en_BW.UTF-8
+ en_US.UTF-8/Compose:		en_BZ.UTF-8
+ en_US.UTF-8/Compose:		en_CA.UTF-8
+ en_US.UTF-8/Compose:		en_GB.UTF-8
++en_US.UTF-8/Compose:		en_HK.UTF-8
+ en_US.UTF-8/Compose:		en_IE.UTF-8
++en_US.UTF-8/Compose:		en_IN.UTF-8
+ en_US.UTF-8/Compose:		en_JM.UTF-8
+ en_US.UTF-8/Compose:		en_MT.UTF-8
+ en_US.UTF-8/Compose:		en_NZ.UTF-8
++en_US.UTF-8/Compose:		en_PH.UTF-8
++en_US.UTF-8/Compose:		en_SG.UTF-8
+ en_US.UTF-8/Compose:		en_TT.UTF-8
+ en_US.UTF-8/Compose:		en_UK.UTF-8
+ en_US.UTF-8/Compose:		en_US.UTF-8
+ en_US.UTF-8/Compose:		en_ZA.UTF-8
++en_US.UTF-8/Compose:		en_ZW.UTF-8
+ en_US.UTF-8/Compose:		eo_XX.UTF-8
+ en_US.UTF-8/Compose:		es_AR.UTF-8
+ en_US.UTF-8/Compose:		es_BO.UTF-8
+@@ -337,14 +345,15 @@ en_US.UTF-8/Compose:		is_IS.UTF-8
  en_US.UTF-8/Compose:		it_CH.UTF-8
  en_US.UTF-8/Compose:		it_IT.UTF-8
  en_US.UTF-8/Compose:		iu_CA.UTF-8
@@ -38,15 +78,19 @@
 +ko_KR.UTF-8/Compose:		ko_KR.UTF-8
  en_US.UTF-8/Compose:		ks_IN.UTF-8
  en_US.UTF-8/Compose:		[email protected]
++en_US.UTF-8/Compose:		ku_TR.UTF-8
  en_US.UTF-8/Compose:		kw_GB.UTF-8
-@@ -413,7 +413,9 @@ en_US.UTF-8/Compose:		vi_VN.UTF-8
+ en_US.UTF-8/Compose:		ky_KG.UTF-8
+ en_US.UTF-8/Compose:		lo_LA.UTF-8
+@@ -413,7 +422,10 @@ en_US.UTF-8/Compose:		vi_VN.UTF-8
  en_US.UTF-8/Compose:		wa_BE.UTF-8
  en_US.UTF-8/Compose:		yi_US.UTF-8
  en_US.UTF-8/Compose:		xh_ZA.UTF-8
 -en_US.UTF-8/Compose:		zh_TW.UTF-8
-+zh_TW.UTF-8/Compose:		zh_TW.UTF-8
 +zh_CN.UTF-8/Compose:		zh_CN.UTF-8
 +zh_HK.UTF-8/Compose:		zh_HK.UTF-8
++zh_CN.UTF-8/Compose:		zh_SG.UTF-8
++zh_TW.UTF-8/Compose:		zh_TW.UTF-8
  en_US.UTF-8/Compose:		zu_ZA.UTF-8
  en_US.UTF-8/Compose:		bs_BA.UTF-8
  en_US.UTF-8/Compose:		ne_NP.UTF-8
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/lib/libX11/locale.dir.patch	Wed Aug 11 14:38:03 2010 -0700
@@ -0,0 +1,58 @@
+###############################################################################
+# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+#
+
+diff -urp -x '*~' -x '*.orig' nls/locale.dir.pre nls/locale.dir.pre
+--- nls/locale.dir.pre	2010-01-14 17:11:36.000000000 -0800
++++ nls/locale.dir.pre	2010-08-10 16:38:37.615315910 -0700
+@@ -299,17 +299,23 @@ en_US.UTF-8/XLC_LOCALE:			el_CY.UTF-8
+ en_US.UTF-8/XLC_LOCALE:			el_GR.UTF-8
+ en_US.UTF-8/XLC_LOCALE:			en_AU.UTF-8
+ en_US.UTF-8/XLC_LOCALE:			en_BE.UTF-8
++en_US.UTF-8/XLC_LOCALE:			en_BW.UTF-8
+ en_US.UTF-8/XLC_LOCALE:			en_BZ.UTF-8
+ en_US.UTF-8/XLC_LOCALE:			en_CA.UTF-8
+ en_US.UTF-8/XLC_LOCALE:			en_GB.UTF-8
++en_US.UTF-8/XLC_LOCALE:			en_HK.UTF-8
+ en_US.UTF-8/XLC_LOCALE:			en_IE.UTF-8
++en_US.UTF-8/XLC_LOCALE:			en_IN.UTF-8
+ en_US.UTF-8/XLC_LOCALE:			en_JM.UTF-8
+ en_US.UTF-8/XLC_LOCALE:			en_MT.UTF-8
+ en_US.UTF-8/XLC_LOCALE:			en_NZ.UTF-8
++en_US.UTF-8/XLC_LOCALE:			en_PH.UTF-8
++en_US.UTF-8/XLC_LOCALE:			en_SG.UTF-8
+ en_US.UTF-8/XLC_LOCALE:			en_TT.UTF-8
+ en_US.UTF-8/XLC_LOCALE:			en_UK.UTF-8
+ en_US.UTF-8/XLC_LOCALE:			en_US.UTF-8
+ en_US.UTF-8/XLC_LOCALE:			en_ZA.UTF-8
++en_US.UTF-8/XLC_LOCALE:			en_ZW.UTF-8
+ en_US.UTF-8/XLC_LOCALE:			eo_EO.UTF-8
+ en_US.UTF-8/XLC_LOCALE:			eo_XX.UTF-8
+ en_US.UTF-8/XLC_LOCALE:			es_AR.UTF-8
+@@ -368,6 +374,7 @@ en_US.UTF-8/XLC_LOCALE:                 
+ ko_KR.UTF-8/XLC_LOCALE:			ko_KR.UTF-8
+ en_US.UTF-8/XLC_LOCALE:			kw_GB.UTF-8
+ en_US.UTF-8/XLC_LOCALE:			ky_KG.UTF-8
++en_US.UTF-8/XLC_LOCALE:			ku_TR.UTF-8
+ en_US.UTF-8/XLC_LOCALE:			lo_LA.UTF-8
+ en_US.UTF-8/XLC_LOCALE:			lt_LT.UTF-8
+ en_US.UTF-8/XLC_LOCALE:			lv_LV.UTF-8
sustaining/oi_151a/xnv