diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2014-06-30 14:53:09 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2014-06-30 14:53:09 +0200 |
| commit | 77c3e15506839c9c7c2a6e8c7582da49b33507b8 (patch) | |
| tree | 0825df3613dd960b5b2724212aaf3511923b50f6 /debian/patches | |
| parent | 035de8281a0455d0bf98fdd786e492587ae88e31 (diff) | |
| download | nx-libs-77c3e15506839c9c7c2a6e8c7582da49b33507b8.tar.gz nx-libs-77c3e15506839c9c7c2a6e8c7582da49b33507b8.tar.bz2 nx-libs-77c3e15506839c9c7c2a6e8c7582da49b33507b8.zip | |
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
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/210_nxagent_save_session_state.full.patch (renamed from debian/patches/210_nxagent+nxcomp_save_session_state.full+lite.patch) | 12 | ||||
| -rw-r--r-- | debian/patches/210_nxcomp_save_session_state.full+lite.patch | 15 | ||||
| -rw-r--r-- | debian/patches/series | 3 |
3 files changed, 17 insertions, 13 deletions
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 |