[X2go-Commits] x2goserver.git - master (branch) updated: 3.1.1.3-16-g0b3c71c

X2Go dev team git-admin at x2go.org
Fri Sep 14 22:41:43 CEST 2012


The branch, master has been updated
       via  0b3c71ca7b6e3681a2ade80346621b22ffa7f255 (commit)
       via  98512000e2b0208849d93b97f0e9a216f0c18c28 (commit)
       via  1590476de31766028725fa1272dfcc50b7d1305e (commit)
      from  22ede8d3f939d849856feeaad0e777738fbeea9b (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 0b3c71ca7b6e3681a2ade80346621b22ffa7f255
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Sep 14 22:41:37 2012 +0200

    Make sure when launching desktop session through the Xsession mechanism that the LD_LIBRARY_PATH variable stays intact. Closes #29.

commit 98512000e2b0208849d93b97f0e9a216f0c18c28
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Sep 14 16:43:05 2012 +0200

    Depend on nx-libs (>=3.5.0.15-0~) which has the Xrandr symlinks folder.

commit 1590476de31766028725fa1272dfcc50b7d1305e
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Sep 14 16:39:58 2012 +0200

    For applications inside of a session, use NX's Xrandr library instead of Xorg's Xrandr library (partially closes #28).

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

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

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 740b935..1a33679 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,9 +12,14 @@ x2goserver (3.1.1.4-0~x2go1) UNRELEASED; urgency=low
     - Wrap padsp around rdesktop calls if pulse is used as audio protocol.
     - Add option ,,-r sound:local'' to rdesktop calls if pulse is enabled.
     - Proxy X2Go client-side shares into remote desktop session.
+    - For applications inside of a session, use NX's Xrandr library instead
+      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.
   * /debian/control:
     + Fix x2goagent dependency.
     + Add rdesktop and pulseaudio-utils to Suggests.
+    + Depend on nx-libs (>=3.5.0.15-0~) which has the Xrandr symlinks folder.
 
   [ Oleksandr Shneyder ]
   * remove "-nolisten tcp" option with XDMCP sessions
diff --git a/debian/control b/debian/control
index ce2467e..def35e4 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Architecture: any
 Depends:
  ${shlibs:Depends},
  ${misc:Depends},
- x2goagent (>= 2:3.5.0.12-0~),
+ x2goagent (>= 2:3.5.0.15-0~),
  lsof,
  openssh-client,
  openssh-server,
diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand
index 7be8039..f5eb7aa 100755
--- a/x2goserver/bin/x2goruncommand
+++ b/x2goserver/bin/x2goruncommand
@@ -53,8 +53,11 @@ 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_LIBS:$LD_LIBRARY_PATH || LD_LIBRARY_PATH="$NX_XINERAMA_LIBS:$NX_LIBS"
+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"
 $X2GO_LIB_PATH/x2gosyslog "$0" "debug" "exporting LD_LIBRARY_PATH=$LD_LIBRARY_PATH"
 export LD_LIBRARY_PATH
 
@@ -213,7 +216,7 @@ if [ "$EXEC" != "" ] && [ -x $EXEC ]; then
 	x2gofeature X2GO_XSESSION &>/dev/null && [ "x$X2GO_SESS_TYPE" = "xD" ] && {
 		STARTUP="$cmd$args"
 		$X2GO_LIB_PATH/x2gosyslog "$0" "notice" "launching session with Xsession-x2go mechanism, using STARTUP=\"$STARTUP\""
-		STARTUP="$STARTUP" /etc/x2go/Xsession
+		STARTUP="/usr/bin/env LD_LIBRARY_PATH=${LD_LIBRARY_PATH} ${STARTUP}" /etc/x2go/Xsession
 	} || {
 		$X2GO_LIB_PATH/x2gosyslog "$0" "debug" "executing command \"$cmd$args\"..."
 		$EXEC_WRAPPER $cmd$args


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