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

[Andreas Radke]

    Date: Sunday, November 1, 2015 @ 10:41:52
  Author: andyrtr
Revision: 249905

upgpkg: xorg-server 1.17.4-2

fix file conflict with latest evdev driver pkg

Modified:
  xorg-server/trunk/PKGBUILD

----------+
 PKGBUILD |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-11-01 09:22:18 UTC (rev 249904)
+++ PKGBUILD	2015-11-01 09:41:52 UTC (rev 249905)
@@ -5,7 +5,7 @@
 pkgbase=xorg-server
 pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-xwayland' 'xorg-server-common' 'xorg-server-devel')
 pkgver=1.17.4
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('custom')
 url="http://xorg.freedesktop.org"
@@ -148,6 +148,8 @@
   rm -rf "${pkgdir}/usr/lib/pkgconfig"
   rm -rf "${pkgdir}/usr/include"
   rm -rf "${pkgdir}/usr/share/aclocal"
+  # this is now part of xorg-input-evdev
+  rm -rf "${pkgdir}/usr/share/X11/xorg.conf.d/10-evdev.conf"
 }
 
 package_xorg-server-xephyr() {