The branch, master has been updated via d7dfa95bf6f99174a9a88adae3b3de68b57aa7d8 (commit) via a9be575d798f9cf7674f232becd9abddc63ec0ab (commit) via 090e7aff4281c5fa3bbc441962bbdc6056cb73c8 (commit) from dc2af16a85f83b4b1ebe9ce9079d6f00c8ab5c3e (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 d7dfa95bf6f99174a9a88adae3b3de68b57aa7d8 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Sep 29 08:51:20 2011 +0200 Add man pages for x2go<action>-desktopsharing commands, re-arrange man page folders in source project. commit a9be575d798f9cf7674f232becd9abddc63ec0ab Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Sep 29 08:49:14 2011 +0200 fork to background commit 090e7aff4281c5fa3bbc441962bbdc6056cb73c8 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Sep 29 08:33:54 2011 +0200 man page update ----------------------------------------------------------------------- Summary of changes: bin/x2goresume-desktopsharing | 2 +- debian/changelog | 2 + debian/x2godesktopsharing.manpages | 3 +- man/{ => man1}/x2godesktopsharing.1 | 4 +- man/man8/x2goresume-desktopsharing.8 | 28 +++++++++++++++++++++++ man/man8/x2gosuspend-desktopsharing.8 | 37 +++++++++++++++++++++++++++++++ man/man8/x2goterminate-desktopsharing.8 | 30 +++++++++++++++++++++++++ 7 files changed, 102 insertions(+), 4 deletions(-) rename man/{ => man1}/x2godesktopsharing.1 (86%) create mode 100644 man/man8/x2goresume-desktopsharing.8 create mode 100644 man/man8/x2gosuspend-desktopsharing.8 create mode 100644 man/man8/x2goterminate-desktopsharing.8 The diff of changes is: diff --git a/bin/x2goresume-desktopsharing b/bin/x2goresume-desktopsharing index c4ca03a..34da2b5 100755 --- a/bin/x2goresume-desktopsharing +++ b/bin/x2goresume-desktopsharing @@ -35,5 +35,5 @@ X2GO_DISPLAY=$(echo $SESSION_NAME | cut -d"-" -f2) test -e $HOME/.x2go/C-$SESSION_NAME/resume-desktopsharing && { rm -f $HOME/.x2go/C-$SESSION_NAME/resume-desktopsharing - export DISPLAY=:$X2GO_DISPLAY.0 x2godesktopsharing &>/dev/null + export DISPLAY=:$X2GO_DISPLAY.0 x2godesktopsharing &>/dev/null & } diff --git a/debian/changelog b/debian/changelog index c1aa47b..38b315a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,8 @@ x2godesktopsharing (3.0.1.3-0~x2go1) UNRELEASED; urgency=low x2goresume-session). - Rename desktopsharing scripts: from x2godesktopsharing-<action> to x2go<action>-desktopsharing. + - Add man pages for x2go<action>-desktopsharing commands, re-arrange man page + folders in source project. * Depend on x2goserver (>=3.0.99.6). -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Mon, 13 Jun 2011 20:39:33 +0200 diff --git a/debian/x2godesktopsharing.manpages b/debian/x2godesktopsharing.manpages index 7aee1a9..ad46900 100644 --- a/debian/x2godesktopsharing.manpages +++ b/debian/x2godesktopsharing.manpages @@ -1 +1,2 @@ -man/x2godesktopsharing.1 \ No newline at end of file +man/man1/x2godesktopsharing.1 +man/man8/x2go*-desktopsharing.8 diff --git a/man/x2godesktopsharing.1 b/man/man1/x2godesktopsharing.1 similarity index 86% rename from man/x2godesktopsharing.1 rename to man/man1/x2godesktopsharing.1 index 2fba34c..07736a1 100644 --- a/man/x2godesktopsharing.1 +++ b/man/man1/x2godesktopsharing.1 @@ -15,8 +15,8 @@ x2godesktopsharing \- Share an X2go desktop with other clients and users. \fBx2godesktopsharing\fR .SH DESCRIPTION -\fBx2godesktopsharing\fR is a system tray tool that allows a user to control access his/her X2go -session (via shadow sessions). +\fBx2godesktopsharing\fR is a system tray tool that allows a user to give/control access to his/her X/X2go +session (via shadow session support in NX libraries). .PP .SH OPTIONS \fBx2godesktopsharing\fR has no known options. diff --git a/man/man8/x2goresume-desktopsharing.8 b/man/man8/x2goresume-desktopsharing.8 new file mode 100644 index 0000000..dc6fd28 --- /dev/null +++ b/man/man8/x2goresume-desktopsharing.8 @@ -0,0 +1,28 @@ +'\" -*- 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 x2goresume-desktopsharing 8 "Sep 2011" "Version 3.0.99.x" "X2go Server Tool" +.SH NAME +x2goresume-desktopsharing \- Resume Desktop Sharing Applet for a given X2go Session +.SH SYNOPSIS +'nh +.fi +.ad l +x2goresume-desktopsharing <session_id> + +.SH DESCRIPTION +\fBx2goresume-desktopsharing\fR launches the \fBx2godesktopsharing\fR applet for X2go session <session_id>. +.PP +\fBx2goresume-desktopsharing\fR is run with normal user privileges and it is used from within X2go Server. +There normally is no need to execute this command manually. +.SH RETURN VALUES +As exitcode \fBx2goresume-desktopsharing\fR always returns 0. +.SH SEE ALSO +x2godesktopsharing(1), x2goresume-session(8), x2gosuspend-desktopsharing(8), x2goterminate-desktopsharing(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/man/man8/x2gosuspend-desktopsharing.8 b/man/man8/x2gosuspend-desktopsharing.8 new file mode 100644 index 0000000..6f7b6b4 --- /dev/null +++ b/man/man8/x2gosuspend-desktopsharing.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 x2gosuspend-desktopsharing 8 "Sep 2011" "Version 3.0.99.x" "X2go Server Tool" +.SH NAME +x2gosuspend-desktopsharing \- Suspend Desktop Sharing for a given X2go Session +.SH SYNOPSIS +'nh +.fi +.ad l +x2gosuspend-desktopsharing <session_id> + +.SH DESCRIPTION +\fBx2gosuspend-desktopsharing\fR executes \fBx2goterminate-desktopsharing\fR and places a reminder file +.PP + ,,resume-desktopsharing'' +.PP +into +.PP + $HOME/.x2go/C-<session_id>/ +.PP +so that \fBx2godesktopsharing\fR can be resumed +on session resume. +.PP +\fBx2gosuspend-desktopsharing\fR is run with normal user privileges and it is used from within X2go Server. +There normally is no need to execute this command manually. +.SH RETURN VALUES +As exitcode \fBx2gosuspend-desktopsharing\fR always returns 0. +.SH SEE ALSO +x2godesktopsharing(1), x2gosuspend-session(8), x2goterminate-desktopsharing(8), x2goresume-desktopsharing(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/man/man8/x2goterminate-desktopsharing.8 b/man/man8/x2goterminate-desktopsharing.8 new file mode 100644 index 0000000..b970b16 --- /dev/null +++ b/man/man8/x2goterminate-desktopsharing.8 @@ -0,0 +1,30 @@ +'\" -*- 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 x2goterminate-desktopsharing 8 "Sep 2011" "Version 3.0.99.x" "X2go Server Tool" +.SH NAME +x2goterminate-desktopsharing \- Cleanly Terminate Desktop Sharing for a given X2go Session +.SH SYNOPSIS +'nh +.fi +.ad l +x2goterminate-desktopsharing <session_id> + +.SH DESCRIPTION +\fBx2goterminate-desktopsharing\fR allows to detect a running and associated \fBx2godesktopsharing\fR +applet and to cleanly terminate this applet. +.PP +\fBx2goterminate-desktopsharing\fR is run with normal user privileges and it is used from within X2go Server. +There normally is no need to execute this command manually. +.SH RETURN VALUES +As exitcode \fBx2goterminate-desktopsharing\fR returns 0 if a \fBx2godesktopsharing\fR process could be identified +and terminated. If not, the exit code is -1. +.SH SEE ALSO +x2godesktopsharing(1), x2goteminate-session(8), x2gosuspend-desktopsharing(8), x2goresume-desktopsharing(8) +.SH AUTHOR +This manual has been written by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> for the X2go project +(http://www.x2go.org). hooks/post-receive -- x2godesktopsharing.git (Desktop Sharing for X2go) 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 "x2godesktopsharing.git" (Desktop Sharing for X2go).