The branch, build-main has been updated via 4218318fd0d5fe281be98eede39ef284da410a7f (commit) via bcbc438d86b8330755cb238ec626e8fb59cde59b (commit) via 90c6884f0433390f33716bb23e1570c2b6fda1a0 (commit) from 5af367fc604d6b08b8a375c4a2def544124c5abb (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 | 7 +++++++ x2goserver-compat/VERSION.x2goserver-compat | 2 +- .../VERSION.x2goserver-extensions | 2 +- .../VERSION.x2goserver-fmbindings | 2 +- x2goserver-printing/VERSION.x2goserver-printing | 2 +- x2goserver-pyhoca/VERSION.x2goserver-pyhoca | 2 +- x2goserver-xsession/VERSION.x2goserver-xsession | 2 +- x2goserver/VERSION.x2goserver | 2 +- x2goserver/bin/x2goruncommand | 12 ++++++------ 9 files changed, 20 insertions(+), 13 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index e505384..6e5e93e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +x2goserver (3.1.1.8-0~x2go1) unstable; 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 12:01:01 +0100 + x2goserver (3.1.1.7-0~x2go1) unstable; urgency=low * New upstream+bugfix release (3.1.1.7): diff --git a/x2goserver-compat/VERSION.x2goserver-compat b/x2goserver-compat/VERSION.x2goserver-compat index 861a59a..bb994f9 100644 --- a/x2goserver-compat/VERSION.x2goserver-compat +++ b/x2goserver-compat/VERSION.x2goserver-compat @@ -1 +1 @@ -3.1.1.6 \ No newline at end of file +3.1.1.8 \ No newline at end of file diff --git a/x2goserver-extensions/VERSION.x2goserver-extensions b/x2goserver-extensions/VERSION.x2goserver-extensions index 861a59a..bb994f9 100644 --- a/x2goserver-extensions/VERSION.x2goserver-extensions +++ b/x2goserver-extensions/VERSION.x2goserver-extensions @@ -1 +1 @@ -3.1.1.6 \ No newline at end of file +3.1.1.8 \ No newline at end of file diff --git a/x2goserver-fmbindings/VERSION.x2goserver-fmbindings b/x2goserver-fmbindings/VERSION.x2goserver-fmbindings index 861a59a..bb994f9 100644 --- a/x2goserver-fmbindings/VERSION.x2goserver-fmbindings +++ b/x2goserver-fmbindings/VERSION.x2goserver-fmbindings @@ -1 +1 @@ -3.1.1.6 \ No newline at end of file +3.1.1.8 \ No newline at end of file diff --git a/x2goserver-printing/VERSION.x2goserver-printing b/x2goserver-printing/VERSION.x2goserver-printing index 861a59a..bb994f9 100644 --- a/x2goserver-printing/VERSION.x2goserver-printing +++ b/x2goserver-printing/VERSION.x2goserver-printing @@ -1 +1 @@ -3.1.1.6 \ No newline at end of file +3.1.1.8 \ No newline at end of file diff --git a/x2goserver-pyhoca/VERSION.x2goserver-pyhoca b/x2goserver-pyhoca/VERSION.x2goserver-pyhoca index 861a59a..bb994f9 100644 --- a/x2goserver-pyhoca/VERSION.x2goserver-pyhoca +++ b/x2goserver-pyhoca/VERSION.x2goserver-pyhoca @@ -1 +1 @@ -3.1.1.6 \ No newline at end of file +3.1.1.8 \ No newline at end of file diff --git a/x2goserver-xsession/VERSION.x2goserver-xsession b/x2goserver-xsession/VERSION.x2goserver-xsession index 861a59a..bb994f9 100644 --- a/x2goserver-xsession/VERSION.x2goserver-xsession +++ b/x2goserver-xsession/VERSION.x2goserver-xsession @@ -1 +1 @@ -3.1.1.6 \ No newline at end of file +3.1.1.8 \ No newline at end of file diff --git a/x2goserver/VERSION.x2goserver b/x2goserver/VERSION.x2goserver index 861a59a..bb994f9 100644 --- a/x2goserver/VERSION.x2goserver +++ b/x2goserver/VERSION.x2goserver @@ -1 +1 @@ -3.1.1.6 \ No newline at end of file +3.1.1.8 \ No newline at end of file diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand index b7e0246..b88c3b9 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).