[X2Go-Commits] x2goserver.git - master (branch) updated: 3.1.1.3-195-g8dc6651

[X2Go dev team]

The branch, master has been updated
       via  8dc6651a55c7505ab67f367adec97693473f77e2 (commit)
      from  54f2bf95568e4c1fabeb5e2f47cea732b551072f (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 8dc6651a55c7505ab67f367adec97693473f77e2
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Jul 26 08:40:10 2013 +0200

    The gnome-terminal TERMINAL returns immediately and runs in background starting with GNOME 3.8. Thus, set IMEXIT to false for gnome-terminal. (Fixes: #268).

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

Summary of changes:
 debian/changelog              |   13 ++++++++-----
 x2goserver/bin/x2goruncommand |    2 ++
 2 files changed, 10 insertions(+), 5 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 5fc5a0b..aff0e2f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -39,10 +39,6 @@ x2goserver (4.1.0.0-0~x2go1) UNRELEASED; urgency=low
     not set. (Fixes: #82).
   * Make x2goruncommand aware of the Cinnamon desktop shell. (Fixes: #117).
 
-  [ Rok Mandeljc ]
-  * New upstream version (4.1.0.0):
-    - x2golistsessions: Import db_changestatus into name space. (Fixes: #267).
-
   [ Otto Kjell ]
   * New upstream version (4.1.0.0):
     + Add markdown files for most of the X2Go Server project folders. (Fixes:
@@ -57,11 +53,18 @@ x2goserver (4.1.0.0-0~x2go1) UNRELEASED; urgency=low
 
 x2goserver (4.0.1.4-0~x2go1) UNRELEASED; urgency=low
 
-  * New upstream versino (4.0.1.4):
+  [ Mike Gabriel ]
+  * New upstream version (4.0.1.4):
     - Multiply query USED_DISPLAYS and USED_PORTS in x2gostartagent to minimize
       race conditions in cases where many clients launch session simultaneously.
     - Make X2Go Server aware of the MATE desktop environment.
 
+  [ Rok Mandeljc ]
+  * New upstream version (4.0.1.4):
+    - The gnome-terminal TERMINAL returns immediately and runs in background
+      starting with GNOME 3.8. Thus, set IMEXIT to false for gnome-terminal.
+      (Fixes: #268).
+
  -- Mike Gabriel <mike.gabriel at das-netzwertkeam.de>  Fri, 19 Jul 2013 17:53:11 +0200
 
 x2goserver (4.0.1.3-0~x2go1) unstable; urgency=low
diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand
index e10a0ac..29d7c3f 100755
--- a/x2goserver/bin/x2goruncommand
+++ b/x2goserver/bin/x2goruncommand
@@ -183,6 +183,8 @@ if [ "$cmd" == "TERMINAL" ]; then
 		cmd="/usr/bin/mate-terminal"
 	elif  [ -e "/usr/bin/gnome-terminal" ]; then
 		cmd="/usr/bin/gnome-terminal"
+		# GNOME terminal starting with 3.8 also immediately exits
+		IMEXIT="false"
 	elif  [ -e "/usr/bin/lxterminal" ]; then
 		cmd="/usr/bin/lxterminal"
 	elif  [ -e "/usr/bin/rxvt" ]; 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).