The branch, release/4.0.1.x has been updated via 5e65654724f5b9fc9e76260fe4a1ef8182af3b3b (commit) from d64013f1b0ac2d5de341b5acddb29223a1e98e6d (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/x2goserver-extensions.dirs | 3 + debian/x2goserver-extensions.docs | 1 + debian/x2goserver-extensions.install | 2 + debian/x2goserver-extensions.manpages | 1 + .../html/man8/x2gosetkeyboard.8.html | 26 ++++++-- .../.build_man2html/html/man8/x2goversion.8.html | 69 ++++++++++++++++++++ {x2goserver => x2goserver-extensions}/Makefile | 48 +++++++------- .../VERSION.x2goserver-extensions | 0 x2goserver-extensions/bin/x2gosetkeyboard | 60 +++++++++++++++++ x2goserver-extensions/bin/x2goversion | 47 +++++++++++++ x2goserver-extensions/man/man8/x2gosetkeyboard.8 | 29 ++++++++ x2goserver-extensions/man/man8/x2goversion.8 | 35 ++++++++++ 12 files changed, 290 insertions(+), 31 deletions(-) create mode 100644 debian/x2goserver-extensions.dirs create mode 100644 debian/x2goserver-extensions.docs create mode 100644 debian/x2goserver-extensions.install create mode 100644 debian/x2goserver-extensions.manpages copy x2goserver/.build_man2html/html/man8/x2goprint.8.html => x2goserver-extensions/.build_man2html/html/man8/x2gosetkeyboard.8.html (55%) create mode 100644 x2goserver-extensions/.build_man2html/html/man8/x2goversion.8.html copy {x2goserver => x2goserver-extensions}/Makefile (60%) copy x2goserver/VERSION.x2goserver => x2goserver-extensions/VERSION.x2goserver-extensions (100%) create mode 100755 x2goserver-extensions/bin/x2gosetkeyboard create mode 100755 x2goserver-extensions/bin/x2goversion create mode 100644 x2goserver-extensions/man/man8/x2gosetkeyboard.8 create mode 100644 x2goserver-extensions/man/man8/x2goversion.8 The diff of changes is: diff --git a/debian/x2goserver-extensions.dirs b/debian/x2goserver-extensions.dirs new file mode 100644 index 0000000..45adc59 --- /dev/null +++ b/debian/x2goserver-extensions.dirs @@ -0,0 +1,3 @@ +usr/bin +usr/share/x2go +usr/share/x2go/versions diff --git a/debian/x2goserver-extensions.docs b/debian/x2goserver-extensions.docs new file mode 100644 index 0000000..f000f68 --- /dev/null +++ b/debian/x2goserver-extensions.docs @@ -0,0 +1 @@ +x2goserver-extensions/.build_man2html/html diff --git a/debian/x2goserver-extensions.install b/debian/x2goserver-extensions.install new file mode 100644 index 0000000..8263b77 --- /dev/null +++ b/debian/x2goserver-extensions.install @@ -0,0 +1,2 @@ +x2goserver-extensions/bin/x2go* /usr/bin/ +x2goserver-extensions/VERSION.x2goserver-extensions /usr/share/x2go/versions/ \ No newline at end of file diff --git a/debian/x2goserver-extensions.manpages b/debian/x2goserver-extensions.manpages new file mode 100644 index 0000000..1dec58d --- /dev/null +++ b/debian/x2goserver-extensions.manpages @@ -0,0 +1 @@ +x2goserver-extensions/man/man8/* \ No newline at end of file diff --git a/x2goserver/.build_man2html/html/man8/x2goprint.8.html b/x2goserver-extensions/.build_man2html/html/man8/x2gosetkeyboard.8.html similarity index 55% copy from x2goserver/.build_man2html/html/man8/x2goprint.8.html copy to x2goserver-extensions/.build_man2html/html/man8/x2gosetkeyboard.8.html index d71bba5..cff91de 100644 --- a/x2goserver/.build_man2html/html/man8/x2goprint.8.html +++ b/x2goserver-extensions/.build_man2html/html/man8/x2gosetkeyboard.8.html @@ -1,31 +1,42 @@ Content-type: text/html <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<HTML><HEAD><TITLE>Man page of x2goprint</TITLE> +<HTML><HEAD><TITLE>Man page of x2gosetkeyboard</TITLE> </HEAD><BODY> -<H1>x2goprint</H1> -Section: X2go Server Tool (8)<BR>Updated: 18 May 2011<BR><A HREF="#index">Index</A> +<H1>x2gosetkeyboard</H1> +Section: X2go Server Tool (Extension) (8)<BR>Updated: 31 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> -x2goprint - X2go Server Script +x2gosetkeyboard - Allow server-side Keyboard Setting Updates issued by X2go Client <A NAME="lbAC"> </A> <H2>SYNOPSIS</H2> -<B>x2goprint</B> +<B>x2gosetkeyboard</B> <P> <A NAME="lbAD"> </A> <H2>DESCRIPTION</H2> -<B>x2goprint</B> is one of many scripts belonging to X2go Server. +<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@das-netzwerkteam.de">mike.gabriel@das-netzwerkteam.de</A>> for the X2go project @@ -38,7 +49,8 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da <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">AUTHOR</A><DD> +<DT><A HREF="#lbAE">FILES</A><DD> +<DT><A HREF="#lbAF">AUTHOR</A><DD> </DL> <HR> This document was created by diff --git a/x2goserver-extensions/.build_man2html/html/man8/x2goversion.8.html b/x2goserver-extensions/.build_man2html/html/man8/x2goversion.8.html new file mode 100644 index 0000000..458ec41 --- /dev/null +++ b/x2goserver-extensions/.build_man2html/html/man8/x2goversion.8.html @@ -0,0 +1,69 @@ +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 (Extension) (8)<BR>Updated: 31 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@das-netzwerkteam.de">mike.gabriel@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: 10:13:24 GMT, May 31, 2011 +</BODY> +</HTML> diff --git a/x2goserver/Makefile b/x2goserver-extensions/Makefile similarity index 60% copy from x2goserver/Makefile copy to x2goserver-extensions/Makefile index 765f17f..c7ea989 100755 --- a/x2goserver/Makefile +++ b/x2goserver-extensions/Makefile @@ -14,14 +14,14 @@ DESTDIR= PREFIX=/usr/local ETCDIR=/etc/x2go BINDIR=$(PREFIX)/bin -SBINDIR=$(PREFIX)/sbin -LIBDIR=$(PREFIX)/lib/x2go +#SBINDIR=$(PREFIX)/sbin +#LIBDIR=$(PREFIX)/lib/x2go MANDIR=$(PREFIX)/share/man -SHAREDIR=$(PREFIX)/share/x2go +#SHAREDIR=$(PREFIX)/share/x2go BIN_SCRIPTS=$(shell cd bin && ls) -SBIN_SCRIPTS=$(shell cd sbin && ls) -LIB_FILES=$(shell cd lib && ls) +#SBIN_SCRIPTS=$(shell cd sbin && ls) +#LIB_FILES=$(shell cd lib && ls) man_pages = `cd man && find * -type f` @@ -49,18 +49,18 @@ install: install_scripts install_config install_man install_version install_scripts: $(INSTALL_DIR) $(DESTDIR)$(BINDIR) - $(INSTALL_DIR) $(DESTDIR)$(SBINDIR) - $(INSTALL_DIR) $(DESTDIR)$(LIBDIR) +# $(INSTALL_DIR) $(DESTDIR)$(SBINDIR) +# $(INSTALL_DIR) $(DESTDIR)$(LIBDIR) $(INSTALL_PROGRAM) bin/* $(DESTDIR)$(BINDIR)/ - $(INSTALL_PROGRAM) sbin/* $(DESTDIR)$(SBINDIR)/ - $(INSTALL_FILE) lib/* $(DESTDIR)$(LIBDIR)/ +# $(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_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) @@ -71,22 +71,22 @@ install_man: install_version: $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR) $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/versions - $(INSTALL_FILE) VERSION.x2goserver $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver + $(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) +# 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 +# $(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 @@ -94,5 +94,5 @@ uninstall_man: $(RM_DIR) $(DESTDIR)$(MANDIR) uninstall_version: - $(RM_FILE) $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver + $(RM_FILE) $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver-extensions $(RM_DIR) $(DESTDIR)$(SHAREDIR)/versions diff --git a/x2goserver/VERSION.x2goserver b/x2goserver-extensions/VERSION.x2goserver-extensions similarity index 100% copy from x2goserver/VERSION.x2goserver copy to x2goserver-extensions/VERSION.x2goserver-extensions diff --git a/x2goserver-extensions/bin/x2gosetkeyboard b/x2goserver-extensions/bin/x2gosetkeyboard new file mode 100755 index 0000000..022f97d --- /dev/null +++ b/x2goserver-extensions/bin/x2gosetkeyboard @@ -0,0 +1,60 @@ +#!/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@obviously-nice.de> +# Copyright (C) 2011 Heinz-Markus Graesing <heinz-m.graesing@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-extensions/bin/x2goversion b/x2goserver-extensions/bin/x2goversion new file mode 100755 index 0000000..64dd758 --- /dev/null +++ b/x2goserver-extensions/bin/x2goversion @@ -0,0 +1,47 @@ +#!/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@obviously-nice.de> +# Copyright (C) 2011 Heinz-Markus Graesing <heinz-m.graesing@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-extensions/man/man8/x2gosetkeyboard.8 b/x2goserver-extensions/man/man8/x2gosetkeyboard.8 new file mode 100644 index 0000000..ff9a1d9 --- /dev/null +++ b/x2goserver-extensions/man/man8/x2gosetkeyboard.8 @@ -0,0 +1,29 @@ +'\" -*- 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 "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 +\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@das-netzwerkteam.de> for the X2go project +(http://www.x2go.org). diff --git a/x2goserver-extensions/man/man8/x2goversion.8 b/x2goserver-extensions/man/man8/x2goversion.8 new file mode 100644 index 0000000..a1ea984 --- /dev/null +++ b/x2goserver-extensions/man/man8/x2goversion.8 @@ -0,0 +1,35 @@ +'\" -*- 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 "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 +\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@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).