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 7851b71e22b243f01d5252e59fb00f238af3401f Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Apr 1 10:29:38 2014 +0200 debian/x2goserver.init: status option / LSB header + Add status option for init script (test if x2gocleansessions is running or not). + Add Description key to LSB header. --- debian/changelog | 4 ++++ debian/x2goserver.init | 9 +++++++++ 2 files changed, 13 insertions(+) diff --git a/debian/changelog b/debian/changelog index 3e587f9..9e16cc0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,6 +25,10 @@ x2goserver (4.0.1.14-0x2go1) UNRELEASED; urgency=low * debian/*.doc-base: + Provide *.doc-base files for bin:packages containing HTML man pages or other documentation. + * debian/x2goserver.init: + + Add status option for init script (test if x2gocleansessions is + running or not). + + Add Description key to LSB header. [ Harald Nordgard-Hansen ] * New upstream release (4.0.1.14): diff --git a/debian/x2goserver.init b/debian/x2goserver.init index d18aaff..61a49af 100644 --- a/debian/x2goserver.init +++ b/debian/x2goserver.init @@ -1,4 +1,5 @@ #! /bin/sh -e + ### BEGIN INIT INFO # Provides: x2goserver # Required-Start: $remote_fs $syslog @@ -6,6 +7,7 @@ # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 # Short-Description: Start and stop the X2Go daemon +# Description: The X2Go daemon is responsible for post-session clean-ups ### END INIT INFO PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin @@ -42,6 +44,13 @@ case "$1" in sleep 1 start ;; + status) + if ps -C x2gocleansessions 1>/dev/null 2>/dev/null; then + log_action_msg "X2Go Server clean-up daemon is up and running" + else + log_warning_msg "X2Go Server clean-up daemon is down" + fi + ;; *) N=/etc/init.d/x2goserver echo "Usage: $N {start|stop|restart|force-reload}" >&2 -- Alioth's /srv/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 92b5333a30c386496847c618c569f2e42c0e1ec3 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Apr 1 10:40:05 2014 +0200 Fix typos / hyphen-as-minus signs issues in x2goversion.8 and x2gomountdirs.8. --- debian/changelog | 2 ++ x2goserver/man/man8/x2gomountdirs.8 | 11 ++++++----- x2goserver/man/man8/x2goversion.8 | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9bb991c..e126663 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,6 +21,8 @@ x2goserver (4.0.1.14-0x2go1) UNRELEASED; urgency=low - Provide proper Gentoo support in x2goserver-xsession portion of X2Go Server. (Fixes: #445). - x2gofm.desktop: Drop obsolete Encoding key from .desktop file. + - Fix typos / hyphen-as-minus signs issues in x2goversion.8 and + x2gomountdirs.8. * x2goserver.spec: - Let builds for EPEL-7 behave like recent Fedora builds. * debian/*.doc-base: diff --git a/x2goserver/man/man8/x2gomountdirs.8 b/x2goserver/man/man8/x2gomountdirs.8 index 594079a..e4e22a9 100644 --- a/x2goserver/man/man8/x2gomountdirs.8 +++ b/x2goserver/man/man8/x2gomountdirs.8 @@ -15,7 +15,7 @@ x2gomountdirs \- Share Client-Side Folder with X2Go Session x2gomountdirs <mount_type> <session_id> <username> <key_file> <dir1> [<dir2> [<dir3> [...]]] .SH DESCRIPTION -\fBx2gomountdirs\fR mounts client-side folders or devices onto mountpoints that are accessible +\fBx2gomountdirs\fR mounts client\-side folders or devices onto mountpoints that are accessible from within your remote X2Go session. .PP \fBx2gomountdirs\fR is run with X2Go user privileges and normally issued by an X2Go client application. @@ -38,19 +38,19 @@ Location of a temporary private SSH key file (only valid for this command execut A list of client-side folders or device mount points that shall be mounted for X2Go session <session_id>. .PP .SH PERMISSIONS -X2Go uses the fuse-based SSH filesystem (SSHFS) for sharing client-side file ressources with X2Go sessions. +X2Go uses the fuse-based SSH filesystem (SSHFS) for sharing client\-side file resources with X2Go sessions. Users that shall use X2Go folder sharing must be members of the X2Go server's ,,fuse'' POSIX group. .SH RETURN VALUES \fBx2gomountdirs\fR returns some mount point information to stdout if the mounting process has been successful. -The mount results are printed line-by-line. The individual lines must be interpreted as shown below: +The mount results are printed line\-by\-line. The individual lines must be interpreted as shown below: line 01: dirs:<local_path>__REVERSESSH_PORT__<sshfs_port> line 02: ssh port:<sshfs_port> line 03: Host:<client_ip> line 04: User:<user> - line 05: inserted, sshfs -o <options> \\ + line 05: inserted, sshfs \-o <options> \\ "<user">@<client_ip>:"<local_path>" \\ - "<server_path>" -p <sshfs_port> + "<server_path>" \-p <sshfs_port> line 06: mount <local_path> ok line 07: fname: <desktop_icon_name> .PP @@ -65,3 +65,4 @@ x2goumount-session(8) .SH AUTHOR This manual has been written by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> for the X2Go project (http://www.x2go.org). + diff --git a/x2goserver/man/man8/x2goversion.8 b/x2goserver/man/man8/x2goversion.8 index f120f3b..36c6602 100644 --- a/x2goserver/man/man8/x2goversion.8 +++ b/x2goserver/man/man8/x2goversion.8 @@ -15,7 +15,7 @@ x2goversion \- Retrieve Code Versions of X2Go Server Components x2goversion [<x2go-component>] .SH DESCRIPTION -\fBx2goversion\fR allows to retrieve code versions of X2Go server components. +\fBx2goversion\fR allows one to retrieve code versions of X2Go server components. .PP If the \fB[<x2go-component>]\fR parameter is omitted then a list of all available X2Go server -- Alioth's /srv/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 6dc555d04534848b5542827d12d44ca244bee656 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Apr 1 10:31:50 2014 +0200 debian/config: Explicitly call set -e. Makes lintian happier. --- debian/changelog | 2 ++ debian/x2goserver.config | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 9e16cc0..187ba43 100644 --- a/debian/changelog +++ b/debian/changelog @@ -29,6 +29,8 @@ x2goserver (4.0.1.14-0x2go1) UNRELEASED; urgency=low + Add status option for init script (test if x2gocleansessions is running or not). + Add Description key to LSB header. + * debian/config: + + Explicitly call set -e. Makes lintian happier. [ Harald Nordgard-Hansen ] * New upstream release (4.0.1.14): diff --git a/debian/x2goserver.config b/debian/x2goserver.config index b7012da..1aeb625 100755 --- a/debian/x2goserver.config +++ b/debian/x2goserver.config @@ -1,4 +1,6 @@ -#!/bin/sh -e +#!/bin/sh + +set -e # Source debconf library. . /usr/share/debconf/confmodule -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git