[X2Go-Commits] x2goserver.git - build-main (branch) updated: 4.0.1.4-2-g6667eef

[X2Go dev team]

The branch, build-main has been updated
       via  6667eefec14315a0f0c16041c973cedefddf0920 (commit)
      from  9edcabfa9339b78b8aeadca6226e99857184bf69 (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              |    8 ++++++++
 x2goserver/bin/x2gopath       |    1 +
 x2goserver/bin/x2goruncommand |   11 ++---------
 3 files changed, 11 insertions(+), 9 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 61dbf32..524abbd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+x2goserver (4.0.1.5-0~x2go1) UNRELEASED; urgency=low
+
+  * New upstream version (4.0.1.5):
+    - Do not hard-code paths to NX code in x2goruncommand anymore. Use
+      x2gopath instead. (Fixes: #273).
+
+ -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Sun, 28 Jul 2013 01:50:57 +0200
+
 x2goserver (4.0.1.4-0~x2go1) unstable; urgency=low
 
   [ Mike Gabriel ]
diff --git a/x2goserver/bin/x2gopath b/x2goserver/bin/x2gopath
index b42c9bb..25cad44 100755
--- a/x2goserver/bin/x2gopath
+++ b/x2goserver/bin/x2gopath
@@ -36,6 +36,7 @@ case "$1" in
 	lib) echo -n "$base/lib/x2go";;
 	libexec) echo -n "$base/lib/x2go";;
 	share) echo -n "$base/share/x2go";;
+	nx-x11) echo -n "$base/lib/nx/X11";;
 	xinerama) echo -n "$base/lib/nx/X11/Xinerama";;
 	*) exit 1;;
 esac;
diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand
index 7b3d995..bca44f1 100755
--- a/x2goserver/bin/x2goruncommand
+++ b/x2goserver/bin/x2goruncommand
@@ -52,8 +52,8 @@ export QT_GRAPHICSSYSTEM=native
 
 IMEXIT="false"
 
-NX_XINERAMA_LIBS=/usr/lib/nx/X11/Xinerama
-NX_LIBS=/usr/lib/nx/X11
+NX_XINERAMA_LIBS=$(x2gopath xinerama)
+NX_LIBS=$(x2gopath 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"
@@ -212,13 +212,6 @@ then
 	X2GO_SESS_TYPE="R"
 fi
 
-#if [ "$cmd" == "startkde" ]; then
-#	NX_XRANDR_LIBS=/usr/lib/nx/X11/Xrandr
-#	LD_LIBRARY_PATH="$NX_XRANDR_LIBS:$LD_LIBRARY_PATH"
-#	$X2GO_LIB_PATH/x2gosyslog "$0" "debug" "extending LD_LIBRARY_PATH=$LD_LIBRARY_PATH by Xrandr extension"
-#	export LD_LIBRARY_PATH
-#fi
-
 
 # run x2goserver-extensions for pre-runcommand
 x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions "$X2GO_SESSION" pre-runcommand || true


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