The branch, master has been updated via cd23b80ca2f1056500e8b78cedebf60089086bda (commit) from bd0955765cfa6d6c6de1d462fb5a5ab004de65df (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 cd23b80ca2f1056500e8b78cedebf60089086bda Author: Matthew L. Dailey <matthew.l.dailey@dartmouth.edu> Date: Mon Feb 11 22:45:08 2013 +0100 Fix command/version detection for GNOME/Unity on Ubuntu. (Fixes: #105). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 ++++ x2goserver/bin/x2goruncommand | 12 ++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 432dd7c..8d32658 100644 --- a/debian/changelog +++ b/debian/changelog @@ -47,6 +47,10 @@ x2goserver (4.0.0.1-0~x2go1) UNRELEASED; urgency=low * New upstream version (4.0.0.1): - Make CFLAGS usable in x2goserver. (Fixes: #83). + [ Matthew L. Dailey ] + * New upstream version (4.0.0.1): + - Fix command/version detection for GNOME/Unity on Ubuntu. (Fixes: #105). + -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Mon, 11 Feb 2013 11:42:32 +0100 x2goserver (4.0.0.0-0~x2go1) unstable; urgency=low diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand index 0aa79b6..112f258 100755 --- a/x2goserver/bin/x2goruncommand +++ b/x2goserver/bin/x2goruncommand @@ -91,13 +91,13 @@ fi if [ "$cmd" == "GNOME" ] || [ "$cmd" == "gnome-session" ]; then cmd="/usr/bin/gnome-session" - if [ "$DISTRIB_ID" == "Ubuntu" ] && $(echo "$DISTRIB_RELEASE >= 11.10" | bc); then + if [ "$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); then + 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); then + 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" @@ -108,13 +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_RELEASE" >= 12.10 | bc); then + if [ "$DISTRIB_ID" == "Ubuntu" ] && [ "$(echo "$DISTRIB_RELEASE" >= 12.10 | bc)" == "1" ]; then export DESKTOP_SESSION="ubuntu" args=" --session=$DESKTOP_SESSION" - elif [ "$DISTRIB_ID" == "Ubuntu" ] && [ $(echo "$DISTRIB_RELEASE" == 11.10 | bc) || $(echo $DISTRIB_RELEASE == 12.04 | bc) ]; then + elif [ "$DISTRIB_ID" == "Ubuntu" ] && [ "$(echo "$DISTRIB_RELEASE" == 11.10 | bc)" == "1" -o "$(echo $DISTRIB_RELEASE == 12.04 | bc)" == "1" ]; then export DESKTOP_SESSION="ubuntu-2d" args=" --session=$DESKTOP_SESSION" - elif [ "$DISTRIB_ID" == "Ubuntu" ] && $(echo "$DISTRIB_RELEASE" == 11.04 | bc); then + elif [ "$DISTRIB_ID" == "Ubuntu" ] && [ "$(echo "$DISTRIB_RELEASE" == 11.04 | bc)" == "1" ]; 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).