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

[Andreas Radke]

    Date: Saturday, March 14, 2015 @ 19:23:15
  Author: andyrtr
Revision: 233811

upgpkg: nx 3.5.0.30-1

upstream update 3.5.0.30

Modified:
  nx/trunk/PKGBUILD

----------+
 PKGBUILD |   32 +++++++++++++++++++-------------
 1 file changed, 19 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-03-14 17:55:21 UTC (rev 233810)
+++ PKGBUILD	2015-03-14 18:23:15 UTC (rev 233811)
@@ -3,7 +3,7 @@
 
 pkgbase=nx
 pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'x2go-agent' 'nx-headers')
-pkgver=3.5.0.29
+pkgver=3.5.0.30
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://wiki.x2go.org/"
@@ -14,10 +14,10 @@
              'libxcomposite' 'libxtst' 'xorg-sessreg' 'libfontenc' # makedepends
              )
 source=(http://code.x2go.org/releases/source/nx-libs/nx-libs-$pkgver-full.tar.gz{,.asc})
-sha256sums=('56e1aff8d6453272adae594b5c05c0209ca8ff72c4d0f9582ab1ee3d187836f9'
+sha256sums=('60bf86a41f6e7a04a17d5fb471f77a37045c11e06e5e0786b3dc959bb6a3fc5a'
           'SKIP')
-validpgpkeys=('1AD23D1B8F087A35AB74BDE9F4A7678C9C6B0B2B') # X2go Git Administrator <git-admin at x2go.org>
-
+validpgpkeys=('1AD23D1B8F087A35AB74BDE9F4A7678C9C6B0B2B' # X2go Git Administrator <git-admin at x2go.org>
+              '9BFBAEE86C0AA5FFBF2207829AF46B3025771B31') # Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
 build() {
   cd "${srcdir}/nx-libs-$pkgver"
   
@@ -88,12 +88,14 @@
   depends=('libxcomp' 'fontconfig')
   optdepends=('libxext: for Xinerama support')
 	
-  install -dm755 ${pkgdir}/{usr/bin,usr/lib/nx/{X11,bin}}
+  install -dm755 ${pkgdir}/{usr/bin,usr/lib/nx/{X11,bin},usr/share/man/man1}
   cp -aR ${srcdir}/fakeinstall/usr/lib/nx/X11/* ${pkgdir}/usr/lib/nx/X11
   cp -aR ${srcdir}/fakeinstall/usr/lib/libNX* ${pkgdir}/usr/lib
   
   # nxauth
   cp -a ${srcdir}/fakeinstall/usr/lib/nx/bin/nxauth ${pkgdir}/usr/lib/nx/bin
+  cp -a ${srcdir}/fakeinstall/usr/share/man/man1/nxauth.1 ${pkgdir}/usr/share/man/man1
+
   # the wrapper
   cp -a ${srcdir}/fakeinstall/usr/bin/nxauth ${pkgdir}/usr/bin
   # add symlinks required for proper Xinerama support # FS#41037
@@ -105,16 +107,19 @@
 package_nxagent() {
   
   pkgdesc="NX X server based on Xnest"
-  backup=('etc/nxagent/keystrokes.cfg')
+  backup=(etc/nxagent/{keystrokes.cfg,nxagent.keyboard,rgb})
   depends=('nx-xcompext' 'libxml2')
 	
-  install -dm755 ${pkgdir}/usr/{bin,lib/nx/bin,share/nx}
+  install -dm755 ${pkgdir}/usr/{bin,lib/nx/bin,share/nx,share/man/man1,share/pixmaps}
   cp -a ${srcdir}/fakeinstall/usr/lib/nx/bin/nxagent ${pkgdir}/usr/lib/nx/bin
+  cp -a ${srcdir}/fakeinstall/usr/share/man/man1/nxagent.1 ${pkgdir}/usr/share/man/man1
+  cp -a ${srcdir}/fakeinstall/usr/share/pixmaps/nxagent.xpm ${pkgdir}/usr/share/pixmaps
+
   # the wrapper
   cp -a ${srcdir}/fakeinstall/usr/bin/nxagent ${pkgdir}/usr/bin
   
   # additional files for documentation
-  cp -a ${srcdir}/fakeinstall/usr/share/nx/SecurityPolicy ${pkgdir}/usr/share/nx
+  cp -a ${srcdir}/fakeinstall/usr/share/nx/{rgb,SecurityPolicy} ${pkgdir}/usr/share/nx
   
   cp -a ${srcdir}/fakeinstall/usr/lib/libXcompshad.so* ${pkgdir}/usr/lib
   
@@ -123,30 +128,31 @@
   touch ${pkgdir}/usr/lib/X11/xkb/keymap.dir
   
   install -dm755 ${pkgdir}/etc/nxagent
-  cp -a ${srcdir}/fakeinstall/etc/nxagent/keystrokes.cfg ${pkgdir}/etc/nxagent
+  cp -a ${srcdir}/fakeinstall/etc/nxagent/{keystrokes.cfg,nxagent.keyboard,rgb} ${pkgdir}/etc/nxagent
 }
 
 package_x2go-agent() {
   
   pkgdesc="Wrapper arround nxagent to use with x2goserver"
-  backup=('etc/x2go/keystrokes.cfg')
+  backup=(etc/x2go/{keystrokes.cfg,x2goagent.keyboard,rgb})
   depends=('nxagent')
   provides=('x2goagent')
   replaces=('x2goagent')
 	
-  install -dm755 ${pkgdir}/usr/{bin,lib/x2go/bin,share/{pixmaps,x2go/versions}}
+  install -dm755 ${pkgdir}/usr/{bin,lib/x2go/bin,share/{pixmaps,x2go/versions,man/man1}}
   # this is a nxagent symlink
   ln -sv /usr/lib/nx/bin/nxagent ${pkgdir}/usr/lib/x2go/bin/x2goagent 
 
   # the wrapper
   cp -a ${srcdir}/fakeinstall/usr/bin/x2goagent ${pkgdir}/usr/bin
-  
+  cp -a ${srcdir}/fakeinstall/usr/share/man/man1/x2goagent.1 ${pkgdir}/usr/share/man/man1
+
   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
+  cp -a ${srcdir}/fakeinstall/etc/x2go/{keystrokes.cfg,x2goagent.keyboard,rgb} ${pkgdir}/etc/x2go
 }
 
 package_nx-headers() {