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

[andyrtr at archlinux.org]

    Date: Tuesday, October 13, 2009 @ 18:21:01
  Author: andyrtr
Revision: 55684

upgpkg: xorg-server 1.7.0.901-1
    added some dropped dirver conflicts

Modified:
  xorg-server/trunk/PKGBUILD

----------+
 PKGBUILD |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-10-13 22:14:10 UTC (rev 55683)
+++ PKGBUILD	2009-10-13 22:21:01 UTC (rev 55684)
@@ -12,7 +12,7 @@
 makedepends=('libx11>=1.3' 'mesa>=7.6' 'xf86driproto>=2.1.0' 'xtrans>=1.2.4' 'libxkbfile>=1.0.6' 'randrproto>=1.3.1' 'renderproto>=0.11' 'xcmiscproto>=1.2.0' 'bigreqsproto>=1.1.0' 'resourceproto>=1.1.0' 'videoproto>=2.3.0' 'compositeproto>=0.4.1' 'scrnsaverproto>=1.2.0' 'xf86dgaproto>=2.1' 'recordproto>=1.14' 'libgl>=7.6' 'glproto>=1.4.10' 'xorg-util-macros>=1.3.0' 'xineramaproto>=1.2')
 conflicts=('catalyst-utils<=9.2' 'xf86-input-calcomp' 'xf86-input-citron' 'xf86-input-digitaledge' 'xf86-input-dmc' 'xf86-input-dynapro' 'xf86-input-elo2300'
 	'xf86-input-jamstudio' 'xf86-input-magellan' 'xf86-input-magictouch' 'xf86-input-microtouch' 'xf86-input-palmax' 'xf86-input-spaceorb'
-	'xf86-input-summa' 'xf86-input-tek4957' 'xf86-input-ur98')
+	'xf86-input-summa' 'xf86-input-tek4957' 'xf86-input-ur98' 'xf86-video-vga' 'xf86-video-intel-vga')
 options=('!libtool')
 provides=('x-server')
 groups=('xorg')