The branch, master has been updated via 2a2d081e6f4e7c1acb6258e59cb01b2fd20b2607 (commit) from 9d595921188a6ae5b0c2cdd8b9c02588c91b8ba4 (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 2a2d081e6f4e7c1acb6258e59cb01b2fd20b2607 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Dec 16 12:38:52 2013 +0100 Use xkb ruleset 'base' rather than xfree86 as on RHEL systems the xfree86 symlink to base rulset does not exist. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ x2goserver/bin/x2gosetkeyboard | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index f762f2f..c0d5f2d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -89,6 +89,8 @@ x2goserver (4.0.1.10-0x2go1) UNRELEASED; urgency=low files into it. - Handle TCP listening of x2goagent in x2goagent.options. (Fixes: #354). - Clean up Makefiles, remove commented out line. + - Use xkb ruleset 'base' rather than xfree86 as on RHEL systems the + xfree86 symlink to base rulset does not exist. * Grab systemd service file from Fedora and ship it upstream. * Add init script for RPM based distro. Taken from the Fedora package. diff --git a/x2goserver/bin/x2gosetkeyboard b/x2goserver/bin/x2gosetkeyboard index 007233d..7c2a6ee 100755 --- a/x2goserver/bin/x2gosetkeyboard +++ b/x2goserver/bin/x2gosetkeyboard @@ -71,7 +71,7 @@ reset_keymap() { update_keymap() { if [ "$XKB_RULES" = "evdev" ]; then - XKB_RULES="xfree86" + XKB_RULES="base" fi # prepare for setxkbmap call [ -n "$XKB_RULES" ] && XKB_RULES="-rules $XKB_RULES" 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).