The branch, master has been updated via f7a90065730c793e87510da101fdc00f8b5ceba8 (commit) from 9d80dff36e3e6c37ce2e78fa5180caa96a0c31a3 (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 f7a90065730c793e87510da101fdc00f8b5ceba8 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Nov 12 09:30:59 2012 +0100 Use DISTRIB_RELEASE to query Ubuntu release versions and detect Unity launch command. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 8 ++++++++ debian/control | 1 + x2goserver/bin/x2goruncommand | 7 +++++-- 3 files changed, 14 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index eb604fe..e62acbb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -30,6 +30,14 @@ x2goserver (3.2.0.0-0~x2go1) UNRELEASED; urgency=low -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 03 Jul 2012 10:03:28 +0200 +x2goserver (3.1.1.7-0~x2go1) UNRELEASED; urgency=low + + * New upstream release (3.1.1.7): + - Use DISTRIB_RELEASE to query Ubuntu release versions and detect Unity launch + command. + + -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 12 Nov 2012 09:28:32 +0100 + x2goserver (3.1.1.6-0~x2go1) unstable; urgency=low * Bugfix release (3.1.1.6): diff --git a/debian/control b/debian/control index 971a3a1..1c321e9 100644 --- a/debian/control +++ b/debian/control @@ -21,6 +21,7 @@ Depends: libx2go-server-perl (>= ${source:Version}), libx2go-server-db-perl (<< ${source:Version}.1~), x2goagent (>= 2:3.5.0.15-0~), lsof, + bc, openssh-client, openssh-server, xauth, diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand index 01552a5..70b9de1 100755 --- a/x2goserver/bin/x2goruncommand +++ b/x2goserver/bin/x2goruncommand @@ -108,10 +108,13 @@ if [ "$cmd" == "GNOME" ] || [ "$cmd" == "gnome-session" ]; then elif ([ "$cmd" == "UNITY" ] || [ "$cmd" == "unity" ]); then cmd="/usr/bin/gnome-session" - if [ "$DISTRIB_ID" == "Ubuntu" ] && echo "$DISTRIB_CODENAME" | egrep -v "^[a-n].*" >/dev/null; then + if [ "$DISTRIB_ID" == "Ubuntu" ] && $(echo $DISTRIB_RELEASE >= 12.10 | bc); then + export DESKTOP_SESSION="ubuntu" + args=" --session=$DESKTOP_SESSION" + if [ "$DISTRIB_ID" == "Ubuntu" ] && ( $(echo $DISTRIB_RELEASE == 11.10 | bc) || $(echo $DISTRIB_RELEASE == 12.04 | bc) ); then export DESKTOP_SESSION="ubuntu-2d" args=" --session=$DESKTOP_SESSION" - elif [ "$DISTRIB_ID" == "Ubuntu" ] && echo "$DISTRIB_CODENAME" | egrep -v "^n.*" >/dev/null; then + elif [ "$DISTRIB_ID" == "Ubuntu" ] && $(echo $DISTRIB_RELEASE == 11.04 | bc); then export DESKTOP_SESSION="2d-ubuntu" args=" --session=$DESKTOP_SESSION" fi 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).