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

[Eduardo Romero]

    Date: Monday, September 29, 2008 @ 20:14:53
  Author: eduardo
Revision: 13932

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

........
  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
........
  r13931 | eduardo | 2008-09-29 20:05:03 -0400 (Mon, 29 Sep 2008) | 2 lines
  
  upgpkg: libgphoto2 2.4.2-2
      get rid of recursive symlink
........

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

----------------+
 PKGBUILD       |   10 +++++-----
 fix-udev.patch |   15 ---------------
 2 files changed, 5 insertions(+), 20 deletions(-)


Property changes on: libgphoto2/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /libgphoto2/trunk:1-5286
   + /libgphoto2/trunk:1-13931

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-09-30 00:05:03 UTC (rev 13931)
+++ extra-i686/PKGBUILD	2008-09-30 00:14:53 UTC (rev 13932)
@@ -1,14 +1,15 @@
 # $Id$
-# Maintainer: Jason Chu <jason at archlinux.org>
+# Maintainer: Eduardo Romero <eduardo at archlinux.org>
 # Contributor: Damir Perisa <damir.perisa at bluewin.ch>
 
 pkgname=libgphoto2
 pkgver=2.4.2
-pkgrel=1
+pkgrel=2
 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
@@ -54,7 +55,6 @@
       ${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
+  # Remove recursive symlink
+  rm -f $pkgdir/usr/include/gphoto2/gphoto2 || return 1
 }

Deleted: extra-i686/fix-udev.patch
===================================================================
--- extra-i686/fix-udev.patch	2008-09-30 00:05:03 UTC (rev 13931)
+++ extra-i686/fix-udev.patch	2008-09-30 00:14:53 UTC (rev 13932)
@@ -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"