X Strike Force X.Org X11 SVN commit: r421 - in branches/6.9/debian: . patches/general
Author: dnusinow
Date: 2005-07-27 22:20:59 -0500 (Wed, 27 Jul 2005)
New Revision: 421
Modified:
branches/6.9/debian/changelog
branches/6.9/debian/patches/general/003_linux.cf_and_xfree86.cf.diff
branches/6.9/debian/patches/general/004_imake_manpage_handling_overhaul.diff
branches/6.9/debian/patches/general/008_fix_xgetpw_macro.diff
branches/6.9/debian/patches/general/009_disable_Xprt.diff
branches/6.9/debian/patches/general/010_donot_build_XpConfig.diff
branches/6.9/debian/patches/general/011_SECURITY_makedepend_safer.diff
branches/6.9/debian/patches/general/011a_recognize_glibc_2.3.2_locale_names.diff
branches/6.9/debian/patches/general/012_Xaw_StripChart_fix.diff
Log:
- Forward-port the following:
- general/003_linux.cf_and_xfree86.cf.diff
- general/008_fix_xgetpw_macro.diff
- general/011a_recognize_glibc_2.3.2_locale_names.diff
- Un-fuzzy all other changed patches in this commit
Modified: branches/6.9/debian/changelog
===================================================================
--- branches/6.9/debian/changelog 2005-07-28 03:14:36 UTC (rev 420)
+++ branches/6.9/debian/changelog 2005-07-28 03:20:59 UTC (rev 421)
@@ -5,6 +5,10 @@
- general/0000_backport_from_upstream.diff
- general/000_stolen_from_HEAD_i810.diff
- general/000_stolen_from_unichrome.sf.net.diff
+ - Forward-port the following:
+ - general/003_linux.cf_and_xfree86.cf.diff
+ - general/008_fix_xgetpw_macro.diff
+ - general/011a_recognize_glibc_2.3.2_locale_names.diff
- Update 000_stolen_from_linuxwacom_wacom_driver.diff to have version
0.6.8 of xf86Wacom.c to get the patch to apply
Modified: branches/6.9/debian/patches/general/003_linux.cf_and_xfree86.cf.diff
===================================================================
--- branches/6.9/debian/patches/general/003_linux.cf_and_xfree86.cf.diff 2005-07-28 03:14:36 UTC (rev 420)
+++ branches/6.9/debian/patches/general/003_linux.cf_and_xfree86.cf.diff 2005-07-28 03:20:59 UTC (rev 421)
@@ -22,9 +22,10 @@
as they had no place in the upstream tree, per the policy of not placing
debian/ and the like in upstream trees. Due to be maintained externally.
-diff -urN xc/config/cf~/linux.cf xc/config/cf/linux.cf
---- xc/config/cf~/linux.cf 2005-06-13 19:41:23.384951000 -0500
-+++ xc/config/cf/linux.cf 2005-06-13 19:42:04.195129471 -0500
+Index: xc/config/cf/linux.cf
+===================================================================
+--- xc/config/cf/linux.cf.orig 2005-07-23 18:16:01.000000000 -0400
++++ xc/config/cf/linux.cf 2005-07-23 21:03:32.000000000 -0400
@@ -101,12 +101,22 @@
#endif
@@ -217,7 +218,7 @@
# endif /* DebianMaintainer */
#endif /* LinuxDebian */
-@@ -675,10 +750,10 @@
+@@ -710,10 +785,10 @@
# if UseElfFormat
# ifdef AlphaArchitecture
# define CcCmd gcc -b alpha-linux
@@ -229,7 +230,7 @@
# endif /* AlphaArchitecture */
# ifdef HPArchitecture
# define CcCmd gcc
-@@ -690,10 +765,10 @@
+@@ -725,10 +800,10 @@
# endif /* HPArchitecture */
# ifdef i386Architecture
# define CcCmd gcc -b i486-linux
@@ -241,7 +242,7 @@
# endif /* i386Architecture */
# ifdef ia64Architecture
# define CcCmd gcc
-@@ -704,10 +779,10 @@
+@@ -739,10 +814,10 @@
# endif /* ia64Architecture */
# ifdef Mc68020Architecture
# define CcCmd gcc -b m68k-linux
@@ -253,7 +254,7 @@
# endif /* Mc68020Architecture */
# ifdef AMD64Architecture
# define CcCmd gcc
-@@ -720,13 +795,14 @@
+@@ -755,7 +830,7 @@
# define CcCmd gcc
# define AsCmd CcCmd -c -x assembler
# define LdCmd CcCmd -nostdlib
@@ -262,15 +263,7 @@
# endif
#endif
- #if UseElfFormat
- # ifndef DoLoadableServer
--# ifdef HPArchitecture
-+# if (defined(HPArchitecture) || defined(MIPSArchitecture) || \
-+ defined(SuperHArchitecture)) && !defined(MakeDllModules)
- # define DoLoadableServer NO
- # else
- # define DoLoadableServer YES
-@@ -793,7 +869,7 @@
+@@ -818,7 +893,7 @@
#ifdef AlphaArchitecture
# ifndef OptimizedCDebugFlags
@@ -279,16 +272,16 @@
# endif
# define LinuxMachineDefines -D__alpha__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
-@@ -806,7 +882,7 @@
+@@ -831,7 +906,7 @@
#ifdef Arm32Architecture
- # define DefaultCCOptions -fsigned-char
+ # define DefaultCCOptions
# ifndef OptimizedCDebugFlags
-# define OptimizedCDebugFlags -O3
+# define OptimizedCDebugFlags DefaultGcc2DebugOpt DefaultGcc2OptimizeOpt GccAliasingArgs
# endif
# define LinuxMachineDefines -D__arm__ -D__arm32__ -U__arm -Uarm
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
-@@ -814,7 +890,9 @@
+@@ -839,7 +914,9 @@
#endif /* Arm32Achitecture */
#ifdef HPArchitecture
@@ -299,7 +292,7 @@
# define LinuxMachineDefines -D__hppa__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines
-@@ -822,7 +900,7 @@
+@@ -847,7 +924,7 @@
#ifdef i386Architecture
# ifndef OptimizedCDebugFlags
@@ -308,7 +301,7 @@
# endif
# define LinuxMachineDefines -D__i386__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
-@@ -831,7 +909,7 @@
+@@ -856,7 +933,7 @@
#ifdef ia64Architecture
# ifndef OptimizedCDebugFlags
@@ -317,7 +310,7 @@
# endif
# define LinuxMachineDefines -D__ia64__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
-@@ -840,7 +918,7 @@
+@@ -865,7 +942,7 @@
#ifdef Mc68020Architecture
# ifndef OptimizedCDebugFlags
@@ -326,50 +319,41 @@
# endif
# define LinuxMachineDefines -D__mc68000__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
-@@ -849,7 +927,7 @@
-
- #ifdef MipsArchitecture
- # ifndef OptimizedCDebugFlags
--# define OptimizedCDebugFlags -O2 GccAliasingArgs
-+# define OptimizedCDebugFlags DefaultGcc2DebugOpt DefaultGcc2OptimizeOpt GccAliasingArgs
- # endif
- # define LinuxMachineDefines -D__mips__
- # define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
-@@ -859,7 +937,7 @@
+@@ -884,7 +961,7 @@
#ifdef Ppc64Architecture
- # define DefaultCCOptions -fsigned-char -mminimal-toc
+ # define DefaultCCOptions -mminimal-toc
# ifndef OptimizedCDebugFlags
-# define OptimizedCDebugFlags DefaultGcc2Ppc64Opt
-+# define OptimizedCDebugFlags DefaultGcc2DebugOpt DefaultGcc2OptimizeOpt GccAliasingArgs
++# define OptimizedCDebugFlags DefaultGcc2Ppc64Opt GccAliasingArgs
# endif
# define LinuxMachineDefines -D__powerpc64__ -D__powerpc__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
-@@ -869,7 +947,7 @@
+@@ -894,7 +971,7 @@
#ifdef PpcArchitecture
- # define DefaultCCOptions -fsigned-char
+ # define DefaultCCOptions
# ifndef OptimizedCDebugFlags
-# define OptimizedCDebugFlags DefaultGcc2PpcOpt
-+# define OptimizedCDebugFlags DefaultGcc2DebugOpt DefaultGcc2OptimizeOpt GccAliasingArgs
++# define OptimizedCDebugFlags DefaultGcc2DebugOpt DefaultGcc2OptimizeOpt GccAliasingArgs
# endif
# define LinuxMachineDefines -D__powerpc__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
-@@ -878,7 +956,7 @@
+@@ -903,7 +980,7 @@
#ifdef s390Architecture
# ifndef OptimizedCDebugFlags
-# define OptimizedCDebugFlags -O2 -fomit-frame-pointer GccAliasingArgs
-+# define OptimizedCDebugFlags DefaultGcc2DebugOpt DefaultGcc2OptimizeOpt GccAliasingArgs
++# define OptimizedCDebugFlags DefaultGcc2DebugOpt DefaultGcc2OptimizeOpt GccAliasingArgs
# endif
# define LinuxMachineDefines -D__s390__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
-@@ -886,16 +964,17 @@
+@@ -911,16 +988,17 @@
#endif /* s390Architecture */
#ifdef s390xArchitecture
-/*#define DefaultCCOptions -fsigned-char */
-#define OptimizedCDebugFlags -O3 -fomit-frame-pointer
+# ifndef OptimizedCDebugFlags
-+# define OptimizedCDebugFlags DefaultGcc2DebugOpt DefaultGcc2OptimizeOpt GccAliasingArgs
++# define OptimizedCDebugFlags DefaultGcc2DebugOpt DefaultGcc2OptimizeOpt GccAliasingArgs
+# endif
#define LinuxMachineDefines -D__s390x__
-#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
@@ -384,7 +368,7 @@
# endif
# define LinuxMachineDefines -D__sparc__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
-@@ -926,7 +1005,7 @@
+@@ -951,7 +1029,7 @@
# endif
# endif
# ifndef OptimizedCDebugFlags
@@ -393,7 +377,7 @@
# endif
# define LinuxMachineDefines -D__sh__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
-@@ -938,7 +1017,7 @@
+@@ -963,7 +1041,7 @@
#ifdef AMD64Architecture
# ifndef OptimizedCDebugFlags
@@ -402,9 +386,10 @@
# endif
# define LinuxMachineDefines -D__amd64__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
-diff -urN xc/config/cf~/xfree86.cf xc/config/cf/xfree86.cf
---- xc/config/cf~/xfree86.cf 2005-02-28 12:35:18.000000000 -0500
-+++ xc/config/cf/xfree86.cf 2005-06-13 19:41:42.010491371 -0500
+Index: xc/config/cf/xfree86.cf
+===================================================================
+--- xc/config/cf/xfree86.cf.orig 2005-07-01 04:56:12.000000000 -0400
++++ xc/config/cf/xfree86.cf 2005-07-27 20:33:45.000000000 -0400
@@ -233,6 +233,11 @@
#define GlideDriver /**/
#endif
@@ -417,7 +402,7 @@
/*
* There are three parameters that determine where and how the Matrox HAL
* library is used:
-@@ -477,8 +482,11 @@
+@@ -485,8 +490,11 @@
vga dummy fbdev vesa
# endif
@@ -431,7 +416,7 @@
# define DevelDRIDrivers /**/
-@@ -848,8 +856,14 @@
+@@ -872,8 +880,14 @@
savage nv cirrus DevelDrivers siliconmotion \
vga XF86OSCardDrivers XF86ExtraCardDrivers
# endif
@@ -447,7 +432,7 @@
# endif
#endif
-@@ -940,8 +954,13 @@
+@@ -968,8 +982,13 @@
DevelDrivers vga \
XF86OSCardDrivers XF86ExtraCardDrivers
# endif
@@ -462,7 +447,7 @@
# endif
#endif
-@@ -1034,7 +1053,7 @@
+@@ -1066,7 +1085,7 @@
# define TdfxDriDriver /**/
# endif
# ifndef DriDrivers
@@ -471,7 +456,7 @@
# endif
#endif
-@@ -1891,27 +1910,33 @@
+@@ -2009,33 +2028,39 @@
# define GccAliasingArgs /* */
#endif
@@ -502,6 +487,13 @@
# endif
#endif
+ #if HasGcc2 && defined(Ppc64Architecture)
+ # ifndef DefaultGcc2Ppc64Opt
+-# define DefaultGcc2Ppc64Opt -O2 GccAliasingArgs
++# define DefaultGcc2Ppc64Opt DefaultGcc2OptimizeOpt GccAliasingArgs
+ # endif
+ #endif
+
#if HasGcc2 && defined(PpcArchitecture)
# ifndef DefaultGcc2PpcOpt
-# define DefaultGcc2PpcOpt -O2 GccAliasingArgs
@@ -509,10 +501,11 @@
# endif
#endif
-diff -urN xc/config/cf~/xorg.cf xc/config/cf/xorg.cf
---- xc/config/cf~/xorg.cf 2005-06-13 19:41:22.971939000 -0500
-+++ xc/config/cf/xorg.cf 2005-06-13 19:41:42.012491429 -0500
-@@ -257,6 +257,11 @@
+Index: xc/config/cf/xorg.cf
+===================================================================
+--- xc/config/cf/xorg.cf.orig 2005-07-01 04:56:12.000000000 -0400
++++ xc/config/cf/xorg.cf 2005-07-27 20:36:10.000000000 -0400
+@@ -259,6 +259,11 @@
#define GlideDriver /**/
#endif
@@ -524,7 +517,7 @@
/*
* There are three parameters that determine where and how the Matrox HAL
* library is used:
-@@ -420,7 +425,13 @@
+@@ -422,7 +427,13 @@
/* SiS is 64-bit unclean as of this writing. */
# define i386DRIDrivers /**/
# endif
@@ -539,7 +532,7 @@
# endif
#endif /* i386Architecture || ia64Architecture */
-@@ -446,8 +457,13 @@
+@@ -458,8 +469,13 @@
# endif
/* SiS is 64-bit unclean as of this writing. */
@@ -554,7 +547,7 @@
# endif
#endif /*AMD64Arcitecture*/
-@@ -586,8 +602,13 @@
+@@ -599,8 +615,13 @@
* Glide is available for Alpha, therefore build tdfx DRM module.
* SiS is 64-bit unclean as of this writing.
*/
@@ -569,25 +562,17 @@
# endif
#endif /* AlphaArchitecture */
-@@ -755,7 +776,7 @@
- # define TdfxDriDriver /**/
+@@ -764,7 +785,7 @@
# endif
+ # define TdfxDriDriver /**/
# ifndef DriDrivers
-# define DriDrivers gamma r128
+# define DriDrivers gamma r128 TdfxDriDriver
# endif
#endif /* Ppc64Architecture */
-@@ -1557,33 +1578,39 @@
- # define GccAliasingArgs /* */
- #endif
+@@ -1553,37 +1574,37 @@
-+#if HasGcc2
-+# ifndef DefaultGcc2OptimizeOpt
-+# define DefaultGcc2OptimizeOpt -O2
-+# endif
-+#endif
-+
#if HasGcc2 && defined(i386Architecture)
# ifndef DefaultGcc2i386Opt
-# define DefaultGcc2i386Opt -O2 -fno-strength-reduce GccAliasingArgs
@@ -616,6 +601,13 @@
# endif
#endif
+ #if HasGcc2 && defined(MipsArchitecture)
+ # ifndef DefaultGcc2MipsOpt
+-# define DefaultGcc2MipsOpt -O2 GccAliasingArgs
++# define DefaultGcc2MipsOpt DefaultGcc2OptimizeOpt GccAliasingArgs
+ # endif
+ #endif
+
#if HasGcc2 && defined(PpcArchitecture)
# ifndef DefaultGcc2PpcOpt
-# define DefaultGcc2PpcOpt -O2 GccAliasingArgs
Modified: branches/6.9/debian/patches/general/004_imake_manpage_handling_overhaul.diff
===================================================================
--- branches/6.9/debian/patches/general/004_imake_manpage_handling_overhaul.diff 2005-07-28 03:14:36 UTC (rev 420)
+++ branches/6.9/debian/patches/general/004_imake_manpage_handling_overhaul.diff 2005-07-28 03:20:59 UTC (rev 421)
@@ -8,10 +8,11 @@
Not submitted upstream.
-diff -urN xc.orig/config/cf/Imake.tmpl xc/config/cf/Imake.tmpl
---- xc.orig/config/cf/Imake.tmpl 2005-02-02 00:17:15.186147368 +1100
-+++ xc/config/cf/Imake.tmpl 2005-02-02 00:20:07.980878576 +1100
-@@ -883,37 +883,82 @@
+Index: xc/config/cf/Imake.tmpl
+===================================================================
+--- xc/config/cf/Imake.tmpl.orig 2005-06-29 17:51:09.000000000 -0400
++++ xc/config/cf/Imake.tmpl 2005-07-27 20:36:30.000000000 -0400
+@@ -900,37 +900,82 @@
#define ManSourcePath $(MANPATH)/man
#endif
#ifndef ManDir
@@ -109,7 +110,7 @@
#endif
#ifndef AdminManDefs
#define AdminManDefs -D__adminmansuffix__=$(ADMINMANSUFFIX)
-@@ -1584,32 +1629,50 @@
+@@ -1607,32 +1652,50 @@
#ifndef SHsuf
#define SHsuf sh
#endif
@@ -173,7 +174,7 @@
#endif
#ifndef AdminManSuffix
#if SystemV || SystemV4
-@@ -1738,9 +1801,13 @@
+@@ -1761,9 +1824,13 @@
MANPATH = ManPath /* top of manual page tree */
MANSOURCEPATH = ManSourcePath /* prefix for man page sources */
MANDIR = ManDir /* man pages for commands */
@@ -188,7 +189,7 @@
DRIVERMANDIR = DriverManDir /* man pages for drivers */
LOGDIRECTORY = LogDirectory /* OS location of log files */
#ifdef VarRunDirectory
-@@ -1847,15 +1914,30 @@
+@@ -1870,15 +1937,30 @@
PERL = PerlCmd
PERLOPTS = PerlOptions
PERLENVSETUP = PerlEnvSetup
@@ -221,10 +222,11 @@
COMPRESSMANCMD = CompressManCmd
-diff -urN xc.orig/config/cf/gnu.cf xc/config/cf/gnu.cf
---- xc.orig/config/cf/gnu.cf 2005-02-02 00:17:15.217142656 +1100
-+++ xc/config/cf/gnu.cf 2005-02-02 00:20:07.951882984 +1100
-@@ -146,26 +146,6 @@
+Index: xc/config/cf/gnu.cf
+===================================================================
+--- xc/config/cf/gnu.cf.orig 2005-07-23 18:16:01.000000000 -0400
++++ xc/config/cf/gnu.cf 2005-07-27 20:36:30.000000000 -0400
+@@ -148,26 +148,6 @@
#define ConnectionFlags -DUNIXCONN -DTCPCONN
@@ -251,9 +253,10 @@
#ifndef StaticLibrary
#define StaticLibrary(libpath,libname) -Wl,-Bstatic Concat(-L,libpath) Concat(-l,libname) -Wl,-Bdynamic
#endif
-diff -urN xc.orig/config/cf/linux.cf xc/config/cf/linux.cf
---- xc.orig/config/cf/linux.cf 2005-02-02 00:17:15.203144784 +1100
-+++ xc/config/cf/linux.cf 2005-02-02 00:20:48.022791280 +1100
+Index: xc/config/cf/linux.cf
+===================================================================
+--- xc/config/cf/linux.cf.orig 2005-07-23 21:03:32.000000000 -0400
++++ xc/config/cf/linux.cf 2005-07-27 20:36:30.000000000 -0400
@@ -141,6 +141,8 @@
# define MiscManSuffix 7x
# define MiscManDir $(MANSOURCEPATH)7
@@ -263,7 +266,7 @@
/*
*
*
-@@ -1054,26 +1056,6 @@
+@@ -1078,26 +1080,6 @@
# define ConnectionFlags -DUNIXCONN -DTCPCONN
#endif
@@ -290,10 +293,11 @@
#ifndef StaticLibrary
# define StaticLibrary(libpath,libname) -Wl,-Bstatic Concat(-L,libpath) Concat(-l,libname) -Wl,-Bdynamic
#endif
-diff -urN xc.orig/config/cf/xfree86.cf xc/config/cf/xfree86.cf
---- xc.orig/config/cf/xfree86.cf 2005-02-02 00:17:15.298130344 +1100
-+++ xc/config/cf/xfree86.cf 2005-02-02 00:20:08.062866112 +1100
-@@ -1843,10 +1843,6 @@
+Index: xc/config/cf/xfree86.cf
+===================================================================
+--- xc/config/cf/xfree86.cf.orig 2005-07-27 20:33:45.000000000 -0400
++++ xc/config/cf/xfree86.cf 2005-07-27 20:36:30.000000000 -0400
+@@ -1961,10 +1961,6 @@
# define UseRgbTxt YES
#endif
@@ -304,10 +308,11 @@
/*
* GNU Compiler stuff
*/
-diff -urN xc.orig/config/cf/xorg.cf xc/config/cf/xorg.cf
---- xc.orig/config/cf/xorg.cf 2005-02-02 00:17:15.219142352 +1100
-+++ xc/config/cf/xorg.cf 2005-02-02 00:21:15.937547592 +1100
-@@ -1503,10 +1503,6 @@
+Index: xc/config/cf/xorg.cf
+===================================================================
+--- xc/config/cf/xorg.cf.orig 2005-07-27 20:36:10.000000000 -0400
++++ xc/config/cf/xorg.cf 2005-07-27 20:36:30.000000000 -0400
+@@ -1497,10 +1497,6 @@
# define UseRgbTxt YES
#endif
Modified: branches/6.9/debian/patches/general/008_fix_xgetpw_macro.diff
===================================================================
--- branches/6.9/debian/patches/general/008_fix_xgetpw_macro.diff 2005-07-28 03:14:36 UTC (rev 420)
+++ branches/6.9/debian/patches/general/008_fix_xgetpw_macro.diff 2005-07-28 03:20:59 UTC (rev 421)
@@ -2,10 +2,11 @@
Fix the _XGetpwnam macro to be more consistent; this patch by Robert Millan.
-diff -ruN xc-old/include/Xos_r.h xc/include/Xos_r.h
---- xc-old/include/Xos_r.h 2004-04-23 18:43:05.000000000 +0000
-+++ xc/include/Xos_r.h 2004-10-26 05:45:59.432421400 +0000
-@@ -217,8 +217,8 @@
+Index: xc/include/Xos_r.h
+===================================================================
+--- xc/include/Xos_r.h.orig 2005-03-02 14:29:31.000000000 -0500
++++ xc/include/Xos_r.h 2005-07-27 20:38:06.000000000 -0400
+@@ -220,8 +220,8 @@
*
* typedef ... _Xgetpwparams;
*
@@ -16,7 +17,7 @@
*/
#if defined(X_INCLUDE_PWD_H) && !defined(_XOS_INCLUDED_PWD_H)
-@@ -238,8 +238,8 @@
+@@ -241,8 +241,8 @@
extern struct passwd *getpwuid(), *getpwnam();
# endif
typedef int _Xgetpwparams; /* dummy */
@@ -27,7 +28,7 @@
#elif !defined(XOS_USE_MTSAFE_PWDAPI) || defined(XNO_MTSAFE_PWDAPI)
/* UnixWare 2.0, or other systems with thread support but no _r API. */
-@@ -316,12 +316,12 @@
+@@ -319,12 +319,12 @@
((p).pwp = &(p).pws), \
0 )
#endif
@@ -42,7 +43,7 @@
( (_Xos_processLock), \
(((p).pwp = getpwnam((u))) ? _Xpw_copyPasswd(p), 0 : 0), \
(_Xos_processUnlock), \
-@@ -336,21 +336,21 @@
+@@ -339,21 +339,21 @@
} _Xgetpwparams;
# if defined(_POSIX_REENTRANT_FUNCTIONS) || !defined(SVR4) || defined(Lynx)
# ifndef Lynx
@@ -76,23 +77,11 @@
# endif /* SVR4 */
#else /* _POSIX_THREAD_SAFE_FUNCTIONS */
-@@ -367,10 +367,10 @@
- struct passwd* pwp;
- } _Xgetpwparams;
- typedef int _Xgetpwret;
--# define _XGetpwuid(u,p) \
-+# define _XGetpwuid(u,p,s) \
- ((getpwuid_r((u),&(p).pws,(p).pwbuf,sizeof((p).pwbuf),&(p).pwp) == -1) ? \
- NULL : (p).pwp)
--# define _XGetpwnam(u,p) \
-+# define _XGetpwnam(u,p,s) \
- ((getpwnam_r((u),&(p).pws,(p).pwbuf,sizeof((p).pwbuf),&(p).pwp) == -1) ? \
- NULL : (p).pwp)
- #endif /* X_INCLUDE_PWD_H */
-diff -ruN xc-old/lib/X11/GetDflt.c xc/lib/X11/GetDflt.c
---- xc-old/lib/X11/GetDflt.c 2004-04-23 18:43:23.000000000 +0000
-+++ xc/lib/X11/GetDflt.c 2004-10-26 05:45:59.435420944 +0000
-@@ -126,10 +126,11 @@
+Index: xc/lib/X11/GetDflt.c
+===================================================================
+--- xc/lib/X11/GetDflt.c.orig 2005-05-13 18:53:43.000000000 -0400
++++ xc/lib/X11/GetDflt.c 2005-07-27 20:38:06.000000000 -0400
+@@ -129,10 +129,11 @@
(void) strncpy(dest, ptr, len-1);
dest[len-1] = '\0';
} else {
@@ -106,10 +95,11 @@
if (pw != NULL) {
(void) strncpy(dest, pw->pw_dir, len-1);
dest[len-1] = '\0';
-diff -ruN xc-old/lib/Xp/XpJob.c xc/lib/Xp/XpJob.c
---- xc-old/lib/Xp/XpJob.c 2004-04-23 18:43:46.000000000 +0000
-+++ xc/lib/Xp/XpJob.c 2004-10-26 05:50:19.246923592 +0000
-@@ -105,7 +105,8 @@
+Index: xc/lib/Xp/XpJob.c
+===================================================================
+--- xc/lib/Xp/XpJob.c.orig 2005-05-18 16:27:58.000000000 -0400
++++ xc/lib/Xp/XpJob.c 2005-07-27 20:38:06.000000000 -0400
+@@ -108,7 +108,8 @@
_Xgetpwparams pwparams;
#endif
struct passwd *pw;
@@ -119,10 +109,11 @@
if (pw && (PwName = pw->pw_name)) {
#else
-diff -ruN xc-old/lib/Xt/Initialize.c xc/lib/Xt/Initialize.c
---- xc-old/lib/Xt/Initialize.c 2004-04-23 18:43:52.000000000 +0000
-+++ xc/lib/Xt/Initialize.c 2004-10-26 05:51:16.445228128 +0000
-@@ -303,7 +303,8 @@
+Index: xc/lib/Xt/Initialize.c
+===================================================================
+--- xc/lib/Xt/Initialize.c.orig 2005-05-18 11:38:31.000000000 -0400
++++ xc/lib/Xt/Initialize.c 2005-07-27 20:38:06.000000000 -0400
+@@ -306,7 +306,8 @@
(void) strncpy (dest, ptr, len-1);
dest[len-1] = '\0';
} else {
@@ -132,7 +123,7 @@
(void) strncpy (dest, pw->pw_name, len-1);
dest[len-1] = '\0';
} else
-@@ -350,10 +351,11 @@
+@@ -353,10 +354,11 @@
(void) strncpy (dest, ptr, len-1);
dest[len-1] = '\0';
} else {
Modified: branches/6.9/debian/patches/general/009_disable_Xprt.diff
===================================================================
--- branches/6.9/debian/patches/general/009_disable_Xprt.diff 2005-07-28 03:14:36 UTC (rev 420)
+++ branches/6.9/debian/patches/general/009_disable_Xprt.diff 2005-07-28 03:20:59 UTC (rev 421)
@@ -1,6 +1,7 @@
-diff -Nru xc.orig/config/cf/linux.cf xc/config/cf/linux.cf
---- xc.orig/config/cf/linux.cf 2005-07-07 20:40:56.000000000 +0800
-+++ xc/config/cf/linux.cf 2005-07-07 20:41:57.000000000 +0800
+Index: xc/config/cf/linux.cf
+===================================================================
+--- xc/config/cf/linux.cf.orig 2005-07-27 20:36:30.000000000 -0400
++++ xc/config/cf/linux.cf 2005-07-27 20:40:18.000000000 -0400
@@ -233,6 +233,15 @@
# define FontLibSharedFreeType NO
# define HasLatex YES
@@ -17,10 +18,11 @@
# ifdef UseInstalled
# define RenderLibraryDir /usr
# define XftLibraryDir /usr
-diff -Nru xc.orig/programs/Xserver/Xprint/Imakefile xc/programs/Xserver/Xprint/Imakefile
---- xc.orig/programs/Xserver/Xprint/Imakefile 2005-07-07 20:40:46.000000000 +0800
-+++ xc/programs/Xserver/Xprint/Imakefile 2005-07-07 20:41:57.000000000 +0800
-@@ -125,12 +125,3 @@
+Index: xc/programs/Xserver/Xprint/Imakefile
+===================================================================
+--- xc/programs/Xserver/Xprint/Imakefile.orig 2005-03-23 14:58:45.000000000 -0500
++++ xc/programs/Xserver/Xprint/Imakefile 2005-07-27 20:40:18.000000000 -0400
+@@ -124,12 +124,3 @@
#endif
DependTarget()
Modified: branches/6.9/debian/patches/general/010_donot_build_XpConfig.diff
===================================================================
--- branches/6.9/debian/patches/general/010_donot_build_XpConfig.diff 2005-07-28 03:14:36 UTC (rev 420)
+++ branches/6.9/debian/patches/general/010_donot_build_XpConfig.diff 2005-07-28 03:20:59 UTC (rev 421)
@@ -2,10 +2,11 @@
This patch by Fabio M. Di Nitto.
-diff -ruN xc-old/programs/Xserver/Imakefile xc/programs/Xserver/Imakefile
---- xc-old/programs/Xserver/Imakefile 2004-09-01 00:59:17.000000000 +0000
-+++ xc/programs/Xserver/Imakefile 2004-10-29 06:12:42.000000000 +0000
-@@ -133,7 +133,9 @@
+Index: xc/programs/Xserver/Imakefile
+===================================================================
+--- xc/programs/Xserver/Imakefile.orig 2005-07-01 04:56:12.000000000 -0400
++++ xc/programs/Xserver/Imakefile 2005-07-27 20:40:55.000000000 -0400
+@@ -143,7 +143,9 @@
#if BuildXprint
Modified: branches/6.9/debian/patches/general/011_SECURITY_makedepend_safer.diff
===================================================================
--- branches/6.9/debian/patches/general/011_SECURITY_makedepend_safer.diff 2005-07-28 03:14:36 UTC (rev 420)
+++ branches/6.9/debian/patches/general/011_SECURITY_makedepend_safer.diff 2005-07-28 03:20:59 UTC (rev 421)
@@ -6,10 +6,11 @@
Not submitted upstream.
-diff -ruN xc-old/config/util/mdepend.cpp xc/config/util/mdepend.cpp
---- xc-old/config/util/mdepend.cpp 2004-04-23 20:42:00.000000000 +0200
-+++ xc/config/util/mdepend.cpp 2004-10-18 13:21:29.772427816 +0200
-@@ -30,14 +30,20 @@
+Index: xc/config/util/mdepend.cpp
+===================================================================
+--- xc/config/util/mdepend.cpp.orig 2004-10-30 16:33:43.000000000 -0400
++++ xc/config/util/mdepend.cpp 2005-07-27 21:24:13.000000000 -0400
+@@ -31,14 +31,20 @@
silent='-'
TMP=`pwd`/.mdep$$
@@ -37,7 +38,7 @@
echo " \c" > $CPPCMD
if [ `wc -c < $CPPCMD` -eq 1 ]
-@@ -253,5 +259,5 @@
+@@ -276,5 +282,5 @@
esac
Modified: branches/6.9/debian/patches/general/011a_recognize_glibc_2.3.2_locale_names.diff
===================================================================
--- branches/6.9/debian/patches/general/011a_recognize_glibc_2.3.2_locale_names.diff 2005-07-28 03:14:36 UTC (rev 420)
+++ branches/6.9/debian/patches/general/011a_recognize_glibc_2.3.2_locale_names.diff 2005-07-28 03:20:59 UTC (rev 421)
@@ -57,8 +57,8 @@
Index: xc/nls/compose.dir
===================================================================
---- xc/nls/compose.dir (revision 292)
-+++ xc/nls/compose.dir (working copy)
+--- xc/nls/compose.dir.orig 2005-01-18 20:53:55.000000000 -0500
++++ xc/nls/compose.dir 2005-07-27 21:00:47.000000000 -0400
@@ -1,14 +1,22 @@
XCOMM $Xorg: compose.dir,v 1.3 2000/08/17 19:46:48 cpqbld Exp $
XCOMM
@@ -85,32 +85,28 @@
iso8859-6/Compose: ar_BH.ISO8859-6
iso8859-6/Compose: ar_DZ.ISO8859-6
iso8859-6/Compose: ar_EG.ISO8859-6
-@@ -21,16 +29,21 @@
+@@ -21,13 +29,17 @@
iso8859-6/Compose: ar_OM.ISO8859-6
iso8859-6/Compose: ar_QA.ISO8859-6
iso8859-6/Compose: ar_SA.ISO8859-6
-+iso8859-6/Compose: ar_SD.ISO8859-6
-+iso8859-6/Compose: ar_SY.ISO8859-6
++iso8859-6/Compose: ar_SD.ISO8859-6
++iso8859-6/Compose: ar_SY.ISO8859-6
iso8859-6/Compose: ar_TN.ISO8859-6
iso8859-6/Compose: ar_YE.ISO8859-6
iso8859-9e/Compose: az_AZ.ISO8859-9E
-koi8-c/Compose: a3_AZ.KOI8-C
-microsoft-cp1251/Compose: be_BY.CP1251
+koi8-c/Compose: az_AZ.KOI8-C
-+iso8859-5/Compose: be_BY.ISO8859-5
-+XCOMM microsoft-cp1251/Compose: be_BY.CP1251
++iso8859-5/Compose: be_BY.ISO8859-5
++XCOMM microsoft-cp1251/Compose: be_BY.CP1251
iso8859-5/Compose: bg_BG.ISO8859-5
-microsoft-cp1251/Compose: bg_BG.CP1251
-+XCOMM microsoft-cp1251/Compose: bg_BG.CP1251
-+koi8-r/Compose: bg_BG.KOI8-R
++XCOMM microsoft-cp1251/Compose: bg_BG.CP1251
++koi8-r/Compose: bg_BG.KOI8-R
iso8859-1/Compose: br_FR.ISO8859-1
iso8859-14/Compose: br_FR.ISO8859-14
iso8859-15/Compose: br_FR.ISO8859-15
-+iso8859-2/Compose: bs_BA.ISO8859-2
- iso8859-1/Compose: ca_ES.ISO8859-1
- iso8859-15/Compose: ca_ES.ISO8859-15
- iso8859-2/Compose: cs_CZ.ISO8859-2
-@@ -41,6 +54,8 @@
+@@ -42,6 +54,8 @@
iso8859-15/Compose: da_DK.ISO8859-15
iso8859-1/Compose: de_AT.ISO8859-1
iso8859-15/Compose: de_AT.ISO8859-15
@@ -119,7 +115,7 @@
iso8859-1/Compose: de_CH.ISO8859-1
iso8859-15/Compose: de_CH.ISO8859-15
iso8859-1/Compose: de_DE.ISO8859-1
-@@ -50,15 +65,25 @@
+@@ -51,15 +65,25 @@
iso8859-1/Compose: de_LU.ISO8859-1
iso8859-15/Compose: de_LU.ISO8859-15
iso8859-7/Compose: el_GR.ISO8859-7
@@ -145,7 +141,7 @@
iso8859-1/Compose: en_TT.ISO8859-1
iso8859-1/Compose: en_UK.ISO8859-1
iso8859-15/Compose: en_UK.ISO8859-15
-@@ -66,7 +91,11 @@
+@@ -67,7 +91,11 @@
iso8859-15/Compose: en_US.ISO8859-15
iso8859-1/Compose: en_ZA.ISO8859-1
iso8859-15/Compose: en_ZA.ISO8859-15
@@ -158,7 +154,7 @@
iso8859-1/Compose: es_AR.ISO8859-1
iso8859-1/Compose: es_BO.ISO8859-1
iso8859-1/Compose: es_CL.ISO8859-1
-@@ -85,6 +114,7 @@
+@@ -86,6 +114,7 @@
iso8859-1/Compose: es_PR.ISO8859-1
iso8859-1/Compose: es_PY.ISO8859-1
iso8859-1/Compose: es_SV.ISO8859-1
@@ -166,7 +162,7 @@
iso8859-1/Compose: es_UY.ISO8859-1
iso8859-1/Compose: es_VE.ISO8859-1
iso8859-1/Compose: et_EE.ISO8859-1
-@@ -93,6 +123,8 @@
+@@ -94,6 +123,8 @@
iso8859-15/Compose: et_EE.ISO8859-15
iso8859-1/Compose: eu_ES.ISO8859-1
iso8859-15/Compose: eu_ES.ISO8859-15
@@ -175,7 +171,7 @@
isiri-3342/Compose: fa_IR.ISIRI-3342
iso8859-1/Compose: fi_FI.ISO8859-1
iso8859-15/Compose: fi_FI.ISO8859-15
-@@ -120,17 +152,15 @@
+@@ -121,17 +152,15 @@
iso8859-14/Compose: gv_GB.ISO8859-14
iso8859-15/Compose: gv_GB.ISO8859-15
iso8859-8/Compose: he_IL.ISO8859-8
@@ -194,7 +190,7 @@
iso8859-1/Compose: it_IT.ISO8859-1
iso8859-15/Compose: it_IT.ISO8859-15
ja/Compose: ja_JP.eucJP
-@@ -139,14 +169,20 @@
+@@ -140,14 +169,20 @@
georgian-academy/Compose: ka_GE.GEORGIAN-ACADEMY
georgian-ps/Compose: ka_GE.GEORGIAN-PS
iso8859-1/Compose: kl_GL.ISO8859-1
@@ -217,7 +213,7 @@
iso8859-4/Compose: lt_LT.ISO8859-4
iso8859-13/Compose: lt_LT.ISO8859-13
iso8859-4/Compose: lv_LV.ISO8859-4
-@@ -154,7 +190,7 @@
+@@ -155,7 +190,7 @@
iso8859-13/Compose: mi_NZ.ISO8859-13
iso8859-5/Compose: mk_MK.ISO8859-5
XCOMM mk_MK.UTF-8/Compose: mk_MK.UTF-8
@@ -226,18 +222,18 @@
iso8859-1/Compose: ms_MY.ISO8859-1
iso8859-3/Compose: mt_MT.ISO8859-3
iso8859-1/Compose: nl_BE.ISO8859-1
-@@ -171,58 +207,88 @@
+@@ -172,63 +207,92 @@
iso8859-15/Compose: ny_NO.ISO8859-15
iso8859-1/Compose: oc_FR.ISO8859-1
iso8859-15/Compose: oc_FR.ISO8859-15
-iso8859-1/Compose: pd_DE.ISO8859-1
-iso8859-1/Compose: pd_US.ISO8859-1
-+iso8859-1/Compose: om_KE.ISO8859-1
++iso8859-1/Compose: om_KE.ISO8859-1
+XCOMM Presumably, "pd" is "Pennsylvania 'Dutch'", a U.S. dialect of German.
+XCOMM This is not an ISO language code defined for it, and the GNU C Library
+XCOMM doesn't support it.
-+XCOMM iso8859-1/Compose: pd_DE.ISO8859-1
-+XCOMM iso8859-1/Compose: pd_US.ISO8859-1
++XCOMM iso8859-1/Compose: pd_DE.ISO8859-1
++XCOMM iso8859-1/Compose: pd_US.ISO8859-1
iso8859-1/Compose: ph_PH.ISO8859-1
iso8859-2/Compose: pl_PL.ISO8859-2
iso8859-1/Compose: pp_AN.ISO8859-1
@@ -246,27 +242,26 @@
iso8859-1/Compose: pt_PT.ISO8859-1
iso8859-15/Compose: pt_PT.ISO8859-15
iso8859-2/Compose: ro_RO.ISO8859-2
-+iso8859-5/Compose: ru_RU.ISO8859-5
-+XCOMM microsoft-cp1251/Compose: ru_RU.CP1251
++XCOMM microsoft-cp1251/Compose: ru_RU.CP1251
koi8-r/Compose: ru_RU.KOI8-R
-iso8859-5/Compose: ru_RU.ISO8859-5
-microsoft-cp1251/Compose: ru_RU.CP1251
-+XCOMM microsoft-cp1251/Compose: ru_UA.CP1251
++XCOMM microsoft-cp1251/Compose: ru_UA.CP1251
koi8-u/Compose: ru_UA.KOI8-U
iso8859-2/Compose: sh_YU.ISO8859-2
iso8859-2/Compose: sk_SK.ISO8859-2
-iso8859-2/Compose: sl_CS.ISO8859-2
iso8859-2/Compose: sl_SI.ISO8859-2
-+iso8859-1/Compose: so_DJ.ISO8859-1
-+iso8859-1/Compose: so_KE.ISO8859-1
-+iso8859-1/Compose: so_SO.ISO8859-1
++iso8859-1/Compose: so_DJ.ISO8859-1
++iso8859-1/Compose: so_KE.ISO8859-1
++iso8859-1/Compose: so_SO.ISO8859-1
iso8859-5/Compose: sp_YU.ISO8859-5
iso8859-2/Compose: sq_AL.ISO8859-2
iso8859-2/Compose: sr_SP.ISO8859-2
iso8859-2/Compose: sr_YU.ISO8859-2
iso8859-5/Compose: sr_YU.ISO8859-5
-+XCOMM microsoft-cp1251/Compose: sr_YU.CP1251
-+iso8859-1/Compose: st_ZA.ISO8859-1
++XCOMM microsoft-cp1251/Compose: sr_YU.CP1251
++iso8859-1/Compose: st_ZA.ISO8859-1
iso8859-1/Compose: sv_FI.ISO8859-1
iso8859-15/Compose: sv_FI.ISO8859-15
iso8859-1/Compose: sv_SE.ISO8859-1
@@ -275,75 +270,81 @@
koi8-c/Compose: tg_TJ.KOI8-C
+XCOMM There was once a blank th_TH Compose map, but it was removed. See
+XCOMM <URL: http://linux.thai.net/~thep/thaisupp/ >.
-+XCOMM iso8859-11/Compose: th_TH.ISO8859-11
-+XCOMM th_TH/Compose: th_TH.TIS620
++XCOMM iso8859-11/Compose: th_TH.ISO8859-11
++XCOMM th_TH/Compose: th_TH.TIS620
iso8859-1/Compose: tl_PH.ISO8859-1
iso8859-9/Compose: tr_TR.ISO8859-9
tatar-cyr/Compose: tt_RU.TATAR-CYR
koi8-c/Compose: tt_RU.KOI8-C
-+iso8859-5/Compose: uk_UA.ISO8859-5
++iso8859-5/Compose: uk_UA.ISO8859-5
koi8-u/Compose: uk_UA.KOI8-U
-microsoft-cp1256/Compose: ur_PK.CP1256
-+XCOMM microsoft-cp1251/Compose: uk_UA.CP1251
-+XCOMM microsoft-cp1256/Compose: ur_PK.CP1256
-+iso8859-1/Compose: uz_UZ.ISO8859-1
++XCOMM microsoft-cp1251/Compose: uk_UA.CP1251
++XCOMM microsoft-cp1256/Compose: ur_PK.CP1256
++iso8859-1/Compose: uz_UZ.ISO8859-1
vi_VN.viscii/Compose: vi_VN.VISCII
vi_VN.tcvn/Compose: vi_VN.TCVN
iso8859-1/Compose: wa_BE.ISO8859-1
-microsoft-cp1255/Compose: yi_US.CP1256
-+iso8859-15/Compose: wa_BE.ISO8859-15
-+iso8859-1/Compose: xh_ZA.ISO8859-1
-+XCOMM microsoft-cp1255/Compose: yi_US.CP1255
++iso8859-15/Compose: wa_BE.ISO8859-15
++iso8859-1/Compose: xh_ZA.ISO8859-1
++XCOMM microsoft-cp1255/Compose: yi_US.CP1255
zh_CN/Compose: zh_CN.eucCN
-zh_CN/Compose: zh_CN.GB2312
-zh_CN.gbk/Compose: zh_CN.GBK
-+zh_CN/Compose: zh_CN.gb2312
-+zh_CN.gbk/Compose: zh_CN.gbk
-+zh_HK.big5/Compose: zh_HK.big5
-+zh_HK.big5hkscs/Compose: zh_HK.big5-hkscs
-+zh_HK.big5hkscs/Compose: zh_HK.Big5-HKSCS
-+zh_HK.big5hkscs/Compose: zh_HK.big5hkscs
-+zh_HK.big5hkscs/Compose: zh_HK.Big5HKSCS
-+zh_CN/Compose: zh_SG.gb2312
-+zh_CN.gbk/Compose: zh_SG.gbk
++zh_CN/Compose: zh_CN.gb2312
++zh_CN.gbk/Compose: zh_CN.gbk
++zh_HK.big5/Compose: zh_HK.big5
++zh_HK.big5hkscs/Compose: zh_HK.big5-hkscs
++zh_HK.big5hkscs/Compose: zh_HK.Big5-HKSCS
++zh_HK.big5hkscs/Compose: zh_HK.big5hkscs
++zh_HK.big5hkscs/Compose: zh_HK.Big5HKSCS
++zh_CN/Compose: zh_SG.gb2312
++zh_CN.gbk/Compose: zh_SG.gbk
+ zh_CN.gb18030/Compose: zh_CN.GB18030
+ zh_HK.big5/Compose: zh_HK.big5
+ zh_HK.big5/Compose: zh_HK.Big5
+ zh_HK.big5hkscs/Compose: zh_HK.big5hkscs
+ zh_HK.big5hkscs/Compose: zh_HK.Big5HKSCS
zh_TW.big5/Compose: zh_TW.big5
-zh_TW.big5/Compose: zh_TW.Big5
zh_TW/Compose: zh_TW.eucTW
-XCOMM
-XCOMM
-+iso8859-1/Compose: zu_ZA.ISO8859-1
++iso8859-1/Compose: zu_ZA.ISO8859-1
+XCOMM Note: The UTF-8 locales don't work correctly yet. Work in progress.
+XCOMM a3 is not an ISO 639 language code, but in Cyrillic, "Z" looks like "3".
-+en_US.UTF-8/Compose: a3_AZ.UTF-8
-+en_US.UTF-8/Compose: aa_ER.UTF-8
-+en_US.UTF-8/Compose: aa_ET.UTF-8
++en_US.UTF-8/Compose: a3_AZ.UTF-8
++en_US.UTF-8/Compose: aa_ER.UTF-8
++en_US.UTF-8/Compose: aa_ET.UTF-8
en_US.UTF-8/Compose: af_ZA.UTF-8
-+en_US.UTF-8/Compose: am_ET.UTF-8
++en_US.UTF-8/Compose: am_ET.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_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
-+en_US.UTF-8/Compose: ar_IN.UTF-8
++en_US.UTF-8/Compose: ar_IN.UTF-8
en_US.UTF-8/Compose: ar_IQ.UTF-8
en_US.UTF-8/Compose: ar_JO.UTF-8
en_US.UTF-8/Compose: ar_KW.UTF-8
-@@ -232,17 +298,20 @@
+@@ -238,19 +302,21 @@
en_US.UTF-8/Compose: ar_OM.UTF-8
en_US.UTF-8/Compose: ar_QA.UTF-8
en_US.UTF-8/Compose: ar_SA.UTF-8
-+en_US.UTF-8/Compose: ar_SD.UTF-8
-+en_US.UTF-8/Compose: ar_SY.UTF-8
++en_US.UTF-8/Compose: ar_SD.UTF-8
++en_US.UTF-8/Compose: ar_SY.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 bs_BA.UTF-8
en_US.UTF-8/Compose: az_AZ.UTF-8
-en_US.UTF-8/Compose: a3_AZ.UTF-8
en_US.UTF-8/Compose: be_BY.UTF-8
en_US.UTF-8/Compose: bg_BG.UTF-8
-+en_US.UTF-8/Compose: bn_BD.UTF-8
-+en_US.UTF-8/Compose: bn_IN.UTF-8
++en_US.UTF-8/Compose: bn_BD.UTF-8
+ en_US.UTF-8/Compose: bn_IN.UTF-8
en_US.UTF-8/Compose: br_FR.UTF-8
-+en_US.UTF-8/Compose: byn_ER.UTF-8
++en_US.UTF-8/Compose: byn_ER.UTF-8
en_US.UTF-8/Compose: ca_ES.UTF-8
en_US.UTF-8/Compose: cs_CZ.UTF-8
en_US.UTF-8/Compose: cy_GB.UTF-8
@@ -351,7 +352,7 @@
en_US.UTF-8/Compose: da_DK.UTF-8
en_US.UTF-8/Compose: de_AT.UTF-8
en_US.UTF-8/Compose: de_BE.UTF-8
-@@ -252,17 +321,28 @@
+@@ -260,17 +326,28 @@
en_US.UTF-8/Compose: de_LU.UTF-8
el_GR.UTF-8/Compose: el_GR.UTF-8
en_US.UTF-8/Compose: en_AU.UTF-8
@@ -381,7 +382,7 @@
en_US.UTF-8/Compose: es_AR.UTF-8
en_US.UTF-8/Compose: es_BO.UTF-8
en_US.UTF-8/Compose: es_CL.UTF-8
-@@ -280,10 +360,12 @@
+@@ -288,10 +365,12 @@
en_US.UTF-8/Compose: es_PR.UTF-8
en_US.UTF-8/Compose: es_PY.UTF-8
en_US.UTF-8/Compose: es_SV.UTF-8
@@ -394,210 +395,217 @@
en_US.UTF-8/Compose: fa_IR.UTF-8
en_US.UTF-8/Compose: fi_FI.UTF-8
en_US.UTF-8/Compose: fo_FO.UTF-8
-@@ -294,7 +376,10 @@
+@@ -302,6 +381,8 @@
en_US.UTF-8/Compose: fr_LU.UTF-8
en_US.UTF-8/Compose: ga_IE.UTF-8
en_US.UTF-8/Compose: gd_GB.UTF-8
-+en_US.UTF-8/Compose: gez_ER.UTF-8
-+en_US.UTF-8/Compose: gez_ET.UTF-8
++en_US.UTF-8/Compose: gez_ER.UTF-8
++en_US.UTF-8/Compose: gez_ET.UTF-8
en_US.UTF-8/Compose: gl_ES.UTF-8
-+en_US.UTF-8/Compose: gu_IN.UTF-8
+ en_US.UTF-8/Compose: gu_IN.UTF-8
en_US.UTF-8/Compose: gv_GB.UTF-8
- en_US.UTF-8/Compose: he_IL.UTF-8
- en_US.UTF-8/Compose: hi_IN.UTF-8
-@@ -306,23 +391,40 @@
+@@ -315,9 +396,11 @@
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
-+en_US.UTF-8/Compose: iw_IL.UTF-8
-+en_US.UTF-8/Compose: ja_JP.UTF-8
++en_US.UTF-8/Compose: iw_IL.UTF-8
+ en_US.UTF-8/Compose: ja_JP.UTF-8
en_US.UTF-8/Compose: ka_GE.UTF-8
en_US.UTF-8/Compose: kl_GL.UTF-8
-+en_US.UTF-8/Compose: kn_IN.UTF-8
-+en_US.UTF-8/Compose: ko_KR.UTF-8
++en_US.UTF-8/Compose: kn_IN.UTF-8
+ en_US.UTF-8/Compose: ko_KR.UTF-8
en_US.UTF-8/Compose: kw_GB.UTF-8
en_US.UTF-8/Compose: lo_LA.UTF-8
- en_US.UTF-8/Compose: lt_LT.UTF-8
+@@ -325,16 +408,28 @@
en_US.UTF-8/Compose: lv_LV.UTF-8
en_US.UTF-8/Compose: mi_NZ.UTF-8
en_US.UTF-8/Compose: mk_MK.UTF-8
-+en_US.UTF-8/Compose: ml_IN.UTF-8
-+en_US.UTF-8/Compose: mn_MN.UTF-8
-+en_US.UTF-8/Compose: mr_IN.UTF-8
++en_US.UTF-8/Compose: ml_IN.UTF-8
++en_US.UTF-8/Compose: mn_MN.UTF-8
++en_US.UTF-8/Compose: mr_IN.UTF-8
en_US.UTF-8/Compose: ms_MY.UTF-8
-+en_US.UTF-8/Compose: mt_MT.UTF-8
-+en_US.UTF-8/Compose: ne_NP.UTF-8
++en_US.UTF-8/Compose: mt_MT.UTF-8
++en_US.UTF-8/Compose: ne_NP.UTF-8
en_US.UTF-8/Compose: nl_BE.UTF-8
en_US.UTF-8/Compose: nl_NL.UTF-8
en_US.UTF-8/Compose: no_NO.UTF-8
en_US.UTF-8/Compose: nb_NO.UTF-8
-en_US.UTF-8/Compose: ny_NO.UTF-8
-+en_US.UTF-8/Compose: nn_NO.UTF-8
++en_US.UTF-8/Compose: nn_NO.UTF-8
+XCOMM ny is the language code for Nyanja (spoken in Malawi), not Nynorsk.
+XCOMM See <URL: http://www.ethnologue.com/show_iso639.asp?code=nya >.
-+XCOMM en_US.UTF-8/Compose: ny_NO.UTF-8
++XCOMM en_US.UTF-8/Compose: ny_NO.UTF-8
en_US.UTF-8/Compose: oc_FR.UTF-8
++en_US.UTF-8/Compose: om_ET.UTF-8
+ en_US.UTF-8/Compose: pa_IN.UTF-8
-en_US.UTF-8/Compose: pd_DE.UTF-8
-en_US.UTF-8/Compose: pd_US.UTF-8
-+en_US.UTF-8/Compose: om_ET.UTF-8
-+en_US.UTF-8/Compose: pa_IN.UTF-8
+XCOMM Presumably, "pd" is "Pennsylvania 'Dutch'", a U.S. dialect of German.
+XCOMM This is not an ISO language code defined for it, and the GNU C Library
+XCOMM doesn't support it.
-+XCOMM en_US.UTF-8/Compose: pd_DE.UTF-8
-+XCOMM en_US.UTF-8/Compose: pd_US.UTF-8
++XCOMM en_US.UTF-8/Compose: pd_DE.UTF-8
++XCOMM en_US.UTF-8/Compose: pd_US.UTF-8
en_US.UTF-8/Compose: ph_PH.UTF-8
en_US.UTF-8/Compose: pl_PL.UTF-8
en_US.UTF-8/Compose: pp_AN.UTF-8
-@@ -331,15 +433,24 @@
+@@ -343,16 +438,25 @@
en_US.UTF-8/Compose: ro_RO.UTF-8
en_US.UTF-8/Compose: ru_RU.UTF-8
en_US.UTF-8/Compose: ru_UA.UTF-8
-+en_US.UTF-8/Compose: se_NO.UTF-8
-+en_US.UTF-8/Compose: sh_YU.UTF-8
-+en_US.UTF-8/Compose: sid_ET.UTF-8
++en_US.UTF-8/Compose: se_NO.UTF-8
++en_US.UTF-8/Compose: sh_YU.UTF-8
++en_US.UTF-8/Compose: sid_ET.UTF-8
+ en_US.UTF-8/Compose: si_LK.UTF-8
en_US.UTF-8/Compose: sk_SK.UTF-8
en_US.UTF-8/Compose: sl_SI.UTF-8
-+en_US.UTF-8/Compose: so_ET.UTF-8
++en_US.UTF-8/Compose: so_ET.UTF-8
en_US.UTF-8/Compose: sq_AL.UTF-8
en_US.UTF-8/Compose: sr_YU.UTF-8
-+en_US.UTF-8/Compose: st_ZA.UTF-8
++en_US.UTF-8/Compose: st_ZA.UTF-8
en_US.UTF-8/Compose: sv_FI.UTF-8
en_US.UTF-8/Compose: sv_SE.UTF-8
en_US.UTF-8/Compose: ta_IN.UTF-8
-+en_US.UTF-8/Compose: te_IN.UTF-8
++en_US.UTF-8/Compose: te_IN.UTF-8
en_US.UTF-8/Compose: tg_TJ.UTF-8
en_US.UTF-8/Compose: th_TH.UTF-8
-+en_US.UTF-8/Compose: ti_ER.UTF-8
-+en_US.UTF-8/Compose: ti_ET.UTF-8
-+en_US.UTF-8/Compose: tig_ER.UTF-8
++en_US.UTF-8/Compose: ti_ER.UTF-8
++en_US.UTF-8/Compose: ti_ET.UTF-8
++en_US.UTF-8/Compose: tig_ER.UTF-8
en_US.UTF-8/Compose: tl_PH.UTF-8
en_US.UTF-8/Compose: tr_TR.UTF-8
en_US.UTF-8/Compose: tt_RU.UTF-8
-@@ -348,4 +459,10 @@
+@@ -361,7 +465,12 @@
en_US.UTF-8/Compose: uz_UZ.UTF-8
en_US.UTF-8/Compose: vi_VN.UTF-8
en_US.UTF-8/Compose: wa_BE.UTF-8
-+en_US.UTF-8/Compose: xh_ZA.UTF-8
++en_US.UTF-8/Compose: xh_ZA.UTF-8
en_US.UTF-8/Compose: yi_US.UTF-8
-+en_US.UTF-8/Compose: zh_CN.UTF-8
-+en_US.UTF-8/Compose: zh_HK.UTF-8
-+en_US.UTF-8/Compose: zh_SG.UTF-8
-+en_US.UTF-8/Compose: zh_TW.UTF-8
-+en_US.UTF-8/Compose: zu_ZA.UTF-8
++en_US.UTF-8/Compose: zh_CN.UTF-8
++en_US.UTF-8/Compose: zh_HK.UTF-8
++en_US.UTF-8/Compose: zh_SG.UTF-8
+ en_US.UTF-8/Compose: zh_TW.UTF-8
++en_US.UTF-8/Compose: zu_ZA.UTF-8
+ iso8859-2/Compose: bs_BA.ISO8859-2
+ en_US.UTF-8/Compose: bs_BA.UTF-8
Index: xc/nls/locale.alias
===================================================================
---- xc/nls/locale.alias (revision 292)
-+++ xc/nls/locale.alias (working copy)
-@@ -17,58 +17,104 @@
+--- xc/nls/locale.alias.orig 2005-01-13 23:59:05.000000000 -0500
++++ xc/nls/locale.alias 2005-07-27 21:18:05.000000000 -0400
+@@ -17,43 +17,85 @@
Cextend: en_US.ISO8859-1
Cextend.en: en_US.ISO8859-1
English_United-States.437: C
-+XCOMM a3 is not an ISO 639 language code, but in Cyrillic, "Z" looks like "3".
-+a3: a3_AZ.KOI8-C
-+a3_AZ: a3_AZ.KOI8-C
-+a3_AZ.koi8c: a3_AZ.KOI8-C
-+aa_DJ: aa_DJ.ISO8859-1
-+aa_DJ.iso88591: aa_DJ.ISO8859-1
-+aa_DJ.ISO-8859-1: aa_DJ.ISO8859-1
-+aa_ER: aa_ER.UTF-8
-+aa_ER@saaho: aa_ER.UTF-8
-+aa_ER.UTF-8@saaho: aa_ER.UTF-8
-+aa_ET: aa_ET.UTF-8
++XCOMM a3 is not an ISO 639 language code, but in Cyrillic, "Z" looks like
++"3".
++a3: a3_AZ.KOI8-C
++a3_AZ: a3_AZ.KOI8-C
++a3_AZ.koi8c: a3_AZ.KOI8-C
++aa_DJ: aa_DJ.ISO8859-1
++aa_DJ.iso88591: aa_DJ.ISO8859-1
++aa_DJ.ISO-8859-1: aa_DJ.ISO8859-1
++aa_ER: aa_ER.UTF-8
++aa_ER@saaho: aa_ER.UTF-8
++aa_ER.UTF-8@saaho: aa_ER.UTF-8
++aa_ET: aa_ET.UTF-8
af: af_ZA.ISO8859-1
af_ZA: af_ZA.ISO8859-1
af_ZA.iso88591: af_ZA.ISO8859-1
-+af_ZA.ISO-8859-1: af_ZA.ISO8859-1
++af_ZA.ISO-8859-1: af_ZA.ISO8859-1
am: am_ET.UTF-8
-+am_ET: am_ET.UTF-8
-+an_ES: an_ES.ISO8859-15
-+an_ES.ISO-8859-15: an_ES.ISO8859-15
++am_ET: am_ET.UTF-8
++an_ES: an_ES.ISO8859-15
++an_ES.ISO-8859-15: an_ES.ISO8859-15
ar: ar_AA.ISO8859-6
ar_AA: ar_AA.ISO8859-6
AR_AA: ar_AA.ISO8859-6
Ar_AA: ar_AA.ISO8859-6
AR_AA.UTF-8: ar_AA.UTF-8
ar_AA.iso88596: ar_AA.ISO8859-6
-+ar_AA.ISO-8859-6: ar_AA.ISO8859-6
++ar_AA.ISO-8859-6: ar_AA.ISO8859-6
ar_AE: ar_AE.ISO8859-6
-+ar_AE.iso88596: ar_AE.ISO8859-6
-+ar_AE.ISO-8859-6: ar_AE.ISO8859-6
++ar_AE.iso88596: ar_AE.ISO8859-6
++ar_AE.ISO-8859-6: ar_AE.ISO8859-6
ar_AE.utf8: ar_AE.UTF-8
ar_BH: ar_BH.ISO8859-6
-+ar_BH.iso88596: ar_BH.ISO8859-6
-+ar_BH.ISO-8859-6: ar_BH.ISO8859-6
++ar_BH.iso88596: ar_BH.ISO8859-6
++ar_BH.ISO-8859-6: ar_BH.ISO8859-6
ar_BH.utf8: ar_BH.UTF-8
ar_DZ: ar_DZ.ISO8859-6
-+ar_DZ.iso88596: ar_DZ.ISO8859-6
-+ar_DZ.ISO-8859-6: ar_DZ.ISO8859-6
++ar_DZ.iso88596: ar_DZ.ISO8859-6
++ar_DZ.ISO-8859-6: ar_DZ.ISO8859-6
ar_DZ.utf8: ar_DZ.UTF-8
ar_EG: ar_EG.ISO8859-6
ar_EG.iso88596: ar_EG.ISO8859-6
-+ar_EG.ISO-8859-6: ar_EG.ISO8859-6
++ar_EG.ISO-8859-6: ar_EG.ISO8859-6
ar_EG.utf8: ar_EG.UTF-8
-+ar_IN: ar_IN.UTF-8
++ar_IN: ar_IN.UTF-8
ar_IQ: ar_IQ.ISO8859-6
-+ar_IQ.iso88596: ar_IQ.ISO8859-6
-+ar_IQ.ISO-8859-6: ar_IQ.ISO8859-6
++ar_IQ.iso88596: ar_IQ.ISO8859-6
++ar_IQ.ISO-8859-6: ar_IQ.ISO8859-6
ar_IQ.utf8: ar_IQ.UTF-8
ar_JO: ar_JO.ISO8859-6
-+ar_JO.iso88596: ar_JO.ISO8859-6
-+ar_JO.ISO-8859-6: ar_JO.ISO8859-6
++ar_JO.iso88596: ar_JO.ISO8859-6
++ar_JO.ISO-8859-6: ar_JO.ISO8859-6
ar_JO.utf8: ar_JO.UTF-8
ar_KW: ar_KW.ISO8859-6
-+ar_KW.iso88596: ar_KW.ISO8859-6
-+ar_KW.ISO-8859-6: ar_KW.ISO8859-6
++ar_KW.iso88596: ar_KW.ISO8859-6
++ar_KW.ISO-8859-6: ar_KW.ISO8859-6
ar_KW.utf8: ar_KW.UTF-8
ar_LB: ar_LB.ISO8859-6
-+ar_LB.iso88596: ar_LB.ISO8859-6
-+ar_LB.ISO-8859-6: ar_LB.ISO8859-6
++ar_LB.iso88596: ar_LB.ISO8859-6
++ar_LB.ISO-8859-6: ar_LB.ISO8859-6
ar_LB.utf8: ar_LB.UTF-8
ar_LY: ar_LY.ISO8859-6
-+ar_LY.iso88596: ar_LY.ISO8859-6
-+ar_LY.ISO-8859-6: ar_LY.ISO8859-6
++ar_LY.iso88596: ar_LY.ISO8859-6
++ar_LY.ISO-8859-6: ar_LY.ISO8859-6
ar_LY.utf8: ar_LY.UTF-8
ar_MA: ar_MA.ISO8859-6
-+ar_MA.iso88596: ar_MA.ISO8859-6
-+ar_MA.ISO-8859-6: ar_MA.ISO8859-6
++ar_MA.iso88596: ar_MA.ISO8859-6
++ar_MA.ISO-8859-6: ar_MA.ISO8859-6
ar_MA.utf8: ar_MA.UTF-8
ar_OM: ar_OM.ISO8859-6
-+ar_OM.iso88596: ar_OM.ISO8859-6
-+ar_OM.ISO-8859-6: ar_OM.ISO8859-6
++ar_OM.iso88596: ar_OM.ISO8859-6
++ar_OM.ISO-8859-6: ar_OM.ISO8859-6
ar_OM.utf8: ar_OM.UTF-8
ar_QA: ar_QA.ISO8859-6
-+ar_QA.iso88596: ar_QA.ISO8859-6
-+ar_QA.ISO-8859-6: ar_QA.ISO8859-6
++ar_QA.iso88596: ar_QA.ISO8859-6
++ar_QA.ISO-8859-6: ar_QA.ISO8859-6
ar_QA.utf8: ar_QA.UTF-8
ar_SA: ar_SA.ISO8859-6
ar_SA.iso88596: ar_SA.ISO8859-6
-+ar_SA.ISO-8859-6: ar_SA.ISO8859-6
++ar_SA.ISO-8859-6: ar_SA.ISO8859-6
+ bs bs_BA.ISO8859-2
+ bs_BA bs_BA.ISO8859-2
+ bs_BA.iso88592 bs_BA.ISO8859-2
+@@ -61,19 +103,24 @@
+ bs_BA.ISO_8859-2 bs_BA.ISO8859-2
ar_SA.utf8: ar_SA.UTF-8
ar_SD: ar_SD.ISO8859-6
-+ar_SD.iso88596: ar_SD.ISO8859-6
-+ar_SD.ISO-8859-6: ar_SD.ISO8859-6
++ar_SD.iso88596: ar_SD.ISO8859-6
++ar_SD.ISO-8859-6: ar_SD.ISO8859-6
ar_SD.utf8: ar_SD.UTF-8
ar_SY: ar_SY.ISO8859-6
-+ar_SY.iso88596: ar_SY.ISO8859-6
-+ar_SY.ISO-8859-6: ar_SY.ISO8859-6
++ar_SY.iso88596: ar_SY.ISO8859-6
++ar_SY.ISO-8859-6: ar_SY.ISO8859-6
ar_SY.utf8: ar_SY.UTF-8
ar_TN: ar_TN.ISO8859-6
-+ar_TN.iso88596: ar_TN.ISO8859-6
-+ar_TN.ISO-8859-6: ar_TN.ISO8859-6
++ar_TN.iso88596: ar_TN.ISO8859-6
++ar_TN.ISO-8859-6: ar_TN.ISO8859-6
ar_TN.utf8: ar_TN.UTF-8
ar_YE: ar_YE.ISO8859-6
-+ar_YE.iso88596: ar_YE.ISO8859-6
-+ar_YE.ISO-8859-6: ar_YE.ISO8859-6
++ar_YE.iso88596: ar_YE.ISO8859-6
++ar_YE.ISO-8859-6: ar_YE.ISO8859-6
ar_YE.utf8: ar_YE.UTF-8
az: az_AZ.ISO8859-9E
az_AZ: az_AZ.ISO8859-9E
az_AZ.iso88599e: az_AZ.ISO8859-9E
--a3: a3_AZKOI8-C
+-a3: a3_AZ.KOI8-C
-a3_AZ: a3_AZ.KOI8-C
-a3_AZ.koi8c: a3_AZ.KOI8-C
be: be_BY.CP1251
be_BY: be_BY.CP1251
be_BY.cp1251: be_BY.CP1251
-@@ -76,7 +122,6 @@
+@@ -81,7 +128,6 @@
be_BY.microsoft-cp1251: be_BY.CP1251
be_BY.MICROSOFT-CP1251: be_BY.CP1251
be_BY.utf8: be_BY.UTF-8
@@ -605,45 +613,47 @@
bg: bg_BG.CP1251
bg_BG: bg_BG.CP1251
bg_BG.cp1251: bg_BG.CP1251
-@@ -84,21 +129,35 @@
+@@ -89,23 +135,37 @@
bg_BG.microsoft-cp1251: bg_BG.CP1251
bg_BG.MICROSOFT-CP1251: bg_BG.CP1251
bg_BG.iso88595: bg_BG.ISO8859-5
-+bg_BG.ISO-8859-5: bg_BG.ISO8859-5
++bg_BG.ISO-8859-5: bg_BG.ISO8859-5
bg_BG.koi8r: bg_BG.KOI8-R
-be_BG.utf8: be_BG.UTF-8
+bg_BG.utf8: bg_BG.UTF-8
+ bn_IN.utf8: bn_IN.UTF-8
+ bn_IN.UTF-8: bn_IN.UTF-8
br: br_FR.ISO8859-1
br_FR: br_FR.ISO8859-1
br_FR.iso88591: br_FR.ISO8859-1
-+br_FR.ISO-8859-1: br_FR.ISO8859-1
++br_FR.ISO-8859-1: br_FR.ISO8859-1
br_FR.iso885914: br_FR.ISO8859-14
-+br_FR.ISO-8859-14: br_FR.ISO8859-14
++br_FR.ISO-8859-14: br_FR.ISO8859-14
br_FR.iso885915: br_FR.ISO8859-15
-+br_FR.ISO-8859-15: br_FR.ISO8859-15
-+br_FR.ISO-8859-15@euro: br_FR.ISO8859-15
++br_FR.ISO-8859-15: br_FR.ISO8859-15
++br_FR.ISO-8859-15@euro: br_FR.ISO8859-15
br_FR@euro: br_FR.ISO8859-15
-+br_FR.UTF-8@euro: br_FR.UTF-8
-+bn_BD: bn_BD.UTF-8
-+bn_IN: bn_BD.UTF-8
-+bs_BA: bs_BA.ISO8859-2
-+bs_BA.ISO-8859-2: bs_BA.ISO8859-2
-+byn_ER: byn_ER.UTF-8
++br_FR.UTF-8@euro: br_FR.UTF-8
++bn_BD: bn_BD.UTF-8
++bn_IN: bn_BD.UTF-8
++bs_BA: bs_BA.ISO8859-2
++bs_BA.ISO-8859-2: bs_BA.ISO8859-2
++byn_ER: byn_ER.UTF-8
ca: ca_ES.ISO8859-1
ca_ES: ca_ES.ISO8859-1
-+ca_ES@euro: ca_ES.ISO8859-15
++ca_ES@euro: ca_ES.ISO8859-15
ca_ES.iso88591: ca_ES.ISO8859-1
ca_ES.ISO-8859-1: ca_ES.ISO8859-1
ca_ES.iso885915: ca_ES.ISO8859-15
-ca_ES@euro: ca_ES.ISO8859-15
ca_ES.utf8: ca_ES.UTF-8
-+ca_ES.ISO-8859-15: ca_ES.ISO8859-15
-+ca_ES.ISO-8859-15@euro: ca_ES.ISO8859-15
-+ca_ES.UTF-8@euro: ca_ES.UTF-8
++ca_ES.ISO-8859-15: ca_ES.ISO8859-15
++ca_ES.ISO-8859-15@euro: ca_ES.ISO8859-15
++ca_ES.UTF-8@euro: ca_ES.UTF-8
cs: cs_CZ.ISO8859-2
cs_CS: cs_CZ.ISO8859-2
cs_CS.ISO8859-2: cs_CZ.ISO8859-2
-@@ -107,14 +166,19 @@
+@@ -114,14 +174,19 @@
cs_CZ.ISO-8859-2: cs_CZ.ISO8859-2
cs_CZ.ISO_8859-2: cs_CZ.ISO8859-2
cs_CZ.utf8: cs_CZ.UTF-8
@@ -664,7 +674,7 @@
da: da_DK.ISO8859-1
da_DK: da_DK.ISO8859-1
DA_DK: da_DK.ISO8859-1
-@@ -124,24 +188,31 @@
+@@ -131,24 +196,31 @@
da_DK.ISO-8859-1: da_DK.ISO8859-1
da_DK.ISO_8859-1: da_DK.ISO8859-1
da_DK.iso885915: da_DK.ISO8859-15
@@ -698,7 +708,7 @@
de_CH: de_CH.ISO8859-1
de_CH.iso88591: de_CH.ISO8859-1
de_CH.ISO_8859-1: de_CH.ISO8859-1
-@@ -151,6 +222,7 @@
+@@ -158,6 +230,7 @@
de_CH.ISO-8859-15: de_CH.ISO8859-15
de_CH.utf8: de_CH.UTF-8
de_DE: de_DE.ISO8859-1
@@ -706,7 +716,7 @@
de_DE.88591: de_DE.ISO8859-1
de_DE.88591.en: de_DE.ISO8859-1
de_DE.iso88591: de_DE.ISO8859-1
-@@ -161,27 +233,34 @@
+@@ -168,27 +241,34 @@
de_DE.ISO_8859-15: de_DE.ISO8859-15
de_DE.8859-15: de_DE.ISO8859-15
de_DE.8859-15@euro: de_DE.ISO8859-15
@@ -747,7 +757,7 @@
el_GR.utf8: el_GR.UTF-8
en: en_US.ISO8859-1
en.ISO-8859-1: en_US.ISO8859-1
-@@ -194,34 +273,52 @@
+@@ -201,34 +281,52 @@
en_BE@euro: en_BE.ISO8859-15
en_BE.utf8: en_BE.UTF-8
en_BW: en_BW.ISO8859-1
@@ -801,7 +811,7 @@
en_US: en_US.ISO8859-1
EN_US: en_US.ISO8859-1
en_US.88591: en_US.ISO8859-1
-@@ -230,6 +327,7 @@
+@@ -237,6 +335,7 @@
en_US.ISO-8859-1: en_US.ISO8859-1
en_US.ISO_8859-1: en_US.ISO8859-1
en_US.iso885915: en_US.ISO8859-15
@@ -809,13 +819,13 @@
en_US.8859-15: en_US.ISO8859-15
en_US.ISO8859-15@euro: en_US.ISO8859-15
en_US.utf8: en_US.UTF-8
-@@ -249,36 +347,47 @@
+@@ -256,36 +355,47 @@
en_ZA.iso88591: en_ZA.ISO8859-1
en_ZA.ISO-8859-1: en_ZA.ISO8859-1
en_ZA.ISO_8859-1: en_ZA.ISO8859-1
-+en_ZA.iso885915: en_ZA.ISO8859-15
- en_ZA.ISO-8859-15: en_ZA.ISO8859-15
--en_ZA.iso885915: en_ZA.ISO8859-15
+-en_ZA.ISO-8859-15: en_ZA.ISO8859-15
+ en_ZA.iso885915: en_ZA.ISO8859-15
++en_ZA.ISO-8859-15: en_ZA.ISO8859-15
en_ZA.utf8: en_ZA.UTF-8
en_ZW: en_ZW.ISO8859-1
-eo: eo_XX.ISO8859-3
@@ -863,7 +873,7 @@
es_EC.utf8: es_EC.UTF-8
es_ES: es_ES.ISO8859-1
es_ES.88591: es_ES.ISO8859-1
-@@ -287,107 +396,144 @@
+@@ -294,107 +404,144 @@
es_ES.ISO-8859-1: es_ES.ISO8859-1
es_ES.ISO_8859-1: es_ES.ISO8859-1
es_ES.iso885915: es_ES.ISO8859-15
@@ -1018,7 +1028,7 @@
fr_CH.utf8: fr_CH.UTF-8
fr_FR: fr_FR.ISO8859-1
fr_FR.88591: fr_FR.ISO8859-1
-@@ -396,7 +542,10 @@
+@@ -403,7 +550,10 @@
fr_FR.ISO-8859-1: fr_FR.ISO8859-1
fr_FR.ISO_8859-1: fr_FR.ISO8859-1
fr_FR.iso885915: fr_FR.ISO8859-15
@@ -1029,71 +1039,7 @@
fr_FR.utf8: fr_FR.UTF-8
fr_LU: fr_LU.ISO8859-1
fr_LU.88591: fr_LU.ISO8859-1
-@@ -405,38 +554,63 @@
- fr_LU.ISO-8859-1: fr_LU.ISO8859-1
- fr_LU.ISO_8859-1: fr_LU.ISO8859-1
- fr_LU.iso885915: fr_LU.ISO8859-15
-+fr_LU.ISO-8859-15: fr_LU.ISO8859-15
-+fr_LU.ISO-8859-15@euro: fr_LU.ISO8859-15
- fr_LU@euro: fr_LU.ISO8859-15
-+fr_LU.UTF-8@euro: fr_LU.UTF-8
- fr_LU.utf8: fr_LU.UTF-8
- FRE_FR.8859: fr_FR.ISO8859-1
- FRE_FR.8859.in: fr_FR.ISO8859-1
- ga: ga_IE.ISO8859-1
- ga_IE: ga_IE.ISO8859-1
- ga_IE.iso88591: ga_IE.ISO8859-1
-+ga_IE.ISO-8859-1: ga_IE.ISO8859-1
- ga_IE.iso885914: ga_IE.ISO8859-14
-+ga_IE.ISO-8859-14: ga_IE.ISO8859-14
- ga_IE.iso885915: ga_IE.ISO8859-15
-+ga_IE.ISO-8859-15: ga_IE.ISO8859-15
-+ga_IE.ISO-8859-15@euro: ga_IE.ISO8859-15
- ga_IE@euro: ga_IE.ISO8859-15
-+ga_IE.UTF-8@euro: ga_IE.UTF-8
- ga_IE.utf8: ga_IE.UTF-8
- gd: gd_GB.ISO8859-1
- gd_GB: gd_GB.ISO8859-1
- gd_GB.iso88591: gd_GB.ISO8859-1
-+gd_GB.ISO-8859-1: gd_GB.ISO8859-1
- gd_GB.iso885914: gd_GB.ISO8859-14
-+gd_GB.ISO-8859-14: gd_GB.ISO8859-14
- gd_GB.iso885915: gd_GB.ISO8859-15
-+gd_GB.ISO-8859-15: gd_GB.ISO8859-15
-+gez_ER: gez_ER.UTF-8
-+gez_ET: gez_ET.UTF-8
-+gez_ER@abegede: gez_ER.UTF-8
-+gez_ET@abegede: gez_ET.UTF-8
-+gez_ER.UTF-8@abegede: gez_ER.UTF-8
-+gez_ET.UTF-8@abegede: gez_ET.UTF-8
- gl: gl_ES.ISO8859-1
- gl_ES: gl_ES.ISO8859-1
- gl_ES.iso88591: gl_ES.ISO8859-1
- gl_ES.ISO-8859-1: gl_ES.ISO8859-1
- gl_ES.iso885915: gl_ES.ISO8859-15
-+gl_ES.ISO-8859-15: gl_ES.ISO8859-15
-+gl_ES.ISO-8859-15@euro: gl_ES.ISO8859-15
- gl_ES@euro: gl_ES.ISO8859-15
-+gl_ES.UTF-8@euro: gl_ES.UTF-8
- gl_ES.utf8: gl_ES.UTF-8
-+gu_IN: gu_IN.UTF-8
- gv: gv_GB.ISO8859-1
- gv_GB: gv_GB.ISO8859-1
- gv_GB.iso88591: gv_GB.ISO8859-1
-+gv_GB.ISO-8859-1: gv_GB.ISO8859-1
- gv_GB.iso885914: gv_GB.ISO8859-14
-+gv_GB.ISO-8859-14: gv_GB.ISO8859-14
- gv_GB.iso885915: gv_GB.ISO8859-15
-+gv_GB.ISO-8859-15: gv_GB.ISO8859-15
- he: he_IL.ISO8859-8
- he_IL: he_IL.ISO8859-8
- HE_IL: he_IL.ISO8859-8
- he_IL.iso88598: he_IL.ISO8859-8
-+he_IL.ISO-8859-8: he_IL.ISO8859-8
- he_IL.cp1255: he_IL.CP1255
- he_IL.microsoftcp1255: he_IL.CP1255
- he_IL.microsoft-cp1255: he_IL.CP1255
-@@ -459,7 +633,12 @@
+@@ -468,7 +618,12 @@
hu_HU: hu_HU.ISO8859-2
hu_HU.iso88592: hu_HU.ISO8859-2
hu_HU.ISO-8859-2: hu_HU.ISO8859-2
@@ -1107,7 +1053,7 @@
in: id_ID.ISO8859-1
in_ID: id_ID.ISO8859-1
is: is_IS.ISO8859-1
-@@ -468,12 +647,13 @@
+@@ -477,12 +632,13 @@
is_IS.ISO-8859-1: is_IS.ISO8859-1
is_IS.ISO_8859-1: is_IS.ISO8859-1
is_IS.iso885915: is_IS.ISO8859-15
@@ -1122,7 +1068,7 @@
it_CH.utf8: it_CH.UTF-8
it_IT: it_IT.ISO8859-1
it_IT.88591: it_IT.ISO8859-1
-@@ -482,13 +662,17 @@
+@@ -491,13 +647,17 @@
it_IT.ISO-8859-1: it_IT.ISO8859-1
it_IT.ISO_8859-1: it_IT.ISO8859-1
it_IT.iso885915: it_IT.ISO8859-15
@@ -1145,7 +1091,7 @@
iw: he_IL.ISO8859-8
iw_IL: he_IL.ISO8859-8
Iw_IL: he_IL.ISO8859-8
-@@ -529,8 +713,9 @@
+@@ -538,8 +698,9 @@
kl: kl_GL.ISO8859-1
kl_GL: kl_GL.ISO8859-1
kl_GL.iso88591: kl_GL.ISO8859-1
@@ -1156,7 +1102,7 @@
ko: ko_KR.eucKR
ko_KR: ko_KR.eucKR
KO_KR: ko_KR.eucKR
-@@ -543,8 +728,13 @@
+@@ -552,8 +713,13 @@
kw: kw_GB.ISO8859-1
kw_GB: kw_GB.ISO8859-1
kw_GB.iso88591: kw_GB.ISO8859-1
@@ -1170,7 +1116,7 @@
lo: lo_LA.MULELAO-1
lo_LA: lo_LA.MULELAO-1
lo_LA.cp1133: lo_LA.IBM-CP1133
-@@ -552,14 +742,15 @@
+@@ -561,14 +727,15 @@
lo_LA.mulelao1: lo_LA.MULELAO-1
#if defined(VeryOldFreeBSD)
XCOMM most locales in FreeBSD 2.1.[56] do not work, allow use of FreeBSD's
@@ -1188,7 +1134,7 @@
lt_LT.ISO_8859-4: lt_LT.ISO8859-4
lt_LT.iso885913: lt_LT.ISO8859-13
lt_LT.ISO-8859-13: lt_LT.ISO8859-13
-@@ -568,42 +759,56 @@
+@@ -577,42 +744,56 @@
lv: lv_LV.ISO8859-13
lv_LV: lv_LV.ISO8859-13
lv_LV.iso88594: lv_LV.ISO8859-4
@@ -1249,7 +1195,7 @@
nl_NL: nl_NL.ISO8859-1
nl_NL.88591: nl_NL.ISO8859-1
nl_NL.88591.en: nl_NL.ISO8859-1
-@@ -611,13 +816,27 @@
+@@ -620,13 +801,27 @@
nl_NL.ISO-8859-1: nl_NL.ISO8859-1
nl_NL.ISO_8859-1: nl_NL.ISO8859-1
nl_NL.iso885915: nl_NL.ISO8859-15
@@ -1277,11 +1223,11 @@
no: no_NO.ISO8859-1
no_NO: no_NO.ISO8859-1
no_NO.88591: no_NO.ISO8859-1
-@@ -625,26 +844,29 @@
+@@ -634,28 +829,32 @@
no_NO.iso88591: no_NO.ISO8859-1
no_NO.ISO-8859-1: no_NO.ISO8859-1
no_NO.iso885915: no_NO.ISO8859-15
-+no_NO.ISO-8859-15: no_NO.ISO8859-15
++no_NO.ISO-8859-15: no_NO.ISO8859-15
no_NO.utf8: no_NO.UTF-8
-ny: ny_NO.ISO8859-1
-ny_NO: ny_NO.ISO8859-1
@@ -1293,10 +1239,16 @@
oc: oc_FR.ISO8859-1
oc_FR: oc_FR.ISO8859-1
oc_FR.iso88591: oc_FR.ISO8859-1
-+oc_FR.ISO-8859-1: oc_FR.ISO8859-1
++oc_FR.ISO-8859-1: oc_FR.ISO8859-1
oc_FR.iso885915: oc_FR.ISO8859-15
-+oc_FR.ISO-8859-15: oc_FR.ISO8859-15
++oc_FR.ISO-8859-15: oc_FR.ISO8859-15
oc_FR@euro: oc_FR.ISO8859-15
++om_ET: om_ET.UTF-8
++om_KE: om_KE.ISO8859-1
++om_KE.ISO-8859-1: om_KE.ISO8859-1
++pa_IN: pa_IN.UTF-8
+ pa_IN.utf8: pa_IN.UTF-8
+ pa_IN.UTF-8: pa_IN.UTF-8
-pd: pd_US.ISO8859-1
-pd_DE: pd_DE.ISO8859-1
-pd_US: pd_US.ISO8859-1
@@ -1304,24 +1256,21 @@
-pd_US.iso88591: pd_US.ISO8859-1
-pd_DE.iso885915: pd_DE.ISO8859-15
-pd_US.iso885915: pd_US.ISO8859-15
-+om_ET: om_ET.UTF-8
-+om_KE: om_KE.ISO8859-1
-+om_KE.ISO-8859-1: om_KE.ISO8859-1
-+pa_IN: pa_IN.UTF-8
+++pa_IN: pa_IN.UTF-8
+XCOMM Presumably, "pd" is "Pennsylvania 'Dutch'", a U.S. dialect of German.
+XCOMM This is not an ISO language code defined for it, and the GNU C Library
+XCOMM doesn't support it.
-+XCOMM pd: pd_US.ISO8859-1
-+XCOMM pd_DE: pd_DE.ISO8859-1
-+XCOMM pd_US: pd_US.ISO8859-1
-+XCOMM pd_DE.iso88591: pd_DE.ISO8859-1
-+XCOMM pd_US.iso88591: pd_US.ISO8859-1
-+XCOMM pd_DE.iso885915: pd_DE.ISO8859-15
-+XCOMM pd_US.iso885915: pd_US.ISO8859-15
++XCOMM pd: pd_US.ISO8859-1
++XCOMM pd_DE: pd_DE.ISO8859-1
++XCOMM pd_US: pd_US.ISO8859-1
++XCOMM pd_DE.iso88591: pd_DE.ISO8859-1
++XCOMM pd_US.iso88591: pd_US.ISO8859-1
++XCOMM pd_DE.iso885915: pd_DE.ISO8859-15
++XCOMM pd_US.iso885915: pd_US.ISO8859-15
ph: ph_PH.ISO8859-1
ph_PH: ph_PH.ISO8859-1
ph_PH.iso88591: ph_PH.ISO8859-1
-@@ -663,7 +885,6 @@
+@@ -674,7 +873,6 @@
pt_BR.iso88591: pt_BR.ISO8859-1
pt_BR.ISO-8859-1: pt_BR.ISO8859-1
pt_BR.ISO_8859-1: pt_BR.ISO8859-1
@@ -1329,7 +1278,7 @@
pt_BR.utf8: pt_BR.UTF-8
pt_PT: pt_PT.ISO8859-1
pt_PT.88591: pt_PT.ISO8859-1
-@@ -672,6 +893,8 @@
+@@ -683,6 +881,8 @@
pt_PT.ISO-8859-1: pt_PT.ISO8859-1
pt_PT.ISO_8859-1: pt_PT.ISO8859-1
pt_PT.iso885915: pt_PT.ISO8859-15
@@ -1338,7 +1287,7 @@
pt_PT@euro: pt_PT.ISO8859-15
pt_PT.utf8: pt_PT.UTF-8
pt_PT.UTF-8@euro: pt_PT.UTF-8
-@@ -704,10 +927,10 @@
+@@ -715,12 +915,12 @@
se_NO: se_NO.UTF-8
se_NO.utf8: se_NO.UTF-8
sh: sh_YU.ISO8859-2
@@ -1346,11 +1295,13 @@
sh_SP: sh_YU.ISO8859-2
sh_YU: sh_YU.ISO8859-2
sh_YU.utf8: sh_YU.UTF-8
-+sid_ET: sid_ET.UTF-8
+ si: si_LK.UTF-8
+ si_LK: si_LK.UTF-8
++sid_ET: sid_ET.UTF-8
sk: sk_SK.ISO8859-2
sk_SK: sk_SK.ISO8859-2
sk_SK.iso88592: sk_SK.ISO8859-2
-@@ -718,20 +941,31 @@
+@@ -731,20 +931,31 @@
sl_SI.iso88592: sl_SI.ISO8859-2
sl_SI.ISO-8859-2: sl_SI.ISO8859-2
sl_SI.utf8: sl_SI.UTF-8
@@ -1382,7 +1333,7 @@
sr_YU.ISO8859-5@cyrillic: sr_YU.ISO8859-5
sr_YU.cp1251@cyrillic: sr_YU.CP1251
sr_YU.CP1251@cyrillic: sr_YU.CP1251
-@@ -740,11 +974,17 @@
+@@ -753,11 +964,17 @@
sr_YU.MICROSOFT-CP1251@cyrillic: sr_YU.CP1251
sr_YU.utf8: sr_YU.UTF-8
sr_YU.UTF-8@cyrillic: sr_YU.UTF-8
@@ -1400,7 +1351,7 @@
sv_FI.utf8: sv_FI.UTF-8
sv_SE: sv_SE.ISO8859-1
sv_SE.88591: sv_SE.ISO8859-1
-@@ -753,12 +993,14 @@
+@@ -766,12 +983,14 @@
sv_SE.ISO-8859-1: sv_SE.ISO8859-1
sv_SE.ISO_8859-1: sv_SE.ISO8859-1
sv_SE.iso885915: sv_SE.ISO8859-15
@@ -1415,7 +1366,7 @@
tg: tg_TJ.KOI8-C
tg_TJ: tg_TJ.KOI8-C
tg_TJ.koi8c: tg_TJ.KOI8-C
-@@ -769,9 +1011,13 @@
+@@ -782,9 +1001,13 @@
th_TH.TIS-620: th_TH.TIS620
th_TH.TACTIS: th_TH.TIS620
th_TH.utf8: th_TH.UTF-8
@@ -1429,7 +1380,7 @@
tr: tr_TR.ISO8859-9
tr_TR: tr_TR.ISO8859-9
TR_TR: tr_TR.ISO8859-9
-@@ -800,6 +1046,9 @@
+@@ -813,6 +1036,9 @@
ur_PK.MICROSOFT-CP1256: ur_PK.CP1256
uz: uz_UZ.UTF-8
uz_UZ: uz_UZ.UTF-8
@@ -1439,7 +1390,7 @@
vi: vi_VN.TCVN
vi_VN: vi_VN.TCVN
Vi_VN: vi_VN.TCVN
-@@ -813,8 +1062,13 @@
+@@ -826,8 +1052,13 @@
wa: wa_BE.ISO8859-1
wa_BE: wa_BE.ISO8859-1
wa_BE.iso88591: wa_BE.ISO8859-1
@@ -1453,28 +1404,28 @@
yi: yi_US.CP1255
yi_US: yi_US.CP1255
yi_US.cp1255: yi_US.CP1255
-@@ -840,13 +1094,20 @@
+@@ -854,13 +1085,20 @@
zh_HK.Big5: zh_HK.big5
zh_HK.utf8: zh_HK.UTF-8
- ZH_HK.UTF-8: zh_CN.UTF-8
-+zh_SG: zh_SG.gb2312
-+zh_SG.GBK: zh_SG.gbk
-+zh_SG.GB2312: zh_SG.gb2312
+ ZH_HK.UTF-8: zh_HK.UTF-8
++zh_SG: zh_SG.gb2312
++zh_SG.GBK: zh_SG.gbk
++zh_SG.GB2312: zh_SG.gb2312
ZH_SG.UTF-8: zh_SG.UTF-8
zh_TW: zh_TW.big5
zh_TW.Big5: zh_TW.big5
-+zh_TW.BIG5: zh_TW.big5
++zh_TW.BIG5: zh_TW.big5
Zh_TW.big5: zh_TW.big5
zh_TW.EUC: zh_TW.eucTW
-+zh_TW.EUC-TW: zh_TW.eucTW
++zh_TW.EUC-TW: zh_TW.eucTW
zh_TW.utf8: zh_TW.UTF-8
ZH_TW.UTF-8: zh_TW.UTF-8
-+zu_ZA: zu_ZA.ISO8859-1
-+zu_ZA.ISO-8859-1: zu_ZA.ISO8859-1
++zu_ZA: zu_ZA.ISO8859-1
++zu_ZA.ISO-8859-1: zu_ZA.ISO8859-1
XCOMM The following locale names are used in SCO 3.0
english_uk.8859: en_GB.ISO8859-1
-@@ -875,7 +1136,7 @@
+@@ -889,7 +1127,7 @@
dutch: nl_NL.ISO8859-1
dutch.iso88591: nl_BE.ISO8859-1
eesti: et_EE.ISO8859-1
@@ -1483,7 +1434,7 @@
estonian: et_EE.ISO8859-1
finnish: fi_FI.ISO8859-1
finnish.iso88591: fi_FI.ISO8859-1
-@@ -888,8 +1149,8 @@
+@@ -902,8 +1140,8 @@
german.iso88591: de_CH.ISO8859-1
greek: el_GR.ISO8859-7
greek.iso88597: el_GR.ISO8859-7
@@ -1494,7 +1445,7 @@
hrvatski: hr_HR.ISO8859-2
hungarian: hu_HU.ISO8859-2
icelandic.iso88591: is_IS.ISO8859-1
-@@ -931,103 +1192,103 @@
+@@ -951,103 +1189,103 @@
#ifdef WIN32
XCOMM Microsoft Windows/NT 4.0 SP3
XCOMM parser doesn't grok embedded spaces in locale name
@@ -1696,8 +1647,8 @@
ISO8859-1: en_US.ISO8859-1
Index: xc/nls/locale.dir
===================================================================
---- xc/nls/locale.dir (revision 292)
-+++ xc/nls/locale.dir (working copy)
+--- xc/nls/locale.dir.orig 2005-01-18 20:53:55.000000000 -0500
++++ xc/nls/locale.dir 2005-07-27 21:23:48.000000000 -0400
@@ -9,8 +9,13 @@
XCOMM
@@ -1712,7 +1663,7 @@
iso8859-6/XLC_LOCALE: ar_BH.ISO8859-6
iso8859-6/XLC_LOCALE: ar_DZ.ISO8859-6
iso8859-6/XLC_LOCALE: ar_EG.ISO8859-6
-@@ -37,13 +42,13 @@
+@@ -38,13 +43,13 @@
iso8859-1/XLC_LOCALE: br_FR.ISO8859-1
iso8859-14/XLC_LOCALE: br_FR.ISO8859-14
iso8859-15/XLC_LOCALE: br_FR.ISO8859-15
@@ -1727,7 +1678,7 @@
iso8859-1/XLC_LOCALE: da_DK.ISO8859-1
iso8859-15/XLC_LOCALE: da_DK.ISO8859-15
iso8859-1/XLC_LOCALE: de_AT.ISO8859-1
-@@ -55,20 +60,24 @@
+@@ -56,20 +61,24 @@
iso8859-1/XLC_LOCALE: de_DE.ISO8859-1
iso8859-15/XLC_LOCALE: de_DE.ISO8859-15
iso8859-1/XLC_LOCALE: de_LI.ISO8859-1
@@ -1753,7 +1704,7 @@
iso8859-15/XLC_LOCALE: en_IN.ISO8859-15
iso8859-1/XLC_LOCALE: en_JM.ISO8859-1
iso8859-1/XLC_LOCALE: en_NZ.ISO8859-1
-@@ -81,8 +90,11 @@
+@@ -82,8 +91,11 @@
iso8859-15/XLC_LOCALE: en_US.ISO8859-15
iso8859-1/XLC_LOCALE: en_ZA.ISO8859-1
iso8859-15/XLC_LOCALE: en_ZA.ISO8859-15
@@ -1767,7 +1718,7 @@
iso8859-1/XLC_LOCALE: es_AR.ISO8859-1
iso8859-1/XLC_LOCALE: es_BO.ISO8859-1
iso8859-1/XLC_LOCALE: es_CL.ISO8859-1
-@@ -110,6 +122,8 @@
+@@ -111,6 +123,8 @@
iso8859-15/XLC_LOCALE: et_EE.ISO8859-15
iso8859-1/XLC_LOCALE: eu_ES.ISO8859-1
iso8859-15/XLC_LOCALE: eu_ES.ISO8859-15
@@ -1776,7 +1727,7 @@
isiri-3342/XLC_LOCALE: fa_IR.ISIRI-3342
iso8859-1/XLC_LOCALE: fi_FI.ISO8859-1
iso8859-15/XLC_LOCALE: fi_FI.ISO8859-15
-@@ -158,6 +172,7 @@
+@@ -159,6 +173,7 @@
iso8859-1/XLC_LOCALE: kw_GB.ISO8859-1
iso8859-14/XLC_LOCALE: kw_GB.ISO8859-14
iso8859-15/XLC_LOCALE: kw_GB.ISO8859-15
@@ -1784,7 +1735,7 @@
ibm-cp1133/XLC_LOCALE: lo_LA.IBM-CP1133
mulelao-1/XLC_LOCALE: lo_LA.MULELAO-1
iso8859-4/XLC_LOCALE: lt_LT.ISO8859-4
-@@ -183,8 +198,12 @@
+@@ -184,8 +199,12 @@
iso8859-1/XLC_LOCALE: ny_NO.ISO8859-15
iso8859-1/XLC_LOCALE: oc_FR.ISO8859-1
iso8859-15/XLC_LOCALE: oc_FR.ISO8859-15
@@ -1799,7 +1750,7 @@
iso8859-2/XLC_LOCALE: pl_PL.ISO8859-2
iso8859-1/XLC_LOCALE: pp_AN.ISO8859-1
iso8859-1/XLC_LOCALE: pt_BR.ISO8859-1
-@@ -194,24 +213,29 @@
+@@ -195,24 +214,29 @@
iso8859-5/XLC_LOCALE: ru_RU.ISO8859-5
microsoft-cp1251/XLC_LOCALE: ru_RU.CP1251
koi8-r/XLC_LOCALE: ru_RU.KOI8-R
@@ -1824,13 +1775,13 @@
iso8859-15/XLC_LOCALE: sv_SE.ISO8859-15
tscii-0/XLC_LOCALE: ta_IN.TSCII-0
koi8-c/XLC_LOCALE: tg_TJ.KOI8-C
-+iso8859-11/XLC_LOCALE: th_TH.ISO8859-11
- th_TH/XLC_LOCALE: th_TH.TIS620
--iso8859-11/XLC_LOCALE: th_TH.ISO8859-11
+-th_TH/XLC_LOCALE: th_TH.TIS620
+ iso8859-11/XLC_LOCALE: th_TH.ISO8859-11
++th_TH/XLC_LOCALE: th_TH.TIS620
iso8859-1/XLC_LOCALE: tl_PH.ISO8859-1
iso8859-9/XLC_LOCALE: tr_TR.ISO8859-9
tatar-cyr/XLC_LOCALE: tt_RU.TATAR-CYR
-@@ -220,10 +244,12 @@
+@@ -221,10 +245,12 @@
microsoft-cp1251/XLC_LOCALE: uk_UA.CP1251
koi8-u/XLC_LOCALE: uk_UA.KOI8-U
microsoft-cp1256/XLC_LOCALE: ur_PK.CP1256
@@ -1843,7 +1794,7 @@
microsoft-cp1255/XLC_LOCALE: yi_US.CP1255
zh_CN/XLC_LOCALE: zh_CN.eucCN
zh_CN/XLC_LOCALE: zh_CN.gb2312
-@@ -233,9 +259,16 @@
+@@ -235,9 +261,16 @@
zh_HK.big5hkscs/XLC_LOCALE: zh_HK.Big5-HKSCS
zh_HK.big5hkscs/XLC_LOCALE: zh_HK.big5hkscs
zh_HK.big5hkscs/XLC_LOCALE: zh_HK.Big5HKSCS
@@ -1860,7 +1811,7 @@
en_US.UTF-8/XLC_LOCALE: af_ZA.UTF-8
en_US.UTF-8/XLC_LOCALE: am_ET.UTF-8
en_US.UTF-8/XLC_LOCALE: ar_AA.UTF-8
-@@ -243,6 +276,7 @@
+@@ -245,6 +278,7 @@
en_US.UTF-8/XLC_LOCALE: ar_BH.UTF-8
en_US.UTF-8/XLC_LOCALE: ar_DZ.UTF-8
en_US.UTF-8/XLC_LOCALE: ar_EG.UTF-8
@@ -1868,7 +1819,7 @@
en_US.UTF-8/XLC_LOCALE: ar_IQ.UTF-8
en_US.UTF-8/XLC_LOCALE: ar_JO.UTF-8
en_US.UTF-8/XLC_LOCALE: ar_KW.UTF-8
-@@ -257,11 +291,12 @@
+@@ -260,12 +294,12 @@
en_US.UTF-8/XLC_LOCALE: ar_TN.UTF-8
en_US.UTF-8/XLC_LOCALE: ar_YE.UTF-8
en_US.UTF-8/XLC_LOCALE: az_AZ.UTF-8
@@ -1876,13 +1827,13 @@
en_US.UTF-8/XLC_LOCALE: be_BY.UTF-8
en_US.UTF-8/XLC_LOCALE: bg_BG.UTF-8
en_US.UTF-8/XLC_LOCALE: bn_BD.UTF-8
-+en_US.UTF-8/XLC_LOCALE: bn_IN.UTF-8
+ en_US.UTF-8/XLC_LOCALE: bn_IN.UTF-8
en_US.UTF-8/XLC_LOCALE: br_FR.UTF-8
-+en_US.UTF-8/XLC_LOCALE: byn_ER.UTF-8
++en_US.UTF-8/XLC_LOCALE: byn_ER.UTF-8
en_US.UTF-8/XLC_LOCALE: ca_ES.UTF-8
en_US.UTF-8/XLC_LOCALE: cs_CZ.UTF-8
en_US.UTF-8/XLC_LOCALE: cy_GB.UTF-8
-@@ -276,18 +311,27 @@
+@@ -280,18 +314,27 @@
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
@@ -1912,7 +1863,7 @@
en_US.UTF-8/XLC_LOCALE: es_AR.UTF-8
en_US.UTF-8/XLC_LOCALE: es_BO.UTF-8
en_US.UTF-8/XLC_LOCALE: es_CL.UTF-8
-@@ -305,10 +349,12 @@
+@@ -309,10 +352,12 @@
en_US.UTF-8/XLC_LOCALE: es_PR.UTF-8
en_US.UTF-8/XLC_LOCALE: es_PY.UTF-8
en_US.UTF-8/XLC_LOCALE: es_SV.UTF-8
@@ -1925,18 +1876,16 @@
en_US.UTF-8/XLC_LOCALE: fa_IR.UTF-8
en_US.UTF-8/XLC_LOCALE: fi_FI.UTF-8
en_US.UTF-8/XLC_LOCALE: fo_FO.UTF-8
-@@ -319,7 +365,10 @@
+@@ -323,6 +368,8 @@
en_US.UTF-8/XLC_LOCALE: fr_LU.UTF-8
en_US.UTF-8/XLC_LOCALE: ga_IE.UTF-8
en_US.UTF-8/XLC_LOCALE: gd_GB.UTF-8
-+en_US.UTF-8/XLC_LOCALE: gez_ER.UTF-8
-+en_US.UTF-8/XLC_LOCALE: gez_ET.UTF-8
++en_US.UTF-8/XLC_LOCALE: gez_ER.UTF-8
++en_US.UTF-8/XLC_LOCALE: gez_ET.UTF-8
en_US.UTF-8/XLC_LOCALE: gl_ES.UTF-8
-+en_US.UTF-8/XLC_LOCALE: gu_IN.UTF-8
+ en_US.UTF-8/XLC_LOCALE: gu_IN.UTF-8
en_US.UTF-8/XLC_LOCALE: gv_GB.UTF-8
- en_US.UTF-8/XLC_LOCALE: he_IL.UTF-8
- en_US.UTF-8/XLC_LOCALE: hi_IN.UTF-8
-@@ -331,9 +380,11 @@
+@@ -336,9 +383,11 @@
en_US.UTF-8/XLC_LOCALE: it_CH.UTF-8
en_US.UTF-8/XLC_LOCALE: it_IT.UTF-8
en_US.UTF-8/XLC_LOCALE: iu_CA.UTF-8
@@ -1948,73 +1897,74 @@
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: lo_LA.UTF-8
-@@ -341,17 +392,28 @@
+@@ -346,18 +395,28 @@
en_US.UTF-8/XLC_LOCALE: lv_LV.UTF-8
en_US.UTF-8/XLC_LOCALE: mi_NZ.UTF-8
en_US.UTF-8/XLC_LOCALE: mk_MK.UTF-8
-+en_US.UTF-8/XLC_LOCALE: ml_IN.UTF-8
-+en_US.UTF-8/XLC_LOCALE: mn_MN.UTF-8
++en_US.UTF-8/XLC_LOCALE: ml_IN.UTF-8
++en_US.UTF-8/XLC_LOCALE: mn_MN.UTF-8
en_US.UTF-8/XLC_LOCALE: mr_IN.UTF-8
en_US.UTF-8/XLC_LOCALE: ms_MY.UTF-8
-+en_US.UTF-8/XLC_LOCALE: mt_MT.UTF-8
-+en_US.UTF-8/XLC_LOCALE: ne_NP.UTF-8
++en_US.UTF-8/XLC_LOCALE: mt_MT.UTF-8
++en_US.UTF-8/XLC_LOCALE: ne_NP.UTF-8
en_US.UTF-8/XLC_LOCALE: nl_BE.UTF-8
en_US.UTF-8/XLC_LOCALE: nl_NL.UTF-8
en_US.UTF-8/XLC_LOCALE: nb_NO.UTF-8
en_US.UTF-8/XLC_LOCALE: nn_NO.UTF-8
+XCOMM ny is the language code for Nyanja (spoken in Malawi), not Nynorsk.
+XCOMM See <URL: http://www.ethnologue.com/show_iso639.asp?code=nya >.
-+XCOMM en_US.UTF-8/XLC_LOCALE: ny_NO.UTF-8
++XCOMM en_US.UTF-8/XLC_LOCALE: ny_NO.UTF-8
en_US.UTF-8/XLC_LOCALE: no_NO.UTF-8
-en_US.UTF-8/XLC_LOCALE: ny_NO.UTF-8
en_US.UTF-8/XLC_LOCALE: oc_FR.UTF-8
++en_US.UTF-8/XLC_LOCALE: om_ET.UTF-8
+ en_US.UTF-8/XLC_LOCALE: pa_IN.UTF-8
-en_US.UTF-8/XLC_LOCALE: pd_DE.UTF-8
-en_US.UTF-8/XLC_LOCALE: pd_US.UTF-8
-+en_US.UTF-8/XLC_LOCALE: om_ET.UTF-8
-+en_US.UTF-8/XLC_LOCALE: pa_IN.UTF-8
+XCOMM Presumably, "pd" is "Pennsylvania 'Dutch'", a U.S. dialect of German.
+XCOMM This is not an ISO language code defined for it, and the GNU C Library
+XCOMM doesn't support it.
-+XCOMM en_US.UTF-8/XLC_LOCALE: pd_DE.UTF-8
-+XCOMM en_US.UTF-8/XLC_LOCALE: pd_US.UTF-8
++XCOMM en_US.UTF-8/XLC_LOCALE: pd_DE.UTF-8
++XCOMM en_US.UTF-8/XLC_LOCALE: pd_US.UTF-8
en_US.UTF-8/XLC_LOCALE: ph_PH.UTF-8
en_US.UTF-8/XLC_LOCALE: pl_PL.UTF-8
en_US.UTF-8/XLC_LOCALE: pp_AN.UTF-8
-@@ -361,18 +423,23 @@
+@@ -367,19 +426,24 @@
en_US.UTF-8/XLC_LOCALE: ru_RU.UTF-8
en_US.UTF-8/XLC_LOCALE: ru_UA.UTF-8
en_US.UTF-8/XLC_LOCALE: se_NO.UTF-8
-+en_US.UTF-8/XLC_LOCALE: sid_ET.UTF-8
++en_US.UTF-8/XLC_LOCALE: sid_ET.UTF-8
en_US.UTF-8/XLC_LOCALE: sh_YU.UTF-8
+ en_US.UTF-8/XLC_LOCALE: si_LK.UTF-8
en_US.UTF-8/XLC_LOCALE: sk_SK.UTF-8
en_US.UTF-8/XLC_LOCALE: sl_SI.UTF-8
-+en_US.UTF-8/XLC_LOCALE: so_ET.UTF-8
++en_US.UTF-8/XLC_LOCALE: so_ET.UTF-8
en_US.UTF-8/XLC_LOCALE: sq_AL.UTF-8
en_US.UTF-8/XLC_LOCALE: sr_YU.UTF-8
-+en_US.UTF-8/XLC_LOCALE: st_ZA.UTF-8
++en_US.UTF-8/XLC_LOCALE: st_ZA.UTF-8
en_US.UTF-8/XLC_LOCALE: sv_FI.UTF-8
en_US.UTF-8/XLC_LOCALE: sv_SE.UTF-8
en_US.UTF-8/XLC_LOCALE: ta_IN.UTF-8
-+en_US.UTF-8/XLC_LOCALE: te_IN.UTF-8
++en_US.UTF-8/XLC_LOCALE: te_IN.UTF-8
en_US.UTF-8/XLC_LOCALE: tg_TJ.UTF-8
th_TH.UTF-8/XLC_LOCALE: th_TH.UTF-8
en_US.UTF-8/XLC_LOCALE: ti_ER.UTF-8
en_US.UTF-8/XLC_LOCALE: ti_ET.UTF-8
-+en_US.UTF-8/XLC_LOCALE: tig_ER.UTF-8
++en_US.UTF-8/XLC_LOCALE: tig_ER.UTF-8
en_US.UTF-8/XLC_LOCALE: tl_PH.UTF-8
en_US.UTF-8/XLC_LOCALE: tr_TR.UTF-8
en_US.UTF-8/XLC_LOCALE: tt_RU.UTF-8
-@@ -381,11 +448,13 @@
+@@ -388,11 +452,13 @@
en_US.UTF-8/XLC_LOCALE: uz_UZ.UTF-8
en_US.UTF-8/XLC_LOCALE: vi_VN.UTF-8
en_US.UTF-8/XLC_LOCALE: wa_BE.UTF-8
-+en_US.UTF-8/XLC_LOCALE: xh_ZA.UTF-8
++en_US.UTF-8/XLC_LOCALE: xh_ZA.UTF-8
en_US.UTF-8/XLC_LOCALE: yi_US.UTF-8
zh_CN.UTF-8/XLC_LOCALE: zh_CN.UTF-8
- zh_CN.UTF-8/XLC_LOCALE: zh_HK.UTF-8
+ zh_HK.UTF-8/XLC_LOCALE: zh_HK.UTF-8
zh_CN.UTF-8/XLC_LOCALE: zh_SG.UTF-8
zh_TW.UTF-8/XLC_LOCALE: zh_TW.UTF-8
-+en_US.UTF-8/XLC_LOCALE: zu_ZA.UTF-8
++en_US.UTF-8/XLC_LOCALE: zu_ZA.UTF-8
#ifdef __uxp__
ja.U90/XLC_LOCALE: ja_JP.U90
ja.S90/XLC_LOCALE: ja_JP.S90
Modified: branches/6.9/debian/patches/general/012_Xaw_StripChart_fix.diff
===================================================================
--- branches/6.9/debian/patches/general/012_Xaw_StripChart_fix.diff 2005-07-28 03:14:36 UTC (rev 420)
+++ branches/6.9/debian/patches/general/012_Xaw_StripChart_fix.diff 2005-07-28 03:20:59 UTC (rev 421)
@@ -21,9 +21,11 @@
Not submitted upstream yet.
---- xc/lib/Xaw/StripChart.c~ 2003-01-01 15:27:49.000000000 -0500
-+++ xc/lib/Xaw/StripChart.c 2003-01-01 15:31:59.000000000 -0500
-@@ -370,12 +370,12 @@
+Index: xc/lib/Xaw/StripChart.c
+===================================================================
+--- xc/lib/Xaw/StripChart.c.orig 2005-05-23 17:47:37.000000000 -0400
++++ xc/lib/Xaw/StripChart.c 2005-07-27 21:24:19.000000000 -0400
+@@ -373,12 +373,12 @@
* the returned value is identical to the initial value of next and data is
* unchanged. Otherwise keeps half a window's worth of data. If data is
* changed, then w->strip_chart.max_value is updated to reflect the
@@ -39,7 +41,7 @@
int next = w->strip_chart.interval;
int scale = w->strip_chart.scale;
int scalewidth = 0;
-@@ -420,8 +420,10 @@
+@@ -423,8 +423,10 @@
}
/* Draw graph reference lines */
@@ -51,7 +53,7 @@
XDrawLine(dpy, win, w->strip_chart.hiGC, left, j, scalewidth, j);
}
}
-@@ -443,7 +445,7 @@
+@@ -446,7 +448,7 @@
MoveChart(StripChartWidget w, Bool blit)
{
double old_max;
@@ -60,7 +62,7 @@
int next = w->strip_chart.interval;
if (!XtIsRealized((Widget)w))
-@@ -492,8 +494,10 @@
+@@ -495,8 +497,10 @@
/* Draw graph reference lines */
left = j;
@@ -72,7 +74,7 @@
XDrawLine(XtDisplay((Widget)w), XtWindow((Widget)w),
w->strip_chart.hiGC, left, j, XtWidth(w), j);
}
-@@ -554,23 +558,26 @@
+@@ -557,23 +561,26 @@
StripChartWidget w = (StripChartWidget)widget;
XPoint *points;
Cardinal size;
Reply to: