[X2go-Commits] x2goserver.git - master (branch) updated: 3.0.99.8-23-g202213d

X2go dev team git-admin at x2go.org
Wed Nov 30 13:00:54 CET 2011 

The branch, master has been updated
       via  202213dfd8d860923fd3560cbb59ae99a21a61e3 (commit)
      from  52e277550101af3b80dc306ede67a5a9b94937ff (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 202213dfd8d860923fd3560cbb59ae99a21a61e3
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Nov 30 13:00:32 2011 +0100

    Remove x2gosetkeyboard from x2goserver-extensions package.

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

Summary of changes:
 debian/changelog                                   |    1 +
 x2goserver-extensions/bin/x2gosetkeyboard          |   64 --------------------
 x2goserver-extensions/man/man8/x2gosetkeyboard.8   |   34 ----------
 .../x2gofeature.d/x2goserver-extensions.features   |    1 -
 4 files changed, 1 insertions(+), 99 deletions(-)
 delete mode 100755 x2goserver-extensions/bin/x2gosetkeyboard
 delete mode 100644 x2goserver-extensions/man/man8/x2gosetkeyboard.8

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 0261825..e41088b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ x2goserver (3.0.99.9-0~x2go1) UNRELEASED; urgency=low
     - Allow client-side setting of session window title.
     - Fix x2gobasepath for Perl versions < 5.10.x.
     - Fix x2godbadmin for Perl versions < 5.10.x.
+    - Remove x2gosetkeyboard from x2goserver-extensions package.
   * Add psmisc package as dependency.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Fri, 25 Nov 2011 11:38:46 +0100
diff --git a/x2goserver-extensions/bin/x2gosetkeyboard b/x2goserver-extensions/bin/x2gosetkeyboard
deleted file mode 100755
index 4073fa9..0000000
--- a/x2goserver-extensions/bin/x2gosetkeyboard
+++ /dev/null
@@ -1,64 +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
-
-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-extensions/man/man8/x2gosetkeyboard.8 b/x2goserver-extensions/man/man8/x2gosetkeyboard.8
deleted file mode 100644
index e77ee77..0000000
--- a/x2goserver-extensions/man/man8/x2gosetkeyboard.8
+++ /dev/null
@@ -1,34 +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 "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-extensions/share/x2gofeature.d/x2goserver-extensions.features b/x2goserver-extensions/share/x2gofeature.d/x2goserver-extensions.features
index 7e50dd7..509e5a4 100755
--- a/x2goserver-extensions/share/x2gofeature.d/x2goserver-extensions.features
+++ b/x2goserver-extensions/share/x2gofeature.d/x2goserver-extensions.features
@@ -29,7 +29,6 @@ X2GO_FEATURE=$1
 # check for X2go server core features
 case "$X2GO_FEATURE" in
 
-    "X2GO_SET_KEYBOARD") echo "ok"; exit 0;;
     "X2GO_RUN_EXTENSIONS") echo "ok"; exit 0;;
     *) exit -1;;
 


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