[X2go-Commits] x2goserver.git - master (branch) updated: 3.0.99-2-184-gbacef83

[X2go dev team]

The branch, master has been updated
       via  bacef836dbccd17b4aafa2a50d02fdefeac9316a (commit)
       via  cb0b351fd0db336501a5499cf5fd6b5096892b48 (commit)
      from  ee5959221495e85c472f4c79bd0dd9a60c14b224 (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 bacef836dbccd17b4aafa2a50d02fdefeac9316a
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Aug 15 21:12:26 2011 +0200

    Add lxterminal as possible TERMINAL to x2goruncommand.

commit cb0b351fd0db336501a5499cf5fd6b5096892b48
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Aug 15 21:11:25 2011 +0200

    Add chromium-browser as possible WWWBROWSER to x2goruncommand.

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

Summary of changes:
 debian/changelog              |    2 ++
 x2goserver/bin/x2goruncommand |    4 ++++
 2 files changed, 6 insertions(+), 0 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 8ba0dce..3356e02 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,8 @@ x2goserver (3.0.99.5-0~x2go3) UNRELEASED; urgency=low
   * Add x2gobasepath script to reliably detect x2goserver install path.
   * Add man page for x2gobasepath.
   * Remove Debianisms from INSTALL howto.
+  * Add chromium-browser as possible WWWBROWSER to x2goruncommand.
+  * Add lxterminal as possible TERMINAL to x2goruncommand.
 
   [Martin Oehler]
   * Removes old debug code fragment, fixes x2golistsessions parsing.
diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand
index 8499d8a..4ce5a70 100755
--- a/x2goserver/bin/x2goruncommand
+++ b/x2goserver/bin/x2goruncommand
@@ -56,6 +56,8 @@ if [ "$cmd" == "WWWBROWSER" ]; then
 		cmd="/usr/bin/konqueror"
 	elif  [ -e "/usr/bin/galeon" ]; then
 		cmd="/usr/bin/galeon"
+	elif  [ -e "/usr/bin/chromium-browser" ]; then
+		cmd="/usr/bin/chromium-browser"
 	fi
 fi
 
@@ -84,6 +86,8 @@ if [ "$cmd" == "TERMINAL" ]; then
 		cmd="/usr/bin/konsole"
 	elif  [ -e "/usr/bin/gnome-terminal" ]; then
 		cmd="/usr/bin/gnome-terminal"
+	elif  [ -e "/usr/bin/lxterminal" ]; then
+		cmd="/usr/bin/lxterminal"
 	elif  [ -e "/usr/bin/rxvt" ]; then
 		cmd="/usr/bin/rxvt"
 	elif  [ -e "/usr/bin/xterm" ]; 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).