This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch release/4.0.1.x in repository x2goserver. from beb3517 x2goserver/bin/x2gostartagent: changes to Robert Nowotny's SSH_PORT patch. Fixes: #922. new b12d8b6 x2goserver/bin/x2goruncommand: whitespace and comment changes only. new 203d95e x2goserver/bin/x2goruncommand: add the other trinity launcher scripts in order from newest to oldest. Fixes: #985. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 6 ++++++ x2goserver/bin/x2goruncommand | 20 +++++++++++++++++--- 2 files changed, 23 insertions(+), 3 deletions(-) -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch release/4.0.1.x in repository x2goserver. commit b12d8b68a937637e6377704680bff5d6cc0ff166 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Jan 23 04:52:33 2016 +0100 x2goserver/bin/x2goruncommand: whitespace and comment changes only. --- debian/changelog | 1 + x2goserver/bin/x2goruncommand | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index bd416a2..0666110 100644 --- a/debian/changelog +++ b/debian/changelog @@ -68,6 +68,7 @@ x2goserver (4.0.1.20-0x2go1) UNRELEASED; urgency=low measure. Change the default method to randomization instead of IP-based initialization. If IP-based initialization was requested but the default outgoing IP address unavailable, fall back to randomization. + - x2goserver/bin/x2goruncommand: whitespace and comment changes only. * x2goserver.spec: - Add sudo and logcheck as BuildRequires and Requires. Don't own directories that are owned by sudo and logcheck. Logcheck is not diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand index fa62f71..290cfa6 100755 --- a/x2goserver/bin/x2goruncommand +++ b/x2goserver/bin/x2goruncommand @@ -195,8 +195,8 @@ elif [ "$cmd" == "XFCE4" ] || [ "$cmd" == "XFCE" ]; then elif [ "$cmd" == "LXDE" ]; then cmd="/usr/bin/startlxde" elif [ "$cmd" == "TRINITY" ]; then - # If we are on Q4OS, which needs to set env and run some tasks before - # launching trinity. + # If we are on Q4OS, we needs to set env and run some tasks before + # launching trinity. if [ -e /usr/bin/start-q4os-x2go ]; then cmd="/usr/bin/start-q4os-x2go" else -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch release/4.0.1.x in repository x2goserver. commit 203d95e0fa7acf97232745c70756559f5dc3690e Author: Stefan Baur <X2Go-ML-1@baur-itcs.de> Date: Sat Jan 23 04:54:01 2016 +0100 x2goserver/bin/x2goruncommand: add the other trinity launcher scripts in order from newest to oldest. Fixes: #985. --- debian/changelog | 5 +++++ x2goserver/bin/x2goruncommand | 16 +++++++++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 0666110..f87c694 100644 --- a/debian/changelog +++ b/debian/changelog @@ -102,6 +102,11 @@ x2goserver (4.0.1.20-0x2go1) UNRELEASED; urgency=low - x2goserver/bin/x2gostartagent: original patch for SSH_PORT randomization/IP-based initialization. Submitted as #922. + [ Stefan Baur ] + * New upstream version (4.0.1.20): + - x2goserver/bin/x2goruncommand: add the other trinity launcher scripts in + order from newest to oldest. Fixes: #985. + -- X2Go Release Manager <git-admin@x2go.org> Tue, 24 Feb 2015 22:11:49 +0100 x2goserver (4.0.1.19-0x2go2) UNRELEASED; urgency=low diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand index 290cfa6..43b4064 100755 --- a/x2goserver/bin/x2goruncommand +++ b/x2goserver/bin/x2goruncommand @@ -200,7 +200,21 @@ elif [ "$cmd" == "TRINITY" ]; then if [ -e /usr/bin/start-q4os-x2go ]; then cmd="/usr/bin/start-q4os-x2go" else - cmd="/usr/bin/starttrinity" + # Multiple trinity launchers exist in practice, this list + # is sorted from newest to oldest. + + # Note: the /opt/trinity prefix might look weird, but this is + # actually the location Debian installs trinity to. The reason + # seems to be that otherwise trinity clashes with KDE3. + # It's entirely possible that this situation changes again + # once KDE3 has been completely removed. + if [ -x "/opt/trinity/bin/starttde" ]; then + cmd="/opt/trinity/bin/starttde" + elif [ -x "/opt/trinity/bin/starttrinity" ]; then + cmd="/opt/trinity/bin/starttrinity" + else + cmd="/usr/bin/starttrinity" + fi fi elif [ "$cmd" == "OPENBOX" ]; then cmd="/usr/bin/openbox-session" -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
-
git-admin＠x2go.org