[X2Go-Commits] x2goserver.git - build-main (branch) updated: 3.0.99.8-43-g2e398b9

X2Go dev team git-admin at x2go.org
Wed Dec 4 06:18:04 CET 2013


The branch, build-main has been updated
       via  2e398b9c0964748f404b7ad4140d7ae229e98612 (commit)
      from  5ea9eaad648e916e182ee0c3a56c3c49c97ce80f (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                  |    3 +++
 x2goserver/bin/x2goresume-session |    6 ++++++
 x2goserver/bin/x2goruncommand     |    7 +++++++
 3 files changed, 16 insertions(+)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 9012d25..03d8753 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,9 @@ x2goserver (3.0.99.9-0~x2go1) UNRELEASED; urgency=low
   * New upstream version (3.0.99.9):
     - Fix potentially empty LD_LIBRARY_PATH in x2gostartagent.
 
+  [ Oleksandr Shneyder ]
+  * Xinerama support
+
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Fri, 25 Nov 2011 11:38:46 +0100
 
 x2goserver (3.0.99.8-0~x2go1) unstable; urgency=low
diff --git a/x2goserver/bin/x2goresume-session b/x2goserver/bin/x2goresume-session
index 16a7f0c..7ad09f4 100755
--- a/x2goserver/bin/x2goresume-session
+++ b/x2goserver/bin/x2goresume-session
@@ -35,6 +35,12 @@ X2GO_ROOT=${HOME}/.x2go
 X2GO_RESIZE=0
 X2GO_FULLSCREEN=0
 
+NX_XINERAMA_CONF=$X2GO_ROOT/C-$SESSION_NAME/xinerama.conf
+if [ -e $NX_XINERAMA_CONF ]
+then
+	rm $NX_XINERAMA_CONF
+fi
+
 $X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@"
 
 if [ "$X2GO_GEOMETRY" == "" ]
diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand
index d3f0d98..9af731a 100755
--- a/x2goserver/bin/x2goruncommand
+++ b/x2goserver/bin/x2goruncommand
@@ -40,8 +40,15 @@ X2GO_ROOT=${HOME}/.x2go
 MESSAGE_FILE=$X2GO_ROOT/C-$X2GO_SESSION/cmdoutput
 echo "exec $cmd" >> $MESSAGE_FILE
 
+NX_XINERAMA_CONF=$X2GO_ROOT/C-$X2GO_SESSION/xinerama.conf
+export NX_XINERAMA_CONF
+
 IMEXIT="false"
 
+NX_XINERAMA_LIBS=/usr/lib/nx/X11/Xinerama
+LD_LIBRARY_PATH=$NX_XINERAMA_LIBS:$LD_LIBRARY_PATH
+export LD_LIBRARY_PATH
+
 if [ "$sndsys" == "esd" ]; then
 	export ESPEAKER=localhost:$4
 elif [ "$sndsys" == "arts" ]; 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