[arch-commits] CVS update of extra/multimedia/sane (PKGBUILD)

[Tobias Powalowski]

    Date: Thursday, March 6, 2008 @ 04:32:08
  Author: tpowa
    Path: /home/cvs-extra/extra/multimedia/sane

Modified: PKGBUILD (1.41 -> 1.42)

'upgpkg: update to new version'


----------+
 PKGBUILD |   33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)


Index: extra/multimedia/sane/PKGBUILD
diff -u extra/multimedia/sane/PKGBUILD:1.41 extra/multimedia/sane/PKGBUILD:1.42
--- extra/multimedia/sane/PKGBUILD:1.41	Mon Oct 22 15:12:05 2007
+++ extra/multimedia/sane/PKGBUILD	Thu Mar  6 04:32:08 2008
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD,v 1.41 2007/10/22 19:12:05 tpowa Exp $
+# $Id: PKGBUILD,v 1.42 2008/03/06 09:32:08 tpowa Exp $
 # Maintainer: Tobias Powalowski <tpowa at archlinux.org>
 # Contributed by Sarah Hay <sarahhay at mb.sympatico.ca>, Tobias Powalowski <t.powa at gmx.de>, Simo L. <neotuli at yahoo.com>, eric <eric at archlinux.org>
 
 pkgname=sane
-pkgver=1.0.18
-pkgrel=9
+pkgver=1.0.19
+pkgrel=1
 pkgdesc="Scanner Access Now Easy"
 arch=(i686 x86_64)
 license=('GPL')
 depends=('libtiff' 'libgphoto2' 'libjpeg' 'libieee1284' 'libusb' 'bash')
-source=(http://alioth.debian.org/download.php/1669/$pkgname-backends-$pkgver.tar.gz \
+source=(ftp://ftp.sane-project.org/pub/sane/$pkgname-backends-$pkgver/$pkgname-backends-$pkgver.tar.gz \
 	http://heanet.dl.sourceforge.net/sourceforge/hp44x0backend/sane_hp_rts88xx-0.18.tar.gz
-	convert-usermap-sane.sh post-1.0.18.patch.bz2 patch-sane.sh.patch sane.xinetd)
+	patch-sane.sh.patch sane.xinetd)
 url="http://www.sane-project.org"
 install=$pkgname.install
 backup=(etc/sane.d/{abaton.conf,agfafocus.conf,apple.conf,artec.conf,artec_eplus48u.conf,avision.conf,bh.conf,canon.conf,canon630u.conf,canon_pp.conf,coolscan.conf,coolscan2.conf,dc210.conf,dc240.conf,dc25.conf,dell1600n_net.conf,dll.conf,dmc.conf,epson.conf,epson2.conf,fujitsu.conf,genesys.conf,gphoto2.conf,gt68xx.conf,hp.conf,hp4200.conf,hp5400.conf,hp_rts88xx.conf,hpsj5s.conf,ibm.conf,leo.conf,lexmark.conf,ma1509.conf,matsushita.conf,microtek.conf,microtek2.conf,mustek.conf,mustek_pp.conf,mustek_usb.conf,nec.conf,net.conf,pie.conf,plustek.conf,plustek_pp.conf,qcam.conf,ricoh.conf,s9036.conf,saned.conf,sceptre.conf,sharp.conf,sm3840.conf,snapscan.conf,sp15c.conf,st400.conf,stv680.conf,tamarack.conf,teco1.conf,teco2.conf,teco3.conf,test.conf,u12.conf,umax.conf,umax1220u.conf,umax_pp.conf,v4l.conf} etc/xinetd.d/sane)
@@ -23,30 +23,29 @@
   patch -Np0 -i $startdir/src/patch-sane.sh.patch || return 1
   ./patch-sane.sh $startdir/src/$pkgname-backends-$pkgver || return 1
   cd $startdir/src/$pkgname-backends-$pkgver
-  # bump to latest cvs
-  patch -Np1 -i ../post-1.0.18.patch || return 1
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
-  mkdir tools/hal
   /usr/bin/make || return 1
   /usr/bin/make DESTDIR=$startdir/pkg install
   # fix hp officejets
   echo "#hpaio" >> $startdir/pkg/etc/sane.d/dll.conf
-	# install udev files
-	cd $startdir/src
-	/bin/install -D -m0644 $startdir/src/$pkgname-backends-$pkgver/tools/udev/libsane.rules \
-			$startdir/pkg/etc/udev/rules.d/53-sane.rules
-	# fix for new udev syntax >= udev 098
-	sed -i -e 's#SYSFS#ATTRS#g' $startdir/pkg/etc/udev/rules.d/53-sane.rules
+  # disable epson2 backend by default
+  sed -i -e  's/^epson2/#epson2/g' $startdir/pkg/etc/sane.d/dll.conf
+  # install udev files
+  cd $startdir/src
+  /bin/install -D -m0644 $startdir/src/$pkgname-backends-$pkgver/tools/udev/libsane.rules \
+			 $startdir/pkg/etc/udev/rules.d/53-sane.rules
+  # fix for new udev syntax >= udev 098
+  sed -i -e 's#SYSFS#ATTRS#g' $startdir/pkg/etc/udev/rules.d/53-sane.rules
   # fix group on /var/lock
   mkdir -p $startdir/pkg/var/lock/sane
+  chgrp 0 $startdir/pkg/var
+  chgrp 0 $startdir/pkg/var/lock
   chmod 775 $startdir/pkg/var/lock/sane
   chgrp 96 $startdir/pkg/var/lock/sane
   # install xinetd file
   install -D -m644 $startdir/src/sane.xinetd $startdir/pkg/etc/xinetd.d/sane
 }
-md5sums=('7ca7e2908e24721471de92cf40c75e60'
+md5sums=('8c0936272dcfd4e98c51512699f1c06f'
          '09d3eaf73f35b7795cd8418b8dc60f69'
-         '7e0e857d77dd37c4d789c423b15be35a'
-         '2ee7d8e4699239f3e1a085e13a968fc3'
          '1555b998e43d43d8841ff3ad3cd9602e'
          'da946cc36fb83612162cf9505986d4b2')