x2go-commits

x2go-commits@lists.x2go.org

1 participants
37910 discussions

x2goserver.git - build-main (branch) updated: 3.1.1.9
by git-admin＠x2go.org 04 Dec '13

04 Dec '13

The branch, build-main has been updated via 6d8d5d4779f8da210e0261c0bc7d9721a252c54f (commit) from 191012c93d89d61bc01fb9018ff8d5b13ab0c0a6 (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 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index e96a35c..7263072 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -x2goserver (3.1.1.9-0~x2go1) UNRELEASED; urgency=low +x2goserver (3.1.1.9-0~x2go1) unstable; urgency=low - * New upstream release (3.1.1.9): + * New bugfix release (3.1.1.9): - Fix x2godesktopsharing, we had added to many quotation marks in x2gostartagent. - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 23 Nov 2012 12:06:40 +0100 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 23 Nov 2012 15:32:11 +0100 x2goserver (3.1.1.8-0~x2go1) unstable; urgency=low 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).

1 0

x2goserver.git - build-main (branch) updated: 3.1.1.9-1-gfccfdb6
by git-admin＠x2go.org 04 Dec '13

04 Dec '13

The branch, build-main has been updated via fccfdb6ad15add7b98e1c11af9f159b943899fa8 (commit) from 6d8d5d4779f8da210e0261c0bc7d9721a252c54f (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 +- 8 files changed, 14 insertions(+), 7 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 7263072..46ca99f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +x2goserver (3.1.1.10-0~x2go1) UNRELEASED; urgency=low + + * New upstream version (3.1.1.10): + - Continue development... + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 23 Nov 2012 15:35:48 +0100 + x2goserver (3.1.1.9-0~x2go1) unstable; urgency=low * New bugfix release (3.1.1.9): diff --git a/x2goserver-compat/VERSION.x2goserver-compat b/x2goserver-compat/VERSION.x2goserver-compat index 3a154d4..42ab9ff 100644 --- a/x2goserver-compat/VERSION.x2goserver-compat +++ b/x2goserver-compat/VERSION.x2goserver-compat @@ -1 +1 @@ -3.1.1.9 \ No newline at end of file +3.1.1.10 \ No newline at end of file diff --git a/x2goserver-extensions/VERSION.x2goserver-extensions b/x2goserver-extensions/VERSION.x2goserver-extensions index 3a154d4..42ab9ff 100644 --- a/x2goserver-extensions/VERSION.x2goserver-extensions +++ b/x2goserver-extensions/VERSION.x2goserver-extensions @@ -1 +1 @@ -3.1.1.9 \ No newline at end of file +3.1.1.10 \ No newline at end of file diff --git a/x2goserver-fmbindings/VERSION.x2goserver-fmbindings b/x2goserver-fmbindings/VERSION.x2goserver-fmbindings index 3a154d4..42ab9ff 100644 --- a/x2goserver-fmbindings/VERSION.x2goserver-fmbindings +++ b/x2goserver-fmbindings/VERSION.x2goserver-fmbindings @@ -1 +1 @@ -3.1.1.9 \ No newline at end of file +3.1.1.10 \ No newline at end of file diff --git a/x2goserver-printing/VERSION.x2goserver-printing b/x2goserver-printing/VERSION.x2goserver-printing index 3a154d4..42ab9ff 100644 --- a/x2goserver-printing/VERSION.x2goserver-printing +++ b/x2goserver-printing/VERSION.x2goserver-printing @@ -1 +1 @@ -3.1.1.9 \ No newline at end of file +3.1.1.10 \ No newline at end of file diff --git a/x2goserver-pyhoca/VERSION.x2goserver-pyhoca b/x2goserver-pyhoca/VERSION.x2goserver-pyhoca index 3a154d4..42ab9ff 100644 --- a/x2goserver-pyhoca/VERSION.x2goserver-pyhoca +++ b/x2goserver-pyhoca/VERSION.x2goserver-pyhoca @@ -1 +1 @@ -3.1.1.9 \ No newline at end of file +3.1.1.10 \ No newline at end of file diff --git a/x2goserver-xsession/VERSION.x2goserver-xsession b/x2goserver-xsession/VERSION.x2goserver-xsession index 3a154d4..42ab9ff 100644 --- a/x2goserver-xsession/VERSION.x2goserver-xsession +++ b/x2goserver-xsession/VERSION.x2goserver-xsession @@ -1 +1 @@ -3.1.1.9 \ No newline at end of file +3.1.1.10 \ No newline at end of file diff --git a/x2goserver/VERSION.x2goserver b/x2goserver/VERSION.x2goserver index 3a154d4..42ab9ff 100644 --- a/x2goserver/VERSION.x2goserver +++ b/x2goserver/VERSION.x2goserver @@ -1 +1 @@ -3.1.1.9 \ No newline at end of file +3.1.1.10 \ No newline at end of file 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).

