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

[Jan de Groot]

    Date: Saturday, August 1, 2009 @ 15:58:10
  Author: jgc
Revision: 48412

Merged revisions 48406 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/xf86-video-apm/trunk

........
  r48406 | jgc | 2009-08-01 21:45:13 +0200 (Sat, 01 Aug 2009) | 1 line
  
  upgpkg: xf86-video-apm 1.2.2-1
........

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

----------+
 PKGBUILD |   16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)


Property changes on: xf86-video-apm/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /xf86-video-apm/trunk:1-37472
   + /xf86-video-apm/trunk:1-48411

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-08-01 19:52:55 UTC (rev 48411)
+++ extra-i686/PKGBUILD	2009-08-01 19:58:10 UTC (rev 48412)
@@ -2,24 +2,26 @@
 # Maintainer: Alexander Baldeck <alexander at archlinux.org>
 # Contributor: Jan de Groot <jgc at archlinux.org>
 pkgname=xf86-video-apm
-pkgver=1.2.1
-pkgrel=3
+pkgver=1.2.2
+pkgrel=1
 pkgdesc="X.org Alliance ProMotion video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
-makedepends=('pkgconfig' 'xorg-server>=1.6.0')
-conflicts=('xorg-server<1.6.0')
+makedepends=('pkgconfig' 'xorg-server>=1.6.3')
+conflicts=('xorg-server<1.6.3')
 groups=('xorg-video-drivers')
 options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 LICENSE)
-md5sums=('673c93df004bb857dc89ae9c78ccf907' '2b3c2bcfb649de50646172064bc02b14')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+        LICENSE)
+md5sums=('48441a19aaf015570b267f2a8e67d8ab'
+         '2b3c2bcfb649de50646172064bc02b14')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr || return 1
   make || return 1
   make DESTDIR="${pkgdir}" install || return 1
-  install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" || return 1
 }