Made handling of DevelDrivers for x86-64 more conformant to other platforms.

Compress all font encodings (Stefan Dirsch).
Fixed warnings.
Turn on forwarding XNSpotLocation event to XIM server in OffTheSpot and Root mode (bugzilla #1580, James Su).
Added another compose key combination for the Euro symbol (Stefan Dirsch).
Added support for UTF-8 in ja_JP, ko_KR and zh_TW locales (Mike Fabian).
Changed default encoding for ru from KOI8-R to ISO8859-5 (Mike Fabian). This is the encoding that is also used by glibc. We may break other libcs - lets see who complains.
Added explanation for DESTDIR to install to a different directory than /.
Added some early bailouts to atiprobe if PCI structure pointer is NULL to prevent sig11.
XV support doesn't depend on 2D acceleration any more. This patch removes this limitation from the NSC driver. This is a patch that I have committed to XFree86 a while ago but never ported over to X.Org. Matthieu Herrb contributed some build fixes.
Fixing SetDPMSTimers() so that DPMS*Time == 0 disables the appropriate timer. This takes advantage of the fact that TimerSet() with a timeout argument 0 behaves like TimerCanel().
Use /dev/xconsole (named pipe) or devpts for system logger (Werner Fink).
Create missing links for backward compatibility to XFree86 (Stefan Dirsch).
Changed comment to mention xorg.
Changed cursor for the 'kill' action from XC_draped_box to XC_Pirate. If you don't like it we can change it back (original author unkown).
Added 'pic' to the man page rendering command pipeline (Werner Fink).
Added missing return value (Stefan Dirsch, Roland Mainz)

4 files changed, 11 insertions, 6 deletions

diff --git a/modules/im/ximcp/imRm.c b/modules/im/ximcp/imRm.c
index db5851e1..57aa760c 100644
--- a/modules/im/ximcp/imRm.c
+++ b/modules/im/ximcp/imRm.c
@@ -1860,11 +1860,11 @@ static XimICMode	ic_mode[] = {
 		0,
 		0},
     {XNSpotLocation, 0,
-		0,
+		0, /*(XIM_MODE_PRE_SET | XIM_MODE_PRE_GET),*/
 		(XIM_MODE_PRE_CREATE | XIM_MODE_PRE_SET | XIM_MODE_PRE_GET),
 		0,
-		0,
-		0,
+		(XIM_MODE_PRE_SET | XIM_MODE_PRE_GET),
+		(XIM_MODE_PRE_SET | XIM_MODE_PRE_GET),
 		0,
 		0,
 		0,
diff --git a/nls/compose.dir.pre b/nls/compose.dir.pre
index 035fa475..3a9d1248 100644
--- a/nls/compose.dir.pre
+++ b/nls/compose.dir.pre
@@ -306,8 +306,10 @@ 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
+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:		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
@@ -349,3 +351,4 @@ 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:		yi_US.UTF-8
+en_US.UTF-8/Compose:		zh_TW.UTF-8
diff --git a/nls/en_US.UTF-8/Compose.pre b/nls/en_US.UTF-8/Compose.pre
index ff41f8f3..6898c352 100644
--- a/nls/en_US.UTF-8/Compose.pre
+++ b/nls/en_US.UTF-8/Compose.pre
@@ -151,6 +151,8 @@ XCOMM "₪" U20aa NEW SHEQEL SIGN
 <Multi_key> <d> <minus>			: "₫" U20ab # DONG SIGN
 <Multi_key> <C> <equal>			: "€" EuroSign # EURO SIGN
 <Multi_key> <equal> <C>			: "€" EuroSign # EURO SIGN
+<Multi_key> <c> <equal>			: "€" EuroSign # EURO SIGN
+<Multi_key> <equal> <c>			: "€" EuroSign # EURO SIGN
 <Multi_key> <E> <equal>			: "€" EuroSign # EURO SIGN
 <Multi_key> <equal> <E>			: "€" EuroSign # EURO SIGN
 
diff --git a/nls/locale.alias.pre b/nls/locale.alias.pre
index c00e1413..0842efbf 100644
--- a/nls/locale.alias.pre
+++ b/nls/locale.alias.pre
@@ -1,4 +1,4 @@
-XCOMM	$XdotOrg: lib/X11/nls/locale.alias.pre,v 1.2 2004-04-23 18:44:33 eich Exp $
+XCOMM	$XdotOrg: lib/X11/nls/locale.alias.pre,v 1.3 2004-10-18 14:21:45 eich Exp $
 XCOMM	$Xorg: locale.alias,v 1.3 2000/08/17 19:46:48 cpqbld Exp $
 XCOMM
 XCOMM	This file contains alias name of locale.
@@ -680,8 +680,8 @@ ro_RO:						ro_RO.ISO8859-2
 ro_RO.iso88592:					ro_RO.ISO8859-2
 ro_RO.ISO-8859-2:				ro_RO.ISO8859-2
 ro_RO.utf8:					ro_RO.UTF-8
-ru:						ru_RU.KOI8-R
-ru_RU:						ru_RU.KOI8-R
+ru:						ru_RU.ISO8859-5
+ru_RU:						ru_RU.ISO8859-5
 ru_RU.iso88595:					ru_RU.ISO8859-5
 ru_RU.ISO-8859-5:				ru_RU.ISO8859-5
 ru_RU.koi8r:					ru_RU.KOI8-R