The branch, master has been updated via 88acc5fef88df9c2e40b8ba356b950f5ee519848 (commit) from 516d847818e55a6ae6b4ce7cb122195b046a157c (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 88acc5fef88df9c2e40b8ba356b950f5ee519848 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Aug 5 12:18:41 2013 +0200 Fix automatic keyboard setup (via x2gosetkeyboard) while resuming a session. (Fixes: #285). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ x2goserver/bin/x2goresume-session | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 77b61dd..b6ffa89 100644 --- a/debian/changelog +++ b/debian/changelog @@ -66,6 +66,8 @@ x2goserver (4.0.1.7-0~x2go1) UNRELEASED; urgency=low Xsession.options they get symlinked into /etc/x2go. Otherwise Xsession.d and Xsession.options are created under /etc/x2go as empty dir/file. (Fixes: #278). + - Fix automatic keyboard setup (via x2gosetkeyboard) while resuming a session. + (Fixes: #285). * /debian/control: - Update LONG_DESCRIPTIONS. - Move xfonts-base from Recommends: field to Depends: field (bin:package diff --git a/x2goserver/bin/x2goresume-session b/x2goserver/bin/x2goresume-session index 3d01b0a..f3a1387 100755 --- a/x2goserver/bin/x2goresume-session +++ b/x2goserver/bin/x2goresume-session @@ -133,12 +133,14 @@ KTSTR=`echo "$KTSTR" | sed "s/\//\\\\\\\\\//"` X2GO_KBD_TYPE=`echo "$X2GO_KBD_TYPE" | sed "s/\//\\\\\\\\\//"` if [ "$X2GO_SET_KBD" == "0" ] || [ "$X2GO_KBD_TYPE" == "auto" ]; then - X2GO_KBD_TYPE="null\/null" + keyboard_type="null\/null" +else + keyboard_type="$X2GO_KBD_TYPE" fi NEWOPTIONS=`echo "$OPTIONS" | sed -e "s/$LSTR/link=$X2GO_LINK/"\ -e "s/$PSTR/pack=$X2GO_PACK/"\ - -e "s/$KTSTR/kbtype=$X2GO_KBD_TYPE/"\ + -e "s/$KTSTR/kbtype=$keyboard_type/"\ -e "s/$GSTR/geometry=$X2GO_GEOMETRY/"\ -e "s/$RSTR/resize=$X2GO_RESIZE/"\ -e "s/$LISTSTR/listen=$GR_PORT/"\ 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).