[X2go-Commits] nx-libs.git - master (branch) updated: 7fb19af290ef90d542ab8be0e05620e2e7510878

[X2go dev team]

The branch, master has been updated
       via  7fb19af290ef90d542ab8be0e05620e2e7510878 (commit)
       via  9da56898675240c6b3ae966a273c482615a9bded (commit)
       via  5a7e3cc13d5ca68d0360758124688e1c7636922d (commit)
      from  e603345464ad97bcbd214a4baf2b3129c500f8aa (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 7fb19af290ef90d542ab8be0e05620e2e7510878
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Nov 19 17:50:14 2011 +0100

    add chown a+x for nxagent wrapper script

commit 9da56898675240c6b3ae966a273c482615a9bded
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Nov 19 17:49:48 2011 +0100

    add newline at EOF

commit 5a7e3cc13d5ca68d0360758124688e1c7636922d
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Nov 19 17:44:07 2011 +0100

    Add patch: 005_add_nxagent_wrapper.patch.

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

Summary of changes:
 debian/changelog                             |    1 +
 debian/patches/005_add_nxagent_wrapper.patch |   12 ++++++++++++
 debian/patches/series                        |    1 +
 debian/post-build-nx.sh                      |    2 +-
 debian/rules                                 |    1 +
 5 files changed, 16 insertions(+), 1 deletions(-)
 create mode 100644 debian/patches/005_add_nxagent_wrapper.patch

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 460ba6f..6bb0f65 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,5 +7,6 @@ nx-libs (2:3.5.0-0~x2go1) UNRELEASED; urgency=low
   * Add patch: 002_nxcompshad-build-against-nx-x11-only.patch.
   * Add patch: 003_nxcompshad-gcc43.patch.
   * Add patch: 004_nx-x11-fix-nxcompshad-build.patch.
+  * Add patch: 005_add_nxagent_wrapper.patch.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Fri, 14 Oct 2011 03:01:39 +0200
diff --git a/debian/patches/005_add_nxagent_wrapper.patch b/debian/patches/005_add_nxagent_wrapper.patch
new file mode 100644
index 0000000..a2a9f92
--- /dev/null
+++ b/debian/patches/005_add_nxagent_wrapper.patch
@@ -0,0 +1,12 @@
+--- /dev/null
++++ b/bin/nxagent
+@@ -0,0 +1,9 @@
++#!/bin/bash
++
++NX_LIBS=/usr/lib/nx
++LD_LIBRARY_PATH=/usr/lib/nx
++
++export NX_LIBS
++export LD_LIBRARY_PATH
++
++exec /usr/lib/nx/nxagent "$@"
diff --git a/debian/patches/series b/debian/patches/series
index 38a6041..d004ac1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 002_nxcompshad-build-against-nx-x11-only.patch
 003_nxcompshad-gcc43.patch
 004_nx-x11-fix-nxcompshad-build.patch
+005_add_nxagent_wrapper.patch
diff --git a/debian/post-build-nx.sh b/debian/post-build-nx.sh
index 4c94956..0724e19 100755
--- a/debian/post-build-nx.sh
+++ b/debian/post-build-nx.sh
@@ -20,4 +20,4 @@ find nx-X11/exports/lib/ | egrep "^.*\.so$" | while read libpath; do
     done
 done
 
-exit 0
\ No newline at end of file
+exit 0
diff --git a/debian/rules b/debian/rules
index caf546b..360b880 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,6 +25,7 @@ override_dh_auto_install:
 override_dh_quilt_patch:
 	dh_quilt_patch
 	chown a+x Makefile
+	chown a+x bin/nxagent
 
 override_dh_quilt_unpatch:
 	dh_quilt_unpatch


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