[arch-commits] Commit in libgphoto2/repos (3 files)

[Eric Belanger]

    Date: Monday, July 14, 2008 @ 20:59:23
  Author: eric
Revision: 5299

Merged revisions 106-5298 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/libgphoto2/trunk

........
  r356 | aaron | 2008-04-18 18:56:27 -0400 (Fri, 18 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r4665 | eduardo | 2008-07-08 11:31:13 -0400 (Tue, 08 Jul 2008) | 1 line
........
  r4680 | eduardo | 2008-07-08 16:15:01 -0400 (Tue, 08 Jul 2008) | 1 line
........
  r4748 | eduardo | 2008-07-09 15:19:37 -0400 (Wed, 09 Jul 2008) | 1 line
........
  r4761 | eduardo | 2008-07-09 16:11:07 -0400 (Wed, 09 Jul 2008) | 1 line
........
  r5286 | eduardo | 2008-07-14 14:27:39 -0400 (Mon, 14 Jul 2008) | 1 line
........
  r5294 | eduardo | 2008-07-14 18:11:01 -0400 (Mon, 14 Jul 2008) | 1 line
  
  deleted fix-udev.patch, apparently not needed anymore
........
  r5298 | eric | 2008-07-14 20:58:59 -0400 (Mon, 14 Jul 2008) | 2 lines
  
  upgpkg: libgphoto2 2.4.2-1
      added cvs makedepends
........

Modified:
  libgphoto2/repos/extra-x86_64/	(properties)
  libgphoto2/repos/extra-x86_64/PKGBUILD
Deleted:
  libgphoto2/repos/extra-x86_64/fix-udev.patch

----------------+
 PKGBUILD       |   22 +++++++++++-----------
 fix-udev.patch |   15 ---------------
 2 files changed, 11 insertions(+), 26 deletions(-)


Property changes on: libgphoto2/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /libgphoto2/trunk:1-105
   + /libgphoto2/trunk:1-5298

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-07-15 00:58:59 UTC (rev 5298)
+++ extra-x86_64/PKGBUILD	2008-07-15 00:59:23 UTC (rev 5299)
@@ -3,19 +3,19 @@
 # Contributor: Damir Perisa <damir.perisa at bluewin.ch>
 
 pkgname=libgphoto2
-pkgver=2.4.0
-pkgrel=6
+pkgver=2.4.2
+pkgrel=1
 pkgdesc="The core of gphoto2 software. It is a portable library to gives access to more than 400 digital cameras."
 arch=(i686 x86_64)
 url="http://www.gphoto.org"
 depends=('libexif' 'libjpeg' 'libtool>=2.2-2' 'hal>=0.5.10')
+makedepends=('cvs')
 license=(LGPL)
 install=(libgphoto2.install)
 source=(http://downloads.sourceforge.net/gphoto/${pkgname}-${pkgver}.tar.gz
-	no-mdns.patch fix-udev.patch)
-md5sums=('adef1a564d3d1a48e1c13ece34b111b6'
-         '28f57616cbba6f12ca113b87c8123993'
-         'e5f3b19f7cdca8d72190170da995dfec')
+	no-mdns.patch)
+md5sums=('7ec19a0f434da3aea15e136b9dacdd04'
+         '28f57616cbba6f12ca113b87c8123993')
 options=('libtool')
 
 build() {
@@ -30,10 +30,10 @@
 
   # Relibtoolize, doesn't compile without it.
   libtoolize --force --copy || return 1
-  AT_M4DIR=". m4m" autoreconf || return 1
+  AT_M4DIR=". m4m" autoreconf -i --force || return 1
   pushd libgphoto2_port || return 1
   libtoolize --force --copy || return 1
-  autoreconf || return 1
+  autoreconf -i --force || return 1
   popd 
 
   ./configure --prefix=/usr --with-exif --disable-static || return 1
@@ -55,7 +55,7 @@
       ${startdir}/pkg/etc/udev/rules.d/54-gphoto.rules || return 1
   install -m755 -d ${startdir}/pkg/lib
   mv ${startdir}/pkg/usr/lib/udev ${startdir}/pkg/lib/ || return 1
-  # fix usb and usb_device subsystems
-  cd ${startdir}/pkg/etc/udev/rules.d/
-  patch -Np0 -i ${startdir}/src/fix-udev.patch || return 1
+#  fix usb and usb_device subsystems
+#  cd ${startdir}/pkg/etc/udev/rules.d/
+#  patch -Np0 -i ${startdir}/src/fix-udev.patch || return 1
 }

Deleted: extra-x86_64/fix-udev.patch
===================================================================
--- extra-x86_64/fix-udev.patch	2008-07-15 00:58:59 UTC (rev 5298)
+++ extra-x86_64/fix-udev.patch	2008-07-15 00:59:23 UTC (rev 5299)
@@ -1,15 +0,0 @@
---- 54-gphoto.rules~	2007-11-09 08:06:38.000000000 +0100
-+++ 54-gphoto.rules	2007-11-19 07:42:53.000000000 +0100
-@@ -3,8 +3,11 @@
- #   libgphoto2      2.4.0          gcc, ltdl, EXIF
- #   libgphoto2_port 0.8.0          gcc, ltdl, USB, serial without locking
- #
--SUBSYSTEM!="usb_device", GOTO="libgphoto2_rules_end"
- ACTION!="add", GOTO="libgphoto2_rules_end"
-+SUBSYSTEM=="usb", GOTO="libgphoto2_rules_begin"
-+SUBSYSTEM=="usb_device", GOTO="libgphoto2_rules_begin"
-+SUBSYSTEM!="usb_device", GOTO="libgphoto2_rules_end"
-+LABEL="libgphoto2_rules_begin"
- 
- ATTRS{idVendor}=="0553", ATTRS{idProduct}=="0202", MODE="0660", GROUP="camera"
- ATTRS{idVendor}=="06bd", ATTRS{idProduct}=="0403", MODE="0660", GROUP="camera"