Split up patch 210 (for correct creation nx-libs, nx-libs-lite tarballs):

* Split up patch 210 (for correct creation nx-libs, nx-libs-lite tarballs):
  + 210_nxagent_save_session_state.full.patch
  + 210_nxcomp_save_session_state.full+lite.patch

5 files changed, 26 insertions, 14 deletions

diff --git a/debian/VERSION.x2goagent b/debian/VERSION.x2goagent
index b101b6383..e057f0dee 100644
--- a/debian/VERSION.x2goagent
+++ b/debian/VERSION.x2goagent
@@ -1 +1 @@
-3.5.0.26
+3.5.0.27
diff --git a/debian/changelog b/debian/changelog
index bf6fbe517..6cc86d3a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+nx-libs (2:3.5.0.27-0x2go1) UNRELEASED; urgency=medium
+
+  * Split up patch 210 (for correct creation nx-libs, nx-libs-lite tarballs):
+    + 210_nxagent_save_session_state.full.patch
+    + 210_nxcomp_save_session_state.full+lite.patch
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de>  Mon, 30 Jun 2014 14:51:09 +0200
+
 nx-libs (2:3.5.0.26-0x2go1) unstable; urgency=medium
 
   * Fix patch names:
diff --git a/debian/patches/210_nxagent+nxcomp_save_session_state.full+lite.patch b/debian/patches/210_nxagent_save_session_state.full.patch
index 8eff50c60..223d0bc7a 100644
--- a/debian/patches/210_nxagent+nxcomp_save_session_state.full+lite.patch
+++ b/debian/patches/210_nxagent_save_session_state.full.patch
@@ -174,15 +174,3 @@ Author: Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>
  
      KillAllClients();
      DEALLOCATE_LOCAL(clientReady);
---- a/nxcomp/Loop.cpp
-+++ b/nxcomp/Loop.cpp
-@@ -8872,7 +8872,8 @@
-     }
-     else if (strcasecmp(name, "defer") == 0 ||
-                  strcasecmp(name, "tile") == 0 ||
--                     strcasecmp(name, "menu") == 0)
-+                     strcasecmp(name, "menu") == 0 ||
-+                        strcasecmp(name, "state") == 0 )
-     {
-       #ifdef DEBUG
-       *logofs << "Loop: Ignoring agent option '" << name
diff --git a/debian/patches/210_nxcomp_save_session_state.full+lite.patch b/debian/patches/210_nxcomp_save_session_state.full+lite.patch
new file mode 100644
index 000000000..1ef4440d8
--- /dev/null
+++ b/debian/patches/210_nxcomp_save_session_state.full+lite.patch
@@ -0,0 +1,15 @@
+Description: Ignore state=<statefile> option in nxproxy/nxcomp
+Author: Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>
+
+--- a/nxcomp/Loop.cpp
++++ b/nxcomp/Loop.cpp
+@@ -8872,7 +8872,8 @@
+     }
+     else if (strcasecmp(name, "defer") == 0 ||
+                  strcasecmp(name, "tile") == 0 ||
+-                     strcasecmp(name, "menu") == 0)
++                     strcasecmp(name, "menu") == 0 ||
++                        strcasecmp(name, "state") == 0 )
+     {
+       #ifdef DEBUG
+       *logofs << "Loop: Ignoring agent option '" << name
diff --git a/debian/patches/series b/debian/patches/series
index a7634ba05..cf3e9a001 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -50,7 +50,8 @@
 205_nxagent_refresh-adsl.full.patch
 206_nxagent_clipboard-as-nxoption.full.patch
 209_x2goagent_add-man-page.full.patch
-210_nxagent+nxcomp_save_session_state.full+lite.patch
+210_nxagent_save_session_state.full.patch
+210_nxcomp_save_session_state.full+lite.patch
 211_nxcomp_set_default_options.full+lite.patch
 212_nxcomp_build-on-Android.full+lite.patch
 220_nxproxy_bind-loopback-only.full+lite.patch