x2goserver.git - master (branch) updated: 3.1.1.3-93-g2ec814c - x2go-commits

23 Nov 2012

The branch, master has been updated
       via  2ec814c564c6f8c035a83538d8a0f1f95f4bf9f1 (commit)
       via  43cdc2f98561d12773ab00bbb7f05e4468182cf3 (commit)
      from  7901b02cf5fb9e41283398844be19911c90671ec (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 2ec814c564c6f8c035a83538d8a0f1f95f4bf9f1
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date:   Fri Nov 23 12:00:30 2012 +0100

    Fix startup of GNOME and UNITY sessions (issue introduced with 3.1.1.7).

commit 43cdc2f98561d12773ab00bbb7f05e4468182cf3
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date:   Thu Nov 22 18:11:30 2012 +0100

    release 3.1.1.7
    
    Conflicts (resolved by Mike Gabriel):
    	debian/changelog

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog              |   11 +++++++++--
 x2goserver/bin/x2goruncommand |   12 ++++++------
 2 files changed, 15 insertions(+), 8 deletions(-)

The diff of changes is:

diff --git a/debian/changelog b/debian/changelog
index f99c57e..fdcdfaf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -32,7 +32,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
+x2goserver (3.1.1.8-0~x2go2) UNRELEASED; urgency=low
+
+  * New bugfix release (3.1.1.8):
+    - Fix startup of GNOME and UNITY sessions (issue introduced with 3.1.1.7).
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de>  Fri, 23 Nov 2012 11:59:37 +0100
+
+x2goserver (3.1.1.7-0~x2go1) unstable; urgency=low
 
   * New upstream+bufix release (3.1.1.7):
     - Use DISTRIB_RELEASE to query Ubuntu release versions and detect Unity launch
@@ -41,7 +48,7 @@ x2goserver (3.1.1.7-0~x2go1) UNRELEASED; urgency=low
       and by using the bc command for comparing versions.
     - Do not fail if source_environment() cannot find the file to be sourced.
 
- -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de>  Wed, 12 Nov 2012 09:28:32 +0100
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de>  Thu, 22 Nov 2012 18:11:15 +0100
 
 x2goserver (3.1.1.6-0~x2go1) unstable; urgency=low
 
diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand
index 0724ca8..27bb3b5 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); 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); 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); 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); 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) || $(echo $DISTRIB_RELEASE == 12.04 | bc) ]; 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); 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).

    