[X2Go-Commits] x2goserver.git - build-baikal (branch) updated: 3.1.1.3-219-g018954f

X2Go dev team git-admin at x2go.org
Fri Jan 3 18:05:15 CET 2014


The branch, build-baikal has been updated
       via  018954f2e0f7ea4b0333f9ee524565059b34d3b7 (commit)
      from  141665b794c7dfb28455ba17c6acc16413ff9bdf (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       |    3 +++
 debian/x2goserver.init |    6 ++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index d8518e6..9167afb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -38,6 +38,7 @@ x2goserver (4.1.0.0-0~x2go1) UNRELEASED; urgency=low
     script is called without session as first argument and $X2GO_SESSION
     not set. (Fixes: #82).
   * Make x2goruncommand aware of the Cinnamon desktop shell. (Fixes: #117).
+  * 
 
   [ Otto Kjell ]
   * New upstream version (4.1.0.0):
@@ -79,6 +80,8 @@ x2goserver (4.0.1.7-0~x2go1) UNRELEASED; urgency=low
       x2goserver).
     + Raise Standards: to 3.9.4 (no changes needed).
     + Move xfonts-base to Recommends: field of bin:package x2goserver.
+  * /debian/x2goserver.init:
+    + Make init script LSB compliant.
 
   [ Helmer Teles ]
   * New upstream version (4.0.1.7):
diff --git a/debian/x2goserver.init b/debian/x2goserver.init
index b70b9a9..d18aaff 100644
--- a/debian/x2goserver.init
+++ b/debian/x2goserver.init
@@ -11,6 +11,8 @@
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 XSOCKDIR=/tmp/.X11-unix
 
+. /lib/lsb/init-functions
+
 start()
 {
 		if [ ! -d $XSOCKDIR ]
@@ -18,7 +20,7 @@ start()
 			mkdir $XSOCKDIR
 			chmod 1777 $XSOCKDIR
 		fi
-		echo "Cleaning up stale X2Go sessions."
+		log_action_msg "Cleaning up stale X2Go sessions."
 		x2gocleansessions
 }
 
@@ -37,11 +39,11 @@ case "$1" in
 	;;
 	reload|force-reload|restart)
 		stop
+		sleep 1
 		start
 	;;
 	*)
 		N=/etc/init.d/x2goserver
-		# echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2
 		echo "Usage: $N {start|stop|restart|force-reload}" >&2
 		exit 1
 	;;


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