This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch release/4.0.1.x in repository x2goserver. commit adcfa8897646ecac467bea36f54ba6466fcf79d9 Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Mar 9 06:48:40 2017 +0100 x2goserver/bin/x2gosetkeyboard: rename ${setxkbcomp_opts} to ${setxkbmap_opts}, that's what it really is. --- debian/changelog | 2 ++ x2goserver/bin/x2gosetkeyboard | 10 +++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index dbf7c10..01066e9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,8 @@ x2goserver (4.0.1.21-0x2go1) UNRELEASED; urgency=medium Arctica's nxagent. Also change to an all-bash algorithm. Fixes: #1151. - x2goserver/bin/x2gosetkeyboard: fix a typo that caused the script to not 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.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 44fede9..438ae07 100755 --- a/x2goserver/bin/x2gosetkeyboard +++ b/x2goserver/bin/x2gosetkeyboard @@ -53,8 +53,8 @@ if ! [ -f ${X2GO_CLIENT_KBD_FILE} ]; then exit 0 fi -# Used to hold options to setxkbcomp. -typeset -a setxkbcomp_opts +# Used to hold options to setxkbmap. +typeset -a setxkbmap_opts # retrieve keyboard settings from keyboard file in X2Go session dir read_keyboard_file() { @@ -69,7 +69,7 @@ read_keyboard_file() { [[ "${line}" ]] && file_content+=("${line}") for line in "${file_content[@]}"; do - # Extract the keys, their values and add to setxkbcomp_opts. + # Extract the keys, their values and add to setxkbmap_opts. typeset key='' for key in "rules" "model" "layout" "variant" "options"; do typeset regexp='^[[:space:]]*'"${key}"'[[:space:]]*=[[:space:]]*"?(.*)"?[[:space:]]*' @@ -81,7 +81,7 @@ read_keyboard_file() { # FIXME: find out why that substitution is needed in the first place! [ "${key}" = 'rules' ] && value="${value//evdev/base}" - setxkbcomp_opts+=("-${key}" "${value}") + setxkbmap_opts+=("-${key}" "${value}") fi fi done @@ -94,7 +94,7 @@ reset_keymap() { update_keymap() { # update keyboard map - setxkbmap "${setxkbcomp_opts[@]}" + setxkbmap "${setxkbmap_opts[@]}" } ### main ### -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git