aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog17
-rw-r--r--debian/patches/0009_nxagent_add-man-page.full.patch2
-rw-r--r--debian/patches/0009_nxproxy_add-man-page.full+lite.patch2
-rw-r--r--debian/patches/0209_x2goagent_add-man-page.full.patch2
4 files changed, 20 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index e7e6b7775..2544fbdf9 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 cec8c7527..117a7e42b 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 b60e218ee..2e8395b5b 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 310fa87d6..ad536994f 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