[X2go-Commits] nx-libs.git - master (branch) updated: nxproxy/3.5.0-1-186-g281b04f
X2go dev team
git-admin at x2go.org
Tue Jan 10 11:14:41 CET 2012
The branch, master has been updated
via 281b04f70913ef66f6ba3687e17b3a07203963ca (commit)
from 71cc495aa04bdc09522a4a318405722b89bcb015 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 281b04f70913ef66f6ba3687e17b3a07203963ca
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Tue Jan 10 11:14:36 2012 +0100
Add patches: 009_add-nxagent-man-page.patch, 009_add-nxproxy-man-page.patch. Reintroduce man page creation via patch system, so that all man pages find their way into the NX-redistribution tarball created from this source project.
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 5 ++-
debian/man/nxagent.1 | 37 -----------------------
debian/man/nxproxy.1 | 27 -----------------
debian/nxagent.manpages | 2 +-
debian/nxproxy.manpages | 2 +-
debian/patches/009_nxagent-add-man-page.patch | 40 +++++++++++++++++++++++++
debian/patches/009_nxproxy-add-man-page.patch | 30 ++++++++++++++++++
debian/patches/series | 2 +
8 files changed, 78 insertions(+), 67 deletions(-)
delete mode 100644 debian/man/nxagent.1
delete mode 100644 debian/man/nxproxy.1
create mode 100644 debian/patches/009_nxagent-add-man-page.patch
create mode 100644 debian/patches/009_nxproxy-add-man-page.patch
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 296ba4a..939abfe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -81,7 +81,10 @@ nx-libs (2:3.5.0.0-0) UNRELEASED; urgency=low
* Call dh_clean again. This got lost somewhere on the way.
* Remove branding from descriptions in control file.
* Add patch: 000_add-NX-redistribution-README.patch.
- * Fix dh_installman for nxproxy.
+ * Add patches: 009_add-nxagent-man-page.patch, 009_add-nxproxy-man-page.patch.
+ Reintroduce man page creation via patch system, so that all man pages
+ find their way into the NX-redistribution tarball created from this source
+ project.
-- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Wed, 28 Dec 2011 19:06:26 +0100
diff --git a/debian/man/nxagent.1 b/debian/man/nxagent.1
deleted file mode 100644
index 1986323..0000000
--- a/debian/man/nxagent.1
+++ /dev/null
@@ -1,37 +0,0 @@
-.TH NXAGENT 1
-.SH NAME
-nxagent \- NoMachine's NX Agent.
-.SH SYNOPSIS
-.B nxagent
-.I "[options]"
-
-.SH DESCRIPTION
-\fBnxagent\fR is an Xnest-like X server for remote application/desktop access.
-.PP
-\fBnxagent\fR implements a very efficient compression of the X11 protocol.
-.PP
-This increases performance when using X applications over high latency and
-low bandwidth networks, while providing a local (LAN-like) usage experience
-even if connecting from off-site locations (via cable modem or GSM).
-.PP
-\fBnxagent\fR is not designed to be used as a standalone application.
-It has to be launched on the server side by remote desktop frameworks like FreeNX.
-.PP
-Available clients are
-NoMachine's \fBnxclient\fR or the community projects \fBqtnx\fR and \fBremmina\fR
-(with NX plugin).
-
-.SH OPTIONS
-.TP
-.B \--help
-Lists all others options that are not listed here.
-
-.SH FURTHER READINGS
-Information on NX: http://www.nomachine.com
-.PP
-Information on FreeNX: http://freenx.berlios.de
-
-.SH AUTHOR
-This manual page was written by Per Hansen <spamhans at yahoo.de>,
-and modified by Marcelo Boveto Shima <marceloshima at gmail.com> and
-Mike Gabriel <mike.gabriel at das-netzwerkteam.de>.
diff --git a/debian/man/nxproxy.1 b/debian/man/nxproxy.1
deleted file mode 100644
index 5394b28..0000000
--- a/debian/man/nxproxy.1
+++ /dev/null
@@ -1,27 +0,0 @@
-'\" -*- coding: utf-8 -*-
-.if \n(.g .ds T< \\FC
-.if \n(.g .ds T> \\F[\n[.fam]]
-.de URL
-\\$2 \(la\\$1\(ra\\$3
-..
-.if \n(.g .mso www.tmac
-.TH nxproxy 1 "Nov 2011" "Version 3.5.0" "NX Proxy"
-.SH NAME
-nxproxy \- NX Proxy Tool
-.SH SYNOPSIS
-'nh
-.fi
-.ad l
-\fBnxproxy\fR <options>
-
-.SH DESCRIPTION
-\fBnxproxy\fR is a tool that allows to tunnel X sessions through
-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.
-.PP
-.SH AUTHOR
-This manual has been written by Mike Gabriel <mike.gabriel at das-netzwerkteam.de> for the X2go project
-(http://www.x2go.org).
diff --git a/debian/nxagent.manpages b/debian/nxagent.manpages
index 9f7ca40..681002a 100644
--- a/debian/nxagent.manpages
+++ b/debian/nxagent.manpages
@@ -1 +1 @@
-debian/man/nxagent.1
+nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1
diff --git a/debian/nxproxy.manpages b/debian/nxproxy.manpages
index 21740d3..8564de8 100644
--- a/debian/nxproxy.manpages
+++ b/debian/nxproxy.manpages
@@ -1 +1 @@
-debian/man/nxproxy.1
+nxproxy/man/nxproxy.1
diff --git a/debian/patches/009_nxagent-add-man-page.patch b/debian/patches/009_nxagent-add-man-page.patch
new file mode 100644
index 0000000..8befcf7
--- /dev/null
+++ b/debian/patches/009_nxagent-add-man-page.patch
@@ -0,0 +1,40 @@
+--- /dev/null
++++ b/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1
+@@ -0,0 +1,37 @@
++.TH NXAGENT 1
++.SH NAME
++nxagent \- NoMachine's NX Agent.
++.SH SYNOPSIS
++.B nxagent
++.I "[options]"
++
++.SH DESCRIPTION
++\fBnxagent\fR is an Xnest-like X server for remote application/desktop access.
++.PP
++\fBnxagent\fR implements a very efficient compression of the X11 protocol.
++.PP
++This increases performance when using X applications over high latency and
++low bandwidth networks, while providing a local (LAN-like) usage experience
++even if connecting from off-site locations (via cable modem or GSM).
++.PP
++\fBnxagent\fR is not designed to be used as a standalone application.
++It has to be launched on the server side by remote desktop frameworks like FreeNX.
++.PP
++Available clients are
++NoMachine's \fBnxclient\fR or the community projects \fBqtnx\fR and \fBremmina\fR
++(with NX plugin).
++
++.SH OPTIONS
++.TP
++.B \--help
++Lists all others options that are not listed here.
++
++.SH FURTHER READINGS
++Information on NX: http://www.nomachine.com
++.PP
++Information on FreeNX: http://freenx.berlios.de
++
++.SH AUTHOR
++This manual page was written by Per Hansen <spamhans at yahoo.de>,
++and modified by Marcelo Boveto Shima <marceloshima at gmail.com> and
++Mike Gabriel <mike.gabriel at das-netzwerkteam.de>.
diff --git a/debian/patches/009_nxproxy-add-man-page.patch b/debian/patches/009_nxproxy-add-man-page.patch
new file mode 100644
index 0000000..f872f84
--- /dev/null
+++ b/debian/patches/009_nxproxy-add-man-page.patch
@@ -0,0 +1,30 @@
+--- /dev/null
++++ b/nxproxy/man/nxproxy.1
+@@ -0,0 +1,27 @@
++'\" -*- coding: utf-8 -*-
++.if \n(.g .ds T< \\FC
++.if \n(.g .ds T> \\F[\n[.fam]]
++.de URL
++\\$2 \(la\\$1\(ra\\$3
++..
++.if \n(.g .mso www.tmac
++.TH nxproxy 1 "Nov 2011" "Version 3.5.0" "NX Proxy"
++.SH NAME
++nxproxy \- NX Proxy Tool
++.SH SYNOPSIS
++'nh
++.fi
++.ad l
++\fBnxproxy\fR <options>
++
++.SH DESCRIPTION
++\fBnxproxy\fR is a tool that allows to tunnel X sessions through
++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.
++.PP
++.SH AUTHOR
++This manual has been written by Mike Gabriel <mike.gabriel at das-netzwerkteam.de> for the X2go project
++(http://www.x2go.org).
diff --git a/debian/patches/series b/debian/patches/series
index 2c9610b..a1b6582 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,6 +5,8 @@
004_nx-x11_fix-nxcompshad-build.patch
005_nxcomp_gcc43.patch
007_nxcompshad_clean-gch-files.patch
+009_nxproxy-add-man-page.patch
+009_nxagent-add-man-page.patch
010_nxauth_fix-binary-name-in-man-page.patch
011_nxcomp_sa-restorer.patch
012_nxcomp_makefile-uninstall.patch
hooks/post-receive
--
nx-libs.git (NX libraries)
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "nx-libs.git" (NX libraries).
More information about the x2go-commits
mailing list