[X2go-Commits] nx-libs.git - master (branch) updated: nxproxy/3.5.0-1-174-g82e5023

[X2go dev team]

The branch, master has been updated
       via  82e5023ed4d48e179b0f999162e0294dd92f8478 (commit)
      from  608bbb6d9e6d978a12dff1d22bca9a58c6c63e2f (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 82e5023ed4d48e179b0f999162e0294dd92f8478
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Dec 31 16:27:58 2011 +0100

    Transfer patch: 009_nxproxy_add-man-page.patch into man page file in /debian/man.

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                              |    2 +
 debian/man/nxproxy.1                          |   27 +++++++++++++++++++
 debian/patches/009_nxproxy_add-man-page.patch |   35 -------------------------
 debian/patches/series                         |    1 -
 4 files changed, 29 insertions(+), 36 deletions(-)
 create mode 100644 debian/man/nxproxy.1
 delete mode 100644 debian/patches/009_nxproxy_add-man-page.patch

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 6bd313d..0a16fd5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -74,6 +74,8 @@ nx-libs (2:3.5.0-2) UNRELEASED; urgency=low
   * Add patch headers to all patch files, report most patches upstream. Waiting for
     feedback and quotable URLs from NoMachine.
   * Fix linking of doc folders for nxcomp*-dev.
+  * Transfer patch: 009_nxproxy_add-man-page.patch into man page file
+    in /debian/man.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Wed, 28 Dec 2011 19:06:26 +0100
 
diff --git a/debian/man/nxproxy.1 b/debian/man/nxproxy.1
new file mode 100644
index 0000000..5394b28
--- /dev/null
+++ b/debian/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/009_nxproxy_add-man-page.patch b/debian/patches/009_nxproxy_add-man-page.patch
deleted file mode 100644
index 83d1b88..0000000
--- a/debian/patches/009_nxproxy_add-man-page.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Description: Add man page for nxproxy.
- Providing a man page for nxproxy on Debian.
-Forwarded: not-needed
-Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
-Last-Update: 2012-12-31
---- /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 4c1431a..2ef9a40 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,7 +3,6 @@
 003_nxcompshad_gcc43.patch
 004_nx-x11_fix-nxcompshad-build.patch
 007_nxcompshad_clean-gch-files.patch
-009_nxproxy_add-man-page.patch
 010_nxauth_fix-binary-name-in-man-page.patch
 012_nxcomp_makefile-uninstall.patch
 013_nxcompext_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).