[arch-commits] Commit in xf86-video-intel-legacy/repos (2 files)

[Jan de Groot]

    Date: Friday, April 10, 2009 @ 11:26:02
  Author: jgc
Revision: 34630

Merged revisions 34629 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/xf86-video-intel-legacy/trunk

........
  r34629 | jgc | 2009-04-10 15:25:50 +0000 (Fri, 10 Apr 2009) | 2 lines
  
  upgpkg: xf86-video-intel-legacy 2.3.2-2
      Make it replace the i810 driver
........

Modified:
  xf86-video-intel-legacy/repos/testing-x86_64/	(properties)
  xf86-video-intel-legacy/repos/testing-x86_64/PKGBUILD

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


Property changes on: xf86-video-intel-legacy/repos/testing-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /xf86-video-intel-legacy/trunk:1-34063
   + /xf86-video-intel-legacy/trunk:1-34629

Modified: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD	2009-04-10 15:25:50 UTC (rev 34629)
+++ testing-x86_64/PKGBUILD	2009-04-10 15:26:02 UTC (rev 34630)
@@ -2,13 +2,14 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 pkgname=xf86-video-intel-legacy
 pkgver=2.3.2
-pkgrel=1
+pkgrel=2
 pkgdesc="X.org Intel i810/i830/i915/945G/G965+ legacy video drivers"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 depends=('intel-dri>=7.4' 'libdrm>=2.4.5-3' 'libxvmc')
 makedepends=('pkgconfig' 'xorg-server>=1.6.0' 'xf86driproto>=2.0.4' 'glproto>=1.4.9' 'mesa>=7.4')
 conflicts=('xorg-server<1.6.0' 'xf86-video-i810' 'xf86-video-intel')
+replaces=('xf86-video-i810')
 options=('!libtool')
 source=(${url}/releases/individual/driver/xf86-video-intel-${pkgver}.tar.bz2
 	intel-newserver.patch)