[X2Go-Commits] [nx-libs] 01/02: Split up patch 210 (for correct creation nx-libs, nx-libs-lite tarballs):

git-admin at x2go.org git-admin at x2go.org
Mon Jun 30 14:56:04 CEST 2014


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository nx-libs.

commit 77c3e15506839c9c7c2a6e8c7582da49b33507b8
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Jun 30 14:53:09 2014 +0200

    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
---
 debian/VERSION.x2goagent                           |    2 +-
 debian/changelog                                   |    8 ++++++++
 ...h => 210_nxagent_save_session_state.full.patch} |   12 ------------
 .../210_nxcomp_save_session_state.full+lite.patch  |   15 +++++++++++++++
 debian/patches/series                              |    3 ++-
 nx-libs.spec                                       |    2 +-
 6 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/debian/VERSION.x2goagent b/debian/VERSION.x2goagent
index b101b63..e057f0d 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 bf6fbe5..6cc86d3 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 at 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
similarity index 90%
rename from debian/patches/210_nxagent+nxcomp_save_session_state.full+lite.patch
rename to debian/patches/210_nxagent_save_session_state.full.patch
index 8eff50c..223d0bc 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 at 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 0000000..1ef4440
--- /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 at 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 a7634ba..cf3e9a0 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
diff --git a/nx-libs.spec b/nx-libs.spec
index 4b5e4fc..13bf100 100644
--- a/nx-libs.spec
+++ b/nx-libs.spec
@@ -1,7 +1,7 @@
 %global _hardened_build 1
 
 Name:           nx-libs
-Version:        3.5.0.26
+Version:        3.5.0.27
 Release:        0.0x2go1%{?dist}
 Summary:        NX X11 protocol compression libraries
 

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git


More information about the x2go-commits mailing list