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

[Andreas Radke]

    Date: Monday, February 19, 2018 @ 19:38:52
  Author: andyrtr
Revision: 317285

upgpkg: x2goserver 4.1.0.0-1

upstream update 4.1.0.0

Modified:
  x2goserver/trunk/PKGBUILD

----------+
 PKGBUILD |   30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-02-19 17:05:11 UTC (rev 317284)
+++ PKGBUILD	2018-02-19 19:38:52 UTC (rev 317285)
@@ -37,7 +37,7 @@
          'sshfs'
          # For /etc/sudoers.d
          'sudo'
-         'x2go-agent'
+         'nxagent'
          # For /etc/X11/Xresources
          'xorg-xinit'
          'xorg-fonts-misc'
@@ -52,7 +52,8 @@
          'perl-config-simple'
          'perl-file-basedir' # FS#38551
          'perl-file-which' # FS#44125
-         
+         'perl-switch'
+
          'xorg-xwininfo' # FS#38558
          'xorg-setxkbmap' # FS#53345
 
@@ -66,9 +67,15 @@
 makedepends=('man2html' 'perl-extutils-makemaker' 'systemd')
 #optdepends=('cups-x2go: printing support')
 optdepends=('perl-dbd-pg: Postgres support')
+conflicts=('x2go-agent')
+replaces=('x2go-agent')
+provides=('x2go-agent' 'x2goagent')
 options=('emptydirs')
 install=x2goserver.install
-backup=('etc/x2go/x2goserver.conf') # 'etc/x2go/x2gosql/sql')
+backup=('etc/x2go/x2goserver.conf' # 'etc/x2go/x2gosql/sql')
+        # from old x2go-agent pkg now provided here
+        etc/x2go/{keystrokes.cfg,rgb,x2goagent.keyboard,x2goagent.options}
+)
 # no https due to invalid certificate
 source=(http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc}
        tmpfiles.d
@@ -126,14 +133,15 @@
   chmod 0440 ${pkgdir}/etc/sudoers.d/x2goserver
 
   # these files are part of x2go-agent (pkgbase "nx")
-  rm ${pkgdir}/etc/x2go/keystrokes.cfg
-  rm ${pkgdir}/etc/x2go/rgb
-  rm ${pkgdir}/etc/x2go/x2goagent.keyboard
-  rm ${pkgdir}/etc/x2go/x2goagent.options
-  rm ${pkgdir}/usr/bin/x2goagent
-  rm ${pkgdir}/usr/share/man/man1/x2goagent.1.gz
-  rm ${pkgdir}/usr/share/pixmaps/x2go.xpm
-  rm ${pkgdir}/usr/share/x2go/rgb
+#  rm ${pkgdir}/etc/x2go/keystrokes.cfg
+#  rm ${pkgdir}/etc/x2go/rgb
+#  rm ${pkgdir}/etc/x2go/x2goagent.keyboard
+#  rm ${pkgdir}/etc/x2go/x2goagent.options
+#  rm ${pkgdir}/usr/bin/x2goagent
+#  rm ${pkgdir}/usr/share/man/man1/x2goagent.1.gz
+#  rm ${pkgdir}/usr/share/pixmaps/x2go.xpm
+#  rm ${pkgdir}/usr/share/x2go/rgb
+
 }