diff options
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rw-r--r-- | debian/patches/0320_nxagent_configurable-keystrokes.full.patch | 14 |
2 files changed, 16 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index 6b8794d3e..e012e2ae8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -112,6 +112,8 @@ nx-libs (2:3.5.0.32-0x2go1) UNRELEASED; urgency=low - 1104-xkb-Check-strings-length-against-request-size.patch => 1104-xkb-Check-strings-length-against-request-size.full.patch * debian/rolltarball.sh: + Cherry-picked from Arctica GH 3.6.x branch. + - Use more quotes. Fixes potential bugs, including one triggered by an unquoted hash within the command line. BASH accepts this. Other shells do not (i.e., treat everything following the hash character as a @@ -127,6 +129,9 @@ nx-libs (2:3.5.0.32-0x2go1) UNRELEASED; urgency=low - Copy actions documentation from the wiki. Affects: + 0320_nxagent_configurable-keystrokes.full.patch + - Add documentation for branding behavior. + Affects: + + 0320_nxagent_configurable-keystrokes.full.patch [ Bernard Cafarelli ] * nx-X11: link to libdl to fix undefined references to 'dlopen' and 'dlsym'. diff --git a/debian/patches/0320_nxagent_configurable-keystrokes.full.patch b/debian/patches/0320_nxagent_configurable-keystrokes.full.patch index 3d08b3e00..475b9d0c4 100644 --- a/debian/patches/0320_nxagent_configurable-keystrokes.full.patch +++ b/debian/patches/0320_nxagent_configurable-keystrokes.full.patch @@ -904,7 +904,7 @@ Description: Make nxagent-specific keyboard bindings configurable #endif /* __Keystroke_H__ */ --- /dev/null +++ b/README.keystrokes -@@ -0,0 +1,94 @@ +@@ -0,0 +1,102 @@ +Configurable keybindings in nxagent + +Keybindings in the redistributed x2go version of nxagent can now be configured @@ -913,13 +913,21 @@ Description: Make nxagent-specific keyboard bindings configurable +File location +------------- + -+nxagent searches for the configuration file in the following order: ++nxagent parses the first available configuration file and ignores all others. ++ ++If nxagent is called without branding, it searches: +- in the location given by the '-keystrokefile' command line parameter +- in the location given by the NXAGENT_KEYSTROKEFILE environment variable +- in ~/.nx/config/keystrokes.cfg +- in /etc/nxagent/keystrokes.cfg + -+If none of those files is accessible, the default configuration is used which ++If nxagent is called **with X2Go branding** (i.e., as x2goagent), it searches: ++- in the location given by the '-keystrokefile' command line parameter ++- in the location given by the NXAGENT_KEYSTROKEFILE environment variable ++- in ~/.x2go/config/keystrokes.cfg ++- in /etc/x2go/keystrokes.cfg ++ ++If none of these files are accessible, the default configuration is used which +is the same as the old, traditional nxagent keybindings. + +File format |