[arch-commits] Commit in xf86-video-intel/trunk (PKGBUILD)

[andyrtr at archlinux.org]

    Date: Monday, July 2, 2012 @ 10:51:53
  Author: andyrtr
Revision: 162865

upgpkg: xf86-video-intel 2.19.0-6

add conflict to the former xf86-video-intel pkg that a direct install call would actually remove the old pkg

Modified:
  xf86-video-intel/trunk/PKGBUILD

----------+
 PKGBUILD |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-07-02 14:49:26 UTC (rev 162864)
+++ PKGBUILD	2012-07-02 14:51:53 UTC (rev 162865)
@@ -5,7 +5,7 @@
 pkgbase=xf86-video-intel
 pkgname=('xf86-video-intel-uxa' 'xf86-video-intel-sna')
 pkgver=2.19.0
-pkgrel=5
+pkgrel=6
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
@@ -36,7 +36,7 @@
   pkgdesc="X.org Intel i810/i830/i915/945G/G965+ video drivers with UXA acceleration"
   provides=('xf86-video-intel')
   replaces=('xf86-video-intel')
-  conflicts=('xf86-video-intel-sna' 'xorg-server<1.12.0' 'xf86-video-i810' 'xf86-video-intel-legacy')
+  conflicts=('xf86-video-intel-sna' 'xorg-server<1.12.0' 'xf86-video-i810' 'xf86-video-intel-legacy' 'xf86-video-intel')
   
   cd "${srcdir}/${pkgbase}-${pkgver}"
   make DESTDIR="${pkgdir}" install -C build-UXA
@@ -48,7 +48,7 @@
 
   pkgdesc="X.org Intel i810/i830/i915/945G/G965+ video drivers with SNA acceleration"
   provides=('xf86-video-intel')
-  conflicts=('xf86-video-intel-uxa' 'xorg-server<1.12.0' 'xf86-video-i810' 'xf86-video-intel-legacy')
+  conflicts=('xf86-video-intel-uxa' 'xorg-server<1.12.0' 'xf86-video-i810' 'xf86-video-intel-legacy' 'xf86-video-intel')
 
   cd "${srcdir}/${pkgbase}-${pkgver}"
   make DESTDIR="${pkgdir}" install -C build-SNA