[X2Go-Commits] x2goserver.git - build-baikal (branch) updated: 3.0.99-2-187-g1baf675
X2Go dev team
git-admin at x2go.org
Fri Jan 3 20:52:27 CET 2014
The branch, build-baikal has been updated
via 1baf675e4dd77d98c598df7f4a9c80fa47a620db (commit)
from 469add7e3902442e00ca3a87c5e665673dce2547 (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 | 1 +
x2goserver/bin/x2goruncommand | 4 +++-
2 files changed, 4 insertions(+), 1 deletion(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 3356e02..05870f1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,7 @@ x2goserver (3.0.99.5-0~x2go3) UNRELEASED; urgency=low
* Remove Debianisms from INSTALL howto.
* Add chromium-browser as possible WWWBROWSER to x2goruncommand.
* Add lxterminal as possible TERMINAL to x2goruncommand.
+ * Add LibreOffice.org as possible OFFICE application to x2goruncommand.
[Martin Oehler]
* Removes old debug code fragment, fixes x2golistsessions parsing.
diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand
index fa2f075..42156b9 100755
--- a/x2goserver/bin/x2goruncommand
+++ b/x2goserver/bin/x2goruncommand
@@ -74,7 +74,9 @@ if [ "$cmd" == "MAILCLIENT" ]; then
fi
if [ "$cmd" == "OFFICE" ]; then
- if [ -e "/usr/bin/ooffice" ]; then
+ if [ -e "/usr/bin/loffice" ]; then
+ cmd="/usr/bin/loffice"
+ elif [ -e "/usr/bin/ooffice" ]; then
cmd="/usr/bin/ooffice"
fi
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).
More information about the x2go-commits
mailing list