This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.5.0.x in repository nx-libs. commit 46de1b0721e4280a0d0d8ec7856b1acb22399968 Author: Mike DePaulo <mikedep333@gmail.com> Date: Mon Jun 29 03:35:08 2015 +0200 {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 --- debian/changelog | 17 +++++++++++++++++ .../patches/0009_nxagent_add-man-page.full.patch | 2 +- .../0009_nxproxy_add-man-page.full+lite.patch | 2 +- .../patches/0209_x2goagent_add-man-page.full.patch | 2 +- 4 files changed, 20 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index e7e6b77..2544fbd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -245,6 +245,23 @@ nx-libs (2:3.5.0.32-0x2go1) UNRELEASED; urgency=low 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/debian/patches/0009_nxagent_add-man-page.full.patch b/debian/patches/0009_nxagent_add-man-page.full.patch index cec8c75..117a7e4 100644 --- a/debian/patches/0009_nxagent_add-man-page.full.patch +++ b/debian/patches/0009_nxagent_add-man-page.full.patch @@ -29,7 +29,7 @@ Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> + +.SH OPTIONS +.TP -+.B \--help ++.B \-help +Lists all others options that are not listed here. + +.SH FURTHER READINGS diff --git a/debian/patches/0009_nxproxy_add-man-page.full+lite.patch b/debian/patches/0009_nxproxy_add-man-page.full+lite.patch index b60e218..2e8395b 100644 --- a/debian/patches/0009_nxproxy_add-man-page.full+lite.patch +++ b/debian/patches/0009_nxproxy_add-man-page.full+lite.patch @@ -26,7 +26,7 @@ Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +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 diff --git a/debian/patches/0209_x2goagent_add-man-page.full.patch b/debian/patches/0209_x2goagent_add-man-page.full.patch index 310fa87..ad53699 100644 --- a/debian/patches/0209_x2goagent_add-man-page.full.patch +++ b/debian/patches/0209_x2goagent_add-man-page.full.patch @@ -29,7 +29,7 @@ Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> + +.SH OPTIONS +.TP -+.B \--help ++.B \-help +Lists all others options that are not listed here. + +.SH FURTHER READINGS -- Alioth's /srv/git/code.x2go.org/nx-libs.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git