Date: Monday, February 21, 2011 @ 14:15:42 Author: tpowa Revision: 110715
upgpkg: sane 1.0.22-1 bump to latest version Modified: sane/trunk/PKGBUILD Deleted: sane/trunk/fix_xerox_mfp_color_mode.patch --------------------------------+ PKGBUILD | 20 +++++++------------- fix_xerox_mfp_color_mode.patch | 21 --------------------- 2 files changed, 7 insertions(+), 34 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2011-02-21 19:14:38 UTC (rev 110714) +++ PKGBUILD 2011-02-21 19:15:42 UTC (rev 110715) @@ -3,8 +3,8 @@ # Contributed by Sarah Hay <sarah...@mb.sympatico.ca>, Tobias Powalowski <t.p...@gmx.de>, Simo L. <neot...@yahoo.com>, eric <e...@archlinux.org> pkgname=sane -pkgver=1.0.21 -pkgrel=4 +pkgver=1.0.22 +pkgrel=1 pkgdesc="Scanner Access Now Easy" url="http://www.sane-project.org" arch=('i686' 'x86_64') @@ -12,21 +12,13 @@ depends=('libtiff>=3.9.2-2' 'libgphoto2>=2.4.7-2' 'libjpeg>=8' 'libieee1284' 'libusb-compat' 'v4l-utils' 'avahi' 'bash') makedepends=('texlive-latexextra') 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_dr.conf,canon_pp.conf,cardscan.conf,coolscan2.conf,coolscan3.conf,coolscan.conf,dc25.conf,dc210.conf,dc240.conf,dell1600n_net.conf,dll.conf,dmc.conf,epjitsu.conf,epson.conf,epson2.conf,fujitsu.conf,genesys.conf,gphoto2.conf,gt68xx.conf,hp.conf,hp3900.conf,hp4200.conf,hp5400.conf,hpsj5s.conf,hs2p.conf,ibm.conf,kodak.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,p5.conf,pie.conf,pixma.conf,plustek.conf,plustek_pp.conf,qcam.conf,ricoh.conf,rts8891.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,xerox_mfp.conf,v4l.conf} etc/xinetd.d/sane) -source=(ftp://ftp.sane-project.org/pub/sane/$pkgname-backends-$pkgver/$pkgname-backends-$pkgver.tar.gz - ftp://ftp.sane-project.org/pub/sane/$pkgname-backends-$pkgver/sane-backends-1.0.21-i18n.patch - sane.xinetd - fix_xerox_mfp_color_mode.patch) +backup=(etc/sane.d/{abaton.conf,agfafocus.conf,apple.conf,artec.conf,artec_eplus48u.conf,avision.conf,bh.conf,canon.conf,canon630u.conf,canon_dr.conf,canon_pp.conf,cardscan.conf,coolscan2.conf,coolscan3.conf,coolscan.conf,dc25.conf,dc210.conf,dc240.conf,dell1600n_net.conf,dll.conf,dmc.conf,epjitsu.conf,epson.conf,epson2.conf,fujitsu.conf,genesys.conf,gphoto2.conf,gt68xx.conf,hp.conf,hp3900.conf,hp4200.conf,hp5400.conf,hpsj5s.conf,hs2p.conf,ibm.conf,kodak.conf,leo.conf,lexmark.conf,ma1509.conf,magicolor.conf,matsushita.conf,microtek.conf,microtek2.conf,mustek.conf,mustek_pp.conf,mustek_usb.conf,nec.conf,net.conf,p5.conf,pie.conf,pixma.conf,plustek.conf,plustek_pp.conf,qcam.conf,ricoh.conf,rts8891.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,xerox_mfp.conf,v4l.conf} etc/xinetd.d/sane) +source=(ftp://ftp2.sane-project.org/pub/sane/$pkgname-backends-$pkgver/$pkgname-backends-$pkgver.tar.gz + sane.xinetd) options=(!libtool) -md5sums=('be586a23633949cf2ecf0c9c6d769130' - '8a6443b731f04dada814e268c42b139a' - 'da946cc36fb83612162cf9505986d4b2' - 'd6542c340c2acf30ccb7ead7094ab9d9') build() { cd "${srcdir}/${pkgname}-backends-${pkgver}" - patch -Np1 -i ${srcdir}/sane-backends-1.0.21-i18n.patch - patch -Np1 -i ${srcdir}/fix_xerox_mfp_color_mode.patch ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --with-docdir=/usr/share/doc/sane --enable-avahi make } @@ -52,3 +44,5 @@ # install xinetd file install -D -m644 "${srcdir}/sane.xinetd" "${pkgdir}/etc/xinetd.d/sane" } +md5sums=('fadf56a60f4776bfb24491f66b617cf5' + 'da946cc36fb83612162cf9505986d4b2') Deleted: fix_xerox_mfp_color_mode.patch =================================================================== --- fix_xerox_mfp_color_mode.patch 2011-02-21 19:14:38 UTC (rev 110714) +++ fix_xerox_mfp_color_mode.patch 2011-02-21 19:15:42 UTC (rev 110715) @@ -1,21 +0,0 @@ -Description: Fix xerox_mfp color mode - Corrected color mode malfunction. - - Bug was introduced by mass change to SANE_VALUE macro, (commit ff048f41760c74e67dfea36a079c71fdb72bbf4c). -Author: Alex Belkin <a...@telekom.ru> -Origin: upstream, http://git.debian.org/?p=sane/sane-backends.git;a=commitdiff;h=043cc4b1651fe602f1b7fb58e6592bd3bef0f4ac -Bug: https://alioth.debian.org/tracker/?func=detail&atid=410366&aid=312485&group_id=30186 -Bug-Debian: http://bugs.debian.org/583789 - -Index: sane-backends-1.0.21/backend/xerox_mfp.c -=================================================================== ---- sane-backends-1.0.21.orig/backend/xerox_mfp.c 2010-04-05 15:18:05.000000000 +0200 -+++ sane-backends-1.0.21/backend/xerox_mfp.c 2010-06-01 19:34:07.350975337 +0200 -@@ -386,6 +386,7 @@ - - static SANE_String_Const scan_modes[] = { - SANE_VALUE_SCAN_MODE_LINEART, -+ SANE_VALUE_SCAN_MODE_HALFTONE, - SANE_VALUE_SCAN_MODE_GRAY, - SANE_VALUE_SCAN_MODE_COLOR, - NULL