Patch system: Prepend a "0" to every patch file name in debian/patches/. Adapt only this changelog stanza to this modification.

1 files changed, 25 insertions, 0 deletions

diff --git a/debian/patches/0321_nxagent_x2go-specific-keystroke-config.full.patch b/debian/patches/0321_nxagent_x2go-specific-keystroke-config.full.patch
new file mode 100644
index 000000000..795f10b76
--- /dev/null
+++ b/debian/patches/0321_nxagent_x2go-specific-keystroke-config.full.patch
@@ -0,0 +1,25 @@
+Description: Adapt paths of keystrokes.cfg if nxagent runs as x2goagent
+Author: Horst Schirmeier <horst@schirmeier.com>
+
+--- a/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c
++++ b/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c
+@@ -27,6 +27,7 @@
+ #include "Options.h"
+ #include "Keystroke.h"
+ #include "Drawable.h"
++#include "Init.h" /* extern int nxagentX2go */
+ 
+ #include <unistd.h>
+ 
+@@ -261,6 +262,11 @@ static void parse_keystroke_file(void)
+   char *homefile = "/.nx/config/keystrokes.cfg";
+   char *etcfile = "/etc/nxagent/keystrokes.cfg";
+ 
++  if (nxagentX2go) {
++    homefile = "/.x2go/config/keystrokes.cfg";
++    etcfile = "/etc/x2go/keystrokes.cfg";
++  }
++
+   if (nxagentKeystrokeFile != NULL && access(nxagentKeystrokeFile, R_OK) == 0)
+   {
+     filename = strdup(nxagentKeystrokeFile);