[arch-commits] Commit in xf86-video-ati/repos (testing-i686 testing-i686/PKGBUILD)

[Jan de Groot]

    Date: Sunday, August 31, 2008 @ 11:19:05
  Author: jgc
Revision: 11418

Merged revisions 11415-11417 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/xf86-video-ati/trunk

........
  r11417 | jgc | 2008-08-31 17:18:54 +0200 (Sun, 31 Aug 2008) | 2 lines
  
  upgpkg: xf86-video-ati 6.9.0-1
      Add conflicts
........

Modified:
  xf86-video-ati/repos/testing-i686/	(properties)
  xf86-video-ati/repos/testing-i686/PKGBUILD

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


Property changes on: xf86-video-ati/repos/testing-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /xf86-video-ati/trunk:1-11414
   + /xf86-video-ati/trunk:1-11417

Modified: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD	2008-08-31 15:18:54 UTC (rev 11417)
+++ testing-i686/PKGBUILD	2008-08-31 15:19:05 UTC (rev 11418)
@@ -11,6 +11,7 @@
 depends=('libdrm>=2.3.1' 'libgl>=7.1-2')
 makedepends=('pkgconfig' 'xorg-server>=1.4.99.906' 'imake' 'mesa>=7.1'
 	     'glproto>=1.4.9' 'xf86driproto' 'diffutils')
+conflicts=('xorg-server<1.4.99.906')
 groups=('xorg-video-drivers')
 options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2