diff options
| -rw-r--r-- | debian/changelog | 31 | ||||
| -rwxr-xr-x | doc/examples/run-nxproxy2nxproxy-test | 7 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 | 2 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/man/x2goagent.1 | 2 | ||||
| -rw-r--r-- | nxproxy/man/nxproxy.1 | 2 |
5 files changed, 38 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog index 0d56a4b96..17820e3d9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -243,6 +243,37 @@ nx-libs (2:3.5.0.32-0x2go1) UNRELEASED; urgency=low Adds: - 0992_fix-DEBUG-TEST-DUMP-FLUSH-TOKEN-PING-et-al-builds.full+lite.patch + [ Vadim Troshchinskiy ] + * nxcomp: fix "negotiation in stage 10" error. + v2: backport to nx-libs 3.5.0.x (Mihai Moldovan) + Adds: + - 0660_nxcomp_fix-negotiation-in-stage-10-error.full+lite.patch + + [ Emanuele Giaquinta ] + * nx-X11: Fix alpha premultiplication in XRenderParseColor. + Fixes: #893. + v2: backport to nx-libs 3.6.x (Mike Gabriel) + v3: backport to nx-libs 3.5.0.x (Mihai Moldovan) + Adds: + - 0040_nx-X11_Fix-alpha-premultiplication-in-XRenderPa.full.patch + + [ Michael DePaulo ] + * {nx-X11,nxproxy}: correct manpages: --help -> -help + xorg-server does not follow the convention of using 2 dashes. + Note that --help does produce the help output. However, it + produces this additional output after it: + Error: Aborting session with 'Unrecognized option: --help'. + Session: Aborting session at 'Sun Jun 28 01:35:35 2015'. + Session: Session aborted at 'Sun Jun 28 01:35:35 2015'. + It also causes a return code of 1 rather than 0. + Therefore, we should instruct users to call -help instead. + + v2: backport to nx-libs 3.5.0.x (Mihai Moldovan) + Affects: + - 0009_nxagent_add-man-page.full.patch + - 0009_nxproxy_add-man-page.full+lite.patch + - 0209_x2goagent_add-man-page.full.patch + -- X2Go Release Manager <git-admin@x2go.org> Tue, 17 Mar 2015 19:19:32 +0100 nx-libs (2:3.5.0.31-0x2go1) unstable; urgency=low diff --git a/doc/examples/run-nxproxy2nxproxy-test b/doc/examples/run-nxproxy2nxproxy-test index b7bf64d0f..fd4d6e373 100755 --- a/doc/examples/run-nxproxy2nxproxy-test +++ b/doc/examples/run-nxproxy2nxproxy-test @@ -40,9 +40,10 @@ mkdir -p "${NX_ROOT}" # This should be randlomly generated. # -#NX_COOKIE=`xauth list |grep "${HOSTNAME}/unix:\<${NX_PORT}\>" | grep MIT | cut -f 5 -d ' '` -NX_COOKIE=123efa980d2cba234ef6f73deac810ff - +NX_COOKIE=`xauth -n list |grep "${HOSTNAME}/unix:${NX_PORT}" | grep MIT | cut -f 5 -d ' ' | head -n1` +if [ -z "$NX_COOKIE" ]; then + NX_COOKIE=`mcookie` +fi # # Create the directories for the NX session. diff --git a/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 b/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 index 198632312..f92393893 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 +++ b/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 @@ -23,7 +23,7 @@ NoMachine's \fBnxclient\fR or the community projects \fBqtnx\fR and \fBremmina\f .SH OPTIONS .TP -.B \--help +.B \-help Lists all others options that are not listed here. .SH FURTHER READINGS diff --git a/nx-X11/programs/Xserver/hw/nxagent/man/x2goagent.1 b/nx-X11/programs/Xserver/hw/nxagent/man/x2goagent.1 index b9e8ddab5..a78855584 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/man/x2goagent.1 +++ b/nx-X11/programs/Xserver/hw/nxagent/man/x2goagent.1 @@ -23,7 +23,7 @@ Python X2Go API). .SH OPTIONS .TP -.B \--help +.B \-help Lists all others options that are not listed here. .SH FURTHER READINGS diff --git a/nxproxy/man/nxproxy.1 b/nxproxy/man/nxproxy.1 index 0432380f8..d389d1068 100644 --- a/nxproxy/man/nxproxy.1 +++ b/nxproxy/man/nxproxy.1 @@ -20,7 +20,7 @@ the NX compression libraries. \fBnxproxy\fR is a backend application utilized by the X2GoClient GUI and some other NX/X2Go clients. .PP .SH OPTIONS -For an insight in \fBnxproxy\fR options use \fBnxproxy \-\-help\fR on the command line. +For an insight in \fBnxproxy\fR options use \fBnxproxy \-help\fR on the command line. .PP .SH AUTHOR This manual has been written by Mike Gabriel <mike.gabriel@das\-netzwerkteam.de> for the X2Go project |