This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch release/4.0.1.x in repository x2goserver. from fb3c8ad x2goserver.spec: there is no %trans scriptlet, we're using %posttrans, so the dependency should be specified as Requires(posttrans) as well. new da74275 x2goserver/bin/x2gosetkeyboard: fix a typo that caused the script to not work properly - with or without Arctica's nx-libs. new adcfa88 x2goserver/bin/x2gosetkeyboard: rename ${setxkbcomp_opts} to ${setxkbmap_opts}, that's what it really is. new c25e515 x2goserver/bin/x2goruncommand: stop exporting LD_LIBRARY_PATH when using Arctica's nx-libs and its new Xinerama feature. Fixes: #1153. The 3 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 | 9 +++++++++ x2goserver/bin/x2goruncommand | 16 +++++++++------- x2goserver/bin/x2gosetkeyboard | 12 ++++++------ 3 files changed, 24 insertions(+), 13 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 release/4.0.1.x in repository x2goserver. commit da74275d1421bc24c0e57351233a6e45f1736a19 Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Mar 9 06:47:13 2017 +0100 x2goserver/bin/x2gosetkeyboard: fix a typo that caused the script to not work properly - with or without Arctica's nx-libs. --- debian/changelog | 2 ++ x2goserver/bin/x2gosetkeyboard | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 70c18e7..dbf7c10 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,8 @@ x2goserver (4.0.1.21-0x2go1) UNRELEASED; urgency=medium change to this file. - x2goserver/bin/x2gosetkeyboard: make compatible with changes in 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.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 e5961d2..44fede9 100755 --- a/x2goserver/bin/x2gosetkeyboard +++ b/x2goserver/bin/x2gosetkeyboard @@ -72,7 +72,7 @@ read_keyboard_file() { # Extract the keys, their values and add to setxkbcomp_opts. typeset key='' for key in "rules" "model" "layout" "variant" "options"; do - typeset regexp='^[[:space]]*'"${key}"'[[:space:]]*=[[:space:]]*"?(.*)"?[[:space:]]*' + typeset regexp='^[[:space:]]*'"${key}"'[[:space:]]*=[[:space:]]*"?(.*)"?[[:space:]]*' if [[ "${line}" =~ ${regexp} ]]; then typeset value="${BASH_REMATCH[0]}" -- 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 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
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 c25e5150a8a14c7a0ec5f7939009d0e81a7b83b9 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Mar 9 06:57:47 2017 +0100 x2goserver/bin/x2goruncommand: stop exporting LD_LIBRARY_PATH when using Arctica's nx-libs and its new Xinerama feature. Fixes: #1153. --- debian/changelog | 5 +++++ x2goserver/bin/x2goruncommand | 16 +++++++++------- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index 01066e9..7223028 100644 --- a/debian/changelog +++ b/debian/changelog @@ -80,6 +80,11 @@ x2goserver (4.0.1.21-0x2go1) UNRELEASED; urgency=medium - Delete .packlist which may be in different locations. - Sort some %files entries. + [ Mike Gabriel ] + * New upstream version (4.0.1.21): + - x2goserver/bin/x2goruncommand: stop exporting LD_LIBRARY_PATH when using + Arctica's nx-libs and its new Xinerama feature. Fixes: #1153. + -- X2Go Release Manager <git-admin@x2go.org> Sun, 20 Nov 2016 12:54:13 +0100 x2goserver (4.0.1.20-0x2go1) unstable; urgency=low diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand index 8c3ee62..34c8479 100755 --- a/x2goserver/bin/x2goruncommand +++ b/x2goserver/bin/x2goruncommand @@ -69,13 +69,15 @@ fi export SSH_AUTH_SOCK="$X2GOSSH_AUTH_SOCK" -NX_XINERAMA_LIBS="$(x2gopath xinerama)" -NX_LIBS="$(x2gopath nx-x11)" -test -n "$LD_LIBRARY_PATH" && \ - LD_LIBRARY_PATH="$NX_XINERAMA_LIBS:$NX_LIBS:$LD_LIBRARY_PATH" || \ - LD_LIBRARY_PATH="$NX_XINERAMA_LIBS:$NX_LIBS" -"$X2GO_LIB_PATH/x2gosyslog" "$0" "debug" "exporting LD_LIBRARY_PATH=$LD_LIBRARY_PATH" -export LD_LIBRARY_PATH +if ! x2gofeature X2GOAGENT_RANDRXINERAMA 1>/dev/null; then + NX_XINERAMA_LIBS="$(x2gopath xinerama)" + NX_LIBS="$(x2gopath nx-x11)" + test -n "$LD_LIBRARY_PATH" && \ + LD_LIBRARY_PATH="$NX_XINERAMA_LIBS:$NX_LIBS:$LD_LIBRARY_PATH" || \ + LD_LIBRARY_PATH="$NX_XINERAMA_LIBS:$NX_LIBS" + "$X2GO_LIB_PATH/x2gosyslog" "$0" "debug" "exporting LD_LIBRARY_PATH=$LD_LIBRARY_PATH" + export LD_LIBRARY_PATH +fi if [ "$sndsys" == "esd" ]; then export ESPEAKER="localhost:$4" -- 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