diff options
| -rw-r--r-- | debian/Makefile.nx-libs | 7 | ||||
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | debian/nxagent.install | 3 | ||||
| -rwxr-xr-x | debian/roll-tarballs.sh | 4 | ||||
| -rwxr-xr-x | debian/rules | 2 | ||||
| -rw-r--r-- | debian/x2goagent.install | 1 |
6 files changed, 18 insertions, 2 deletions
diff --git a/debian/Makefile.nx-libs b/debian/Makefile.nx-libs index 02e7d12d4..3083a089a 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 b195530b9..c25941e34 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@das-netzwerkteam.de> Thu, 28 Mar 2013 21:07:42 +0100 diff --git a/debian/nxagent.install b/debian/nxagent.install index 6d1e230a5..3b81cf0a7 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 57b3aad49..2dc1c8942 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 732f2e614..ac9f306b0 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 72058a9d1..adcc160f6 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 |