[X2go-Commits] x2goserver.git - master (branch) updated: 3.0.99.8-25-g123bd19
X2go dev team
git-admin at x2go.org
Wed Nov 30 13:05:13 CET 2011
The branch, master has been updated
via 123bd195c9288a5606bd1b4f807bbdc5651e907f (commit)
via 0ddcb23f0faddfecec4c16bcc67ee7fddf2d1772 (commit)
from 202213dfd8d860923fd3560cbb59ae99a21a61e3 (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 123bd195c9288a5606bd1b4f807bbdc5651e907f
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Wed Nov 30 13:05:10 2011 +0100
complete build env of x2goserver-pyhoca
commit 0ddcb23f0faddfecec4c16bcc67ee7fddf2d1772
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Wed Nov 30 13:01:57 2011 +0100
Add new binary package to x2goserver source: x2goserver-pyhoca.
-----------------------------------------------------------------------
Summary of changes:
Makefile | 6 ++
debian/changelog | 1 +
debian/control | 22 +++++++
...rver-extensions.dirs => x2goserver-pyhoca.dirs} | 0
debian/x2goserver-pyhoca.docs | 1 +
debian/x2goserver-pyhoca.install | 3 +
debian/x2goserver-pyhoca.manpages | 1 +
.../Makefile | 9 +--
.../VERSION.x2goserver-pyhoca | 0
x2goserver-pyhoca/bin/x2gosessiontitle | 66 ++++++++++++++++++++
x2goserver-pyhoca/bin/x2gosetkeyboard | 64 +++++++++++++++++++
x2goserver-pyhoca/man/man8/x2gosetkeyboard.8 | 34 ++++++++++
.../share/x2gofeature.d/x2goserver-pyhoca.features | 3 +-
13 files changed, 204 insertions(+), 6 deletions(-)
copy debian/{x2goserver-extensions.dirs => x2goserver-pyhoca.dirs} (100%)
create mode 100644 debian/x2goserver-pyhoca.docs
create mode 100644 debian/x2goserver-pyhoca.install
create mode 100644 debian/x2goserver-pyhoca.manpages
copy {x2goserver-printing => x2goserver-pyhoca}/Makefile (90%)
copy x2goserver-compat/VERSION.x2goserver-compat => x2goserver-pyhoca/VERSION.x2goserver-pyhoca (100%)
create mode 100755 x2goserver-pyhoca/bin/x2gosessiontitle
create mode 100755 x2goserver-pyhoca/bin/x2gosetkeyboard
create mode 100644 x2goserver-pyhoca/man/man8/x2gosetkeyboard.8
copy x2goserver-xsession/share/x2gofeature.d/x2goserver-xsession.features => x2goserver-pyhoca/share/x2gofeature.d/x2goserver-pyhoca.features (92%)
The diff of changes is:
diff --git a/Makefile b/Makefile
index 657dcfc..e7efc9f 100755
--- a/Makefile
+++ b/Makefile
@@ -11,6 +11,7 @@ build_man2html:
cd x2goserver-compat && make $@
cd x2goserver-extensions && make $@
cd x2goserver-xsession && make $@
+ cd x2goserver-pyhoca && make $@
clean:
cd x2goserver && make $@
@@ -18,6 +19,7 @@ clean:
cd x2goserver-compat && make $@
cd x2goserver-extensions && make $@
cd x2goserver-xsession && make $@
+ cd x2goserver-pyhoca && make $@
build-arch:
cd x2goserver && make $@
@@ -25,6 +27,7 @@ build-arch:
cd x2goserver-compat && make $@
cd x2goserver-extensions && make $@
cd x2goserver-xsession && make $@
+ cd x2goserver-pyhoca && make $@
build-indep:
cd x2goserver && make $@
@@ -32,6 +35,7 @@ build-indep:
cd x2goserver-compat && make $@
cd x2goserver-extensions && make $@
cd x2goserver-xsession && make $@
+ cd x2goserver-pyhoca && make $@
install:
cd x2goserver && make $@
@@ -39,6 +43,7 @@ install:
cd x2goserver-compat && make $@
cd x2goserver-extensions && make $@
cd x2goserver-xsession && make $@
+ cd x2goserver-pyhoca && make $@
uninstall:
cd x2goserver-extensions && make $@
@@ -46,5 +51,6 @@ uninstall:
cd x2goserver-printing && make $@
cd x2goserver && make $@
cd x2goserver-xsession && make $@
+ cd x2goserver-pyhoca && make $@
diff --git a/debian/changelog b/debian/changelog
index e41088b..1b2d499 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ x2goserver (3.0.99.9-0~x2go1) UNRELEASED; urgency=low
- Fix x2godbadmin for Perl versions < 5.10.x.
- Remove x2gosetkeyboard from x2goserver-extensions package.
* Add psmisc package as dependency.
+ * Add new binary package to x2goserver source: x2goserver-pyhoca.
-- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Fri, 25 Nov 2011 11:38:46 +0100
diff --git a/debian/control b/debian/control
index 53e444b..404934b 100644
--- a/debian/control
+++ b/debian/control
@@ -165,3 +165,25 @@ Description: X2go server daemon scripts (Xsession runner)
startups and many more Xsession related features on
X2go session login automagically.
+Package: x2goserver-pyhoca
+Architecture: all
+Depends:
+ ${misc:Depends},
+ x2goserver (>= ${source:Version}), x2goserver (<< ${source:Version}.1~),
+Description: X2go server daemon scripts (add-ons for pyhoca client)
+ X2go is a server based computing environment with
+ - session resuming
+ - low bandwith support
+ - LDAP support
+ - client side mass storage mounting support
+ - audio support
+ - authentication by smartcard and USB stick
+ .
+ This X2go server add-on adds extra functionality when using
+ the pyhoca client (GUI or cmdline tool). The installation
+ of this package is completely optional, the pyhoca client
+ will work without.
+ .
+ Functionalities this package adds:
+ - renaming of session window titles
+ - setting detailled X keyboard parameters
diff --git a/debian/x2goserver-extensions.dirs b/debian/x2goserver-pyhoca.dirs
similarity index 100%
copy from debian/x2goserver-extensions.dirs
copy to debian/x2goserver-pyhoca.dirs
diff --git a/debian/x2goserver-pyhoca.docs b/debian/x2goserver-pyhoca.docs
new file mode 100644
index 0000000..6652b35
--- /dev/null
+++ b/debian/x2goserver-pyhoca.docs
@@ -0,0 +1 @@
+x2goserver-pyhoca/.build_man2html/html
diff --git a/debian/x2goserver-pyhoca.install b/debian/x2goserver-pyhoca.install
new file mode 100644
index 0000000..7ba0b60
--- /dev/null
+++ b/debian/x2goserver-pyhoca.install
@@ -0,0 +1,3 @@
+x2goserver-pyhoca/bin/x2go* /usr/bin/
+x2goserver-pyhoca/VERSION.x2goserver-pyhoca /usr/share/x2go/versions/
+x2goserver-pyhoca/share/x2gofeature.d/* /usr/share/x2go/x2gofeature.d/
diff --git a/debian/x2goserver-pyhoca.manpages b/debian/x2goserver-pyhoca.manpages
new file mode 100644
index 0000000..845a36c
--- /dev/null
+++ b/debian/x2goserver-pyhoca.manpages
@@ -0,0 +1 @@
+x2goserver-pyhoca/man/man8/*
\ No newline at end of file
diff --git a/x2goserver-printing/Makefile b/x2goserver-pyhoca/Makefile
similarity index 90%
copy from x2goserver-printing/Makefile
copy to x2goserver-pyhoca/Makefile
index 04f93bf..aa6a562 100755
--- a/x2goserver-printing/Makefile
+++ b/x2goserver-pyhoca/Makefile
@@ -15,7 +15,7 @@ PREFIX=/usr/local
ETCDIR=/etc/x2go
BINDIR=$(PREFIX)/bin
#SBINDIR=$(PREFIX)/sbin
-#LIBDIR=$(PREFIX)/lib/x2go
+LIBDIR=$(PREFIX)/lib/x2go
MANDIR=$(PREFIX)/share/man
SHAREDIR=$(PREFIX)/share/x2go
@@ -53,11 +53,10 @@ 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)$(SHAREDIR)
+ $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/x2gofeature.d
$(INSTALL_PROGRAM) bin/* $(DESTDIR)$(BINDIR)/
# $(INSTALL_PROGRAM) sbin/* $(DESTDIR)$(SBINDIR)/
-# $(INSTALL_FILE) lib/* $(DESTDIR)$(LIBDIR)/
$(INSTALL_PROGRAM) share/x2gofeature.d/*.features $(DESTDIR)$(SHAREDIR)/x2gofeature.d/
install_config:
@@ -76,7 +75,7 @@ install_man:
install_version:
$(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)
$(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/versions
- $(INSTALL_FILE) VERSION.x2goserver-printing $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver-printing
+ $(INSTALL_FILE) VERSION.x2goserver-pyhoca $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver-pyhoca
uninstall: uninstall_scripts uninstall_config uninstall_man uninstall_version
@@ -99,5 +98,5 @@ uninstall_man:
$(RM_DIR) $(DESTDIR)$(MANDIR) || true
uninstall_version:
- $(RM_FILE) $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver-printing
+ $(RM_FILE) $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver-pyhoca
$(RM_DIR) $(DESTDIR)$(SHAREDIR)/versions || true
diff --git a/x2goserver-compat/VERSION.x2goserver-compat b/x2goserver-pyhoca/VERSION.x2goserver-pyhoca
similarity index 100%
copy from x2goserver-compat/VERSION.x2goserver-compat
copy to x2goserver-pyhoca/VERSION.x2goserver-pyhoca
diff --git a/x2goserver-pyhoca/bin/x2gosessiontitle b/x2goserver-pyhoca/bin/x2gosessiontitle
new file mode 100755
index 0000000..6eccba1
--- /dev/null
+++ b/x2goserver-pyhoca/bin/x2gosessiontitle
@@ -0,0 +1,66 @@
+#!/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) 2007-2011 Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+
+X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go`
+
+$X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@"
+
+# do nothing if called from an established X2Go session...
+test -n $X2GO_SESSION && exit 0
+
+# do nothing if called from some non-x2gostartagent context...
+test -z $SESSION_NAME && exit 0
+
+if [ "x$X2GO_FEATURE_SESSIONTITLE" == "xenabled" ]; then
+
+ if [ -z "${X2GO_SESSION_WINDOW_TITLE}" ] && [ -n "$X2GO_CMD" ];; then
+
+ if [ "$X2GO_STYPE" == "S" ]; then
+
+ if [ "x${SHADOW_MODE}" == "x1" ]; then
+ SHADOW_ACCESS="full"
+ else
+ SHADOW_ACCESS="view-only"
+ fi
+
+ SESSION_WINDOW_TITLE="Shadow Desktop on ${HOSTNAME} shared"
+ if [ "x${SHADOW_USER}" == "x${SHADREQ_USER}" ]; then
+ SESSION_WINDOW_TITLE+=" in ${SHADOW_ACCESS} mode by/with yourself"
+ else
+ SESSION_WINDOW_TITLE+=" by ${SHADOW_USER}, granting ${SHADOW_ACCESS} access to ${SHADREQ_USER}"
+ fi
+
+ X2GO_SESSION_WINDOW_TITLE="${SESSION_WINDOW_TITLE}"
+
+ else
+ SESSION_WINDOW_TITLE="${X2GO_CMD} for ${USER}@${HOSTNAME}"
+ fi
+
+ fi
+
+ X2GO_SESSION_WINDOW_TITLE+=" (X2GO-${SESSION_NAME})"
+ $X2GO_LIB_PATH/x2gosyslog "$0" "info" "renaming session window title as requested by X2Go client to ,,$X2GO_SESSION_WINDOW_TITLE''"
+
+else
+ X2GO_SESSION_WINDOW_TITLE="X2GO-${SESSION_NAME}"
+fi
+
+echo -n "$X2GO_SESSION_WINDOW_TITLE"
diff --git a/x2goserver-pyhoca/bin/x2gosetkeyboard b/x2goserver-pyhoca/bin/x2gosetkeyboard
new file mode 100755
index 0000000..4073fa9
--- /dev/null
+++ b/x2goserver-pyhoca/bin/x2gosetkeyboard
@@ -0,0 +1,64 @@
+#!/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
+
+X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go`
+
+$X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@"
+
+# 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-pyhoca/man/man8/x2gosetkeyboard.8 b/x2goserver-pyhoca/man/man8/x2gosetkeyboard.8
new file mode 100644
index 0000000..e77ee77
--- /dev/null
+++ b/x2goserver-pyhoca/man/man8/x2gosetkeyboard.8
@@ -0,0 +1,34 @@
+'\" -*- 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
+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).
+.SH RETURN VALUES
+If \fBx2gosetkeyboard\fR successfully sets the session's keyboard parameters an exit code of 0 is
+returned. Also, if the file ${HOME}/.x2go/C-${X2GO_SESSION}/keyboard is not presented at the
+expected location, a zero-exitcode is returned.
+.PP
+If the command fails on its way, then the exitcode of the failing command is returned.
+.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-xsession/share/x2gofeature.d/x2goserver-xsession.features b/x2goserver-pyhoca/share/x2gofeature.d/x2goserver-pyhoca.features
similarity index 92%
copy from x2goserver-xsession/share/x2gofeature.d/x2goserver-xsession.features
copy to x2goserver-pyhoca/share/x2gofeature.d/x2goserver-pyhoca.features
index 9fb329e..183aa7d 100755
--- a/x2goserver-xsession/share/x2gofeature.d/x2goserver-xsession.features
+++ b/x2goserver-pyhoca/share/x2gofeature.d/x2goserver-pyhoca.features
@@ -29,7 +29,8 @@ X2GO_FEATURE=$1
# check for X2go server core features
case "$X2GO_FEATURE" in
- "X2GO_XSESSION") echo "ok"; exit 0;;
+ "X2GO_SET_KEYBOARD") echo "ok"; exit 0;;
+ "X2GO_SET_SESSIONTITLE") echo "ok"; exit 0;;
*) exit -1;;
esac
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