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

[Ionuț Mircea Bîru]

    Date: Monday, December 30, 2013 @ 10:31:03
  Author: ioni
Revision: 202990

current nvidia doesn't work with xorg-server 1.15

Modified:
  xorg-server/trunk/PKGBUILD

----------+
 PKGBUILD |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-12-30 08:46:47 UTC (rev 202989)
+++ PKGBUILD	2013-12-30 09:31:03 UTC (rev 202990)
@@ -5,7 +5,7 @@
 pkgbase=xorg-server
 pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel')
 pkgver=1.15.0
-pkgrel=1 # build first with 0.1 and then rebuild it after xf86-input-evdev rebuild
+pkgrel=2 # build first with 0.1 and then rebuild it after xf86-input-evdev rebuild
 arch=('i686' 'x86_64')
 license=('custom')
 url="http://xorg.freedesktop.org"
@@ -106,7 +106,7 @@
   # and /usr/lib/pkgconfig/xorg-server.pc in xorg-server-devel pkg
   provides=('X-ABI-VIDEODRV_VERSION=15' 'X-ABI-XINPUT_VERSION=20' 'X-ABI-EXTENSION_VERSION=8.0' 'x-server')
   groups=('xorg')
-  conflicts=('nvidia-utils<=290.10')
+  conflicts=('nvidia-utils<=331.20')
 
   cd "${pkgbase}-${pkgver}"
   make DESTDIR="${pkgdir}" install