[arch-commits] Commit in libraw1394/repos (extra-x86_64 extra-x86_64/PKGBUILD)

[Eric Belanger]

    Date: Tuesday, September 30, 2008 @ 22:50:47
  Author: eric
Revision: 14005

fixing svn conflict

Modified:
  libraw1394/repos/extra-x86_64/	(properties)
  libraw1394/repos/extra-x86_64/PKGBUILD

----------+
 PKGBUILD |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)


Property changes on: libraw1394/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /libraw1394/trunk:1
   + /libraw1394/trunk:1-14004

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-10-01 02:47:42 UTC (rev 14004)
+++ extra-x86_64/PKGBUILD	2008-10-01 02:50:47 UTC (rev 14005)
@@ -1,16 +1,17 @@
 # $Id$
-# Maintainer: arjan <arjan at archlinux.org>
+# Maintainer: Giovanni Scafora <giovanni at archlinux.org>
 # Contributor: Tom Newsom <Jeepster at gmx.co.uk>
 
 pkgname=libraw1394
 pkgver=1.3.0
-pkgrel=1
-arch=(i686 x86_64)
+pkgrel=2
+arch=('i686' 'x86_64')
 license=('LGPL')
 pkgdesc="Provides an API to the Linux IEEE1394 (FireWire) driver"
 depends=('glibc')
+makedepends=('pkgconfig')
 url="http://www.linux1394.org/"
-options=(!libtool)
+options=(!libtool force)
 source=(http://www.linux1394.org/dl/${pkgname}-${pkgver}.tar.gz)
 md5sums=('c5d9ab62bd25dba96af010b3471e816a')