The branch, build-baikal has been updated via 6aefbf4538b55ca5dc3c5748238b0203f9db180c (commit) from f12dab5a48c70cd32a54ddb5418948bd28dad2b1 (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 | 1 + debian/x2goserver.manpages | 1 - x2goserver/Makefile | 5 ---- x2goserver/man/man1/x2gobasepath.1 | 25 ------------------- x2goserver/man/man1/x2gocmdexitmessage.1 | 22 ----------------- x2goserver/man/man1/x2golistdesktops.1 | 22 ----------------- x2goserver/man/man1/x2golistsessions.1 | 22 ----------------- x2goserver/man/man1/x2gomountdirs.1 | 22 ----------------- x2goserver/man/man1/x2goprint.1 | 22 ----------------- x2goserver/man/man1/x2goresume-session.1 | 22 ----------------- x2goserver/man/man1/x2goruncommand.1 | 22 ----------------- x2goserver/man/man1/x2gosessionlimit.1 | 22 ----------------- x2goserver/man/man1/x2goshowblocks.1 | 22 ----------------- x2goserver/man/man1/x2gostartagent.1 | 35 --------------------------- x2goserver/man/man1/x2gosuspend-session.1 | 22 ----------------- x2goserver/man/man1/x2goterminate-session.1 | 22 ----------------- x2goserver/man/man1/x2goumount-session.1 | 22 ----------------- x2goserver/man/man1/x2goumount_session.1 | 1 - x2goserver/man/man8/x2goumount_session.8 | 1 + 19 files changed, 2 insertions(+), 331 deletions(-) delete mode 100644 x2goserver/man/man1/x2gobasepath.1 delete mode 100644 x2goserver/man/man1/x2gocmdexitmessage.1 delete mode 100644 x2goserver/man/man1/x2golistdesktops.1 delete mode 100644 x2goserver/man/man1/x2golistsessions.1 delete mode 100644 x2goserver/man/man1/x2gomountdirs.1 delete mode 100644 x2goserver/man/man1/x2goprint.1 delete mode 100644 x2goserver/man/man1/x2goresume-session.1 delete mode 100644 x2goserver/man/man1/x2goruncommand.1 delete mode 100644 x2goserver/man/man1/x2gosessionlimit.1 delete mode 100644 x2goserver/man/man1/x2goshowblocks.1 delete mode 100644 x2goserver/man/man1/x2gostartagent.1 delete mode 100644 x2goserver/man/man1/x2gosuspend-session.1 delete mode 100644 x2goserver/man/man1/x2goterminate-session.1 delete mode 100644 x2goserver/man/man1/x2goumount-session.1 delete mode 120000 x2goserver/man/man1/x2goumount_session.1 create mode 120000 x2goserver/man/man8/x2goumount_session.8 The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 8aded28..5d7d515 100644 --- a/debian/changelog +++ b/debian/changelog @@ -51,6 +51,7 @@ x2goserver (3.0.99.5-0~x2go3) UNRELEASED; urgency=low * Use usermapping for SSHFS mount points. * Add notice messages for start, suspend, resume, terminate, mountdirs actions. + * Cleanup of man page area, thanks to Ivan Kabaivanov for pointing that out. [ Martin Oehler ] * Removes old debug code fragment, fixes x2golistsessions parsing. diff --git a/debian/x2goserver.manpages b/debian/x2goserver.manpages index d70a25f..88720a8 100644 --- a/debian/x2goserver.manpages +++ b/debian/x2goserver.manpages @@ -1,2 +1 @@ -x2goserver/man/man1/* x2goserver/man/man8/* \ No newline at end of file diff --git a/x2goserver/Makefile b/x2goserver/Makefile index 71cced9..0bf496c 100755 --- a/x2goserver/Makefile +++ b/x2goserver/Makefile @@ -78,9 +78,6 @@ install_config: install_man: $(INSTALL_DIR) $(DESTDIR)$(MANDIR) - $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man1 - $(INSTALL_FILE) man/man1/*.1 $(DESTDIR)$(MANDIR)/man1 - gzip -f $(DESTDIR)$(MANDIR)/man1/x2go*.1 $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man8 $(INSTALL_FILE) man/man8/*.8 $(DESTDIR)$(MANDIR)/man8 gzip -f $(DESTDIR)$(MANDIR)/man8/x2go*.8 @@ -107,8 +104,6 @@ uninstall_config: $(RM_DIR) $(DESTDIR)$(ETCDIR)/x2gosql || true uninstall_man: - for file in $(BIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(MANDIR)/man1/$$file.1.gz; done - for file in $(SBIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(MANDIR)/man1/$$file.1.gz; done for file in $(BIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(MANDIR)/man8/$$file.8.gz; done for file in $(SBIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(MANDIR)/man8/$$file.8.gz; done $(RM_DIR) $(DESTDIR)$(MANDIR) || true diff --git a/x2goserver/man/man1/x2gobasepath.1 b/x2goserver/man/man1/x2gobasepath.1 deleted file mode 100644 index cb83fe8..0000000 --- a/x2goserver/man/man1/x2gobasepath.1 +++ /dev/null @@ -1,25 +0,0 @@ -'\" -*- 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 x2gobasepath 1 "July 2011" "Version 3.0.99.x" "X2go Server Tool" -.SH NAME -x2gobasepath \- X2go Server Helper Script -.SH SYNOPSIS -'nh -.fi -.ad l -x2gobasepath - -.SH DESCRIPTION -\fBx2gobasepath\fR returns (without \\newline) the base path of the current X2go server installation. -Mostly this is /usr or /usr/local. -.PP -This script is used internally by the X2go server. -.PP -.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/man1/x2gocmdexitmessage.1 b/x2goserver/man/man1/x2gocmdexitmessage.1 deleted file mode 100644 index 1c28470..0000000 --- a/x2goserver/man/man1/x2gocmdexitmessage.1 +++ /dev/null @@ -1,22 +0,0 @@ -'\" -*- 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 x2gocmdexitmessage 1 "July 2011" "Version 3.0.99.x" "X2go Server Tool" -.SH NAME -x2goexitmessage \- X2go Server Script -.SH SYNOPSIS -'nh -.fi -.ad l -x2goexitmessage - -.SH DESCRIPTION -\fBx2goexitmessage\fR is one of many scripts belonging to X2go Server. -.PP -.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/man1/x2golistdesktops.1 b/x2goserver/man/man1/x2golistdesktops.1 deleted file mode 100644 index c1bab38..0000000 --- a/x2goserver/man/man1/x2golistdesktops.1 +++ /dev/null @@ -1,22 +0,0 @@ -'\" -*- 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 x2golistdesktops 1 "July 2011" "Version 3.0.99.x" "X2go Server Tool" -.SH NAME -x2golistdesktops \- X2go Server Script -.SH SYNOPSIS -'nh -.fi -.ad l -x2golistdesktops - -.SH DESCRIPTION -\fBx2golistdesktops\fR is one of many scripts belonging to X2go Server. -.PP -.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/man1/x2golistsessions.1 b/x2goserver/man/man1/x2golistsessions.1 deleted file mode 100644 index 7dfd17d..0000000 --- a/x2goserver/man/man1/x2golistsessions.1 +++ /dev/null @@ -1,22 +0,0 @@ -'\" -*- 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 x2golistsessions 1 "18 May 2011" "Version 3.0.99.x" "X2go Server Tool" -.SH NAME -x2golistsessions \- X2go Server Script -.SH SYNOPSIS -'nh -.fi -.ad l -x2golistsessions - -.SH DESCRIPTION -\fBx2golistsessions\fR is one of many scripts belonging to X2go Server. -.PP -.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/man1/x2gomountdirs.1 b/x2goserver/man/man1/x2gomountdirs.1 deleted file mode 100644 index f8bb5f8..0000000 --- a/x2goserver/man/man1/x2gomountdirs.1 +++ /dev/null @@ -1,22 +0,0 @@ -'\" -*- 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 x2gomountdirs 1 "18 May 2011" "Version 3.0.99.x" "X2go Server Tool" -.SH NAME -x2gomountdirs \- X2go Server Script -.SH SYNOPSIS -'nh -.fi -.ad l -x2gomountdirs - -.SH DESCRIPTION -\fBx2gomountdirs\fR is one of many scripts belonging to X2go Server. -.PP -.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/man1/x2goprint.1 b/x2goserver/man/man1/x2goprint.1 deleted file mode 100644 index d1e09c2..0000000 --- a/x2goserver/man/man1/x2goprint.1 +++ /dev/null @@ -1,22 +0,0 @@ -'\" -*- 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 x2goprint 1 "18 May 2011" "Version 3.0.99.x" "X2go Server Tool" -.SH NAME -x2goprint \- X2go Server Script -.SH SYNOPSIS -'nh -.fi -.ad l -x2goprint - -.SH DESCRIPTION -\fBx2goprint\fR is one of many scripts belonging to X2go Server. -.PP -.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/man1/x2goresume-session.1 b/x2goserver/man/man1/x2goresume-session.1 deleted file mode 100644 index f12d0a9..0000000 --- a/x2goserver/man/man1/x2goresume-session.1 +++ /dev/null @@ -1,22 +0,0 @@ -'\" -*- 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-session 1 "18 May 2011" "Version 3.0.99.x" "X2go Server Tool" -.SH NAME -x2goresume-session \- X2go Server Script -.SH SYNOPSIS -'nh -.fi -.ad l -x2goresume-session - -.SH DESCRIPTION -\fBx2goresume-session\fR is one of many scripts belonging to X2go Server. -.PP -.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/man1/x2goruncommand.1 b/x2goserver/man/man1/x2goruncommand.1 deleted file mode 100644 index 145b238..0000000 --- a/x2goserver/man/man1/x2goruncommand.1 +++ /dev/null @@ -1,22 +0,0 @@ -'\" -*- 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 x2goruncommand 1 "18 May 2011" "Version 3.0.99.x" "X2go Server Tool" -.SH NAME -x2goruncommand \- X2go Server Script -.SH SYNOPSIS -'nh -.fi -.ad l -x2goruncommand - -.SH DESCRIPTION -\fBx2goruncommand\fR is one of many scripts belonging to X2go Server. -.PP -.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/man1/x2gosessionlimit.1 b/x2goserver/man/man1/x2gosessionlimit.1 deleted file mode 100644 index 8e9b70b..0000000 --- a/x2goserver/man/man1/x2gosessionlimit.1 +++ /dev/null @@ -1,22 +0,0 @@ -'\" -*- 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 x2gosessionlimit 1 "July 2011" "Version 3.0.99.x" "X2go Server Tool" -.SH NAME -x2gosessionlimit \- X2go Server Script -.SH SYNOPSIS -'nh -.fi -.ad l -x2golistsessions - -.SH DESCRIPTION -\fBx2gosessionlimit\fR is one of many scripts belonging to X2go Server. -.PP -.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/man1/x2goshowblocks.1 b/x2goserver/man/man1/x2goshowblocks.1 deleted file mode 100644 index 145b238..0000000 --- a/x2goserver/man/man1/x2goshowblocks.1 +++ /dev/null @@ -1,22 +0,0 @@ -'\" -*- 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 x2goruncommand 1 "18 May 2011" "Version 3.0.99.x" "X2go Server Tool" -.SH NAME -x2goruncommand \- X2go Server Script -.SH SYNOPSIS -'nh -.fi -.ad l -x2goruncommand - -.SH DESCRIPTION -\fBx2goruncommand\fR is one of many scripts belonging to X2go Server. -.PP -.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/man1/x2gostartagent.1 b/x2goserver/man/man1/x2gostartagent.1 deleted file mode 100644 index 16f0a8c..0000000 --- a/x2goserver/man/man1/x2gostartagent.1 +++ /dev/null @@ -1,35 +0,0 @@ -'\" -*- 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 x2gostartagent 1 "18 May 2011" "Version 3.0.99.x" "X2go Server Tool" -.SH NAME -x2gostartagent \- X2go Server Script -.SH SYNOPSIS -'nh -.fi -.ad l -x2gostartagent <geometry> <link-quality> <nx-pack-meth> <cache-type+dpi> <kblayout> <kbtype> <setkbd> <session-type> <command> - -.SH DESCRIPTION -\fBx2gostartagent\fR is a script that coordinates the startup process of new X2go sessions. -It expects quite a list of parameters, all of which are obligatory. -.SH RETURN VALUES -A list of parameters will be returned after a successful session startup. Each value will be presented on -a new line: - - \fB<X-display-number>\fR - \fB<session-cookie-hash>\fR - \fB<x2goagent-pid>\fR - \fB<session-name>\fR - \fB<graphics-port>\fR - \fB<sound-port>\fR - \fB<sshfs-port>\fR - -.PP -.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/man1/x2gosuspend-session.1 b/x2goserver/man/man1/x2gosuspend-session.1 deleted file mode 100644 index aeee450..0000000 --- a/x2goserver/man/man1/x2gosuspend-session.1 +++ /dev/null @@ -1,22 +0,0 @@ -'\" -*- 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-session 1 "18 May 2011" "Version 3.0.99.x" "X2go Server Tool" -.SH NAME -x2gosuspend-session \- X2go Server Script -.SH SYNOPSIS -'nh -.fi -.ad l -x2gosuspend-session - -.SH DESCRIPTION -\fBx2gosuspend-session\fR is one of many scripts belonging to X2go Server. -.PP -.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/man1/x2goterminate-session.1 b/x2goserver/man/man1/x2goterminate-session.1 deleted file mode 100644 index 60f53fa..0000000 --- a/x2goserver/man/man1/x2goterminate-session.1 +++ /dev/null @@ -1,22 +0,0 @@ -'\" -*- 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-session 1 "18 May 2011" "Version 3.0.99.x" "X2go Server Tool" -.SH NAME -x2goterminate-session \- X2go Server Script -.SH SYNOPSIS -'nh -.fi -.ad l -x2goterminate-session - -.SH DESCRIPTION -\fBx2goterminate-session\fR is one of many scripts belonging to X2go Server. -.PP -.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/man1/x2goumount-session.1 b/x2goserver/man/man1/x2goumount-session.1 deleted file mode 100644 index baef86b..0000000 --- a/x2goserver/man/man1/x2goumount-session.1 +++ /dev/null @@ -1,22 +0,0 @@ -'\" -*- 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 x2goumount-session 1 "18 May 2011" "Version 3.0.99.x" "X2go Server Tool" -.SH NAME -x2goumount-session \- X2go Server Script -.SH SYNOPSIS -'nh -.fi -.ad l -x2goumount-session - -.SH DESCRIPTION -\fBx2goumount-session\fR is one of many scripts belonging to X2go Server. -.PP -.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/man1/x2goumount_session.1 b/x2goserver/man/man1/x2goumount_session.1 deleted file mode 120000 index 7417601..0000000 --- a/x2goserver/man/man1/x2goumount_session.1 +++ /dev/null @@ -1 +0,0 @@ -x2goumount-session.1 \ No newline at end of file diff --git a/x2goserver/man/man8/x2goumount_session.8 b/x2goserver/man/man8/x2goumount_session.8 new file mode 120000 index 0000000..59dd168 --- /dev/null +++ b/x2goserver/man/man8/x2goumount_session.8 @@ -0,0 +1 @@ +x2goumount-session.8 \ No newline at end of file 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).