[X2Go-Commits] x2goserver.git - build-baikal (branch) updated: 3.1.1.0-13-g389c5d4
X2Go dev team
git-admin at x2go.org
Fri Jan 3 20:51:23 CET 2014
The branch, build-baikal has been updated
via 389c5d45a7b379904537016979b7232151484824 (commit)
from e07883826b637ad0d6d82db3d515d22b6e8d1481 (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 | 43 ++++++++++++++++++++++++++++++++++-------
2 files changed, 37 insertions(+), 7 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 65019bb..f07404d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ x2goserver (3.1.1.1-0~x2go1) UNRELEASED; urgency=low
desktop shell command (GNOME, UNITRY, KDE, etc.) which then gets
translated into an executable command by x2goruncommand.
- Detect desktop session mode to use for Ubuntu precise and later.
+ - Complete UNITY/GNOME support for Ubuntu/Debian.
-- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Wed, 04 Apr 2012 11:44:14 +0200
diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand
index b19abfb..50965f1 100755
--- a/x2goserver/bin/x2goruncommand
+++ b/x2goserver/bin/x2goruncommand
@@ -70,21 +70,50 @@ if [ -e "/etc/lsb-release" ]; then
fi
# let x2goruncommand choose what command to use for a given desktop shell name (GNOME, UNITY, KDE, XFCE4, LXDE, TRINITY)
+
+# NOTES on GNOME startup behaviour in different distributions
+# ===========================================================
+
+# Debian launches 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
+
+# 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)
+
if [ "$cmd" == "GNOME" ] || [ "$cmd" == "gnome-session" ]; then
cmd="/usr/bin/gnome-session"
- # Ubuntu starting with 12.04 (precise) launches Unity when calling gnome-session --session=ubuntu-2d.
- # GNOME (Ubuntu classic) gets launched when calling gnome-session --session=gnome-fallback.
-
- if [ "$DISTRIB_ID" == "Ubuntu" ] && echo "$DISTRIB_CODENAME" | egrep -v "^[a-o].*" >/dev/null; then
+ if [ "$DISTRIB_ID" == "Ubuntu" ] && echo "$DISTRIB_CODENAME" | egrep "^[a-m].*" >/dev/null; then
+ export DESKTOP_SESSION="gnome"
+ elif [ "$DISTRIB_ID" == "Ubuntu" ] && echo "$DISTRIB_CODENAME" | egrep "^n.*" >/dev/null; then
+ export DESKTOP_SESSION="2d-gnome"
+ args="--session=$DESKTOP_SESSION"
+ elif [ "$DISTRIB_ID" == "Ubuntu" ] && echo "$DISTRIB_CODENAME" | egrep -v "^[a-n].*" >/dev/null; then
+ export DESKTOP_SESSION="gnome-fallback"
+ args="--session=$DESKTOP_SESSION"
+ 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"
fi
-elif ([ "$cmd" == "UNITY" ] || [ "$cmd" == "unity" ]) && [ "$DISTRIB_ID" == "Ubuntu" ] && echo "$DISTRIB_CODENAME" | egrep -v "^[a-o].*" >/dev/null; then
+elif ([ "$cmd" == "UNITY" ] || [ "$cmd" == "unity" ]); then
cmd="/usr/bin/gnome-session"
- export DESKTOP_SESSION="ubuntu-2d"
- args="--session=$DESKTOP_SESSION"
+ if [ "$DISTRIB_ID" == "Ubuntu" ] && echo "$DISTRIB_CODENAME" | egrep -v "^[a-n].*" >/dev/null; then
+ export DESKTOP_SESSION="ubuntu-2d"
+ args="--session=$DESKTOP_SESSION"
+ elif [ "$DISTRIB_ID" == "Ubuntu" ] && echo "$DISTRIB_CODENAME" | egrep -v "^n.*" >/dev/null; then
+ export DESKTOP_SESSION="2d-ubuntu"
+ args="--session=$DESKTOP_SESSION"
+ fi
+ # on earlier Ubuntu versions or with non-Ubuntu Distros the ,,UNITY'' command in X2Go will launch the GNOME2 desktop shell
elif [ "$cmd" == "KDE" ]; then
cmd="/usr/bin/startkde"
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