[X2Go-Commits] nx-libs.git - master (branch) updated: redist-client/3.5.0.20-8-gdafbbf2

[X2Go dev team]

The branch, master has been updated
       via  dafbbf21ae9763bd33a43151c290cd9f031d91a9 (commit)
      from  995b70cdc7f65bbfd72afd75e86032307117a78b (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 dafbbf21ae9763bd33a43151c290cd9f031d91a9
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue May 7 20:20:43 2013 +0200

    For vanilla nxagent move keystrokes.cfg from /etc/nx to /etc/nxagent.

-----------------------------------------------------------------------

Summary of changes:
 debian/Makefile.nx-libs                            |    2 +-
 debian/changelog                                   |    1 +
 .../302_nxagent_configurable-keystrokes.full.patch |    8 ++++----
 3 files changed, 6 insertions(+), 5 deletions(-)

The diff of changes is:
diff --git a/debian/Makefile.nx-libs b/debian/Makefile.nx-libs
index 3083a08..ac814dd 100644
--- a/debian/Makefile.nx-libs
+++ b/debian/Makefile.nx-libs
@@ -7,7 +7,7 @@ COPY_SYMLINK=cp -a
 RM_FILE=rm -f
 RM_DIR=rmdir -p --ignore-fail-on-non-empty
 
-ETCDIR_NX ?= /etc/nx
+ETCDIR_NX ?= /etc/nxagent
 ETCDIR_X2GO ?= /etc/x2go
 PREFIX ?= /usr/local
 BINDIR=$(PREFIX)/bin
diff --git a/debian/changelog b/debian/changelog
index 32985e6..4de9a36 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ nx-libs (2:3.5.0.21-0) UNRELEASED; urgency=low
   * Provide a default keystrokes.cfg in /etc/nx (for nxagent) and /etc/x2go
     (for x2goagent). (Fixes: #199).
   * Set NXAGENT_KEYSTROKEFILE to /etc/x2go/keystrokes.cfg for wrapper x2goagent.
+  * For vanilla nxagent move keystrokes.cfg from /etc/nx to /etc/nxagent.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Thu, 28 Mar 2013 21:07:42 +0100
 
diff --git a/debian/patches/302_nxagent_configurable-keystrokes.full.patch b/debian/patches/302_nxagent_configurable-keystrokes.full.patch
index 8fb34df..e7a3e4a 100644
--- a/debian/patches/302_nxagent_configurable-keystrokes.full.patch
+++ b/debian/patches/302_nxagent_configurable-keystrokes.full.patch
@@ -4,7 +4,7 @@ Description: Make nxagent-specific keyboard bindings configurable
  table of keybindings. The default configuration is the same as the
  original one, to maintain compatibility. A user/administrator can either
  specify a command line parameter, environment variable or place a file
- in ~/.nx/config/keystroke.cfg or /etc/nx/keystroke.cfg to reconfigure
+ in ~/.nx/config/keystroke.cfg or /etc/nxagent/keystroke.cfg to reconfigure
  these keybindings.
  .
  The configuration file format is XML, a dependency on libxml2 is added
@@ -397,7 +397,7 @@ Description: Make nxagent-specific keyboard bindings configurable
 + *  - '-keystrokefile' commandline parameter
 + *  - $NXAGENT_KEYSTROKEFILE environment variable
 + *  - $HOME/.nx/config/keystroke.cfg
-+ *  - /etc/nx/keystroke.cfg
++ *  - /etc/nxagent/keystroke.cfg
 + *  - hardcoded traditional NX default settings
 + */
 +static void parse_keystroke_file(void)
@@ -411,7 +411,7 @@ Description: Make nxagent-specific keyboard bindings configurable
 -      {
 -        *result = doSwitchDeferMode;
 +  char *homefile = "/.nx/config/keystroke.cfg";
-+  char *etcfile = "/etc/nx/keystroke.cfg";
++  char *etcfile = "/etc/nxagent/keystroke.cfg";
  
 -        break;
 +  if (nxagentKeystrokeFile != NULL && access(nxagentKeystrokeFile, R_OK) == 0)
@@ -916,7 +916,7 @@ Description: Make nxagent-specific keyboard bindings configurable
 +- in the location given by the '-keystrokefile' command line parameter
 +- in the location given by the NXAGENT_KEYSTROKEFILE environment variable
 +- in ~/.nx/config/keystroke.cfg
-+- in /etc/nx/keystroke.cfg
++- in /etc/nxagent/keystroke.cfg
 +
 +If none of those files is accessible, the default configuration is used which
 +is the same as the old, traditional nxagent keybindings.


hooks/post-receive
-- 
nx-libs.git (NX (redistributed))

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 "nx-libs.git" (NX (redistributed)).