X Strike Force X.Org X11 SVN commit: r1927 - in trunk/xserver/xorg-server-1.0.2/debian: . patches
Author: barbier
Date: 2006-04-20 18:53:56 -0400 (Thu, 20 Apr 2006)
New Revision: 1927
Added:
trunk/xserver/xorg-server-1.0.2/debian/patches/13_debian_add_xkbpath_env_variable.diff
Modified:
trunk/xserver/xorg-server-1.0.2/debian/changelog
trunk/xserver/xorg-server-1.0.2/debian/patches/series
Log:
Add 13_debian_add_xkbpath_env_variable.diff so that the server takes
the XKBPATH environment variable into account. (closes: #363229)
Modified: trunk/xserver/xorg-server-1.0.2/debian/changelog
===================================================================
--- trunk/xserver/xorg-server-1.0.2/debian/changelog 2006-04-20 19:31:50 UTC (rev 1926)
+++ trunk/xserver/xorg-server-1.0.2/debian/changelog 2006-04-20 22:53:56 UTC (rev 1927)
@@ -1,3 +1,10 @@
+xorg-server (1:1.0.2-7) UNRELEASED; urgency=low
+
+ * Add 13_debian_add_xkbpath_env_variable.diff so that the server takes
+ the XKBPATH environment variable into account. (closes: #363229)
+
+ -- Denis Barbier <barbier@debian.org> Fri, 21 Apr 2006 01:42:39 +0200
+
xorg-server (1:1.0.2-6) unstable; urgency=low
* Use -DNO_INLINE on s390. Thanks Bastian Blank and Julien Cristau.
Added: trunk/xserver/xorg-server-1.0.2/debian/patches/13_debian_add_xkbpath_env_variable.diff
===================================================================
--- trunk/xserver/xorg-server-1.0.2/debian/patches/13_debian_add_xkbpath_env_variable.diff 2006-04-20 19:31:50 UTC (rev 1926)
+++ trunk/xserver/xorg-server-1.0.2/debian/patches/13_debian_add_xkbpath_env_variable.diff 2006-04-20 22:53:56 UTC (rev 1927)
@@ -0,0 +1,14 @@
+Index: xorg-server-1.0.2/xkb/xkbInit.c
+===================================================================
+--- xorg-server-1.0.2.orig/xkb/xkbInit.c
++++ xorg-server-1.0.2/xkb/xkbInit.c
+@@ -908,6 +908,9 @@
+ int
+ XkbProcessArguments(int argc,char *argv[],int i)
+ {
++ char * xkbpath= getenv("XKBPATH");
++ if (xkbpath!=NULL)
++ XkbBaseDirectory= xkbpath;
+ if (strcmp(argv[i],"-kb")==0) {
+ noXkbExtension= True;
+ return 1;
Modified: trunk/xserver/xorg-server-1.0.2/debian/patches/series
===================================================================
--- trunk/xserver/xorg-server-1.0.2/debian/patches/series 2006-04-20 19:31:50 UTC (rev 1926)
+++ trunk/xserver/xorg-server-1.0.2/debian/patches/series 2006-04-20 22:53:56 UTC (rev 1927)
@@ -10,3 +10,4 @@
10_dont_look_in_home_for_config.diff -p0
11_debian_always_use_default_font_path.diff -p1
12_security_policy_in_etc.diff -p1
+13_debian_add_xkbpath_env_variable.diff
Reply to: