aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog8
-rw-r--r--debian/patches/210_nxagent+nxcomp_save_session_state.full+lite.patch6
-rw-r--r--debian/patches/211_nxcomp_set_default_options.full+lite.patch4
-rw-r--r--debian/patches/220_nxproxy_bind-loopback-only.full+lite.patch2
-rw-r--r--debian/patches/320_nxagent_configurable-keystrokes.full.patch4
-rw-r--r--debian/patches/990_fix-DEBUG-and-TEST-builds.full.patch2
6 files changed, 13 insertions, 13 deletions
diff --git a/debian/changelog b/debian/changelog
index f9534c466..4af885bd4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -41,6 +41,7 @@ nx-libs (2:3.5.0.25-0x2go1) UNRELEASED; urgency=low
+ 056_nx-X11-Werror-format-security.full.patch
+ 108_nxagent_wine-close-delay.full.patch
+ 300_nxagent_set-wm-class.full.patch
+ + 320_nxagent_configurable-keystrokes.full.patch
* Rename patches to match our naming scheme:
+ 008_nxcomp_sa-restorer.full+lite.patch
@@ -55,10 +56,9 @@ nx-libs (2:3.5.0.25-0x2go1) UNRELEASED; urgency=low
specified by "state" option in agent options file. If option is omitted,
session state will not be saved. Session states are: STARTING, RUNNING,
SUSPENDING, SUSPENDED, RESUMING, TERMINATING, TERMINATED.
- * Add 211_nxcomp_set_default_options.patch. Set default arguments for options
- 'link' and 'pack' to avoid session damage by resuming with incorrect options
- file.
- * Rename Patches 210 and 211. Update series file.
+ * Add 211_nxcomp_set_default_options.full+lite.patch. Set default arguments
+ for options 'link' and 'pack' to avoid session damage by resuming with
+ incorrect options file.
-- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 07 May 2014 09:58:10 +0200
diff --git a/debian/patches/210_nxagent+nxcomp_save_session_state.full+lite.patch b/debian/patches/210_nxagent+nxcomp_save_session_state.full+lite.patch
index fa0284894..8eff50c60 100644
--- a/debian/patches/210_nxagent+nxcomp_save_session_state.full+lite.patch
+++ b/debian/patches/210_nxagent+nxcomp_save_session_state.full+lite.patch
@@ -11,7 +11,7 @@ Author: Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>
/*
* NX includes and definitions.
-@@ -1106,6 +1107,11 @@
+@@ -1090,6 +1091,11 @@
return;
}
@@ -23,7 +23,7 @@ Author: Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>
else if (!strcmp(name, "fullscreen"))
{
if (nxagentReconnectTrap == True)
-@@ -1385,6 +1391,11 @@
+@@ -1369,6 +1375,11 @@
validateString(nxagentOptionFile));
#endif
@@ -176,7 +176,7 @@ Author: Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>
DEALLOCATE_LOCAL(clientReady);
--- a/nxcomp/Loop.cpp
+++ b/nxcomp/Loop.cpp
-@@ -8898,7 +8898,8 @@
+@@ -8872,7 +8872,8 @@
}
else if (strcasecmp(name, "defer") == 0 ||
strcasecmp(name, "tile") == 0 ||
diff --git a/debian/patches/211_nxcomp_set_default_options.full+lite.patch b/debian/patches/211_nxcomp_set_default_options.full+lite.patch
index 9178fb5bf..7bd8a781d 100644
--- a/debian/patches/211_nxcomp_set_default_options.full+lite.patch
+++ b/debian/patches/211_nxcomp_set_default_options.full+lite.patch
@@ -3,7 +3,7 @@ Author: Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>
--- a/nxcomp/Loop.cpp
+++ b/nxcomp/Loop.cpp
-@@ -8350,8 +8350,8 @@
+@@ -8328,8 +8328,8 @@
cerr << "Error" << ": Can't identify 'link' option in string '"
<< value << "'.\n";
@@ -14,7 +14,7 @@ Author: Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>
}
}
else if (strcasecmp(name, "limit") == 0)
-@@ -8809,8 +8809,8 @@
+@@ -8783,8 +8783,8 @@
cerr << "Error" << ": Can't identify pack method for string '"
<< value << "'.\n";
diff --git a/debian/patches/220_nxproxy_bind-loopback-only.full+lite.patch b/debian/patches/220_nxproxy_bind-loopback-only.full+lite.patch
index fc268a55f..799291891 100644
--- a/debian/patches/220_nxproxy_bind-loopback-only.full+lite.patch
+++ b/debian/patches/220_nxproxy_bind-loopback-only.full+lite.patch
@@ -69,7 +69,7 @@ Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
else if (strcasecmp(name, "accept") == 0)
{
if (*connectHost != '\0')
-@@ -13773,7 +13799,14 @@
+@@ -13774,7 +13800,14 @@
}
else
{
diff --git a/debian/patches/320_nxagent_configurable-keystrokes.full.patch b/debian/patches/320_nxagent_configurable-keystrokes.full.patch
index d9f1fd796..ae1897d14 100644
--- a/debian/patches/320_nxagent_configurable-keystrokes.full.patch
+++ b/debian/patches/320_nxagent_configurable-keystrokes.full.patch
@@ -990,7 +990,7 @@ Description: Make nxagent-specific keyboard bindings configurable
+deactivate_input_devices_grab
--- a/nx-X11/programs/Xserver/hw/nxagent/Args.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Args.c
-@@ -148,6 +148,8 @@
+@@ -149,6 +149,8 @@
char nxagentVerbose = 0;
@@ -999,7 +999,7 @@ Description: Make nxagent-specific keyboard bindings configurable
int ddxProcessArgument(int argc, char *argv[], int i)
{
/*
-@@ -1021,6 +1023,20 @@
+@@ -1022,6 +1024,20 @@
return 1;
}
diff --git a/debian/patches/990_fix-DEBUG-and-TEST-builds.full.patch b/debian/patches/990_fix-DEBUG-and-TEST-builds.full.patch
index 0fef1a900..23c8508a2 100644
--- a/debian/patches/990_fix-DEBUG-and-TEST-builds.full.patch
+++ b/debian/patches/990_fix-DEBUG-and-TEST-builds.full.patch
@@ -47,7 +47,7 @@ Abstract:
fprintf(stderr, "nxagentTrapezoids: Destination is a [%s] of geometry [%d,%d].\n",
--- a/nx-X11/programs/Xserver/hw/nxagent/X/NXdispatch.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/X/NXdispatch.c
-@@ -734,7 +734,7 @@
+@@ -735,7 +735,7 @@
client->sequence++;
#ifdef DEBUG