[arch-commits] Commit in nx/trunk (PKGBUILD)

[Andreas Radke]

    Date: Wednesday, March 11, 2015 @ 22:25:27
  Author: andyrtr
Revision: 233368

upgpkg: nx 3.5.0.28-3

add some missing files

Modified:
  nx/trunk/PKGBUILD

----------+
 PKGBUILD |   14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-03-11 19:26:52 UTC (rev 233367)
+++ PKGBUILD	2015-03-11 21:25:27 UTC (rev 233368)
@@ -4,7 +4,7 @@
 pkgbase=nx
 pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'x2go-agent' 'nx-headers')
 pkgver=3.5.0.28
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 url="http://wiki.x2go.org/"
 license=('GPL')
@@ -107,6 +107,7 @@
 package_nxagent() {
   
   pkgdesc="NX X server based on Xnest"
+  backup=('etc/nxagent/keystrokes.cfg')
   depends=('nx-xcompext' 'libxml2')
 	
   install -dm755 ${pkgdir}/usr/{bin,lib/nx/bin,share/nx}
@@ -121,11 +122,19 @@
   # symlinks
   cd ${pkgdir}/usr/lib/
   ln -sv /usr/lib/nx/libXcompshad.so{,.3,.3.5.0} . # files should move to nx-compext pkg
+  
+  # Needed for nxagent to find the keymap directory
+  install -dm755 ${pkgdir}/usr/lib/X11/xkb
+  touch ${pkgdir}/usr/lib/X11/xkb/keymap.dir
+  
+  install -dm755 ${pkgdir}/etc/nxagent
+  cp -a ${srcdir}/fakeinstall/etc/nxagent/keystrokes.cfg ${pkgdir}/etc/nxagent
 }
 
 package_x2go-agent() {
   
   pkgdesc="Wrapper arround nxagent to use with x2goserver"
+  backup=('etc/x2go/keystrokes.cfg')
   depends=('nxagent')
   provides=('x2goagent')
   replaces=('x2goagent')
@@ -140,6 +149,9 @@
   cp -a ${srcdir}/fakeinstall/usr/share/pixmaps/x2go.xpm ${pkgdir}/usr/share/pixmaps
   cp -a ${srcdir}/fakeinstall/usr/share/x2go/rgb ${pkgdir}/usr/share/x2go
   cp -a ${srcdir}/fakeinstall/usr/share/x2go/versions/VERSION.x2goagent ${pkgdir}/usr/share/x2go/versions
+  
+  install -dm755 ${pkgdir}/etc/x2go
+  cp -a ${srcdir}/fakeinstall/etc/x2go/keystrokes.cfg ${pkgdir}/etc/x2go
 }
 
 package_nx-headers() {