[X2Go-Commits] x2goserver.git - build-baikal (branch) updated: 3.0.99.8-45-g21939b5
X2Go dev team
git-admin at x2go.org
Fri Jan 3 20:51:11 CET 2014
The branch, build-baikal has been updated
via 21939b511d26b0bb737fa41c2219e11ce993c842 (commit)
from 45b1367dfa77432852ce741eb9052f83b242a75c (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 +
x2goserver/bin/x2goruncommand | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index d7acf20..07f89a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ x2goserver (3.0.99.9-0~x2go1) UNRELEASED; urgency=low
- Re-add x2gosetkeyboard via new subproject x2goserver-pyhoca.
- Call x2golistmounts with user privileges instead of using db_getmounts
in x2goprint script.
+ - Avoid potentially empty LD_LIBRARY_PATH path in x2goruncommand.
* Add psmisc package as dependency.
* Add new binary package to x2goserver source: x2goserver-pyhoca.
* x2goserver package suggests x2goserver-pyhoca.
diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand
index 9af731a..b24d2f2 100755
--- a/x2goserver/bin/x2goruncommand
+++ b/x2goserver/bin/x2goruncommand
@@ -46,7 +46,7 @@ export NX_XINERAMA_CONF
IMEXIT="false"
NX_XINERAMA_LIBS=/usr/lib/nx/X11/Xinerama
-LD_LIBRARY_PATH=$NX_XINERAMA_LIBS:$LD_LIBRARY_PATH
+test -n $LD_LIBRARY_PATH && LD_LIBRARY_PATH=$NX_XINERAMA_LIBS:$LD_LIBRARY_PATH || LD_LIBRARY_PATH=$NX_XINERAMA_LIBS
export LD_LIBRARY_PATH
if [ "$sndsys" == "esd" ]; then
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