This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository nx-libs. commit 78c016e77f7b9edb42d3f3406a1c3227e5dc1d29 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Jan 28 11:29:52 2015 +0100 Extend 999_nxagent_unbrand-nxagent-brand-x2goagent.full.patch. Allow separate .keyboard files for x2goagent and nxagent. --- debian/changelog | 2 + ...gent_unbrand-nxagent-brand-x2goagent.full.patch | 48 ++++++++++++++++++++ 2 files changed, 50 insertions(+) diff --git a/debian/changelog b/debian/changelog index 2883c3e..ea97edd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -46,6 +46,8 @@ nx-libs (2:3.5.0.29-0x2go2) UNRELEASED; urgency=medium file shipped with x2goagent supersede rgb file shipped with nxagent. FIXME: a better approach would be to decide at runtime if to use /etc/x2go/rgb or /etc/nxagent/rgb. + * Extend 999_nxagent_unbrand-nxagent-brand-x2goagent.full.patch. Allow + separate .keyboard files for x2goagent and nxagent. [ Horst Schirmeier ] * Update 320_nxagent_configurable-keystrokes.full.patch. Fix a typo that diff --git a/debian/patches/999_nxagent_unbrand-nxagent-brand-x2goagent.full.patch b/debian/patches/999_nxagent_unbrand-nxagent-brand-x2goagent.full.patch index db59976..62c85cf 100644 --- a/debian/patches/999_nxagent_unbrand-nxagent-brand-x2goagent.full.patch +++ b/debian/patches/999_nxagent_unbrand-nxagent-brand-x2goagent.full.patch @@ -317,3 +317,51 @@ Last-Update: 2012-01-11 static char _NXRgbPath[1024]; #endif +--- a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c ++++ b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c +@@ -62,6 +62,7 @@ + + #include "globals.h" + #include "property.h" ++#include "Init.h" + + #include <X11/extensions/XKB.h> + +@@ -138,8 +139,11 @@ + #ifndef XKB_ALTERNATE_BASE_DIRECTORY + #define XKB_ALTERNATE_BASE_DIRECTORY "/usr/X11R6/lib/X11/xkb" + #endif +-#ifndef XKB_CONFIG_FILE +-#define XKB_CONFIG_FILE "/etc/nxagent/nxagent.keyboard" ++#ifndef XKB_CONFIG_FILE_NX ++#define XKB_CONFIG_FILE_NX "/etc/nxagent/nxagent.keyboard" ++#endif ++#ifndef XKB_CONFIG_FILE_X2GO ++#define XKB_CONFIG_FILE_X2GO "/etc/x2go/x2goagent.keyboard" + #endif + #ifndef XKB_DFLT_RULES_FILE + #define XKB_DFLT_RULES_FILE "xfree86" +@@ -988,7 +992,10 @@ + + XkbGetControls(nxagentDisplay, XkbAllControlsMask, xkb); + +- nxagentXkbConfigFilePathSize = strlen(XKB_CONFIG_FILE); ++ if (nxagentX2go) ++ nxagentXkbConfigFilePathSize = strlen(XKB_CONFIG_FILE_X2GO); ++ else ++ nxagentXkbConfigFilePathSize = strlen(XKB_CONFIG_FILE_NX); + + nxagentXkbConfigFilePath = malloc((nxagentXkbConfigFilePathSize + 1) * sizeof(char)); + +@@ -997,7 +1004,10 @@ + FatalError("nxagentKeyboardProc: malloc failed."); + } + +- strcpy(nxagentXkbConfigFilePath, XKB_CONFIG_FILE); ++ if (nxagentX2go) ++ nxagentXkbConfigFilePathSize = strlen(XKB_CONFIG_FILE_X2GO); ++ else ++ nxagentXkbConfigFilePathSize = strlen(XKB_CONFIG_FILE_NX); + + #ifdef TEST + fprintf(stderr, "nxagentKeyboardProc: nxagentXkbConfigFilePath [%s].\n", -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git