#! /bin/sh /usr/share/dpatch/dpatch-run
## 90_set_X0-config_path.dpatch by  <marceloshima@gmail.com>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Change the path to the keyboard configuration file

@DPATCH@
diff -urNad nx-x11_3.3.0-5~/programs/Xserver/hw/nxagent/Keyboard.c nx-x11_3.3.0-5/programs/Xserver/hw/nxagent/Keyboard.c
--- nx-x11_3.3.0-5~/programs/Xserver/hw/nxagent/Keyboard.c	2009-01-23 20:16:56.000000000 -0200
+++ nx-x11_3.3.0-5/programs/Xserver/hw/nxagent/Keyboard.c	2009-01-23 20:17:11.000000000 -0200
@@ -136,7 +136,7 @@
 #define XKB_ALTERNATE_BASE_DIRECTORY   "/usr/X11R6/lib/X11/xkb"
 #endif
 #ifndef XKB_CONFIG_FILE
-#define XKB_CONFIG_FILE      "X0-config.keyboard"
+#define XKB_CONFIG_FILE      "/etc/nxagent/nxagent.keyboard"
 #endif
 #ifndef XKB_DFLT_RULES_FILE
 #define XKB_DFLT_RULES_FILE  "xfree86"
@@ -978,8 +978,7 @@
 
         XkbGetControls(nxagentDisplay, XkbAllControlsMask, xkb);
 
-        nxagentXkbConfigFilePathSize = strlen(XkbBaseDirectory) +
-                                           strlen(XKB_CONFIG_FILE) + 1;
+        nxagentXkbConfigFilePathSize = strlen(XKB_CONFIG_FILE);
 
         nxagentXkbConfigFilePath = malloc((nxagentXkbConfigFilePathSize + 1) * sizeof(char));
 
@@ -988,9 +987,7 @@
           FatalError("nxagentKeyboardProc: malloc failed.");
         }
 
-        strcpy(nxagentXkbConfigFilePath, XkbBaseDirectory);
-        strcat(nxagentXkbConfigFilePath, "/");
-        strcat(nxagentXkbConfigFilePath, XKB_CONFIG_FILE);
+        strcpy(nxagentXkbConfigFilePath, XKB_CONFIG_FILE);
  
         #ifdef TEST
         fprintf(stderr, "nxagentKeyboardProc: nxagentXkbConfigFilePath [%s].\n",