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

[X2go dev team]

The branch, master has been updated
       via  5b9cf0a0e8c1a15e13d0e024af63ace3cb51737b (commit)
       via  9e36fbc3021da3b86aa5e1e3f0f3b8e30c007ce6 (commit)
       via  5da0e9ad200529a210b7e41c1eb8b6dc9b934d8d (commit)
      from  b74e5b69112cc355828974e651dd7f27bdc106a1 (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 5b9cf0a0e8c1a15e13d0e024af63ace3cb51737b
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Sep 25 01:44:48 2011 +0200

    add more features to x2gofeature

commit 9e36fbc3021da3b86aa5e1e3f0f3b8e30c007ce6
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Sep 25 01:43:48 2011 +0200

    Move x2goversion into x2goserver core package.

commit 5da0e9ad200529a210b7e41c1eb8b6dc9b934d8d
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Sep 25 01:42:42 2011 +0200

    update of x2golistmount man page

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

Summary of changes:
 debian/changelog                                   |    1 +
 x2goserver-extensions/man/man8/x2golistmounts.8    |   37 ++++++++++++++++++++
 .../x2gofeature.d/x2goserver-extensions.features   |    1 +
 .../bin/x2goversion                                |    0
 .../man/man8/x2goversion.8                         |    0
 x2goserver/share/x2gofeature.d/x2goserver.features |    3 ++
 6 files changed, 42 insertions(+), 0 deletions(-)
 create mode 100644 x2goserver-extensions/man/man8/x2golistmounts.8
 rename {x2goserver-extensions => x2goserver}/bin/x2goversion (100%)
 rename {x2goserver-extensions => x2goserver}/man/man8/x2goversion.8 (100%)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 19438b2..9793cd4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -83,6 +83,7 @@ x2goserver (3.0.99.5-0~x2go3) UNRELEASED; urgency=low
   * Add x2gofeature script and x2gofeature.d subscript for x2goserver-extensions and
     x2goserver-printing.
   * Add x2gofeature man page.
+  * Move x2goversion into x2goserver core package.
 
   [ Ivan Kabaivanov ]
   * Makefile fix around man page installation in x2goserver-compat package.
diff --git a/x2goserver-extensions/man/man8/x2golistmounts.8 b/x2goserver-extensions/man/man8/x2golistmounts.8
new file mode 100644
index 0000000..1263a55
--- /dev/null
+++ b/x2goserver-extensions/man/man8/x2golistmounts.8
@@ -0,0 +1,37 @@
+'\" -*- coding: utf-8 -*-
+.if \n(.g .ds T< \\FC
+.if \n(.g .ds T> \\F[\n[.fam]]
+.de URL
+\\$2 \(la\\$1\(ra\\$3
+..
+.if \n(.g .mso www.tmac
+.TH x2golistmounts 8 "Sep 2011" "Version 3.0.99.x" "X2go Server Tool"
+.SH NAME
+x2golistmounts \- List Mounted Shares for an X2go Session
+.SH SYNOPSIS
+'nh
+.fi
+.ad l
+x2golistmounts <session_id>
+
+.SH DESCRIPTION
+\fBx2golistmounts\fR returns a list of mounted client-side folders or devices for X2go
+session <session_id>.
+.PP
+\fBx2golistmounts\fR is run with normal user privileges and it is used by X2go clients to render
+a list of SSHFS mounts for a given X2go sessions.
+.SH RETURN VALUES
+A line-by-line list of mounted shares is returned by \fBx2golistmounts\fR. Each line consists of
+two mount point attribute fields separated by the pipe symbol (,,|'').
+.PP
+The meanings of these mount point attributes are:
+
+  field 01: <sshfs_target_host_ip>
+  field 02: <mount_point_path_on_server>
+
+As exitcode \fBx2golistmounts\fR always returns 0.
+.SH SEE ALSO
+x2gomountdirs(8), x2goumount-session(8)
+.SH AUTHOR
+This manual has been written by Mike Gabriel <mike.gabriel at das-netzwerkteam.de> for the X2go project
+(http://www.x2go.org).
diff --git a/x2goserver-extensions/share/x2gofeature.d/x2goserver-extensions.features b/x2goserver-extensions/share/x2gofeature.d/x2goserver-extensions.features
index 879e71b..b2e384f 100755
--- a/x2goserver-extensions/share/x2gofeature.d/x2goserver-extensions.features
+++ b/x2goserver-extensions/share/x2gofeature.d/x2goserver-extensions.features
@@ -29,6 +29,7 @@ X2GO_FEATURE=$1
 # check for X2go server core features
 case "$X2GO_FEATURE" in
 
+    "X2GO_SET_KEYBOARD") echo "ok"; exit 0;;
     "X2GO_LIST_MOUNTS") echo "ok"; exit 0;;
     *) exit -1;;
 
diff --git a/x2goserver-extensions/bin/x2goversion b/x2goserver/bin/x2goversion
similarity index 100%
rename from x2goserver-extensions/bin/x2goversion
rename to x2goserver/bin/x2goversion
diff --git a/x2goserver-extensions/man/man8/x2goversion.8 b/x2goserver/man/man8/x2goversion.8
similarity index 100%
rename from x2goserver-extensions/man/man8/x2goversion.8
rename to x2goserver/man/man8/x2goversion.8
diff --git a/x2goserver/share/x2gofeature.d/x2goserver.features b/x2goserver/share/x2gofeature.d/x2goserver.features
index eebdf2b..44458d9 100755
--- a/x2goserver/share/x2gofeature.d/x2goserver.features
+++ b/x2goserver/share/x2gofeature.d/x2goserver.features
@@ -29,6 +29,9 @@ X2GO_FEATURE=$1
 # check for X2go server core features
 case "$X2GO_FEATURE" in
 
+    "X2GO_LIST_DESKTOPS") echo "ok"; exit 0;;
+    "X2GO_MOUNTDIRS") echo "ok"; exit 0;;
+    "X2GO_UMOUNTSESSION_ALL") echo "ok"; exit 0;;
     "X2GO_UMOUNTSESSION_ONLYPATH") echo "ok"; exit 0;;
     *) 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).