[X2Go-Commits] x2goserver.git - master (branch) updated: 3.1.1.3-199-g99e3b62
X2Go dev team
git-admin at x2go.org
Sun Jul 28 02:12:28 CEST 2013
The branch, master has been updated
via 99e3b6282d2db60fe2c0da9a9d19139f96b81419 (commit)
from 50b316f1c5e3a13269d03132bcfe98fd5fdd0c6e (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 99e3b6282d2db60fe2c0da9a9d19139f96b81419
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Sun Jul 28 02:06:26 2013 +0200
Do not hard-code paths to NX code in x2goruncommand anymore. Use x2gopath instead. (Fixes: #273).
Conflicts (resolved by Mike Gabriel after cherry-picking from release/4.0.1.x branch):
debian/changelog
x2goserver/bin/x2goruncommand
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 8 ++++++++
x2goserver/bin/x2gopath | 1 +
x2goserver/bin/x2goruncommand | 4 ++--
3 files changed, 11 insertions(+), 2 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 63b6ec1..cb40b53 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -51,6 +51,14 @@ x2goserver (4.1.0.0-0~x2go1) UNRELEASED; urgency=low
-- Reinhard Tartler <siretart at tauware.de> Thu, 20 Dec 2012 10:15:26 +0100
+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 0a70a54..1d2f9f3 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 29d7c3f..64469ed 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"
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).
More information about the x2go-commits
mailing list