[X2Go-Commits] nx-libs.git - build-main (branch) updated: nxproxy/3.5.0-1-99-g5ea24ed

X2Go dev team git-admin at x2go.org
Fri Aug 30 16:22:35 CEST 2013


The branch, build-main has been updated
       via  5ea24ed1e222be8b569bccd5d63359d778af9aad (commit)
      from  867c3b9785f7da1f66588c24a6191ea43df5639e (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                                   |    1 +
 debian/control                                     |   24 ++++++++++++++++++++
 debian/{nxagent.dirs => nxproxy.dirs}              |    0
 debian/nxproxy.install                             |    3 +++
 ...rapper.patch => 008_add-nx-proxy-wrapper.patch} |    5 ++--
 debian/patches/series                              |    1 +
 6 files changed, 32 insertions(+), 2 deletions(-)
 copy debian/{nxagent.dirs => nxproxy.dirs} (100%)
 create mode 100644 debian/nxproxy.install
 copy debian/patches/{005_add_nxagent_wrapper.patch => 008_add-nx-proxy-wrapper.patch} (64%)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 164beb2..884ccb7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,5 +15,6 @@ nx-libs (2:3.5.0-0~x2go1) UNRELEASED; urgency=low
   * Add patch: 007_nxcompshad-clean-gch-files.patch.
   * Remove unknown option --with from dh_auto_clean.
   * Add autoconf as build dependency.
+  * Add patch: 008_add-nxproxy-wrapper.patch. Build nxproxy package.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Fri, 14 Oct 2011 03:01:39 +0200
diff --git a/debian/control b/debian/control
index a4afbd5..dcc6483 100644
--- a/debian/control
+++ b/debian/control
@@ -110,6 +110,30 @@ Description: NX agent (NoMachine)
 # .
 # This package contains the debug symbols of nxagent. Source: nx-libs
 
+Package: nxproxy
+Architecture: any
+Depends:
+ libxcomp3 (>= ${source:Version}), libxcomp3 (<< ${source:Version}.1~),
+ ${shlibs:Depends},
+ ${misc:Depends}
+Description: NX proxy (NoMachine)
+ NX provides a differential X compression library for X11.
+ .
+ This package provides the NX proxy (client) binary.
+
+#Package: nxproxy-dbg
+#Architecture: any
+#Depends:
+# libxcomp3 (>= ${source:Version}), libxcomp3 (<< ${source:Version}.1~),
+# ${shlibs:Depends},
+# ${misc:Depends}
+#Priority: extra
+#Section: debug
+#Description: NX proxy (NoMachine), debug symbols
+# NX provides a differential X compression library for X11.
+# .
+# This package provides the NX proxy (client) binary.
+
 Package: libxcomp3
 Architecture: any
 Depends:
diff --git a/debian/nxagent.dirs b/debian/nxproxy.dirs
similarity index 100%
copy from debian/nxagent.dirs
copy to debian/nxproxy.dirs
diff --git a/debian/nxproxy.install b/debian/nxproxy.install
new file mode 100644
index 0000000..42a49f2
--- /dev/null
+++ b/debian/nxproxy.install
@@ -0,0 +1,3 @@
+nxproxy/nxproxy                    usr/lib/nx
+bin/nxproxy                        usr/bin
+
diff --git a/debian/patches/005_add_nxagent_wrapper.patch b/debian/patches/008_add-nx-proxy-wrapper.patch
similarity index 64%
copy from debian/patches/005_add_nxagent_wrapper.patch
copy to debian/patches/008_add-nx-proxy-wrapper.patch
index a2a9f92..9c208e2 100644
--- a/debian/patches/005_add_nxagent_wrapper.patch
+++ b/debian/patches/008_add-nx-proxy-wrapper.patch
@@ -1,5 +1,5 @@
 --- /dev/null
-+++ b/bin/nxagent
++++ b/bin/nxproxy
 @@ -0,0 +1,9 @@
 +#!/bin/bash
 +
@@ -9,4 +9,5 @@
 +export NX_LIBS
 +export LD_LIBRARY_PATH
 +
-+exec /usr/lib/nx/nxagent "$@"
++exec /usr/lib/nx/nxproxy "$@"
+\ No newline at end of file
diff --git a/debian/patches/series b/debian/patches/series
index 0067975..4cf8420 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
 005_add_nxagent_wrapper.patch
 006_remove-configure-files.patch
 007_nxcompshad-clean-gch-files.patch
+008_add-nx-proxy-wrapper.patch


hooks/post-receive
-- 
nx-libs.git (NX (redistributed))

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 (redistributed)).




More information about the x2go-commits mailing list