1 files changed, 40 insertions, 0 deletions
diff --git a/debian/patches/103_nxagent_set-X0-config-path.full.patch b/debian/patches/103_nxagent_set-X0-config-path.full.patch
new file mode 100644
index 000000000..eb705ca81
--- /dev/null
+++ b/debian/patches/103_nxagent_set-X0-config-path.full.patch
@@ -0,0 +1,40 @@
+Description: FHS path fix for keyboard config file
+ This patch is needed for Tarball installation and on Distros like
+ Debian, not reporting this path addition to upstream.
+ .
+ Originally contributed by FreeNX Team.
+Forwarded: not-needed
+Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+Last-Update: 2011-12-31
+--- a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
++++ b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
+@@ -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"
+@@ -985,8 +985,7 @@
+ 
+         XkbGetControls(nxagentDisplay, XkbAllControlsMask, xkb);
+ 
+-        nxagentXkbConfigFilePathSize = strlen(XkbBaseDirectory) +
+-                                           strlen(XKB_CONFIG_FILE) + 1;
++        nxagentXkbConfigFilePathSize = strlen(XKB_CONFIG_FILE);
+ 
+         nxagentXkbConfigFilePath = malloc((nxagentXkbConfigFilePathSize + 1) * sizeof(char));
+ 
+@@ -995,9 +994,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",