This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch release/4.0.1.x in repository x2goserver. commit 7ba7f6cc56bda7075d0798c3d11b015b9a57483b Author: Mike DePaulo <mikedep333@gmail.com> Date: Mon Sep 8 08:32:05 2014 -0400 Fix launching GNOME 3 Fallback session (GNOME 3.4 & 3.6) on distros other than Ubuntu and Debian (Fixes: #599) --- debian/changelog | 5 +++- x2goserver/bin/x2goruncommand | 54 ++++++++++++++++++----------------------- 2 files changed, 28 insertions(+), 31 deletions(-) diff --git a/debian/changelog b/debian/changelog index cac9892..eccc8bc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,11 +2,14 @@ x2goserver (4.0.1.16-0x2go1) UNRELEASED; urgency=low [ Mike DePaulo ] * New upstream release (4.0.1.16): - - Support GNOME Flashback session on Ubuntu 13.10+ and on debian Jessie + - Support GNOME Flashback session (GNOME 3.8+) on distro releases such as + Ubuntu 13.10+ and 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.) (Thanks Eugene San (eugenesan@gmail.com)) + - Fix launching GNOME 3 Fallback session (GNOME 3.4 & 3.6) on distros other + than Ubuntu and Debian (Fixes: #599) - Fix support for Cinnamon 1.4 (Linux Mint 13) (Fixes: #569) - Fix the logic for launching Cinnamon 2.0 and 2.2 (Linux Mint 17). (Fixes: #572) diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand index f324d26..f4352b0 100755 --- a/x2goserver/bin/x2goruncommand +++ b/x2goserver/bin/x2goruncommand @@ -77,10 +77,10 @@ fi # NOTES on GNOME startup behaviour in different distributions # =========================================================== -# Debian launches GNOME3 (in accelerated mode) when calling gnome-session +# Debian and every other non-Ubuntu distro launchs GNOME3 (in accelerated mode) when calling gnome-session # 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 +# To make the GNOME variants start up properly on Ubuntu, we have to make the following differentiations # Ubuntu 10.10 and earlier (maverick): # GNOME -> gnome-session @@ -101,18 +101,15 @@ fi # 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) +# Additionally, $GTK_MODULES must include "unity-gtk-module". +# $GTK_MODULES does not need tha value for any other distro +# or any earlier release of Ubuntu. +# +# The logic for launching GNOME should be generic enough +# to work with every other distro. +# +# Also, it appears that some Linux GNOME2 distros need DESKTOP_SESSION="gnome" +# while others do not. if [ "$cmd" == "GNOME" ] || [ "$cmd" == "gnome-session" ]; then cmd="/usr/bin/gnome-session" @@ -124,23 +121,20 @@ if [ "$cmd" == "GNOME" ] || [ "$cmd" == "gnome-session" ]; then 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 - export DESKTOP_SESSION="2d-gnome" - args=" --session=$DESKTOP_SESSION" - elif [ "$DISTRIB_ID" == "Ubuntu" ] && [ "$(echo "$DISTRIB_RELEASE <= 10.10" | bc)" == "1" ]; then - export DESKTOP_SESSION="gnome" + elif [ -e /usr/share/gnome-session/sessions/gnome-flashback.session ]; then + export DESKTOP_SESSION="gnome-flashback" + args=" --session=$DESKTOP_SESSION" + elif [ -e /usr/share/gnome-session/sessions/gnome-fallback.session ]; then + export DESKTOP_SESSION="gnome-fallback" + args=" --session=$DESKTOP_SESSION" + elif [ -e /usr/share/gnome-session/sessions/2d-gnome.session ]; then + export DESKTOP_SESSION="2d-gnome" + args=" --session=$DESKTOP_SESSION" + elif [ "$DISTRIB_ID" == "Ubuntu" ] && [ "$(echo "$DISTRIB_RELEASE <= 10.10" | bc)" == "1" ]; then + export DESKTOP_SESSION="gnome" elif cat /etc/debian_version | egrep "^(squeeze|6\.).*" >/dev/null; then - export DESKTOP_SESSION="gnome" - 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 + export DESKTOP_SESSION="gnome" + fi elif ([ "$cmd" == "UNITY" ] || [ "$cmd" == "unity" ]); then cmd="/usr/bin/gnome-session" -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git