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

[Jan de Groot]

    Date: Sunday, August 31, 2008 @ 10:36:29
  Author: jgc
Revision: 11399

Merged revisions 11332-11398 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/xf86-video-apm/trunk

........
  r11398 | jgc | 2008-08-31 16:36:17 +0200 (Sun, 31 Aug 2008) | 1 line
  
  upgpkg: xf86-video-apm 1.2.0-2
........

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

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


Property changes on: xf86-video-apm/repos/testing-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /xf86-video-apm/trunk:1-11331
   + /xf86-video-apm/trunk:1-11398

Modified: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD	2008-08-31 14:36:17 UTC (rev 11398)
+++ testing-i686/PKGBUILD	2008-08-31 14:36:29 UTC (rev 11399)
@@ -9,6 +9,7 @@
 url="http://xorg.freedesktop.org/"
 depends=('glibc')
 makedepends=('pkgconfig' 'xorg-server>=1.4.99.906')
+conflicts=('xorg-server<1.4.99.906')
 groups=('xorg-video-drivers')
 options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)