1 0

x2goserver.git - build-main (branch) updated: 3.1.1.8-3-g191012c
by git-admin＠x2go.org 04 Dec '13

04 Dec '13

The branch, build-main has been updated via 191012c93d89d61bc01fb9018ff8d5b13ab0c0a6 (commit) from cc11577f9ccb4a7589e8f97c916fbf45409b8e95 (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: x2goserver/bin/x2gostartagent | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) The diff of changes is: diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent index d7a5f1d..5499d15 100755 --- a/x2goserver/bin/x2gostartagent +++ b/x2goserver/bin/x2gostartagent @@ -78,10 +78,7 @@ if [ "$X2GO_STYPE" == "S" ]; then exit -1 fi X2GO_COOKIE=`echo $OUTPUT | awk '{print $2}'` - X2GO_PORT=`echo $OUTPUT | awk '{print $1}' - echo "==================" - echo "X2GO_PORT: $X2GO_PORT" -` echo "==================" + X2GO_PORT=`echo $OUTPUT | awk '{print $1}'` $X2GO_LIB_PATH/x2gosyslog "$0" "debug" "received shadow session information: cookie: $X2GO_COOKIE, port: $X2GO_PORT" xauth -f "$XAUTHORITY" add "${HOSTNAME}/unix:${X2GO_PORT}" MIT-MAGIC-COOKIE-1 "${X2GO_COOKIE}" 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).

1 0

x2goserver.git - build-main (branch) updated: 3.1.1.6-4-ge8d7700
by git-admin＠x2go.org 04 Dec '13

04 Dec '13

