x2goserver.git - master (branch) updated: 3.0.99-2-260-g61c2bd1 - x2go-commits

10 Sep 2011

The branch, master has been updated
       via  61c2bd151f27d0c3bd3bfb840d6c67a934aa203e (commit)
      from  e1d8c19dc2006893f85f76a891d959413f77a9cb (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 61c2bd151f27d0c3bd3bfb840d6c67a934aa203e
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date:   Sat Sep 10 17:01:32 2011 +0200

    Makefile and man page area fix for x2goserver-extensions.

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

Summary of changes:
 debian/changelog                                 |    1 +
 x2goserver-extensions/Makefile                   |    8 ++---
 x2goserver-extensions/man/man1/x2gosetkeyboard.1 |   29 ------------------
 x2goserver-extensions/man/man1/x2goversion.1     |   35 ----------------------
 4 files changed, 4 insertions(+), 69 deletions(-)
 delete mode 100644 x2goserver-extensions/man/man1/x2gosetkeyboard.1
 delete mode 100644 x2goserver-extensions/man/man1/x2goversion.1

The diff of changes is:

diff --git a/debian/changelog b/debian/changelog
index 0de56ff..8221a7d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -54,6 +54,7 @@ x2goserver (3.0.99.5-0~x2go3) UNRELEASED; urgency=low
   * Cleanup of man page area, thanks to Ivan Kabaivanov for pointing that out.
   * Rename example user and group for session limits in x2goserver.conf so that
     people do not get the idea to put users in x2gouser group.
+  * Makefile and man page area fix for x2goserver-extensions.
 
   [ Ivan Kabaivanov ]
   * Makefile fix around man page installation in x2goserver-compat package.
diff --git a/x2goserver-extensions/Makefile b/x2goserver-extensions/Makefile
index 44d84b4..152dc92 100755
--- a/x2goserver-extensions/Makefile
+++ b/x2goserver-extensions/Makefile
@@ -66,9 +66,9 @@ 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/man1/*.8           $(DESTDIR)$(MANDIR)/man8
+	gzip -f $(DESTDIR)$(MANDIR)/man1/x2go*.8
 
 install_version:
 	$(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)
@@ -91,8 +91,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-extensions/man/man1/x2gosetkeyboard.1 b/x2goserver-extensions/man/man1/x2gosetkeyboard.1
deleted file mode 100644
index f9e0f1f..0000000
--- a/x2goserver-extensions/man/man1/x2gosetkeyboard.1
+++ /dev/null
@@ -1,29 +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 x2gosetkeyboard 1 "31 May 2011" "Version 3.0.99.x" "X2go Server Tool (Extension)"
-.SH NAME
-x2gosetkeyboard \- Allow server-side Keyboard Setting Updates issued by X2go Client
-.SH SYNOPSIS
-'nh
-.fi
-.ad l
-x2gosetkeyboard
-
-.SH DESCRIPTION
-\fBx2gosetkeyboard\fR looks for a 'keyboard' file in the X2go session directory and introspects
-the X2go session keyboard settings requested from the client side.
-.PP
-If no 'keyboard' file is present in the X2go session directory, nothing happens (i.e. no error
-will be raised).
-.PP
-.SH FILES
-${HOME}/.x2go/C-${X2GO_SESSION}/keyboard
-.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-extensions/man/man1/x2goversion.1 b/x2goserver-extensions/man/man1/x2goversion.1
deleted file mode 100644
index a930ceb..0000000
--- a/x2goserver-extensions/man/man1/x2goversion.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 x2goversion 1 "31 May 2011" "Version 3.0.99.x" "X2go Server Tool (Extension)"
-.SH NAME
-x2goversion \- Retrieve Code Versions of X2go Server Components
-.SH SYNOPSIS
-'nh
-.fi
-.ad l
-x2goversion [<x2go-component>]
-
-.SH DESCRIPTION
-\fBx2goversion\fR allows 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
-component names and versions is listed.
-.PP
-If an X2go component is specified with the \fB[<x2go-component>]\fR parameter, then only the
-component's version is printed to stdout.
-.PP
-The \fBx2goversion\fR tool can be used by X2go client implementations to query server-side versions
-of X2go components.
-.PP
-.SH FILES
-/usr/share/x2go/versions/VERSION.*
-.PP
-.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
-- 
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).

    