[X2go-Commits] x2goserver.git - master (branch) updated: 3.1.1.0-7-gc13ffe1

[X2Go dev team]

The branch, master has been updated
       via  c13ffe1cb2c39edfacab52bc62e278469da19c9e (commit)
      from  91c4bb8568bb649fcef89484b19a556453b57e04 (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 c13ffe1cb2c39edfacab52bc62e278469da19c9e
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Apr 28 23:46:35 2012 +0200

    Provide nx-X11 libraries for applications launched via x2goruncommand.

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

Summary of changes:
 debian/changelog              |    1 +
 x2goserver/bin/x2goruncommand |    5 ++++-
 2 files changed, 5 insertions(+), 1 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 82df7fc..bca28f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ x2goserver (3.1.1.1-0~x2go1) UNRELEASED; urgency=low
       client-side.
     - Avoid error messages in x2gocmdexistmessage if cmdoutput file could
       not be found.
+    - Provide nx-X11 libraries for applications launched via x2goruncommand.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Wed, 04 Apr 2012 11:44:14 +0200
 
diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand
index 2f70633..a6addbf 100755
--- a/x2goserver/bin/x2goruncommand
+++ b/x2goserver/bin/x2goruncommand
@@ -52,7 +52,9 @@ export QT_GRAPHICSSYSTEM=native
 IMEXIT="false"
 
 NX_XINERAMA_LIBS=/usr/lib/nx/X11/Xinerama
-test -n "$LD_LIBRARY_PATH" && LD_LIBRARY_PATH=$NX_XINERAMA_LIBS:$LD_LIBRARY_PATH || LD_LIBRARY_PATH="$NX_XINERAMA_LIBS"
+NX_LIBS=/usr/lib/nx/X11
+test -n "$LD_LIBRARY_PATH" && LD_LIBRARY_PATH=$NX_XINERAMA_LIBS:$NX_LIBS:$LD_LIBRARY_PATH || LD_LIBRARY_PATH="$NX_XINERAMA_LIBS:$NX_LIBS"
+$X2GO_LIB_PATH/x2gosyslog "$0" "debug" "exporting LD_LIBRARY_PATH=$LD_LIBRARY_PATH"
 export LD_LIBRARY_PATH
 
 if [ "$sndsys" == "esd" ]; then
@@ -141,6 +143,7 @@ if [ "$EXEC" != "" ] && [ -x $EXEC ]; then
 		$X2GO_LIB_PATH/x2gosyslog "$0" "notice" "launching session with Xsession-x2go mechanism, using STARTUP=\"$STARTUP\""
 		STARTUP="$STARTUP" /etc/x2go/Xsession
 	} || {
+		$X2GO_LIB_PATH/x2gosyslog "$0" "debug" "executing command $EXEC..."
 		$cmd
 	}
 


hooks/post-receive
-- 
x2goserver.git (X2Go Server)

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 "x2goserver.git" (X2Go Server).