The branch, build-main has been updated via e8d7700258f72ee991460b709a5f27ec2bdf8bce (commit) from ac44ee30911caecbde4d4b255c3df636400692d3 (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 | 2 ++ x2goserver/bin/x2goruncommand | 12 ++++++------ 2 files changed, 8 insertions(+), 6 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 7fa6d07..df0e4c7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,8 @@ 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. + - Detect GNOME and UNITY startup commands via DISTRIB_RELEASE version number + and by using the bc command for comparing versions. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 12 Nov 2012 09:28:32 +0100 diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand index d2ab738..b7e0246 100755 --- a/x2goserver/bin/x2goruncommand +++ b/x2goserver/bin/x2goruncommand @@ -91,14 +91,14 @@ fi if [ "$cmd" == "GNOME" ] || [ "$cmd" == "gnome-session" ]; then cmd="/usr/bin/gnome-session" - 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 + 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 + export DESKTOP_SESSION="2d-gnome" + args=" --session=$DESKTOP_SESSION" + 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" elif cat /etc/debian_version | egrep "^(wheezy|7\.).*" >/dev/null; then 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).

1 0

x2goserver.git - build-main (branch) updated: 3.1.1.8
by git-admin＠x2go.org 04 Dec '13

04 Dec '13

The branch, build-main has been updated via 4218318fd0d5fe281be98eede39ef284da410a7f (commit) from bcbc438d86b8330755cb238ec626e8fb59cde59b (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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 2751447..6e5e93e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -x2goserver (3.1.1.8-0~x2go2) UNRELEASED; urgency=low +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(a)das-netzwerkteam.de> Fri, 23 Nov 2012 11:59:37 +0100 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 23 Nov 2012 12:01:01 +0100 x2goserver (3.1.1.7-0~x2go1) unstable; urgency=low 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).

1 0

x2goserver.git - build-main (branch) updated: 3.1.1.6-2-g8ee6338
by git-admin＠x2go.org 04 Dec '13

04 Dec '13

The branch, build-main has been updated via 8ee633875ac5a916f7d060c3e518b69d0ff6073a (commit) from 5213ce605d9abaacf576e2df52891c047f2a8e1d (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 | 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 cf4f5cc..7fa6d07 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,14 @@ x2goserver (3.1.1.7-0~x2go1) UNRELEASED; urgency=low -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Mon, 12 Nov 2012 12:54:05 +0100 +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(a)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 ba29b5a..f242c27 100644 --- a/debian/control +++ b/debian/control @@ -20,6 +20,7 @@ Depends: ${misc:Depends}, x2goagent (>= 2:3.5.0.15-0~), lsof, + bc, openssh-client, openssh-server, libconfig-simple-perl, diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand index d26fa82..28832a6 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).

1 0

x2goserver.git - build-main (branch) updated: 3.1.1.7
by git-admin＠x2go.org 04 Dec '13

04 Dec '13

The branch, build-main has been updated via 5af367fc604d6b08b8a375c4a2def544124c5abb (commit) from a9ddc031895260e40e099417c15e32cd9d73a03d (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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index bf93f75..e505384 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -x2goserver (3.1.1.7-0~x2go1) UNRELEASED; urgency=low +x2goserver (3.1.1.7-0~x2go1) unstable; urgency=low * New upstream+bugfix release (3.1.1.7): - Use DISTRIB_RELEASE to query Ubuntu release versions and detect Unity launch @@ -7,7 +7,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(a)das-netzwerkteam.de> Wed, 12 Nov 2012 09:28:32 +0100 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 22 Nov 2012 18:11:15 +0100 x2goserver (3.1.1.6-0~x2go1) unstable; urgency=low 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).

1 0

x2goserver.git - build-main (branch) updated: 3.1.1.6-5-ga9ddc03
by git-admin＠x2go.org 04 Dec '13

04 Dec '13

The branch, build-main has been updated via a9ddc031895260e40e099417c15e32cd9d73a03d (commit) from e8d7700258f72ee991460b709a5f27ec2bdf8bce (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 | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index df0e4c7..bf93f75 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,17 +1,11 @@ x2goserver (3.1.1.7-0~x2go1) UNRELEASED; urgency=low - * New upstream version (3.1.1.7): - - Do not fail if source_environment() cannot find the file to be sourced. - - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Mon, 12 Nov 2012 12:54:05 +0100 - -x2goserver (3.1.1.7-0~x2go1) UNRELEASED; urgency=low - - * New upstream release (3.1.1.7): + * New upstream+bugfix release (3.1.1.7): - Use DISTRIB_RELEASE to query Ubuntu release versions and detect Unity launch command. - Detect GNOME and UNITY startup commands via DISTRIB_RELEASE version number 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(a)das-netzwerkteam.de> Wed, 12 Nov 2012 09:28:32 +0100 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).

1 0

x2goserver.git - build-main (branch) updated: 3.1.1.7-1-g90c6884
by git-admin＠x2go.org 04 Dec '13

04 Dec '13

The branch, build-main has been updated 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/bin/x2goruncommand | 12 ++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index e505384..2751447 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +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(a)das-netzwerkteam.de> Fri, 23 Nov 2012 11:59:37 +0100 + x2goserver (3.1.1.7-0~x2go1) unstable; urgency=low * New upstream+bugfix release (3.1.1.7): 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).

1 0

x2goserver.git - build-main (branch) updated: 3.1.1.6-3-gac44ee3
by git-admin＠x2go.org 04 Dec '13

04 Dec '13

The branch, build-main has been updated via ac44ee30911caecbde4d4b255c3df636400692d3 (commit) from 8ee633875ac5a916f7d060c3e518b69d0ff6073a (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: x2goserver/bin/x2goruncommand | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand index 28832a6..d2ab738 100755 --- a/x2goserver/bin/x2goruncommand +++ b/x2goserver/bin/x2goruncommand @@ -111,7 +111,7 @@ elif ([ "$cmd" == "UNITY" ] || [ "$cmd" == "unity" ]); 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 + 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 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).

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits