This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 87604df66a46430d04307ae5ce186288f4bfc4a8 Author: Mike DePaulo <mikedep333@gmail.com> Date: Wed Apr 23 18:32:21 2014 -0400 Support GNOME Flashback session on Ubuntu 13.10+ and on debian Jessie (cherry-picked from release/4.0.1.x branch) --- debian/changelog | 4 ++++ x2goserver/bin/x2goruncommand | 51 ++++++++++++++++++++++++++++++++++------- 2 files changed, 47 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1553ce4..4488d39 100644 --- a/debian/changelog +++ b/debian/changelog @@ -106,6 +106,10 @@ x2goserver (4.1.0.0-0x2go1) UNRELEASED; urgency=low x2goserver (4.0.1.16-0x2go1) UNRELEASED; urgency=low * Continue development on release branch... + - Support GNOME Flashback session on Ubuntu 13.10+ and on debian Jessie + (Note: This requires that gnome-flashback.session actually be installed. + It also currently requires that the gnome-session binary not require + hardware 3D acceleration for said session.) -- Mike DePaulo <mikedep333@gmail.com> Thu, 23 Apr 2014 17:49:00 -0500 diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand index 782b845..8339166 100755 --- a/x2goserver/bin/x2goruncommand +++ b/x2goserver/bin/x2goruncommand @@ -81,17 +81,49 @@ fi # Ubuntu launches Unity (in accelerated mode) when calling gnome-session. # To make the GNOME variants start up properly on Debian/Ubuntu we have to make the following differentiations -# before and with Ubuntu 10.10 (maverick): GNOME -> gnome-session (would start GNOME2) -# Ubuntu 11.04 (natty): GNOME -> gnome-session --session=2d-gnome, UNITY -> gnome-session --session=2d-ubuntu (GNOME3 based desktop shells) -# Ubuntu 11.10 (oneiric) or later: GNOME -> gnome-session --session=gnome-fallback, UNITY -> gnome-session --session=ubuntu-2d (GNOME3 based desktop shells) - -# before and with Debian squeeze: GNOME -> gnome-session (would start GNOME2) -# Debian wheezy: GNOME -> gnome-session --session=gnome-fallback, UNITY: not available (GNOME3 based desktop shells) +# Ubuntu 10.10 and earlier (maverick): +# GNOME -> gnome-session +# (would start GNOME2) +# Ubuntu 11.04 (natty): +# GNOME -> gnome-session --session=2d-gnome +# UNITY -> gnome-session --session=2d-ubuntu +# (GNOME3 based desktop shells) +# Ubuntu 11.10 (oneiric) & 12.04 (precise): +# GNOME -> gnome-session --session=gnome-fallback +# UNITY -> gnome-session --session=ubuntu-2d +# (GNOME3 based desktop shells) +# Ubuntu 12.10 (quantal): +# GNOME -> gnome-session --session=gnome-fallback +# UNITY -> gnome-session --session=ubuntu +# (GNOME3 based desktop shells) +# Ubuntu 13.10 (raring) and later: +# GNOME -> gnome-session --session=gnome-flashback +# UNITY -> gnome-session --session=ubuntu +# (GNOME3 based desktop shells) + +# Debian squeeze and earlier: +# GNOME -> gnome-session +# (would start GNOME2) +# Debian wheezy: +# GNOME -> gnome-session --session=gnome-fallback +# UNITY: not available +# (GNOME3 based desktop shells) +# Debian jessie: +# GNOME -> gnome-session --session=gnome-flashback +# UNITY: not available +# (GNOME3 based desktop shells) if [ "$cmd" == "GNOME" ] || [ "$cmd" == "gnome-session" ]; then - cmd="/usr/bin/gnome-session" - if [ "$DISTRIB_ID" == "Ubuntu" ] && [ "$(echo "$DISTRIB_RELEASE >= 11.10" | bc)" == "1" ]; then + if [ "$DISTRIB_ID" == "Ubuntu" ] && [ "$(echo "$DISTRIB_RELEASE >= 13.10" | bc)" == "1" ]; then + export DESKTOP_SESSION="gnome-flashback" + if [ -z "$GTK_MODULES" ] ; then + export GTK_MODULES="unity-gtk-module" + else + export GTK_MODULES="$GTK_MODULES:unity-gtk-module" + fi + args=" --session=$DESKTOP_SESSION" + elif [ "$DISTRIB_ID" == "Ubuntu" ] && [ "$(echo "$DISTRIB_RELEASE >= 11.10" | bc)" == "1" ]; then export DESKTOP_SESSION="gnome-fallback" args=" --session=$DESKTOP_SESSION" elif [ "$DISTRIB_ID" == "Ubuntu" ] && [ "$(echo "$DISTRIB_RELEASE == 11.04" | bc)" == "1" ]; then @@ -104,6 +136,9 @@ if [ "$cmd" == "GNOME" ] || [ "$cmd" == "gnome-session" ]; then elif cat /etc/debian_version | egrep "^(wheezy|7\.).*" >/dev/null; then export DESKTOP_SESSION="gnome-fallback" args=" --session=$DESKTOP_SESSION" + elif cat /etc/debian_version | egrep "^(jessie|8\.).*" >/dev/null; then + export DESKTOP_SESSION="gnome-flashback" + args=" --session=$DESKTOP_SESSION" fi elif ([ "$cmd" == "UNITY" ] || [ "$cmd" == "unity" ]); then -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git