[X2Go-Commits] x2goserver.git - build-main (branch) updated: 3.0.99-2-57-g9cdeea7

X2Go dev team git-admin at x2go.org
Wed Dec 4 06:17:26 CET 2013


The branch, build-main has been updated
       via  9cdeea70167490c2257fc905a7b2364aa4a58e2f (commit)
      from  62f39bff4dd294f6973c88f5b54eabace85d5b3e (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:
 Makefile                                           |    8 +-
 debian/changelog                                   |    8 +-
 debian/control                                     |   25 +++--
 debian/copyright                                   |   17 ++--
 debian/x2goserver-extras.dirs                      |    3 -
 debian/x2goserver-extras.docs                      |    1 -
 debian/x2goserver-extras.install                   |    2 -
 debian/x2goserver-extras.manpages                  |    1 -
 .../html/man8/x2gosetkeyboard.8.html               |   61 ------------
 .../.build_man2html/html/man8/x2goversion.8.html   |   69 --------------
 x2goserver-extras/Makefile                         |   98 --------------------
 x2goserver-extras/VERSION.x2goserver-extras        |    1 -
 x2goserver-extras/bin/x2gosetkeyboard              |   60 ------------
 x2goserver-extras/bin/x2goversion                  |   47 ----------
 x2goserver-extras/man/man8/x2gosetkeyboard.8       |   29 ------
 x2goserver-extras/man/man8/x2goversion.8           |   35 -------
 16 files changed, 32 insertions(+), 433 deletions(-)
 delete mode 100644 debian/x2goserver-extras.dirs
 delete mode 100644 debian/x2goserver-extras.docs
 delete mode 100644 debian/x2goserver-extras.install
 delete mode 100644 debian/x2goserver-extras.manpages
 delete mode 100644 x2goserver-extras/.build_man2html/html/man8/x2gosetkeyboard.8.html
 delete mode 100644 x2goserver-extras/.build_man2html/html/man8/x2goversion.8.html
 delete mode 100755 x2goserver-extras/Makefile
 delete mode 100644 x2goserver-extras/VERSION.x2goserver-extras
 delete mode 100755 x2goserver-extras/bin/x2gosetkeyboard
 delete mode 100755 x2goserver-extras/bin/x2goversion
 delete mode 100644 x2goserver-extras/man/man8/x2gosetkeyboard.8
 delete mode 100644 x2goserver-extras/man/man8/x2goversion.8

The diff of changes is:
diff --git a/Makefile b/Makefile
index f702bca..444112f 100755
--- a/Makefile
+++ b/Makefile
@@ -6,18 +6,18 @@ build: build-indep
 
 clean:
 	cd x2goserver && make $@
-	cd x2goserver-extras && make $@
+	cd x2goserver-extensions && make $@
 
 build-indep:
 	cd x2goserver && make $@
-	cd x2goserver-extras && make $@
+	cd x2goserver-extensions && make $@
 
 install:
 	cd x2goserver && make $@
-	cd x2goserver-extras && make $@
+	cd x2goserver-extensions && make $@
 
 uninstall:
 	cd x2goserver && make $@
-	cd x2goserver-extras && make $@
+	cd x2goserver-extensions && make $@
 
 
diff --git a/debian/changelog b/debian/changelog
index b098c95..a805fc0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
 x2goserver (3.0.99.5-0~x2go2) unstable; urgency=low
 
-  * splitting up x2goserver package into x2goserver and x2goserver-extras
-    (x2goserver provides full functionality to legacy x2goclient, 
-    x2goserver-extras is a container for add-on tools/scripts needed for 
-    other client implementations like Python X2go.
+  * splitting up x2goserver package into x2goserver and x2goserver-extensions
+    (x2goserver provides full functionality to legacy x2goclient,
+    x2goserver-extensions is a container/namespace for add-on tools/scripts needed
+    for other client implementations like Python X2go.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Tue, 31 May 2011 10:57:15 +0200
 
diff --git a/debian/control b/debian/control
index ecacf72..67e052b 100644
--- a/debian/control
+++ b/debian/control
@@ -35,7 +35,7 @@ Recommends:
  x11-xkb-utils,
  x11-xserver-utils,
  xinit,
- x2goserver-extras (= ${source:Version})
+ x2goserver-extensions (= ${source:Version})
 Replaces:
  x2goserver-one,
  x2goserver-home,
@@ -52,17 +52,21 @@ Description: X2go server daemon scripts
  This package contains the main daemon and tools for
  X2go server-side session administrations.
  .
- The set of tools and scripts in this package are
- sufficient for running the X2go project's legacy
- x2goclient on the client-side.
+ The x2goserver package provides full functionality
+ for running the X2go project's legacy X2go client
+ (x2goclient) on the client-side.
+ .
+ However, if you intend using other client implementations 
+ of X2go make sure that you also have X2go server
+ extensions package (x2goserver-extensions) installed.
 
-Package: x2goserver-extras
+Package: x2goserver-extensions
 Architecture: all
 Depends:
  ${misc:Depends},
  x2goserver (= ${source:Version}),
  x11-xkb-utils
-Description: X2go server daemon scripts
+Description: X2go server daemon scripts (extensions)
  X2go is a serverbased computing environment with
     - session resuming
     - low bandwith support
@@ -71,5 +75,10 @@ Description: X2go server daemon scripts
     - audio support
     - authentication by smartcard and USB stick
  .
- This package contains the main daemon and tools for
- X2go server-side session administrations.
+ The X2go server extension namespace offers contributors
+ to add script functionality to X2go that is not
+ needed/ignored by the legacy X2go client (x2goclient).
+ .
+ Make sure you have this package installed on your server
+ if you want non-legacy X2go clients to be able to
+ access your server without lack of features.
diff --git a/debian/copyright b/debian/copyright
index 02049e7..23cc85f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,11 +1,5 @@
 Upstream Authors:
 
-x2goserver:
- Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>
- Heinz-M. Graesing <heinz-m.graesing at obviously-nice.de>
-
-x2goserver-extras
- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
  Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>
  Heinz-M. Graesing <heinz-m.graesing at obviously-nice.de>
 
@@ -26,14 +20,17 @@ along with this program; if not, write to the
 Free Software Foundation, Inc.,
 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
-Copyright (C) 2007-2011  Oleksandr Shneyder (x2goserver, x2goserver-extras)
+Copyright (C) 2007-2011  Oleksandr Shneyder
 oleksandr.shneyder at obviously-nice.de
 
-Copyright (C) 2007-2011  Heinz-Markus Graesing (x2goserver, x2goserver-extras)
+Copyright (C) 2007-2011  Heinz-Markus Graesing
 heinz-m.graesing at obviously-nice.de
 
-Copyright (C) 2011  Mike Gabriel (x2goserver-extras)
-mike.gabriel at das-netzwerkteam.de
+Upstream contributors to x2goserver-extensions:
+
+Mike Gabriel <mike.gabriel at das-netzwerkteam.de>:
+    * x2goversion
+    * x2gosetkeyboard
 
 On Debian systems, the complete text of the GNU General
 Public License can be found in `/usr/share/common-licenses/GPL'.
diff --git a/debian/x2goserver-extras.dirs b/debian/x2goserver-extras.dirs
deleted file mode 100644
index 45adc59..0000000
--- a/debian/x2goserver-extras.dirs
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/bin
-usr/share/x2go
-usr/share/x2go/versions
diff --git a/debian/x2goserver-extras.docs b/debian/x2goserver-extras.docs
deleted file mode 100644
index f8fc077..0000000
--- a/debian/x2goserver-extras.docs
+++ /dev/null
@@ -1 +0,0 @@
-x2goserver-extras/.build_man2html/html
diff --git a/debian/x2goserver-extras.install b/debian/x2goserver-extras.install
deleted file mode 100644
index 695ab94..0000000
--- a/debian/x2goserver-extras.install
+++ /dev/null
@@ -1,2 +0,0 @@
-x2goserver-extras/bin/x2go*      /usr/bin/
-x2goserver-extras/VERSION.x2goserver-extras      /usr/share/x2go/versions/
\ No newline at end of file
diff --git a/debian/x2goserver-extras.manpages b/debian/x2goserver-extras.manpages
deleted file mode 100644
index 0e17946..0000000
--- a/debian/x2goserver-extras.manpages
+++ /dev/null
@@ -1 +0,0 @@
-x2goserver-extras/man/man8/*
\ No newline at end of file
diff --git a/x2goserver-extras/.build_man2html/html/man8/x2gosetkeyboard.8.html b/x2goserver-extras/.build_man2html/html/man8/x2gosetkeyboard.8.html
deleted file mode 100644
index 5d23427..0000000
--- a/x2goserver-extras/.build_man2html/html/man8/x2gosetkeyboard.8.html
+++ /dev/null
@@ -1,61 +0,0 @@
-Content-type: text/html
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML><HEAD><TITLE>Man page of x2gosetkeyboard</TITLE>
-</HEAD><BODY>
-<H1>x2gosetkeyboard</H1>
-Section: X2go Server Tool (8)<BR>Updated: 30 May 2011<BR><A HREF="#index">Index</A>
-<A HREF="../index.html">Return to Main Contents</A><HR>
-
-<A NAME="lbAB"> </A>
-<H2>NAME</H2>
-
-x2gosetkeyboard - Allow server-side Keyboard Setting Updates issued by X2go Client
-<A NAME="lbAC"> </A>
-<H2>SYNOPSIS</H2>
-
-
-
-
-<B>x2gosetkeyboard</B>
-<P>
-<A NAME="lbAD"> </A>
-<H2>DESCRIPTION</H2>
-
-<B>x2gosetkeyboard</B> looks for a 'keyboard' file in the X2go session directory and introspects
-the X2go session keyboard settings requested from the client side.
-<P>
-
-If no 'keyboard' file is present in the X2go session directory, nothing happens (i.e. no error
-will be raised).
-<P>
-
-<A NAME="lbAE"> </A>
-<H2>FILES</H2>
-
-${HOME}/.x2go/C-${X2GO_SESSION}/keyboard
-<P>
-
-<A NAME="lbAF"> </A>
-<H2>AUTHOR</H2>
-
-This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel at das-netzwerkteam.de">mike.gabriel at das-netzwerkteam.de</A>> for the X2go project
-(<A HREF="http://www.x2go.org).">http://www.x2go.org).</A>
-<P>
-
-<HR>
-<A NAME="index"> </A><H2>Index</H2>
-<DL>
-<DT><A HREF="#lbAB">NAME</A><DD>
-<DT><A HREF="#lbAC">SYNOPSIS</A><DD>
-<DT><A HREF="#lbAD">DESCRIPTION</A><DD>
-<DT><A HREF="#lbAE">FILES</A><DD>
-<DT><A HREF="#lbAF">AUTHOR</A><DD>
-</DL>
-<HR>
-This document was created by
-<A HREF="/cgi-bin/man/man2html">man2html</A>,
-using the manual pages.<BR>
-Time: 09:53:54 GMT, May 31, 2011
-</BODY>
-</HTML>
diff --git a/x2goserver-extras/.build_man2html/html/man8/x2goversion.8.html b/x2goserver-extras/.build_man2html/html/man8/x2goversion.8.html
deleted file mode 100644
index a3c66a0..0000000
--- a/x2goserver-extras/.build_man2html/html/man8/x2goversion.8.html
+++ /dev/null
@@ -1,69 +0,0 @@
-Content-type: text/html
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML><HEAD><TITLE>Man page of x2goversion</TITLE>
-</HEAD><BODY>
-<H1>x2goversion</H1>
-Section: X2go Server Tool (8)<BR>Updated: 29 May 2011<BR><A HREF="#index">Index</A>
-<A HREF="../index.html">Return to Main Contents</A><HR>
-
-<A NAME="lbAB"> </A>
-<H2>NAME</H2>
-
-x2goversion - Retrieve Code Versions of X2go Server Components
-<A NAME="lbAC"> </A>
-<H2>SYNOPSIS</H2>
-
-
-
-
-<B>x2goversion [<x2go-component>]</B>
-<P>
-<A NAME="lbAD"> </A>
-<H2>DESCRIPTION</H2>
-
-<B>x2goversion</B> allows to retrieve code versions of X2go server components.
-<P>
-
-If the
-<B>[<x2go-component>]</B> parameter is omitted then a list of all available X2go server
-component names and versions is listed.
-<P>
-
-If an X2go component is specified with the <B>[<x2go-component>]</B> parameter, then only the
-component's version is printed to stdout.
-<P>
-
-The <B>x2goversion</B> tool can be used by X2go client implementations to query server-side versions
-of X2go components.
-<P>
-
-<A NAME="lbAE"> </A>
-<H2>FILES</H2>
-
-/usr/share/x2go/versions/VERSION.*
-<P>
-
-<A NAME="lbAF"> </A>
-<H2>AUTHOR</H2>
-
-This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel at das-netzwerkteam.de">mike.gabriel at das-netzwerkteam.de</A>> for the X2go project
-(<A HREF="http://www.x2go.org).">http://www.x2go.org).</A>
-<P>
-
-<HR>
-<A NAME="index"> </A><H2>Index</H2>
-<DL>
-<DT><A HREF="#lbAB">NAME</A><DD>
-<DT><A HREF="#lbAC">SYNOPSIS</A><DD>
-<DT><A HREF="#lbAD">DESCRIPTION</A><DD>
-<DT><A HREF="#lbAE">FILES</A><DD>
-<DT><A HREF="#lbAF">AUTHOR</A><DD>
-</DL>
-<HR>
-This document was created by
-<A HREF="/cgi-bin/man/man2html">man2html</A>,
-using the manual pages.<BR>
-Time: 09:53:54 GMT, May 31, 2011
-</BODY>
-</HTML>
diff --git a/x2goserver-extras/Makefile b/x2goserver-extras/Makefile
deleted file mode 100755
index 9ac9491..0000000
--- a/x2goserver-extras/Makefile
+++ /dev/null
@@ -1,98 +0,0 @@
-#!/usr/bin/make -f
-
-SRC_DIR=$(CURDIR)
-SHELL=/bin/bash
-
-INSTALL_DIR=install -d -o root -g root -m 755
-INSTALL_FILE=install -o root -g root -m 644
-INSTALL_PROGRAM=install -o root -g root -m 755
-
-RM_FILE=rm -f
-RM_DIR=rmdir -p --ignore-fail-on-non-empty
-
-DESTDIR=
-PREFIX=/usr/local
-ETCDIR=/etc/x2go
-BINDIR=$(PREFIX)/bin
-#SBINDIR=$(PREFIX)/sbin
-#LIBDIR=$(PREFIX)/lib/x2go
-MANDIR=$(PREFIX)/share/man
-#SHAREDIR=$(PREFIX)/share/x2go
-
-BIN_SCRIPTS=$(shell cd bin && ls)
-#SBIN_SCRIPTS=$(shell cd sbin && ls)
-#LIB_FILES=$(shell cd lib && ls)
-
-man_pages = `cd man && find * -type f`
-
-MAN2HTML_BIN  = man2html
-MAN2HTML_SRC  = man
-MAN2HTML_DEST = .build_man2html/html
-
-all: clean build
-
-build: build-indep
-
-build-indep: build_man2html
-
-build_man2html:
-	mkdir -p $(MAN2HTML_DEST)
-	for man_page in $(man_pages); do mkdir -p `dirname $(MAN2HTML_DEST)/$$man_page`; done
-	for man_page in $(man_pages); do $(MAN2HTML_BIN) -r $(MAN2HTML_SRC)/$$man_page > $(MAN2HTML_DEST)/$$man_page.html; done
-
-clean: clean_man2html
-
-clean_man2html:
-	rm -rf `dirname $(MAN2HTML_DEST)`
-
-install: install_scripts install_config install_man install_version
-
-install_scripts:
-	$(INSTALL_DIR) $(DESTDIR)$(BINDIR)
-#	$(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
-#	$(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
-	$(INSTALL_PROGRAM) bin/*                $(DESTDIR)$(BINDIR)/
-#	$(INSTALL_PROGRAM) sbin/*               $(DESTDIR)$(SBINDIR)/
-#	$(INSTALL_FILE) lib/*                   $(DESTDIR)$(LIBDIR)/
-
-install_config:
-#	$(INSTALL_DIR) $(DESTDIR)$(ETCDIR)
-#	$(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/x2gosql
-#	$(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/x2gosql/passwords
-#	$(INSTALL_FILE) etc/x2goserver.conf     $(DESTDIR)$(ETCDIR)/
-#	$(INSTALL_FILE) etc/x2gosql/sql         $(DESTDIR)$(ETCDIR)/x2gosql
-
-install_man:
-	$(INSTALL_DIR) $(DESTDIR)$(MANDIR)
-	$(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man8
-	$(INSTALL_FILE) man/man8/*.8           $(DESTDIR)$(MANDIR)/man8
-	gzip -f $(DESTDIR)$(MANDIR)/man8/x2go*.8
-
-install_version:
-	$(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)
-	$(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/versions
-	$(INSTALL_FILE) VERSION.x2goserver-extras     $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver-extras
-
-uninstall: uninstall_scripts uninstall_config uninstall_man uninstall_version
-
-uninstall_scripts:
-	for file in $(BIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(BINDIR)/$$file; done
-#	for file in $(SBIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(SBINDIR)/$$file; done
-#	for file in $(LIB_FILES); do $(RM_FILE) $(DESTDIR)$(LIBDIR)/$$file; done
-#	$(RM_DIR) $(DESTDIR)$(LIBDIR)
-
-uninstall_config:
-#	$(RM_FILE) $(DESTDIR)$(ETCDIR)/x2goserver.conf
-#	$(RM_FILE) $(DESTDIR)$(ETCDIR)/x2gosql/sql
-#	$(RM_DIR)  $(DESTDIR)$(ETCDIR)
-#	$(RM_DIR)  $(DESTDIR)$(ETCDIR)/x2gosql/passwords
-#	$(RM_DIR)  $(DESTDIR)$(ETCDIR)/x2gosql
-
-uninstall_man:
-	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)
-
-uninstall_version:
-	$(RM_FILE) $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver-extras
-	$(RM_DIR)  $(DESTDIR)$(SHAREDIR)/versions
diff --git a/x2goserver-extras/VERSION.x2goserver-extras b/x2goserver-extras/VERSION.x2goserver-extras
deleted file mode 100644
index 34936c7..0000000
--- a/x2goserver-extras/VERSION.x2goserver-extras
+++ /dev/null
@@ -1 +0,0 @@
-3.0.99.5
\ No newline at end of file
diff --git a/x2goserver-extras/bin/x2gosetkeyboard b/x2goserver-extras/bin/x2gosetkeyboard
deleted file mode 100755
index 022f97d..0000000
--- a/x2goserver-extras/bin/x2gosetkeyboard
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/bash
-
-# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the
-# Free Software Foundation, Inc.,
-# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# Copyright (C) 2011  Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>
-# Copyright (C) 2011  Heinz-Markus Graesing <heinz-m.graesing at obviously-nice.de>
-
-set -e
-
-# set up paths
-X2GO_SESSION_ROOT=${HOME}/.x2go
-X2GO_SESSION_DIR=${X2GO_SESSION_ROOT}/C-${X2GO_SESSION}
-
-# client keyboard configuration
-X2GO_CLIENT_KBD_FILE=${X2GO_SESSION_DIR}/keyboard
-
-test -f ${X2GO_CLIENT_KBD_FILE} || exit 0
-
-read_keyboard_file() {
-
-        # retrieve keyboard settings from keyboard file in X2go session dir
-        XKB_RULES=$(cat ${X2GO_CLIENT_KBD_FILE}  | egrep "^rules.*" | head -n1 | cut -d "=" -f2 | cut -d" " -f1)
-        XKB_MODEL=$(cat ${X2GO_CLIENT_KBD_FILE}  | egrep "^model.*" | head -n1 | cut -d "=" -f2 | cut -d" " -f1)
-        XKB_LAYOUT=$(cat ${X2GO_CLIENT_KBD_FILE} | egrep "^layout.*" | head -n1 | cut -d "=" -f2 | cut -d" " -f1)
-        XKB_VARIANT=$(cat ${X2GO_CLIENT_KBD_FILE} | egrep "^variant.*" | head -n1 | cut -d "=" -f2 | cut -d" " -f1)
-        XKB_OPTIONS=$(cat ${X2GO_CLIENT_KBD_FILE} | egrep "^options.*" | head -n1 | cut -d "=" -f2 | cut -d" " -f1)
-
-}
-
-update_keymap() {
-
-        # prepare for setxkbmap call
-        [ -n "$XKB_RULES" ] && XKB_RULES="-rules $XKB_RULES"
-        [ -n "$XKB_MODEL" ] && XKB_MODEL="-model $XKB_MODEL"
-        [ -n "$XKB_LAYOUT" ] && XKB_LAYOUT="-layout $XKB_LAYOUT"
-        [ -n "$XKB_VARIANT" ] && XKB_VARIANT="-variant $XKB_VARIANT"
-        [ -n "$XKB_OPTIONS" ] && XKB_OPTIONS="-options $XKB_OPTIONS"
-
-        # update keyboard map
-        setxkbmap $XKB_RULES $XKB_MODEL $XKB_LAYOUT $XKB_VARIANT $XKB_OPTIONS
-}
-
-### main ###
-read_keyboard_file
-update_keymap
diff --git a/x2goserver-extras/bin/x2goversion b/x2goserver-extras/bin/x2goversion
deleted file mode 100755
index 64dd758..0000000
--- a/x2goserver-extras/bin/x2goversion
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/bash
-
-# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the
-# Free Software Foundation, Inc.,
-# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# Copyright (C) 2011  Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>
-# Copyright (C) 2011  Heinz-Markus Graesing <heinz-m.graesing at obviously-nice.de>
-
-X2GO_VERSIONS_BASEPATH="$(dirname $0)/../share/x2go/versions"
-
-get_version() {
-        cat "$1" | egrep -v "^#.*" | head -n1 | cut -d" " -f1
-}
-
-if [ -n "$1" ]; then
-	X2GO_COMPONENT="$1"
-	X2GO_COMPONENT_VERFILE="${X2GO_VERSIONS_BASEPATH}/VERSION.${X2GO_COMPONENT}"
-
-	if [ -f "${X2GO_COMPONENT_VERFILE}" ]; then
-		echo "$(get_version ${X2GO_COMPONENT_VERFILE})"
-	else
-		echo "Version information for X2go component '$X2GO_COMPONENT' is not available." >&1
-	fi
-else
-	cd ${X2GO_VERSIONS_BASEPATH}
-	for compfile in `ls ${X2GO_VERSIONS_BASEPATH}`; do 
-		X2GO_COMPONENT="$(echo $compfile | cut -d"." -f2)"
-		X2GO_COMPONENT_VERSION="$(get_version $compfile)"
-		echo "${X2GO_COMPONENT}: ${X2GO_COMPONENT_VERSION}"
-	done
-	cd - >/dev/null
-fi
-
diff --git a/x2goserver-extras/man/man8/x2gosetkeyboard.8 b/x2goserver-extras/man/man8/x2gosetkeyboard.8
deleted file mode 100644
index 7c26b33..0000000
--- a/x2goserver-extras/man/man8/x2gosetkeyboard.8
+++ /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 8 "30 May 2011" "Version 3.0.99.x" "X2go Server Tool"
-.SH NAME
-x2gosetkeyboard \- Allow server-side Keyboard Setting Updates issued by X2go Client
-.SH SYNOPSIS
-'nh
-.fi
-.ad l
-\fBx2gosetkeyboard\fR
-
-.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 at das-netzwerkteam.de> for the X2go project
-(http://www.x2go.org).
diff --git a/x2goserver-extras/man/man8/x2goversion.8 b/x2goserver-extras/man/man8/x2goversion.8
deleted file mode 100644
index 6552f1b..0000000
--- a/x2goserver-extras/man/man8/x2goversion.8
+++ /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 8 "29 May 2011" "Version 3.0.99.x" "X2go Server Tool"
-.SH NAME
-x2goversion \- Retrieve Code Versions of X2go Server Components
-.SH SYNOPSIS
-'nh
-.fi
-.ad l
-\fBx2goversion [<x2go-component>]\fR
-
-.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 at 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).




More information about the x2go-commits mailing list