This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository nx-libs. commit 0cf283dca109ff29e18cd36fdbd2e51dadd52772 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Jun 27 02:01:15 2014 +0200 Add 206_nxagent_clipboard-as-nxoption.full.patch. Make the clipboard option configurable in nxagent via NX options as addition to the command line parameter -clipboard. Note that the command line parameter overrides the clipboard NX option. Possible values are both or 1, client, server, none or 0. --- debian/changelog | 5 ++ .../206_nxagent_clipboard-as-nxoption.full.patch | 50 ++++++++++++++++++++ .../210_nxagent_nxcomp_save_session_state.patch | 2 +- debian/patches/series | 1 + 4 files changed, 57 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 907f673..461c5a9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -29,6 +29,11 @@ nx-libs (2:3.5.0.25-0x2go1) UNRELEASED; urgency=low * Add 302_nx-X11_xkbbasedir-detection.patch. For detecting XkbBaseDir test for xkb/rules/base instead of testing for deprecated file xkb/keymap.dir. (Fixes: #40). + * Add 206_nxagent_clipboard-as-nxoption.full.patch. Make the clipboard + option configurable in nxagent via NX options as addition to the + command line parameter -clipboard. Note that the command line + parameter overrides the clipboard NX option. Possible values are + both or 1, client, server, none or 0. * Update patches, to make them apply cleanly after above changes: + 220_nxproxy-bind-loopback-only.full+lite.patch diff --git a/debian/patches/206_nxagent_clipboard-as-nxoption.full.patch b/debian/patches/206_nxagent_clipboard-as-nxoption.full.patch new file mode 100644 index 0000000..f173b25 --- /dev/null +++ b/debian/patches/206_nxagent_clipboard-as-nxoption.full.patch @@ -0,0 +1,50 @@ +--- a/nx-X11/programs/Xserver/hw/nxagent/Args.c ++++ b/nx-X11/programs/Xserver/hw/nxagent/Args.c +@@ -984,7 +984,7 @@ + + if (!strcmp(argv[i], "-clipboard")) + { +- if (!strcmp(argv[i+1], "both")) ++ if ((!strcmp(argv[i+1], "both")) || (!strcmp(argv[i+1], "1"))) + { + nxagentChangeOption(Clipboard, ClipboardBoth); + } +@@ -996,7 +996,7 @@ + { + nxagentChangeOption(Clipboard, ClipboardServer); + } +- else if (!strcmp(argv[i+1], "none")) ++ else if ((!strcmp(argv[i+1], "none")) || (!strcmp(argv[i+1], "1"))) + { + nxagentChangeOption(Clipboard, ClipboardNone); + } +@@ -1255,6 +1255,29 @@ + + return; + } ++ else if (strcmp(name, "clipboard") == 0) ++ { ++ if ((strcmp(value, "both") == 0) || (strcmp(value, "1") == 0)) ++ { ++ nxagentChangeOption(Clipboard, ClipboardBoth); ++ } ++ else if (strcmp(value, "client") == 0) ++ { ++ nxagentChangeOption(Clipboard, ClipboardClient); ++ } ++ else if (strcmp(value, "server") == 0) ++ { ++ nxagentChangeOption(Clipboard, ClipboardServer); ++ } ++ else if ((strcmp(value, "none") == 0) || (strcmp(value, "0") == 0)) ++ { ++ nxagentChangeOption(Clipboard, ClipboardNone); ++ } ++ else ++ { ++ nxagentChangeOption(Clipboard, ClipboardBoth); ++ } ++ } + else + { + #ifdef DEBUG diff --git a/debian/patches/210_nxagent_nxcomp_save_session_state.patch b/debian/patches/210_nxagent_nxcomp_save_session_state.patch index 53cfb85..fa02848 100644 --- a/debian/patches/210_nxagent_nxcomp_save_session_state.patch +++ b/debian/patches/210_nxagent_nxcomp_save_session_state.patch @@ -23,7 +23,7 @@ Author: Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> else if (!strcmp(name, "fullscreen")) { if (nxagentReconnectTrap == True) -@@ -1362,6 +1368,11 @@ +@@ -1385,6 +1391,11 @@ validateString(nxagentOptionFile)); #endif diff --git a/debian/patches/series b/debian/patches/series index 0689392..733f49c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -48,6 +48,7 @@ 203_nxagent_disable-rootless-exit.full.patch 204_nxagent_repaint-solidpict.full.patch 205_nxagent_refresh-adsl.full.patch +206_nxagent_clipboard-as-nxoption.full.patch 209_x2goagent_add-man-page.full.patch 220_nxproxy_bind-loopback-only.full+lite.patch 300_nxagent_set-wm-class.full.patch -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git