The branch, release/4.0.1.x has been updated via 504167bac89b55b9f21047676ddde3a5deeceb95 (commit) from 973db626cf5d84e7c62bb6dc58c094f86512db1a (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 | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 85fecec..c1d50cc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,7 @@ x2goserver (3.1.1.4-0~x2go1) UNRELEASED; urgency=low of Xorg's Xrandr library (partially closes #28). - Make sure when launching desktop session through the Xsession mechanism that the LD_LIBRARY_PATH variable stays intact. Closes #29. + - Only extend LD_LIBRARY_PATH by Xrandr extension for KDE. Breaks GNOME. * /debian/control: + Maintainer change in package: X2Go Developers <x2go-dev@lists.berlios.de>. + Depend on nx-libs (>=3.5.0.15-0~) which has the Xrandr symlinks folder. diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand index f5eb7aa..d783a3a 100755 --- a/x2goserver/bin/x2goruncommand +++ b/x2goserver/bin/x2goruncommand @@ -53,11 +53,10 @@ export QT_GRAPHICSSYSTEM=native IMEXIT="false" NX_XINERAMA_LIBS=/usr/lib/nx/X11/Xinerama -NX_XRANDR_LIBS=/usr/lib/nx/X11/Xrandr NX_LIBS=/usr/lib/nx/X11 test -n "$LD_LIBRARY_PATH" && \ - LD_LIBRARY_PATH="$NX_XINERAMA_LIBS:$NX_XRANDR_LIBS:$NX_LIBS:$LD_LIBRARY_PATH" || \ - LD_LIBRARY_PATH="$NX_XINERAMA_LIBS:$NX_XRANDR_LIBS:$NX_LIBS" + 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 @@ -120,6 +119,10 @@ elif ([ "$cmd" == "UNITY" ] || [ "$cmd" == "unity" ]); then elif [ "$cmd" == "KDE" ]; then cmd="/usr/bin/startkde" + 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 elif [ "$cmd" == "XFCE4" ]; then cmd="/usr/bin/xfce4-session" elif [ "$cmd" == "LXDE" ]; 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).