Merge branch '3.6.x'

1 files changed, 0 insertions, 25 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
deleted file mode 100644
index 795f10b76..000000000
--- a/debian/patches/0321_nxagent_x2go-specific-keystroke-config.full.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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);