[arch-commits] Commit in xorg-server/repos (testing-i686 testing-i686/PKGBUILD)

[andyrtr at archlinux.org]

    Date: Tuesday, October 13, 2009 @ 18:24:04
  Author: andyrtr
Revision: 55686

Merged revisions 55684 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/xorg-server/trunk

........
  r55684 | andyrtr | 2009-10-13 22:21:01 +0000 (Di, 13 Okt 2009) | 2 lines
  
  upgpkg: xorg-server 1.7.0.901-1
      added some dropped dirver conflicts
........

Modified:
  xorg-server/repos/testing-i686/	(properties)
  xorg-server/repos/testing-i686/PKGBUILD

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


Property changes on: xorg-server/repos/testing-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /xorg-server/trunk:1-55451
   + /xorg-server/trunk:1-55685

Modified: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD	2009-10-13 22:21:48 UTC (rev 55685)
+++ testing-i686/PKGBUILD	2009-10-13 22:24:04 UTC (rev 55686)
@@ -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')