X Strike Force XFree86 SVN commit: rev 891 - branches/4.3.0/sid/debian/patches
Author: branden
Date: 2004-01-12 13:10:48 -0500 (Mon, 12 Jan 2004)
New Revision: 891
Removed:
branches/4.3.0/sid/debian/patches/011b_recognize_ko_KR.EUC-KR_locale.diff
Modified:
branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD.diff
branches/4.3.0/sid/debian/patches/011a_recognize_glibc_2.3.2_locale_names.diff
Log:
Drop patch 011b_recognize_ko_KR.EUC-KR_locale patch in favor of practically
identical change to upstream CVS HEAD. Resync offset in patch
011a_recognize_glibc_2.3.2_locale_names.
Modified: branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD.diff
===================================================================
--- branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD.diff 2004-01-12 18:09:28 UTC (rev 890)
+++ branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD.diff 2004-01-12 18:10:48 UTC (rev 891)
@@ -21,6 +21,9 @@
Build fix when using Linux kernel 2.6 headers. (Marc La France, via
Michel Dänzer)
+(xc/nls/locale.alias):
+ Add ko_KR.EUC-KR (Jungshik Shin).
+
diff -urN xc.orig/config/imake/imake.c xc/config/imake/imake.c
--- xc.orig/config/imake/imake.c 2002-12-17 09:48:27.000000000 +1100
+++ xc/config/imake/imake.c 2003-04-09 01:58:14.000000000 +1000
@@ -700,3 +703,13 @@
static void
SetKbdRepeat(InputInfoPtr pInfo, char rad)
{
+--- xc/nls/locale.alias 18 Dec 2003 04:14:22 -0000 1.64
++++ xc/nls/locale.alias 3 Jan 2004 03:31:00 -0000 1.65
+@@ -419,6 +419,7 @@
+ ko: ko_KR.eucKR
+ ko_KR: ko_KR.eucKR
+ ko_KR.EUC: ko_KR.eucKR
++ko_KR.EUC-KR: ko_KR.eucKR
+ ko_KR.euc: ko_KR.eucKR
+ ko_KR.euckr: ko_KR.eucKR
+ ko_KR.utf8: ko_KR.UTF-8
Modified: branches/4.3.0/sid/debian/patches/011a_recognize_glibc_2.3.2_locale_names.diff
===================================================================
--- branches/4.3.0/sid/debian/patches/011a_recognize_glibc_2.3.2_locale_names.diff 2004-01-12 18:09:28 UTC (rev 890)
+++ branches/4.3.0/sid/debian/patches/011a_recognize_glibc_2.3.2_locale_names.diff 2004-01-12 18:10:48 UTC (rev 891)
@@ -10,7 +10,7 @@
--- xc/nls/locale.alias~ 2003-12-16 12:58:34.000000000 -0500
+++ xc/nls/locale.alias 2003-12-16 12:59:31.000000000 -0500
-@@ -884,3 +884,67 @@
+@@ -885,3 +885,67 @@
japan: ja_JP.U90
#endif
Japanese-EUC: ja_JP.eucJP
Deleted: branches/4.3.0/sid/debian/patches/011b_recognize_ko_KR.EUC-KR_locale.diff
===================================================================
--- branches/4.3.0/sid/debian/patches/011b_recognize_ko_KR.EUC-KR_locale.diff 2004-01-12 18:09:28 UTC (rev 890)
+++ branches/4.3.0/sid/debian/patches/011b_recognize_ko_KR.EUC-KR_locale.diff 2004-01-12 18:10:48 UTC (rev 891)
@@ -1,16 +0,0 @@
-$Id$
-
-This patch by Denis Barbier <barbier@debian.org>.
-
-Not submitted upstream yet.
-
---- xc/nls/locale.alias~ 2003-12-24 13:18:49.000000000 -0500
-+++ xc/nls/locale.alias 2003-12-24 13:18:52.000000000 -0500
-@@ -421,6 +421,7 @@
- ko_KR.EUC: ko_KR.eucKR
- ko_KR.euc: ko_KR.eucKR
- ko_KR.euckr: ko_KR.eucKR
-+ko_KR.EUC-KR: ko_KR.eucKR
- ko_KR.utf8: ko_KR.UTF-8
- kw: kw_GB.ISO8859-1
- kw_GB: kw_GB.ISO8859-1
Reply to: