[arch-commits] Commit in xf86-input-joystick/repos (2 files)

[Jan de Groot]

    Date: Saturday, September 6, 2008 @ 11:20:38
  Author: jgc
Revision: 11929

Merged revisions 11123-11928 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/xf86-input-joystick/trunk

........
  r11928 | jgc | 2008-09-06 17:19:57 +0200 (Sat, 06 Sep 2008) | 1 line
  
  upgpkg: xf86-input-joystick 1.3.3-1
........

Modified:
  xf86-input-joystick/repos/testing-i686/	(properties)
  xf86-input-joystick/repos/testing-i686/PKGBUILD

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


Property changes on: xf86-input-joystick/repos/testing-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /xf86-input-joystick/trunk:1-11122
   + /xf86-input-joystick/trunk:1-11928

Modified: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD	2008-09-06 15:19:57 UTC (rev 11928)
+++ testing-i686/PKGBUILD	2008-09-06 15:20:38 UTC (rev 11929)
@@ -2,17 +2,18 @@
 # Maintainer: Alexander Baldeck <alexander at archlinux.org>
 # Contributor: Jan de Groot <jgc at archlinux.org>
 pkgname=xf86-input-joystick
-pkgver=1.3.2
+pkgver=1.3.3
 pkgrel=1
 pkgdesc="X.Org Joystick input driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 depends=('glibc')
-makedepends=('pkgconfig' 'xorg-server>=1.4.99.906')
+makedepends=('pkgconfig' 'xorg-server>=1.5.0')
+conflicts=('xorg-server<1.5.0')
 groups=('xorg-input-drivers')
 options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('e48b99e55093525ebb7811a014391a0b')
+md5sums=('708a1663a291b4f3a5a186ce003c1537')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}