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

[X2Go dev team]

The branch, master has been updated
       via  d8a55d2c604a770133dcb0216f5d6fd7d087c2a3 (commit)
      from  dc5faf7afc6ac120e909c18203dd74a393fdaa2a (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 d8a55d2c604a770133dcb0216f5d6fd7d087c2a3
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon May 6 22:38:51 2013 +0200

    Provide a default keystrokes.cfg in /etc/nx (for nxagent) and /etc/x2go (for x2goagent). (Fixes: #199).

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

Summary of changes:
 debian/Makefile.nx-libs  |    7 +++++++
 debian/changelog         |    3 ++-
 debian/nxagent.install   |    3 ++-
 debian/roll-tarballs.sh  |    4 ++++
 debian/rules             |    2 ++
 debian/x2goagent.install |    1 +
 6 files changed, 18 insertions(+), 2 deletions(-)

The diff of changes is:
diff --git a/debian/Makefile.nx-libs b/debian/Makefile.nx-libs
index 02e7d12..3083a08 100644
--- a/debian/Makefile.nx-libs
+++ b/debian/Makefile.nx-libs
@@ -7,6 +7,8 @@ COPY_SYMLINK=cp -a
 RM_FILE=rm -f
 RM_DIR=rmdir -p --ignore-fail-on-non-empty
 
+ETCDIR_NX ?= /etc/nx
+ETCDIR_X2GO ?= /etc/x2go
 PREFIX ?= /usr/local
 BINDIR=$(PREFIX)/bin
 NXLIBDIR=$(PREFIX)/lib/nx
@@ -127,6 +129,11 @@ install-full:
 	$(INSTALL_FILE) nx-X11/extras/Mesa/include/GLES/*.h \
 	                $(DESTDIR)$(PREFIX)/include/nx/extras/Mesa/GLES/
 
+	$(INSTALL_DIR) $(DESTDIR)/$(ETCDIR_NX)
+	$(INSTALL_DIR) $(DESTDIR)/$(ETCDIR_X2GO)
+	$(INSTALL_FILE) etc/keystrokes.cfg $(DESTDIR)/$(ETCDIR_NX)/
+	$(INSTALL_FILE) etc/keystrokes.cfg $(DESTDIR)/$(ETCDIR_X2GO)/
+
 uninstall:
 	$(MAKE) uninstall-lite
 	[ ! -d nx-X11 ] || $(MAKE) uninstall-full
diff --git a/debian/changelog b/debian/changelog
index b195530..c25941e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 nx-libs (2:3.5.0.21-0) UNRELEASED; urgency=low
 
-  * Continue development...
+  * Provide a default keystrokes.cfg in /etc/nx (for nxagent) and /etc/x2go
+    (for x2goagent). (Fixes: #199).
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Thu, 28 Mar 2013 21:07:42 +0100
 
diff --git a/debian/nxagent.install b/debian/nxagent.install
index 6d1e230..3b81cf0 100644
--- a/debian/nxagent.install
+++ b/debian/nxagent.install
@@ -2,4 +2,5 @@ nx-X11/programs/Xserver/nxagent                usr/lib/nx/bin
 bin/nxagent                                    usr/bin
 debian/rgb                                     usr/share/nx
 debian/nxagent.keyboard                        etc/nxagent
-nx-X11/programs/Xserver/hw/nxagent/nxagent.xpm usr/share/pixmaps
\ No newline at end of file
+nx-X11/programs/Xserver/hw/nxagent/nxagent.xpm usr/share/pixmaps
+etc/nx/keystrokes.cfg
diff --git a/debian/roll-tarballs.sh b/debian/roll-tarballs.sh
index 57b3aad..2dc1c89 100755
--- a/debian/roll-tarballs.sh
+++ b/debian/roll-tarballs.sh
@@ -122,6 +122,10 @@ mv -v debian/changelog doc/changelog
 test -f Makefile || test -f debian/Makefile.nx-libs && cp -v debian/Makefile.nx-libs Makefile
 test -f replace.sh || test -f debian/Makefile.replace.sh && cp -v debian/Makefile.replace.sh replace.sh
 
+# provide a default keystrokes.cfg file
+mkdir -p etc
+test -f etc/keystrokes.cfg || test -f debian/keystrokes.cfg && cp -v debian/keystrokes.cfg etc/keystrokes.cfg
+
 # remove folders that we do not want to roll into the tarball
 rm -Rf ".pc/"
 rm -Rf "debian/"
diff --git a/debian/rules b/debian/rules
index 732f2e6..ac9f306 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,6 +38,8 @@ override_dh_auto_build:
 	ln -s debian/Makefile.nx-libs Makefile
 	ln -s debian/Makefile.replace.sh replace.sh
 	ln -s debian/wrappers bin
+	mkdir -p etc/
+	ln -s debian/keystrokes.cfg etc/keystrokes.cfg
 	ln -s debian/rgb
 	ln -s debian/VERSION.x2goagent
 	LD_LIBRARY_PATH=`pwd`/debian/libnx-x11/usr/lib/nx/X11:$$LD_LIBRARY_PATH dh_auto_build --with quilt --parallel
diff --git a/debian/x2goagent.install b/debian/x2goagent.install
index 72058a9..adcc160 100644
--- a/debian/x2goagent.install
+++ b/debian/x2goagent.install
@@ -3,3 +3,4 @@ usr/lib/x2go/bin/x2goagent
 usr/share/pixmaps/x2go.xpm
 usr/share/x2go/rgb
 usr/share/x2go/versions/VERSION.x2goagent
+etc/x2go/keystrokes.cfg
\ No newline at end of file


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)).