This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goserver. from 7e0dce4 x2goserver/bin/x2goruncommand: stop exporting LD_LIBRARY_PATH when using Arctica's nx-libs and its new Xinerama feature. Fixes: #1153. new e19bb91 x2goserver/bin/x2gosetkeyboard: setxkbmap expects a parameter called "-option", but nxagent uses the key "options". Make setxkbmap happy. new 4234f35 x2goserver/bin/x2gosetkeyboard: $BASH_REMATCH is tricky, actually fetch the first match. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 6 ++++++ x2goserver/bin/x2gosetkeyboard | 9 +++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 4234f35dd9dd126c8ac370fee36a054196882a70 Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Mar 9 07:54:05 2017 +0100 x2goserver/bin/x2gosetkeyboard: $BASH_REMATCH is tricky, actually fetch the first match. In the $BASH_REMATCH array, index 0 contains the *full* match, while indices 1+ only contain the partial matches. We're only interested in the first partial match. Cherry-picked from release/4.0.1.x branch. --- debian/changelog | 4 ++++ x2goserver/bin/x2gosetkeyboard | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 72e9668..8dab29b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -257,6 +257,10 @@ x2goserver (4.0.1.21-0x2go1) UNRELEASED; urgency=medium ${setxkbmap_opts}, that's what it really is. - x2goserver/bin/x2gosetkeyboard: setxkbmap expects a parameter called "-option", but nxagent uses the key "options". Make setxkbmap happy. + - x2goserver/bin/x2gosetkeyboard: $BASH_REMATCH is tricky, actually fetch + the first match. In the $BASH_REMATCH array, index 0 contains the *full* + match, while indices 1+ only contain the partial matches. We're only + interested in the first partial match. * x2goserver.spec: - Add mandatory perl-generators Build-Requires as per https://fedoraproject.org/wiki/Changes/Build_Root_Without_Perl diff --git a/x2goserver/bin/x2gosetkeyboard b/x2goserver/bin/x2gosetkeyboard index 0b5c73e..ed8b1e7 100755 --- a/x2goserver/bin/x2gosetkeyboard +++ b/x2goserver/bin/x2gosetkeyboard @@ -74,7 +74,7 @@ read_keyboard_file() { for key in "rules" "model" "layout" "variant" "options"; do typeset regexp='^[[:space:]]*'"${key}"'[[:space:]]*=[[:space:]]*"?(.*)"?[[:space:]]*' if [[ "${line}" =~ ${regexp} ]]; then - typeset value="${BASH_REMATCH[0]}" + typeset value="${BASH_REMATCH[1]}" if [ -n "${value}" ]; then # Handle a special substitution case for evdev-based rules. -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit e19bb919f1cba056a69a410378c585b3ff3c2a1d Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Mar 9 07:51:11 2017 +0100 x2goserver/bin/x2gosetkeyboard: setxkbmap expects a parameter called "-option", but nxagent uses the key "options". Make setxkbmap happy. Cherry-picked from release/4.0.1.x branch. --- debian/changelog | 2 ++ x2goserver/bin/x2gosetkeyboard | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index b1fd812..72e9668 100644 --- a/debian/changelog +++ b/debian/changelog @@ -255,6 +255,8 @@ x2goserver (4.0.1.21-0x2go1) UNRELEASED; urgency=medium work properly - with or without Arctica's nx-libs. - x2goserver/bin/x2gosetkeyboard: rename ${setxkbcomp_opts} to ${setxkbmap_opts}, that's what it really is. + - x2goserver/bin/x2gosetkeyboard: setxkbmap expects a parameter called + "-option", but nxagent uses the key "options". Make setxkbmap happy. * x2goserver.spec: - Add mandatory perl-generators Build-Requires as per https://fedoraproject.org/wiki/Changes/Build_Root_Without_Perl diff --git a/x2goserver/bin/x2gosetkeyboard b/x2goserver/bin/x2gosetkeyboard index 438ae07..0b5c73e 100755 --- a/x2goserver/bin/x2gosetkeyboard +++ b/x2goserver/bin/x2gosetkeyboard @@ -81,7 +81,12 @@ read_keyboard_file() { # FIXME: find out why that substitution is needed in the first place! [ "${key}" = 'rules' ] && value="${value//evdev/base}" - setxkbmap_opts+=("-${key}" "${value}") + # Even though the keyboard file contains "options" as the key, + # setxkbmap expects a parameter called "-option". + typeset option="${key}" + [ "${option}" = 'options' ] && option='option' + + setxkbmap_opts+=("-${option}" "${value}") fi fi done -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
-
git-admin＠x2go.org