diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-04-12 11:24:37 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-04-12 11:24:37 -0300 |
commit | 1f52af629b1911ab027ef9c5d4d5903b48792050 (patch) | |
tree | e975475390c79c3dd975c95091f3bb33beff24e5 /extra/xf86-video-chips | |
parent | 951244a3e5bdc5f2f029f6550b46e5a06d1bfa26 (diff) | |
parent | 28b5bbf3fee0627993658e096eadab71c2779912 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/llvm/PKGBUILD
community/dsniff/PKGBUILD
community/ngrep/PKGBUILD
community/virtualbox/PKGBUILD
extra/gstreamer0.10-good/PKGBUILD
extra/lirc/PKGBUILD
extra/mc/PKGBUILD
extra/mesa/PKGBUILD
extra/xfburn/PKGBUILD
testing/gnome-panel/PKGBUILD
Diffstat (limited to 'extra/xf86-video-chips')
-rw-r--r-- | extra/xf86-video-chips/PKGBUILD | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/extra/xf86-video-chips/PKGBUILD b/extra/xf86-video-chips/PKGBUILD index 5f6352085..c190ad607 100644 --- a/extra/xf86-video-chips/PKGBUILD +++ b/extra/xf86-video-chips/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 114195 2011-03-11 09:33:53Z jgc $ +# $Id: PKGBUILD 115295 2011-03-17 17:13:45Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=xf86-video-chips pkgver=1.2.4 -pkgrel=1 +pkgrel=2 pkgdesc="X.org Chips and Technologies video driver" arch=(i686 x86_64 'mips64el') url="http://xorg.freedesktop.org/" license=('custom') depends=(glibc) makedepends=('xorg-server-devel') -conflicts=('xorg-server<1.9.0') +conflicts=('xorg-server<1.10.0') groups=('xorg-drivers' 'xorg') options=('!libtool') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) |