[arch-commits] Commit in sane/trunk (PKGBUILD)

2020-10-27 Thread Felix Yan via arch-commits 
Date: Tuesday, October 27, 2020 @ 10:35:17
  Author: felixonmars
Revision: 398858

upgpkg: sane 1.0.31-3: rebuild with net-snmp 5.9

Modified:
  sane/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-10-27 10:34:51 UTC (rev 398857)
+++ PKGBUILD2020-10-27 10:35:17 UTC (rev 398858)
@@ -6,7 +6,7 @@
 
 pkgname=sane
 pkgver=1.0.31
-pkgrel=2
+pkgrel=3
 _commit=8bf1cae2e1803aefab9e5331550e5d5d
 pkgdesc="Scanner Access Now Easy"
 url="http://www.sane-project.org/;

[arch-commits] Commit in sane/trunk (PKGBUILD)

2020-10-17 Thread David Runge via arch-commits 
Date: Saturday, October 17, 2020 @ 10:51:34
  Author: dvzrv
Revision: 398483

upgpkg: sane 1.0.31-2: Rebuild to fix depends/makedepends.

Switch to correct license (GPL2).
Add all available sodeps in package() and the respective packages to 
makedepends.
Add all otherwise directly linked packages to depends.
Add libsane.so to provides.
Update contributor info.

Modified:
  sane/trunk/PKGBUILD

--+
 PKGBUILD |   24 ++--
 1 file changed, 18 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-10-17 10:12:29 UTC (rev 398482)
+++ PKGBUILD2020-10-17 10:51:34 UTC (rev 398483)
@@ -1,4 +1,5 @@
 # Maintainer: Tobias Powalowski 
+# Contributor: David Runge 
 # Contributor: Sarah Hay 
 # Contributor: Simo L. 
 # Contributor: eric 
@@ -5,14 +6,18 @@
 
 pkgname=sane
 pkgver=1.0.31
-pkgrel=1
+pkgrel=2
 _commit=8bf1cae2e1803aefab9e5331550e5d5d
 pkgdesc="Scanner Access Now Easy"
 url="http://www.sane-project.org/;
 arch=('x86_64')
-license=('GPL')
-depends=('libtiff>=4.0.0' 'libgphoto2' 'libjpeg>=8' 'libusbx' 'libieee1284' 
'v4l-utils' 'avahi' 'bash' 'net-snmp' 'poppler-glib')
-makedepends=('texlive-latexextra')
+license=('GPL2')
+# NOTE: libgphoto2 can be moved to makedepends once the package also provides
+# libgphoto2_port.so
+depends=('bash' 'cairo' 'gcc-libs' 'glibc' 'libgphoto2' 'libjpeg-turbo' 'libnl'
+'libpng' 'libtiff' 'libxml2' 'libieee1284' 'net-snmp' 'openssl' 'v4l-utils')
+makedepends=('avahi' 'curl' 'glib2' 'libusb' 'poppler-glib' 
'texlive-latexextra')
+provides=('libsane.so')
 
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,epsonds.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,kodakaio.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,pieusb.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=(https://gitlab.com/sane-project/backends/uploads/$_commit/sane-backends-$pkgver.tar.gz
 'sane.xinetd'
@@ -22,6 +27,10 @@
 
'8f9f18d432087e5445aa533be375a811daf320512069c108d41a79121868937e1a7ffa21ee7d33adcf9fbb670bca460ff06423ce39602f35151eccc243d9d4ec'
 
'62654a59fae3216be9c0ae4f810375de1232133ab12732529a3e064cc83d94563560e01950dea4b25aa298294c5f0421436c5e095a3a00ad8ef78b471f3105f4'
 
'c4cd4427ee8e5cb128c5d54006fafbb4f846508582dffc293f16ab14ab638e6ee3dc5df0eb06f6d0d3839941ab74623c7163ac13bcdfec87b10308587a697536')
+b2sums=('fc36311e4f293c29f0f64ec4090356f54a2823b1886707410bdaf03113a04c3ae1cfcc350796fc707a894be66dd97305b2f539d7066840d860bb29ccc514995d'
+
'158952a09d5b29ae848a4c1377de6ff824b61c7d1932d29f3a0d313bafdaa0c5973614c5b744f53c7d2d4acff3dd4dc8b821068b95ae07a081539fd5cabd7477'
+
'779406b17a77d209ba797b20c39f18fccc6a75c45a97db46e717a68f1998e37d90ac1b3b79d61030e880c09cf4dcc9003c7ed81ab3e96f5fd61756ca251f3ccf'
+
'bedaa660608161734f82c317befde341f36502cf0cfd4ea7987cf5793f3630f80f160fc7adaf474d35679c7e2cebe86fe928c71297dce929e3ea94a9b6a85ba9')
 
 build() {
   cd sane-backends-${pkgver}
@@ -39,6 +48,9 @@
 }
 
 package() {
+  depends+=('libavahi-client.so' 'libavahi-common.so' 'libcurl.so'
+  'libgphoto2.so' 'libglib-2.0.so' 'libgobject-2.0.so' 'libpoppler-glib.so'
+  'libusb-1.0.so')
   cd sane-backends-${pkgver}
   make DESTDIR="${pkgdir}" install
   # fix hp officejets
@@ -48,10 +60,10 @@
 "${pkgdir}/usr/lib/udev/rules.d/49-sane.rules"
   # fix udev rules
   sed -i 's|NAME="%k", ||g' "${pkgdir}/usr/lib/udev/rules.d/49-sane.rules"
-  
+
   # install xinetd file
   install -D -m644 "${srcdir}/sane.xinetd" "${pkgdir}/etc/xinetd.d/sane"
-  
+
   # Install the pkg-config file
   install -D -m644 tools/sane-backends.pc \
  "${pkgdir}/usr/lib/pkgconfig/sane-backends.pc"

[arch-commits] Commit in sane/trunk (PKGBUILD)

2020-09-05 Thread Antonio Rojas via arch-commits 
Date: Saturday, September 5, 2020 @ 09:39:30
  Author: arojas
Revision: 395465

Update to 1.0.31

Modified:
  sane/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2020-09-05 09:14:04 UTC (rev 395464)
+++ PKGBUILD2020-09-05 09:39:30 UTC (rev 395465)
@@ -4,20 +4,21 @@
 # Contributor: eric 
 
 pkgname=sane
-pkgver=1.0.30
+pkgver=1.0.31
 pkgrel=1
+_commit=8bf1cae2e1803aefab9e5331550e5d5d
 pkgdesc="Scanner Access Now Easy"
 url="http://www.sane-project.org/;
 arch=('x86_64')
 license=('GPL')
-depends=('libtiff>=4.0.0' 'libgphoto2' 'libjpeg>=8' 'libusbx' 'libieee1284' 
'v4l-utils' 'avahi' 'bash' 'net-snmp')
+depends=('libtiff>=4.0.0' 'libgphoto2' 'libjpeg>=8' 'libusbx' 'libieee1284' 
'v4l-utils' 'avahi' 'bash' 'net-snmp' 'poppler-glib')
 makedepends=('texlive-latexextra')
 
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,epsonds.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,kodakaio.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,pieusb.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=(https://gitlab.com/sane-project/backends/uploads/c3dd60c9e054b5dee1e7b01a7edc98b0/sane-backends-$pkgver.tar.gz
+source=(https://gitlab.com/sane-project/backends/uploads/$_commit/sane-backends-$pkgver.tar.gz
 'sane.xinetd'
 'saned.socket'
 'saned.service')
-sha512sums=('e9f4ab1f21d5ab0e09b101389c325947824945af968f08b307485f79d4dc4c134b8a1979fb0cf0cfa72435abffe70d0060748a2c2ec46514eb15a0442ee181a5'
+sha512sums=('5d49ca698af38a30a3d23349f2fe82a4a21262b014ca38407d5ea0b3fe7cec72860a39c8651c8a5e2f561a9a740008658a36ed6bd96324be84646dbcf1461bfb'
 
'8f9f18d432087e5445aa533be375a811daf320512069c108d41a79121868937e1a7ffa21ee7d33adcf9fbb670bca460ff06423ce39602f35151eccc243d9d4ec'
 
'62654a59fae3216be9c0ae4f810375de1232133ab12732529a3e064cc83d94563560e01950dea4b25aa298294c5f0421436c5e095a3a00ad8ef78b471f3105f4'
 
'c4cd4427ee8e5cb128c5d54006fafbb4f846508582dffc293f16ab14ab638e6ee3dc5df0eb06f6d0d3839941ab74623c7163ac13bcdfec87b10308587a697536')

[arch-commits] Commit in sane/trunk (PKGBUILD network.patch)

2020-05-18 Thread Antonio Rojas via arch-commits 
Date: Monday, May 18, 2020 @ 19:37:21
  Author: arojas
Revision: 385488

Update to 1.0.30

Modified:
  sane/trunk/PKGBUILD
Deleted:
  sane/trunk/network.patch

---+
 PKGBUILD  |   20 ++--
 network.patch |   42 --
 2 files changed, 6 insertions(+), 56 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-05-18 19:15:18 UTC (rev 385487)
+++ PKGBUILD2020-05-18 19:37:21 UTC (rev 385488)
@@ -4,7 +4,7 @@
 # Contributor: eric 
 
 pkgname=sane
-pkgver=1.0.29
+pkgver=1.0.30
 pkgrel=1
 pkgdesc="Scanner Access Now Easy"
 url="http://www.sane-project.org/;
@@ -13,23 +13,15 @@
 depends=('libtiff>=4.0.0' 'libgphoto2' 'libjpeg>=8' 'libusbx' 'libieee1284' 
'v4l-utils' 'avahi' 'bash' 'net-snmp')
 makedepends=('texlive-latexextra')
 
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,epsonds.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,kodakaio.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,pieusb.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=(https://gitlab.com/sane-project/backends/uploads/54f858b20a364fc35d820df935a86478/sane-backends-$pkgver.tar.gz
+source=(https://gitlab.com/sane-project/backends/uploads/c3dd60c9e054b5dee1e7b01a7edc98b0/sane-backends-$pkgver.tar.gz
 'sane.xinetd'
 'saned.socket'
-'saned.service'
-'network.patch')
-sha512sums=('9ee431b0c048119719e15905f8743c7a0fd8bc6fcee81d75df8459a989cab7e39bf045518976713a7e1d94c816dd1a1e0fa190612d815c0ddb6a51d2abf3fd54'
+'saned.service')
+sha512sums=('e9f4ab1f21d5ab0e09b101389c325947824945af968f08b307485f79d4dc4c134b8a1979fb0cf0cfa72435abffe70d0060748a2c2ec46514eb15a0442ee181a5'
 
'8f9f18d432087e5445aa533be375a811daf320512069c108d41a79121868937e1a7ffa21ee7d33adcf9fbb670bca460ff06423ce39602f35151eccc243d9d4ec'
 
'62654a59fae3216be9c0ae4f810375de1232133ab12732529a3e064cc83d94563560e01950dea4b25aa298294c5f0421436c5e095a3a00ad8ef78b471f3105f4'
-
'c4cd4427ee8e5cb128c5d54006fafbb4f846508582dffc293f16ab14ab638e6ee3dc5df0eb06f6d0d3839941ab74623c7163ac13bcdfec87b10308587a697536'
-
'04b65a06d2c76dde6fce501ba823e999eb89ea41573f887f9e7d5347f3aa5e35310fad69313e99f873640e29a9849372d2ff995678593a0781fba73b464bec0d')
+
'c4cd4427ee8e5cb128c5d54006fafbb4f846508582dffc293f16ab14ab638e6ee3dc5df0eb06f6d0d3839941ab74623c7163ac13bcdfec87b10308587a697536')
 
-prepare() {
-  cd sane-backends-${pkgver}
-   # fix 
http://vasks.debian.org/tracker/?func=detail=410366=313760_id=30186
-   patch -Np1 -i "${srcdir}"/network.patch
-}
-
 build() {
   cd sane-backends-${pkgver}
 
@@ -45,7 +37,7 @@
   make
 }
 
-package () {
+package() {
   cd sane-backends-${pkgver}
   make DESTDIR="${pkgdir}" install
   # fix hp officejets

Deleted: network.patch
===
--- network.patch   2020-05-18 19:15:18 UTC (rev 385487)
+++ network.patch   2020-05-18 19:37:21 UTC (rev 385488)
@@ -1,42 +0,0 @@
-diff --git a/sanei/sanei_tcp.c b/sanei/sanei_tcp.c
-index a57d7c7..d0a1e92 100644
 a/sanei/sanei_tcp.c
-+++ b/sanei/sanei_tcp.c
-@@ -45,6 +45,7 @@
- #include 
- #include 
- #include 
-+#include 
- 
- #ifdef HAVE_WINSOCK2_H
- #include 
-@@ -123,14 +124,27 @@ sanei_tcp_write(int fd, const u_char * buf, int count)
- ssize_t
- sanei_tcp_read(int fd, u_char * buf, int count)
- {
--ssize_t bytes_recv = 0, rc = 1;
-+ssize_t bytes_recv = 0, rc = 1;
-+  int retry = 5;
- 
-   while (bytes_recv < count && rc > 0)
-   {
-   rc = recv(fd, buf+bytes_recv, count-bytes_recv, 0);
-+  DBG(1, "%s: bytes received %d\n", __FUNCTION__, rc);
-   if (rc > 0)
- bytes_recv += rc;
--
-+  else {
-+  if ( errno == EAGAIN && retry-- ) {
-+  DBG(1, "%s: waiting  %d\n", __FUNCTION__, 
retry);
-+  /* wait for max 1s */
-+  struct timespec req;
-+  struct timespec rem;
-+  req.tv_sec = 0;
-+

[arch-commits] Commit in sane/trunk (PKGBUILD)

2020-01-05 Thread Antonio Rojas via arch-commits 
Date: Sunday, January 5, 2020 @ 19:18:07
  Author: arojas
Revision: 372622

Fix some scanners not being detected (FS#63882)

Modified:
  sane/trunk/PKGBUILD

--+
 PKGBUILD |   10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-01-05 17:22:52 UTC (rev 372621)
+++ PKGBUILD2020-01-05 19:18:07 UTC (rev 372622)
@@ -5,7 +5,7 @@
 
 pkgname=sane
 pkgver=1.0.28
-pkgrel=2
+pkgrel=3
 pkgdesc="Scanner Access Now Easy"
 url="http://www.sane-project.org/;
 arch=('x86_64')
@@ -17,17 +17,21 @@
 'sane.xinetd'
 'saned.socket'
 'saned.service'
-'network.patch')
+'network.patch'
+0781f3fd.patch)
 
sha512sums=('84607739cea28c31f9a2f21df583c3d9f3ad1e7e87ad54fb8af8103450b22d2de6cf1670563eaa8310750491f840b377a2ca42c5eaee45aaec500a0a6792b3af'
 
'8f9f18d432087e5445aa533be375a811daf320512069c108d41a79121868937e1a7ffa21ee7d33adcf9fbb670bca460ff06423ce39602f35151eccc243d9d4ec'
 
'62654a59fae3216be9c0ae4f810375de1232133ab12732529a3e064cc83d94563560e01950dea4b25aa298294c5f0421436c5e095a3a00ad8ef78b471f3105f4'
 
'c4cd4427ee8e5cb128c5d54006fafbb4f846508582dffc293f16ab14ab638e6ee3dc5df0eb06f6d0d3839941ab74623c7163ac13bcdfec87b10308587a697536'
-
'04b65a06d2c76dde6fce501ba823e999eb89ea41573f887f9e7d5347f3aa5e35310fad69313e99f873640e29a9849372d2ff995678593a0781fba73b464bec0d')
+
'04b65a06d2c76dde6fce501ba823e999eb89ea41573f887f9e7d5347f3aa5e35310fad69313e99f873640e29a9849372d2ff995678593a0781fba73b464bec0d'
+
'344066c099b574212a9cf78680cb8ecdf6c254bb1e39b3b247f12c4e6ef8af25abff9a268f5ac67cb6159948da7e39a9db522907a860990d3226bef5945d0918')
 
 prepare() {
   cd sane-backends-${pkgver}
# fix 
http://vasks.debian.org/tracker/?func=detail=410366=313760_id=30186
patch -Np1 -i "${srcdir}"/network.patch
+   # fix some scanners not recognized in 1.0.28 
https://gitlab.com/sane-project/backends/issues/136
+   patch -p1 -i ../0781f3fd.patch
 }
 
 build() {

[arch-commits] Commit in sane/trunk (PKGBUILD)

2019-11-28 Thread Antonio Rojas via arch-commits 
Date: Thursday, November 28, 2019 @ 21:42:40
  Author: arojas
Revision: 369888

Fix quoting

Modified:
  sane/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2019-11-28 21:41:08 UTC (rev 369887)
+++ PKGBUILD2019-11-28 21:42:40 UTC (rev 369888)
@@ -18,15 +18,20 @@
 'saned.socket'
 'saned.service'
 'network.patch')
+sha512sums=('84607739cea28c31f9a2f21df583c3d9f3ad1e7e87ad54fb8af8103450b22d2de6cf1670563eaa8310750491f840b377a2ca42c5eaee45aaec500a0a6792b3af'
+
'8f9f18d432087e5445aa533be375a811daf320512069c108d41a79121868937e1a7ffa21ee7d33adcf9fbb670bca460ff06423ce39602f35151eccc243d9d4ec'
+
'62654a59fae3216be9c0ae4f810375de1232133ab12732529a3e064cc83d94563560e01950dea4b25aa298294c5f0421436c5e095a3a00ad8ef78b471f3105f4'
+
'c4cd4427ee8e5cb128c5d54006fafbb4f846508582dffc293f16ab14ab638e6ee3dc5df0eb06f6d0d3839941ab74623c7163ac13bcdfec87b10308587a697536'
+
'04b65a06d2c76dde6fce501ba823e999eb89ea41573f887f9e7d5347f3aa5e35310fad69313e99f873640e29a9849372d2ff995678593a0781fba73b464bec0d')
 
 prepare() {
-  cd "${srcdir}/sane-backends-${pkgver}"
+  cd sane-backends-${pkgver}
# fix 
http://vasks.debian.org/tracker/?func=detail=410366=313760_id=30186
-   patch -Np1 -i ${srcdir}/network.patch
+   patch -Np1 -i "${srcdir}"/network.patch
 }
 
 build() {
-  cd "${srcdir}/sane-backends-${pkgver}"
+  cd sane-backends-${pkgver}
 
   ./configure --prefix=/usr --sbindir=/usr/bin \
 --sysconfdir=/etc \
@@ -41,7 +46,7 @@
 }
 
 package () {
-  cd "${srcdir}/sane-backends-${pkgver}"
+  cd sane-backends-${pkgver}
   make DESTDIR="${pkgdir}" install
   # fix hp officejets
   echo "#hpaio" >> "${pkgdir}/etc/sane.d/dll.conf"
@@ -63,8 +68,3 @@
   install -D -m644 ${srcdir}/saned.service \
   "${pkgdir}/usr/lib/systemd/system/saned@.service"
 }
-sha512sums=('84607739cea28c31f9a2f21df583c3d9f3ad1e7e87ad54fb8af8103450b22d2de6cf1670563eaa8310750491f840b377a2ca42c5eaee45aaec500a0a6792b3af'
-
'8f9f18d432087e5445aa533be375a811daf320512069c108d41a79121868937e1a7ffa21ee7d33adcf9fbb670bca460ff06423ce39602f35151eccc243d9d4ec'
-
'62654a59fae3216be9c0ae4f810375de1232133ab12732529a3e064cc83d94563560e01950dea4b25aa298294c5f0421436c5e095a3a00ad8ef78b471f3105f4'
-
'c4cd4427ee8e5cb128c5d54006fafbb4f846508582dffc293f16ab14ab638e6ee3dc5df0eb06f6d0d3839941ab74623c7163ac13bcdfec87b10308587a697536'
-
'04b65a06d2c76dde6fce501ba823e999eb89ea41573f887f9e7d5347f3aa5e35310fad69313e99f873640e29a9849372d2ff995678593a0781fba73b464bec0d')

[arch-commits] Commit in sane/trunk (PKGBUILD)

2019-11-19 Thread Antonio Rojas via arch-commits 
Date: Wednesday, November 20, 2019 @ 07:22:24
  Author: arojas
Revision: 369460

Drop libcups dependency (FS#64405)

Modified:
  sane/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2019-11-20 05:24:22 UTC (rev 369459)
+++ PKGBUILD2019-11-20 07:22:24 UTC (rev 369460)
@@ -5,12 +5,12 @@
 
 pkgname=sane
 pkgver=1.0.28
-pkgrel=1
+pkgrel=2
 pkgdesc="Scanner Access Now Easy"
 url="http://www.sane-project.org/;
 arch=('x86_64')
 license=('GPL')
-depends=('libtiff>=4.0.0' 'libgphoto2' 'libjpeg>=8' 'libusbx' 'libcups' 
'libieee1284' 'v4l-utils' 'avahi' 'bash' 'net-snmp')
+depends=('libtiff>=4.0.0' 'libgphoto2' 'libjpeg>=8' 'libusbx' 'libieee1284' 
'v4l-utils' 'avahi' 'bash' 'net-snmp')
 makedepends=('texlive-latexextra')
 
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,epsonds.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,kodakaio.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,pieusb.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=(https://gitlab.com/sane-project/backends/uploads/9e718daff347826f4cfe21126c8d5091/sane-backends-$pkgver.tar.gz

[arch-commits] Commit in sane/trunk (PKGBUILD)

2019-08-26 Thread Antonio Rojas via arch-commits 
Date: Monday, August 26, 2019 @ 11:41:45
  Author: arojas
Revision: 361220

Update to 1.0.28

Modified:
  sane/trunk/PKGBUILD

--+
 PKGBUILD |   14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-08-26 11:21:00 UTC (rev 361219)
+++ PKGBUILD2019-08-26 11:41:45 UTC (rev 361220)
@@ -4,8 +4,8 @@
 # Contributor: eric 
 
 pkgname=sane
-pkgver=1.0.27
-pkgrel=2
+pkgver=1.0.28
+pkgrel=1
 pkgdesc="Scanner Access Now Easy"
 url="http://www.sane-project.org/;
 arch=('x86_64')
@@ -13,7 +13,7 @@
 depends=('libtiff>=4.0.0' 'libgphoto2' 'libjpeg>=8' 'libusbx' 'libcups' 
'libieee1284' 'v4l-utils' 'avahi' 'bash' 'net-snmp')
 makedepends=('texlive-latexextra')
 
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,epsonds.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,kodakaio.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,pieusb.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=(https://sources.archlinux.org/other/sane/$pkgname-backends-$pkgver.tar.gz
+source=(https://gitlab.com/sane-project/backends/uploads/9e718daff347826f4cfe21126c8d5091/sane-backends-$pkgver.tar.gz
 'sane.xinetd'
 'saned.socket'
 'saned.service'
@@ -20,13 +20,13 @@
 'network.patch')
 
 prepare() {
-  cd "${srcdir}/${pkgname}-backends-${pkgver}"
+  cd "${srcdir}/sane-backends-${pkgver}"
# fix 
http://vasks.debian.org/tracker/?func=detail=410366=313760_id=30186
patch -Np1 -i ${srcdir}/network.patch
 }
 
 build() {
-  cd "${srcdir}/${pkgname}-backends-${pkgver}"
+  cd "${srcdir}/sane-backends-${pkgver}"
 
   ./configure --prefix=/usr --sbindir=/usr/bin \
 --sysconfdir=/etc \
@@ -41,7 +41,7 @@
 }
 
 package () {
-  cd "${srcdir}/${pkgname}-backends-${pkgver}"
+  cd "${srcdir}/sane-backends-${pkgver}"
   make DESTDIR="${pkgdir}" install
   # fix hp officejets
   echo "#hpaio" >> "${pkgdir}/etc/sane.d/dll.conf"
@@ -63,7 +63,7 @@
   install -D -m644 ${srcdir}/saned.service \
   "${pkgdir}/usr/lib/systemd/system/saned@.service"
 }
-sha512sums=('c6552768bfc10216730fc11011c82f74ca0952182019ded3916072147ec09be5c975ce1d37dc3ccea050c488dbdf983c2ca17dcd702644060ba796ae2591f9c5'
+sha512sums=('84607739cea28c31f9a2f21df583c3d9f3ad1e7e87ad54fb8af8103450b22d2de6cf1670563eaa8310750491f840b377a2ca42c5eaee45aaec500a0a6792b3af'
 
'8f9f18d432087e5445aa533be375a811daf320512069c108d41a79121868937e1a7ffa21ee7d33adcf9fbb670bca460ff06423ce39602f35151eccc243d9d4ec'
 
'62654a59fae3216be9c0ae4f810375de1232133ab12732529a3e064cc83d94563560e01950dea4b25aa298294c5f0421436c5e095a3a00ad8ef78b471f3105f4'
 
'c4cd4427ee8e5cb128c5d54006fafbb4f846508582dffc293f16ab14ab638e6ee3dc5df0eb06f6d0d3839941ab74623c7163ac13bcdfec87b10308587a697536'

[arch-commits] Commit in sane/trunk (PKGBUILD)

2018-10-09 Thread Felix Yan via arch-commits 
Date: Tuesday, October 9, 2018 @ 18:18:59
  Author: felixonmars
Revision: 336071

upgpkg: sane 1.0.27-2

rebuild with net-snmp 5.8

Modified:
  sane/trunk/PKGBUILD

--+
 PKGBUILD |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-10-09 18:15:35 UTC (rev 336070)
+++ PKGBUILD2018-10-09 18:18:59 UTC (rev 336071)
@@ -5,7 +5,7 @@
 
 pkgname=sane
 pkgver=1.0.27
-pkgrel=1
+pkgrel=2
 pkgdesc="Scanner Access Now Easy"
 url="http://www.sane-project.org/;
 arch=('x86_64')
@@ -63,8 +63,8 @@
   install -D -m644 ${srcdir}/saned.service \
   "${pkgdir}/usr/lib/systemd/system/saned@.service"
 }
-md5sums=('b10a08785f92a4c07ad961f4d843c934'
- 'bc2c8b4f7b3012c8936c7da21f60e2ac'
- 'e57e9e15528f47f5f1b3f1411135ed5d'
- '3f9fe36b0c4ff0b01b53b1cffa5d9700'
- '44e77692c52db15b0f530a1d9a8e1296')
+sha512sums=('c6552768bfc10216730fc11011c82f74ca0952182019ded3916072147ec09be5c975ce1d37dc3ccea050c488dbdf983c2ca17dcd702644060ba796ae2591f9c5'
+
'8f9f18d432087e5445aa533be375a811daf320512069c108d41a79121868937e1a7ffa21ee7d33adcf9fbb670bca460ff06423ce39602f35151eccc243d9d4ec'
+
'62654a59fae3216be9c0ae4f810375de1232133ab12732529a3e064cc83d94563560e01950dea4b25aa298294c5f0421436c5e095a3a00ad8ef78b471f3105f4'
+
'c4cd4427ee8e5cb128c5d54006fafbb4f846508582dffc293f16ab14ab638e6ee3dc5df0eb06f6d0d3839941ab74623c7163ac13bcdfec87b10308587a697536'
+
'04b65a06d2c76dde6fce501ba823e999eb89ea41573f887f9e7d5347f3aa5e35310fad69313e99f873640e29a9849372d2ff995678593a0781fba73b464bec0d')

[arch-commits] Commit in sane/trunk (PKGBUILD)

2017-05-23 Thread Tobias Powalowski 
Date: Tuesday, May 23, 2017 @ 14:08:16
  Author: tpowa
Revision: 296470

upgpkg: sane 1.0.27-1

bump to latest version

Modified:
  sane/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-05-23 07:29:43 UTC (rev 296469)
+++ PKGBUILD2017-05-23 14:08:16 UTC (rev 296470)
@@ -5,8 +5,8 @@
 # Contributor: eric 
 
 pkgname=sane
-pkgver=1.0.25
-pkgrel=2
+pkgver=1.0.27
+pkgrel=1
 pkgdesc="Scanner Access Now Easy"
 url="http://www.sane-project.org/;
 arch=('i686' 'x86_64')
@@ -64,7 +64,7 @@
   install -D -m644 ${srcdir}/saned.service \
   "${pkgdir}/usr/lib/systemd/system/saned@.service"
 }
-md5sums=('f9ed5405b3c12f07c6ca51ee60225fe7'
+md5sums=('b10a08785f92a4c07ad961f4d843c934'
  'bc2c8b4f7b3012c8936c7da21f60e2ac'
  'e57e9e15528f47f5f1b3f1411135ed5d'
  '3f9fe36b0c4ff0b01b53b1cffa5d9700'

[arch-commits] Commit in sane/trunk (PKGBUILD)

2017-02-18 Thread Antonio Rojas 
Date: Saturday, February 18, 2017 @ 17:00:19
  Author: arojas
Revision: 289201

openssl 1.1 rebuild

Modified:
  sane/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-02-18 16:57:50 UTC (rev 289200)
+++ PKGBUILD2017-02-18 17:00:19 UTC (rev 289201)
@@ -6,7 +6,7 @@
 
 pkgname=sane
 pkgver=1.0.25
-pkgrel=1
+pkgrel=2
 pkgdesc="Scanner Access Now Easy"
 url="http://www.sane-project.org/;
 arch=('i686' 'x86_64')

[arch-commits] Commit in sane/trunk (PKGBUILD)

2015-10-13 Thread Tobias Powalowski 
Date: Tuesday, October 13, 2015 @ 14:48:13
  Author: tpowa
Revision: 249210

upgpkg: sane 1.0.25-1

bump to latest version

Modified:
  sane/trunk/PKGBUILD

--+
 PKGBUILD |   18 ++
 1 file changed, 6 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-10-13 12:38:16 UTC (rev 249209)
+++ PKGBUILD2015-10-13 12:48:13 UTC (rev 249210)
@@ -5,8 +5,8 @@
 # Contributor: eric 
 
 pkgname=sane
-pkgver=1.0.24
-pkgrel=4
+pkgver=1.0.25
+pkgrel=1
 pkgdesc="Scanner Access Now Easy"
 url="http://www.sane-project.org/;
 arch=('i686' 'x86_64')
@@ -13,22 +13,17 @@
 license=('GPL')
 depends=('libtiff>=4.0.0' 'libgphoto2' 'libjpeg>=8' 'libusbx' 'libcups' 
'libieee1284' 'v4l-utils' 'avahi' 'bash' 'net-snmp')
 makedepends=('texlive-latexextra')
-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,kodakaio.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)
+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,epsonds.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,kodakaio.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,pieusb.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=(https://sources.archlinux.org/other/sane/$pkgname-backends-$pkgver.tar.gz
 'sane.xinetd'
 'saned.socket'
 'saned.service'
-'network.patch'
-'segfault-avahi-fix-kodakio.patch')
+'network.patch')
 
 prepare() {
   cd "${srcdir}/${pkgname}-backends-${pkgver}"
# fix 
http://vasks.debian.org/tracker/?func=detail=410366=313760_id=30186
patch -Np1 -i ${srcdir}/network.patch
-   # fix 
http://anonscm.debian.org/gitweb/?p=sane/sane-backends.git;a=commit;h=37523b867d411c2f82d08128246be7e38bc9812c
-   # #37525
-   # 
https://alioth.debian.org/tracker/?group_id=30186=410366=detail=314301
-   patch -Np1 -i ${srcdir}/segfault-avahi-fix-kodakio.patch
 }
 
 build() {
@@ -69,9 +64,8 @@
   install -D -m644 ${srcdir}/saned.service \
   "${pkgdir}/usr/lib/systemd/system/saned@.service"
 }
-md5sums=('1ca68e536cd7c1852322822f5f6ac3a4'
+md5sums=('f9ed5405b3c12f07c6ca51ee60225fe7'
  'bc2c8b4f7b3012c8936c7da21f60e2ac'
  'e57e9e15528f47f5f1b3f1411135ed5d'
  '3f9fe36b0c4ff0b01b53b1cffa5d9700'
- '44e77692c52db15b0f530a1d9a8e1296'
- '039524a38af8721f2e97d45e889295ca')
+ '44e77692c52db15b0f530a1d9a8e1296')

[arch-commits] Commit in sane/trunk (PKGBUILD)

2014-12-24 Thread Jan de Groot 
Date: Wednesday, December 24, 2014 @ 14:55:32
  Author: jgc
Revision: 228009

upgpkg: sane 1.0.24-4
libgphoto2 rebuild

Modified:
  sane/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-12-24 13:45:50 UTC (rev 228008)
+++ PKGBUILD2014-12-24 13:55:32 UTC (rev 228009)
@@ -6,7 +6,7 @@
 
 pkgname=sane
 pkgver=1.0.24
-pkgrel=3
+pkgrel=4
 pkgdesc=Scanner Access Now Easy
 url=http://www.sane-project.org/;
 arch=('i686' 'x86_64')

[arch-commits] Commit in sane/trunk (PKGBUILD segfault-avahi-fix-kodakio.patch)

2013-10-28 Thread Tobias Powalowski 
Date: Monday, October 28, 2013 @ 18:39:27
  Author: tpowa
Revision: 197702

upgpkg: sane 1.0.24-3

fix segfault with avahi

Added:
  sane/trunk/segfault-avahi-fix-kodakio.patch
Modified:
  sane/trunk/PKGBUILD

--+
 PKGBUILD |   12 +++-
 segfault-avahi-fix-kodakio.patch |   98 +
 2 files changed, 107 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-10-28 17:39:23 UTC (rev 197701)
+++ PKGBUILD2013-10-28 17:39:27 UTC (rev 197702)
@@ -6,7 +6,7 @@
 
 pkgname=sane
 pkgver=1.0.24
-pkgrel=2
+pkgrel=3
 pkgdesc=Scanner Access Now Easy
 url=http://www.sane-project.org/;
 arch=('i686' 'x86_64')
@@ -18,7 +18,8 @@
 'sane.xinetd'
 'saned.socket'
 'saned.service'
-'network.patch')
+'network.patch'
+'segfault-avahi-fix-kodakio.patch')
 options=(!libtool)
 
 prepare() {
@@ -25,6 +26,10 @@
   cd ${srcdir}/${pkgname}-backends-${pkgver}
# fix 
http://vasks.debian.org/tracker/?func=detailatid=410366aid=313760group_id=30186
patch -Np1 -i ${srcdir}/network.patch
+   # fix 
http://anonscm.debian.org/gitweb/?p=sane/sane-backends.git;a=commit;h=37523b867d411c2f82d08128246be7e38bc9812c
+   # #37525
+   # 
https://alioth.debian.org/tracker/?group_id=30186atid=410366func=detailaid=314301
+   patch -Np1 -i ${srcdir}/segfault-avahi-fix-kodakio.patch
 }
 
 build() {
@@ -69,4 +74,5 @@
  'bc2c8b4f7b3012c8936c7da21f60e2ac'
  'e57e9e15528f47f5f1b3f1411135ed5d'
  '3f9fe36b0c4ff0b01b53b1cffa5d9700'
- '44e77692c52db15b0f530a1d9a8e1296')
+ '44e77692c52db15b0f530a1d9a8e1296'
+ '039524a38af8721f2e97d45e889295ca')

Added: segfault-avahi-fix-kodakio.patch
===
--- segfault-avahi-fix-kodakio.patch(rev 0)
+++ segfault-avahi-fix-kodakio.patch2013-10-28 17:39:27 UTC (rev 197702)
@@ -0,0 +1,98 @@
+From 37523b867d411c2f82d08128246be7e38bc9812c Mon Sep 17 00:00:00 2001
+From: Paul Newall quan...@ntlworld.com
+Date: Mon, 14 Oct 2013 22:22:53 +0100
+Subject: [PATCH] Bugfix in kodakaio.c to fix segfault when non kodak scanners
+ return unexpected data via avahi auto discovery
+
+---
+ backend/kodakaio.c |   43 ++--
+ doc/descriptions/kodakaio.desc |2 +-
+ 3 files changed, 37 insertions(+), 12 deletions(-)
+
+diff --git a/backend/kodakaio.c b/backend/kodakaio.c
+index 8c4583a..b442e50 100644
+--- a/backend/kodakaio.c
 b/backend/kodakaio.c
+@@ -127,7 +127,7 @@ for ubuntu 12.10
+ 
+ #define KODAKAIO_VERSION  02
+ #define KODAKAIO_REVISION 4
+-#define KODAKAIO_BUILD6
++#define KODAKAIO_BUILD7
+ 
+ /* for usb (but also used for net though it's not required). */
+ #define MAX_BLOCK_SIZE32768
+@@ -2184,6 +2184,7 @@ static void resolve_callback(
+ AvahiLookupResultFlags flags,
+ AVAHI_GCC_UNUSED void* userdata) {
+ 
++  AvahiStringList *vid_pair_list = NULL, *pid_pair_list = NULL;
+   char *pidkey, *pidvalue;
+   char *vidkey, *vidvalue;
+   size_t valuesize;
+@@ -2204,20 +2205,40 @@ static void resolve_callback(
+ avahi_address_snprint(a, sizeof(a), address);
+ 
+ /* Output short for Kodak ESP */
+-  DBG(min(10,DBG_AUTO), %s:%u  %s  , a,port,host_name);
+-  avahi_string_list_get_pair(avahi_string_list_find(txt, vid), 
+-  vidkey, vidvalue, valuesize);
+-  DBG(min(10,DBG_AUTO), %s=%s  , vidkey, vidvalue);
+-  avahi_string_list_get_pair(avahi_string_list_find(txt, pid), 
+-  pidkey, pidvalue, valuesize);
+-  DBG(min(10,DBG_AUTO), %s=%s\n, pidkey, pidvalue);
++  DBG(min(10,DBG_AUTO), %s:%u  %s\n, a,port,host_name);
+ 
++  vid_pair_list = avahi_string_list_find(txt, vid);
++  if(vid_pair_list != NULL) {
++  avahi_string_list_get_pair(vid_pair_list, vidkey, vidvalue, 
valuesize);
++  DBG(min(10,DBG_AUTO), %s=%s  , vidkey, vidvalue);
++  }
++  elseDBG(min(10,DBG_AUTO), failed to find key vid\n);
++
++  pid_pair_list = avahi_string_list_find(txt, pid);
++  if(pid_pair_list != NULL) {
++  avahi_string_list_get_pair(pid_pair_list, pidkey, pidvalue, 
valuesize);
++  DBG(min(10,DBG_AUTO), %s=%s\n, pidkey, pidvalue);
++  }
++  elseDBG(min(10,DBG_AUTO), failed to find key pid\n);
++
++  if(pid_pair_list != NULL  vid_pair_list != NULL) {
+   ProcessAvahiDevice(name, vidvalue, pidvalue, a);
+-  avahi_free(vidkey); avahi_free(vidvalue);
+-  avahi_free(pidkey); avahi_free(pidvalue);
++  }
++  else DBG(min(10,DBG_AUTO), didn't call ProcessAvahiDevice\n);
++
++  if(vid_pair_list != NULL) {
++  avahi_free(vidkey); 
++  avahi_free(vidvalue);
++

[arch-commits] Commit in sane/trunk (PKGBUILD)

2013-10-06 Thread Tobias Powalowski 
Date: Sunday, October 6, 2013 @ 08:55:57
  Author: tpowa
Revision: 195945

upgpkg: sane 1.0.24-2

rename udev rule, fix #36550

Modified:
  sane/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-10-06 06:46:09 UTC (rev 195944)
+++ PKGBUILD2013-10-06 06:55:57 UTC (rev 195945)
@@ -6,7 +6,7 @@
 
 pkgname=sane
 pkgver=1.0.24
-pkgrel=1
+pkgrel=2
 pkgdesc=Scanner Access Now Easy
 url=http://www.sane-project.org/;
 arch=('i686' 'x86_64')
@@ -49,9 +49,9 @@
   echo #hpaio  ${pkgdir}/etc/sane.d/dll.conf
   # install udev files
   install -D -m0644 tools/udev/libsane.rules \
-${pkgdir}/usr/lib/udev/rules.d/53-sane.rules
+${pkgdir}/usr/lib/udev/rules.d/49-sane.rules
   # fix udev rules
-  sed -i 's|NAME=%k, ||g' ${pkgdir}/usr/lib/udev/rules.d/53-sane.rules
+  sed -i 's|NAME=%k, ||g' ${pkgdir}/usr/lib/udev/rules.d/49-sane.rules
   
   # install xinetd file
   install -D -m644 ${srcdir}/sane.xinetd ${pkgdir}/etc/xinetd.d/sane

[arch-commits] Commit in sane/trunk (PKGBUILD)

2013-05-31 Thread Tobias Powalowski 
Date: Friday, May 31, 2013 @ 21:37:15
  Author: tpowa
Revision: 186913

upgpkg: sane 1.0.23-6

replace libusb-compat with libusbx

Modified:
  sane/trunk/PKGBUILD

--+
 PKGBUILD |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-05-31 18:44:18 UTC (rev 186912)
+++ PKGBUILD2013-05-31 19:37:15 UTC (rev 186913)
@@ -6,12 +6,12 @@
 
 pkgname=sane
 pkgver=1.0.23
-pkgrel=5
+pkgrel=6
 pkgdesc=Scanner Access Now Easy
 url=http://www.sane-project.org/;
 arch=('i686' 'x86_64')
 license=('GPL')
-depends=('libtiff=4.0.0' 'libgphoto2' 'libjpeg=8' 'libusb-compat' 'libcups' 
'libieee1284' 'v4l-utils' 'avahi' 'bash' 'net-snmp')
+depends=('libtiff=4.0.0' 'libgphoto2' 'libjpeg=8' 'libusbx' 'libcups' 
'libieee1284' 'v4l-utils' 'avahi' 'bash' 'net-snmp')
 makedepends=('texlive-latexextra')
 
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,kodakaio.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://ftp.archlinux.org/other/sane/$pkgname-backends-$pkgver.tar.gz
@@ -41,6 +41,7 @@
 --enable-avahi \
 --enable-pthread \
 --disable-rpath \
+--enable-libusb_1_0 \
 --disable-locking
   make
 }

[arch-commits] Commit in sane/trunk (PKGBUILD sane.xinetd saned.service)

2013-05-19 Thread Tobias Powalowski 
Date: Sunday, May 19, 2013 @ 11:05:35
  Author: tpowa
Revision: 185794

upgpkg: sane 1.0.23-5

move saned to /usr/bin

Modified:
  sane/trunk/PKGBUILD
  sane/trunk/sane.xinetd
  sane/trunk/saned.service

---+
 PKGBUILD  |8 
 sane.xinetd   |2 +-
 saned.service |2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-05-19 08:52:55 UTC (rev 185793)
+++ PKGBUILD2013-05-19 09:05:35 UTC (rev 185794)
@@ -6,7 +6,7 @@
 
 pkgname=sane
 pkgver=1.0.23
-pkgrel=4
+pkgrel=5
 pkgdesc=Scanner Access Now Easy
 url=http://www.sane-project.org/;
 arch=('i686' 'x86_64')
@@ -34,7 +34,7 @@
 build() {
   cd ${srcdir}/${pkgname}-backends-${pkgver}
 
-  ./configure --prefix=/usr \
+  ./configure --prefix=/usr --sbindir=/usr/bin \
 --sysconfdir=/etc \
 --localstatedir=/var \
 --with-docdir=/usr/share/doc/sane \
@@ -69,8 +69,8 @@
   ${pkgdir}/usr/lib/systemd/system/saned@.service
 }
 md5sums=('e226a89c54173efea80e91e9a5eb6573'
- '5f519030392d599e2ad348159ec4c96f'
+ 'bc2c8b4f7b3012c8936c7da21f60e2ac'
  'e57e9e15528f47f5f1b3f1411135ed5d'
- 'e44bd4c994a52d6f472463d1eb0a03be'
+ '3f9fe36b0c4ff0b01b53b1cffa5d9700'
  'e65dbefb7c3d69955fb6eb3ace14aa12'
  '44e77692c52db15b0f530a1d9a8e1296')

Modified: sane.xinetd
===
--- sane.xinetd 2013-05-19 08:52:55 UTC (rev 185793)
+++ sane.xinetd 2013-05-19 09:05:35 UTC (rev 185794)
@@ -5,7 +5,7 @@
wait= no
user= nobody 
group   = scanner
-   server  = /usr/sbin/saned
+   server  = /usr/bin/saned
# disabled by default!
disable = yes
  }

Modified: saned.service
===
--- saned.service   2013-05-19 08:52:55 UTC (rev 185793)
+++ saned.service   2013-05-19 09:05:35 UTC (rev 185794)
@@ -3,6 +3,6 @@
 
 [Service]
 Group=scanner
-ExecStart=/usr/sbin/saned
+ExecStart=/usr/bin/saned
 StandardInput=socket
 StandardError=syslog

[arch-commits] Commit in sane/trunk (PKGBUILD sane.install)

2013-04-10 Thread Tobias Powalowski 
Date: Wednesday, April 10, 2013 @ 09:43:20
  Author: tpowa
Revision: 182409

upgpkg: sane 1.0.23-4

added prepare function, removed install message #34683 scanner group is not 
needed anymore

Modified:
  sane/trunk/PKGBUILD
Deleted:
  sane/trunk/sane.install

--+
 PKGBUILD |9 ++---
 sane.install |7 ---
 2 files changed, 6 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-04-10 07:36:56 UTC (rev 182408)
+++ PKGBUILD2013-04-10 07:43:20 UTC (rev 182409)
@@ -6,14 +6,13 @@
 
 pkgname=sane
 pkgver=1.0.23
-pkgrel=3
+pkgrel=4
 pkgdesc=Scanner Access Now Easy
 url=http://www.sane-project.org/;
 arch=('i686' 'x86_64')
 license=('GPL')
 depends=('libtiff=4.0.0' 'libgphoto2' 'libjpeg=8' 'libusb-compat' 'libcups' 
'libieee1284' 'v4l-utils' 'avahi' 'bash' 'net-snmp')
 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,kodakaio.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://ftp.archlinux.org/other/sane/$pkgname-backends-$pkgver.tar.gz
 'sane.xinetd'
@@ -23,14 +22,18 @@
 'network.patch')
 options=(!libtool)
 
-build() {
+prepare() {
   cd ${srcdir}/${pkgname}-backends-${pkgver}
 
# fix FS#33657
patch -Np0 -i ${srcdir}/kodakaio.c.patch
# fix 
http://vasks.debian.org/tracker/?func=detailatid=410366aid=313760group_id=30186
patch -Np1 -i ${srcdir}/network.patch
+}
 
+build() {
+  cd ${srcdir}/${pkgname}-backends-${pkgver}
+
   ./configure --prefix=/usr \
 --sysconfdir=/etc \
 --localstatedir=/var \

Deleted: sane.install
===
--- sane.install2013-04-10 07:36:56 UTC (rev 182408)
+++ sane.install2013-04-10 07:43:20 UTC (rev 182409)
@@ -1,7 +0,0 @@
-post_install() {
-   /bin/cat THEEND
-NOTE
-
-Add your user to group 'scanner' to use scanner devices.
-THEEND
-}

[arch-commits] Commit in sane/trunk (PKGBUILD)

2012-12-11 Thread Jan de Groot 
Date: Tuesday, December 11, 2012 @ 07:24:00
  Author: jgc
Revision: 173117

upgpkg: sane 1.0.23-2

Rebuild for libgphoto2

Modified:
  sane/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2012-12-11 10:32:56 UTC (rev 173116)
+++ PKGBUILD2012-12-11 12:24:00 UTC (rev 173117)
@@ -6,12 +6,12 @@
 
 pkgname=sane
 pkgver=1.0.23
-pkgrel=1
+pkgrel=2
 pkgdesc=Scanner Access Now Easy
 url=http://www.sane-project.org/;
 arch=('i686' 'x86_64')
 license=('GPL')
-depends=('libtiff=4.0.0' 'libgphoto2=2.4.7-2' 'libjpeg=8' 'libusb-compat' 
'libcups' 'libieee1284' 'v4l-utils' 'avahi' 'bash' 'net-snmp')
+depends=('libtiff=4.0.0' 'libgphoto2' 'libjpeg=8' 'libusb-compat' 'libcups' 
'libieee1284' 'v4l-utils' 'avahi' 'bash' 'net-snmp')
 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,kodakaio.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)

[arch-commits] Commit in sane/trunk (PKGBUILD)

2012-08-28 Thread Tobias Powalowski 
Date: Tuesday, August 28, 2012 @ 06:11:19
  Author: tpowa
Revision: 165658

upgpkg: sane 1.0.23-1

bump to latest version

Modified:
  sane/trunk/PKGBUILD

--+
 PKGBUILD |   26 +-
 1 file changed, 9 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-08-28 10:00:57 UTC (rev 165657)
+++ PKGBUILD2012-08-28 10:11:19 UTC (rev 165658)
@@ -5,37 +5,25 @@
 # Contributor: eric e...@archlinux.org
 
 pkgname=sane
-pkgver=1.0.22
-pkgrel=9
+pkgver=1.0.23
+pkgrel=1
 pkgdesc=Scanner Access Now Easy
 url=http://www.sane-project.org/;
 arch=('i686' 'x86_64')
 license=('GPL')
-depends=('libtiff=4.0.0' 'libgphoto2=2.4.7-2' 'libjpeg=8' 'libusb-compat' 
'libieee1284' 'v4l-utils' 'avahi' 'bash' 'net-snmp')
+depends=('libtiff=4.0.0' 'libgphoto2=2.4.7-2' 'libjpeg=8' 'libusb-compat' 
'libcups' 'libieee1284' 'v4l-utils' 'avahi' 'bash' 'net-snmp')
 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,magicolor.conf,matsushita.conf,microtek.conf,microtek2.conf,mustek.conf,mustek_pp.conf,mustek_usb.conf,mustek_usb2.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
+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,kodakaio.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://ftp.archlinux.org/other/sane/$pkgname-backends-$pkgver.tar.gz
 'sane.xinetd'
-'libv4l-0.8.3.patch'
-'xerox_mfp_fix_usb_devices.patch'
 'saned.socket'
 'saned.service')
 options=(!libtool)
-md5sums=('fadf56a60f4776bfb24491f66b617cf5'
- 'da946cc36fb83612162cf9505986d4b2'
- 'e645a8921cff9f18ffbdabb2ed885060'
- 'cfef73e7db7c28308914d3db6767d852'
- 'e57e9e15528f47f5f1b3f1411135ed5d'
- 'e44bd4c994a52d6f472463d1eb0a03be')
 
 build() {
   cd ${srcdir}/${pkgname}-backends-${pkgver}
 
-  patch -p1 -i ${srcdir}/libv4l-0.8.3.patch
-  # fix https://bugs.archlinux.org/task/26114
-  patch -Np1 -i ${srcdir}/xerox_mfp_fix_usb_devices.patch
-
   ./configure --prefix=/usr \
 --sysconfdir=/etc \
 --localstatedir=/var \
@@ -70,3 +58,7 @@
   install -D -m644 ${srcdir}/saned.service \
   ${pkgdir}/usr/lib/systemd/system/saned@.service
 }
+md5sums=('e226a89c54173efea80e91e9a5eb6573'
+ 'da946cc36fb83612162cf9505986d4b2'
+ 'e57e9e15528f47f5f1b3f1411135ed5d'
+ 'e44bd4c994a52d6f472463d1eb0a03be')

[arch-commits] Commit in sane/trunk (PKGBUILD saned.service saned.socket)

2012-06-12 Thread Tobias Powalowski 
Date: Tuesday, June 12, 2012 @ 10:11:41
  Author: tpowa
Revision: 161618

upgpkg: sane 1.0.22-9

include systemd files

Added:
  sane/trunk/saned.service
  sane/trunk/saned.socket
Modified:
  sane/trunk/PKGBUILD

---+
 PKGBUILD  |   23 +--
 saned.service |8 
 saned.socket  |9 +
 3 files changed, 34 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-06-12 13:59:17 UTC (rev 161617)
+++ PKGBUILD2012-06-12 14:11:41 UTC (rev 161618)
@@ -6,24 +6,28 @@
 
 pkgname=sane
 pkgver=1.0.22
-pkgrel=8
+pkgrel=9
 pkgdesc=Scanner Access Now Easy
 url=http://www.sane-project.org/;
 arch=('i686' 'x86_64')
 license=('GPL')
-depends=('libtiff=4.0.0' 'libgphoto2=2.4.7-2' 'libjpeg=8' 'libieee1284' 
'libusb-compat' 'v4l-utils' 'avahi' 'bash' 'net-snmp')
+depends=('libtiff=4.0.0' 'libgphoto2=2.4.7-2' 'libjpeg=8' 'libusb-compat' 
'libieee1284' 'v4l-utils' 'avahi' 'bash' 'net-snmp')
 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,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)
+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,mustek_usb2.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'
 'libv4l-0.8.3.patch'
-'xerox_mfp_fix_usb_devices.patch')
+'xerox_mfp_fix_usb_devices.patch'
+'saned.socket'
+'saned.service')
+options=(!libtool)
 md5sums=('fadf56a60f4776bfb24491f66b617cf5'
  'da946cc36fb83612162cf9505986d4b2'
  'e645a8921cff9f18ffbdabb2ed885060'
- 'cfef73e7db7c28308914d3db6767d852')
-options=(!libtool)
+ 'cfef73e7db7c28308914d3db6767d852'
+ 'e57e9e15528f47f5f1b3f1411135ed5d'
+ 'e44bd4c994a52d6f472463d1eb0a03be')
 
 build() {
   cd ${srcdir}/${pkgname}-backends-${pkgver}
@@ -37,6 +41,8 @@
 --localstatedir=/var \
 --with-docdir=/usr/share/doc/sane \
 --enable-avahi \
+--enable-pthread \
+--disable-rpath \
 --disable-locking
   make
 }
@@ -58,4 +64,9 @@
   # Install the pkg-config file
   install -D -m644 tools/sane-backends.pc \
  ${pkgdir}/usr/lib/pkgconfig/sane-backends.pc
+  # install systemd files
+  install -D -m644 ${srcdir}/saned.socket \
+  ${pkgdir}/usr/lib/systemd/system/saned.socket
+  install -D -m644 ${srcdir}/saned.service \
+  ${pkgdir}/usr/lib/systemd/system/saned@.service
 }

Added: saned.service
===
--- saned.service   (rev 0)
+++ saned.service   2012-06-12 14:11:41 UTC (rev 161618)
@@ -0,0 +1,8 @@
+[Unit]
+Description=Scanner Service
+
+[Service]
+Group=scanner
+ExecStart=/usr/sbin/saned
+StandardInput=socket
+StandardError=syslog

Added: saned.socket
===
--- saned.socket(rev 0)
+++ saned.socket2012-06-12 14:11:41 UTC (rev 161618)
@@ -0,0 +1,9 @@
+[Unit]
+Description=saned incoming socket
+
+[Socket]
+ListenStream=6566
+Accept=yes
+
+[Install]

[arch-commits] Commit in sane/trunk (PKGBUILD)

2012-04-29 Thread Allan McRae 
Date: Sunday, April 29, 2012 @ 02:47:50
  Author: allan
Revision: 157760

upgpkg: sane 1.0.22-8

move udev rules from /lib

Modified:
  sane/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-04-29 06:41:39 UTC (rev 157759)
+++ PKGBUILD2012-04-29 06:47:50 UTC (rev 157760)
@@ -6,7 +6,7 @@
 
 pkgname=sane
 pkgver=1.0.22
-pkgrel=7
+pkgrel=8
 pkgdesc=Scanner Access Now Easy
 url=http://www.sane-project.org/;
 arch=('i686' 'x86_64')
@@ -48,9 +48,9 @@
   echo #hpaio  ${pkgdir}/etc/sane.d/dll.conf
   # install udev files
   install -D -m0644 tools/udev/libsane.rules \
-${pkgdir}/lib/udev/rules.d/53-sane.rules
+${pkgdir}/usr/lib/udev/rules.d/53-sane.rules
   # fix udev rules
-  sed -i 's|NAME=%k, ||g' ${pkgdir}/lib/udev/rules.d/53-sane.rules
+  sed -i 's|NAME=%k, ||g' ${pkgdir}/usr/lib/udev/rules.d/53-sane.rules
   
   # install xinetd file
   install -D -m644 ${srcdir}/sane.xinetd ${pkgdir}/etc/xinetd.d/sane

[arch-commits] Commit in sane/trunk (PKGBUILD)

2012-03-07 Thread Ionut Biru 
Date: Wednesday, March 7, 2012 @ 15:31:52
  Author: ibiru
Revision: 152653

don't include a space in filename

Modified:
  sane/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-03-07 19:49:46 UTC (rev 152652)
+++ PKGBUILD2012-03-07 20:31:52 UTC (rev 152653)
@@ -57,5 +57,5 @@
   
   # Install the pkg-config file
   install -D -m644 tools/sane-backends.pc \
- ${pkgdir}/usr/lib/pkgconfig/sane-backends.pc 
+ ${pkgdir}/usr/lib/pkgconfig/sane-backends.pc
 }

[arch-commits] Commit in sane/trunk (PKGBUILD)

2012-03-04 Thread Tobias Powalowski 
Date: Monday, March 5, 2012 @ 02:52:59
  Author: tpowa
Revision: 152193

upgpkg: sane 1.0.22-7

added missing net-snmp dependency

Modified:
  sane/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2012-03-05 07:22:27 UTC (rev 152192)
+++ PKGBUILD2012-03-05 07:52:59 UTC (rev 152193)
@@ -6,12 +6,12 @@
 
 pkgname=sane
 pkgver=1.0.22
-pkgrel=6
+pkgrel=7
 pkgdesc=Scanner Access Now Easy
 url=http://www.sane-project.org/;
 arch=('i686' 'x86_64')
 license=('GPL')
-depends=('libtiff=4.0.0' 'libgphoto2=2.4.7-2' 'libjpeg=8' 'libieee1284' 
'libusb-compat' 'v4l-utils' 'avahi' 'bash')
+depends=('libtiff=4.0.0' 'libgphoto2=2.4.7-2' 'libjpeg=8' 'libieee1284' 
'libusb-compat' 'v4l-utils' 'avahi' 'bash' 'net-snmp')
 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,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)

[arch-commits] Commit in sane/trunk (PKGBUILD)

2012-03-01 Thread Tobias Powalowski 
Date: Friday, March 2, 2012 @ 02:57:51
  Author: tpowa
Revision: 151750

upgpkg: sane 1.0.22-6

add pkg-config file

Modified:
  sane/trunk/PKGBUILD

--+
 PKGBUILD |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-03-02 07:36:36 UTC (rev 151749)
+++ PKGBUILD2012-03-02 07:57:51 UTC (rev 151750)
@@ -6,7 +6,7 @@
 
 pkgname=sane
 pkgver=1.0.22
-pkgrel=5
+pkgrel=6
 pkgdesc=Scanner Access Now Easy
 url=http://www.sane-project.org/;
 arch=('i686' 'x86_64')
@@ -54,4 +54,8 @@
   
   # install xinetd file
   install -D -m644 ${srcdir}/sane.xinetd ${pkgdir}/etc/xinetd.d/sane
+  
+  # Install the pkg-config file
+  install -D -m644 tools/sane-backends.pc \
+ ${pkgdir}/usr/lib/pkgconfig/sane-backends.pc 
 }

[arch-commits] Commit in sane/trunk (PKGBUILD)

2012-01-24 Thread Eric Bélanger 
Date: Tuesday, January 24, 2012 @ 21:31:05
  Author: eric
Revision: 147245

upgpkg: sane 1.0.22-5

Rebuild against libpng 1.5 and libtiff 4.0

Modified:
  sane/trunk/PKGBUILD

--+
 PKGBUILD |   14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-01-25 02:07:03 UTC (rev 147244)
+++ PKGBUILD2012-01-25 02:31:05 UTC (rev 147245)
@@ -6,12 +6,12 @@
 
 pkgname=sane
 pkgver=1.0.22
-pkgrel=4
+pkgrel=5
 pkgdesc=Scanner Access Now Easy
 url=http://www.sane-project.org/;
 arch=('i686' 'x86_64')
 license=('GPL')
-depends=('libtiff=3.9.2-2' 'libgphoto2=2.4.7-2' 'libjpeg=8' 'libieee1284' 
'libusb-compat' 'v4l-utils' 'avahi' 'bash')
+depends=('libtiff=4.0.0' '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,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)
@@ -19,6 +19,10 @@
 'sane.xinetd'
 'libv4l-0.8.3.patch'
 'xerox_mfp_fix_usb_devices.patch')
+md5sums=('fadf56a60f4776bfb24491f66b617cf5'
+ 'da946cc36fb83612162cf9505986d4b2'
+ 'e645a8921cff9f18ffbdabb2ed885060'
+ 'cfef73e7db7c28308914d3db6767d852')
 options=(!libtool)
 
 build() {
@@ -46,12 +50,8 @@
   install -D -m0644 tools/udev/libsane.rules \
 ${pkgdir}/lib/udev/rules.d/53-sane.rules
   # fix udev rules
-  sed -i 's|NAME=%k, ||g' ${pkgdir}/lib/udev/rules.d/53-sane.rules
+  sed -i 's|NAME=%k, ||g' ${pkgdir}/lib/udev/rules.d/53-sane.rules
   
   # install xinetd file
   install -D -m644 ${srcdir}/sane.xinetd ${pkgdir}/etc/xinetd.d/sane
 }
-md5sums=('fadf56a60f4776bfb24491f66b617cf5'
- 'da946cc36fb83612162cf9505986d4b2'
- 'e645a8921cff9f18ffbdabb2ed885060'
- 'cfef73e7db7c28308914d3db6767d852')

[arch-commits] Commit in sane/trunk (PKGBUILD xerox_mfp_fix_usb_devices.patch)

2011-10-05 Thread Tobias Powalowski 
Date: Wednesday, October 5, 2011 @ 10:02:13
  Author: tpowa
Revision: 139859

upgpkg: sane 1.0.22-3

fix xerox scanners

Added:
  sane/trunk/xerox_mfp_fix_usb_devices.patch
Modified:
  sane/trunk/PKGBUILD

-+
 PKGBUILD|   10 +++--
 xerox_mfp_fix_usb_devices.patch |   67 ++
 2 files changed, 74 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-10-05 14:00:12 UTC (rev 139858)
+++ PKGBUILD2011-10-05 14:02:13 UTC (rev 139859)
@@ -6,7 +6,7 @@
 
 pkgname=sane
 pkgver=1.0.22
-pkgrel=2
+pkgrel=3
 pkgdesc=Scanner Access Now Easy
 url=http://www.sane-project.org/;
 arch=('i686' 'x86_64')
@@ -17,13 +17,16 @@
 
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'
-'libv4l-0.8.3.patch')
+'libv4l-0.8.3.patch'
+'xerox_mfp_fix_usb_devices.patch')
 options=(!libtool)
 
 build() {
   cd ${srcdir}/${pkgname}-backends-${pkgver}
 
   patch -p1 -i ${srcdir}/libv4l-0.8.3.patch
+  # fix https://bugs.archlinux.org/task/26114
+  patch -Np1 -i ${srcdir}/xerox_mfp_fix_usb_devices.patch
 
   ./configure --prefix=/usr \
 --sysconfdir=/etc \
@@ -50,4 +53,5 @@
 }
 md5sums=('fadf56a60f4776bfb24491f66b617cf5'
  'da946cc36fb83612162cf9505986d4b2'
- 'e645a8921cff9f18ffbdabb2ed885060')
+ 'e645a8921cff9f18ffbdabb2ed885060'
+ 'cfef73e7db7c28308914d3db6767d852')

Added: xerox_mfp_fix_usb_devices.patch
===
--- xerox_mfp_fix_usb_devices.patch (rev 0)
+++ xerox_mfp_fix_usb_devices.patch 2011-10-05 14:02:13 UTC (rev 139859)
@@ -0,0 +1,67 @@
+commit 5ea227caeacd504b64eef301e83fa63e0a25b3f7
+Author: Alex Belkin a...@telekom.ru
+Date:   Tue Mar 8 17:57:19 2011 +0300
+
+keep usb device by default (correct for bug introduced by tcp sub-backend
+
+diff --git a/backend/xerox_mfp.c b/backend/xerox_mfp.c
+index e08b50f..d4672a7 100644
+--- a/backend/xerox_mfp.c
 b/backend/xerox_mfp.c
+@@ -37,10 +37,10 @@
+ static const SANE_Device **devlist = NULL;/* sane_get_devices array */
+ static struct device *devices_head = NULL;/* sane_get_devices list */
+ 
+-transport available_transports[] = {
++enum { TRANSPORT_USB, TRANSPORT_TCP, TRANSPORTS_MAX };
++transport available_transports[TRANSPORTS_MAX] = {
+ { usb, usb_dev_request, usb_dev_open, usb_dev_close, 
usb_configure_device },
+ { tcp, tcp_dev_request, tcp_dev_open, tcp_dev_close, 
tcp_configure_device },
+-{ 0 }
+ };
+ 
+ static int resolv_state(int state)
+@@ -824,7 +824,13 @@ free_devices (void)
+   devices_head = NULL;
+ }
+ 
+-/* SANE API ignores return code of this callback */
++static transport *tr_from_devname(SANE_String_Const devname)
++{
++  if (strncmp(tcp, devname, 3) == 0)
++return available_transports[TRANSPORT_TCP];
++  return available_transports[TRANSPORT_USB];
++}
++
+ static SANE_Status
+ list_one_device (SANE_String_Const devname)
+ {
+@@ -839,12 +845,7 @@ list_one_device (SANE_String_Const devname)
+   return SANE_STATUS_GOOD;
+   }
+ 
+-  for (tr = available_transports; tr-ttype; tr++) {
+-if (!strncmp (devname, tr-ttype, strlen(tr-ttype)))
+-  break;
+-  }
+-  if (!tr-ttype)
+-return SANE_STATUS_INVAL;
++  tr = tr_from_devname(devname);
+ 
+   dev = calloc (1, sizeof (struct device));
+   if (dev == NULL)
+@@ -878,13 +879,7 @@ list_one_device (SANE_String_Const devname)
+ static SANE_Status
+ list_conf_devices (UNUSED (SANEI_Config * config), const char *devname)
+ {
+-transport *tr;
+-
+-for (tr = available_transports; tr-ttype; tr++) {
+-  if (!strncmp (devname, tr-ttype, strlen(tr-ttype)))
+-  return tr-configure_device(devname, list_one_device);
+-}
+-returnSANE_STATUS_INVAL;
++  return tr_from_devname(devname)-configure_device(devname,

[arch-commits] Commit in sane/trunk (PKGBUILD)

2011-10-05 Thread Ionut Biru 
Date: Wednesday, October 5, 2011 @ 17:45:27
  Author: ibiru
Revision: 140035

build in clean chroots FS#26287

Modified:
  sane/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-10-05 19:23:23 UTC (rev 140034)
+++ PKGBUILD2011-10-05 21:45:27 UTC (rev 140035)
@@ -6,7 +6,7 @@
 
 pkgname=sane
 pkgver=1.0.22
-pkgrel=3
+pkgrel=4
 pkgdesc=Scanner Access Now Easy
 url=http://www.sane-project.org/;
 arch=('i686' 'x86_64')

[arch-commits] Commit in sane/trunk (PKGBUILD libv4l-0.8.3.patch sane.install)

2011-05-09 Thread Andrea Scarpino 
Date: Monday, May 9, 2011 @ 16:29:22
  Author: andrea
Revision: 123295

disable lock dir usage and remove it from package; add patch to build with 
v4l-utils 0.8.3

Added:
  sane/trunk/libv4l-0.8.3.patch
Modified:
  sane/trunk/PKGBUILD
  sane/trunk/sane.install

+
 PKGBUILD   |   33 +++---
 libv4l-0.8.3.patch |   64 +++
 sane.install   |   10 +++
 3 files changed, 88 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-05-09 20:15:36 UTC (rev 123294)
+++ PKGBUILD2011-05-09 20:29:22 UTC (rev 123295)
@@ -1,12 +1,14 @@
 # $Id$
 # Maintainer: Tobias Powalowski tp...@archlinux.org
-# Contributed by Sarah Hay sarah...@mb.sympatico.ca, Tobias Powalowski 
t.p...@gmx.de, Simo L. neot...@yahoo.com, eric e...@archlinux.org
+# Contributor: Sarah Hay sarah...@mb.sympatico.ca
+# Contributor: Simo L. neot...@yahoo.com
+# Contributor: eric e...@archlinux.org
 
 pkgname=sane
 pkgver=1.0.22
-pkgrel=1
+pkgrel=2
 pkgdesc=Scanner Access Now Easy
-url=http://www.sane-project.org;
+url=http://www.sane-project.org/;
 arch=('i686' 'x86_64')
 license=('GPL')
 depends=('libtiff=3.9.2-2' 'libgphoto2=2.4.7-2' 'libjpeg=8' 'libieee1284' 
'libusb-compat' 'v4l-utils' 'avahi' 'bash')
@@ -14,12 +16,21 @@
 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,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)
+'sane.xinetd'
+'libv4l-0.8.3.patch')
 options=(!libtool)
 
 build() {
   cd ${srcdir}/${pkgname}-backends-${pkgver}
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var 
--with-docdir=/usr/share/doc/sane --enable-avahi
+
+  patch -p1 -i ${srcdir}/libv4l-0.8.3.patch
+
+  ./configure --prefix=/usr \
+--sysconfdir=/etc \
+--localstatedir=/var \
+--with-docdir=/usr/share/doc/sane \
+--enable-avahi \
+--disable-locking
   make
 }
 
@@ -33,16 +44,10 @@
 ${pkgdir}/lib/udev/rules.d/53-sane.rules
   # fix udev rules
   sed -i 's|NAME=%k, ||g' ${pkgdir}/lib/udev/rules.d/53-sane.rules
-  # fix group on /var/lock
-  mkdir -p ${pkgdir}/var/lock/sane
-  chgrp 0 ${pkgdir}/var
-  chmod 755 ${pkgdir}/var
-  chmod 1777 ${pkgdir}/var/lock
-  chgrp 0 ${pkgdir}/var/lock
-  chmod 775 ${pkgdir}/var/lock/sane
-  chgrp 96 ${pkgdir}/var/lock/sane
+  
   # install xinetd file
   install -D -m644 ${srcdir}/sane.xinetd ${pkgdir}/etc/xinetd.d/sane
 }
 md5sums=('fadf56a60f4776bfb24491f66b617cf5'
- 'da946cc36fb83612162cf9505986d4b2')
+ 'da946cc36fb83612162cf9505986d4b2'
+ 'e645a8921cff9f18ffbdabb2ed885060')

Added: libv4l-0.8.3.patch
===
--- libv4l-0.8.3.patch  (rev 0)
+++ libv4l-0.8.3.patch  2011-05-09 20:29:22 UTC (rev 123295)
@@ -0,0 +1,64 @@
+From 26c69b228b29f612faf4b0cc85db969ee7cc4ea6 Mon Sep 17 00:00:00 2001
+From: Nils Philippsen n...@redhat.com
+Date: Mon, 14 Mar 2011 13:35:05 +0100
+Subject: [PATCH] patch: v4l
+
+Squashed commit of the following:
+
+commit 23381932c76846191b42a48e505b37cd74711265
+Author: Julien BLACHE j...@jblache.org
+Date:   Wed Feb 16 19:37:43 2011 +0100
+
+Fix v4l build with libv4l 0.8.3+
+
+(cherry picked from commit c5ca46c2d1be78c651afb843cc834cf2b5b24953)
+
+Conflicts:
+
+   ChangeLog
+
+Signed-off-by: Nils Philippsen n...@redhat.com
+---
+ backend/v4l.c |3 +--
+ backend/v4l.h |3 ++-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/backend/v4l.c b/backend/v4l.c
+index 6510ef0..38595ed 100644
+--- a/backend/v4l.c
 b/backend/v4l.c
+@@ -84,9 +84,8 @@
+ #include ../include/sane/sanei_config.h
+ #define V4L_CONFIG_FILE v4l.conf
+ 
+-#include v4l.h
+-
+ #include libv4l1.h
++#include v4l.h
+ 
+ static const SANE_Device **devlist = NULL;
+ static int num_devices;
+diff --git a/backend/v4l.h b/backend/v4l.h
+index 588b96e..6aee586

[arch-commits] Commit in sane/trunk (PKGBUILD fix_xerox_mfp_color_mode.patch)

2011-02-21 Thread Tobias Powalowski 
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
===
--- PKGBUILD2011-02-21 19:14:38 UTC (rev 110714)
+++ PKGBUILD2011-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=detailatid=410366aid=312485group_id=30186
-Bug-Debian: http://bugs.debian.org/583789
-
-Index: sane-backends-1.0.21/backend/xerox_mfp.c

[arch-commits] Commit in sane/trunk (PKGBUILD)

2010-11-28 Thread Tobias Powalowski 
Date: Sunday, November 28, 2010 @ 12:19:06
  Author: tpowa
Revision: 101277

upgpkg: sane 1.0.21-3
rebuild against libusb

Modified:
  sane/trunk/PKGBUILD

--+
 PKGBUILD |   18 +++---
 1 file changed, 11 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-11-28 15:57:31 UTC (rev 101276)
+++ PKGBUILD2010-11-28 17:19:06 UTC (rev 101277)
@@ -9,14 +9,19 @@
 url=http://www.sane-project.org;
 arch=('i686' 'x86_64')
 license=('GPL')
-depends=('libtiff=3.9.2-2' 'libgphoto2=2.4.7-2' 'libjpeg=8' 'libieee1284' 
'libusb' 'libv4l' 'avahi' 'bash')
+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,v4l.conf}
 etc/xinetd.d/sane)
+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)
 options=(!libtool)
+md5sums=('be586a23633949cf2ecf0c9c6d769130'
+ '8a6443b731f04dada814e268c42b139a'
+ 'da946cc36fb83612162cf9505986d4b2'
+ 'd6542c340c2acf30ccb7ead7094ab9d9')
 
 build() {
   cd ${srcdir}/${pkgname}-backends-${pkgver}
@@ -24,6 +29,10 @@
   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
+}
+
+package () {
+  cd ${srcdir}/${pkgname}-backends-${pkgver}
   make DESTDIR=${pkgdir} install
   # fix hp officejets
   echo #hpaio  ${pkgdir}/etc/sane.d/dll.conf
@@ -43,8 +52,3 @@
   # install xinetd file
   install -D -m644 ${srcdir}/sane.xinetd ${pkgdir}/etc/xinetd.d/sane
 }
-md5sums=('be586a23633949cf2ecf0c9c6d769130'
- '8a6443b731f04dada814e268c42b139a'
- 'da946cc36fb83612162cf9505986d4b2'
- 'd6542c340c2acf30ccb7ead7094ab9d9')
-

[arch-commits] Commit in sane/trunk (PKGBUILD)

2010-11-28 Thread Tobias Powalowski 
Date: Sunday, November 28, 2010 @ 18:37:02
  Author: tpowa
Revision: 101361

upgpkg: sane 1.0.21-4
rebuild against libusb

Modified:
  sane/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-11-28 23:34:47 UTC (rev 101360)
+++ PKGBUILD2010-11-28 23:37:02 UTC (rev 101361)
@@ -4,7 +4,7 @@
 
 pkgname=sane
 pkgver=1.0.21
-pkgrel=3
+pkgrel=4
 pkgdesc=Scanner Access Now Easy
 url=http://www.sane-project.org;
 arch=('i686' 'x86_64')

[arch-commits] Commit in sane/trunk (PKGBUILD fix_xerox_mfp_color_mode.patch)

2010-07-03 Thread Ionut Biru 
Date: Saturday, July 3, 2010 @ 11:09:26
  Author: ibiru
Revision: 84679

upgpkg: sane 1.0.21-3
fix scanning FS#20053

Added:
  sane/trunk/fix_xerox_mfp_color_mode.patch
Modified:
  sane/trunk/PKGBUILD

+
 PKGBUILD   |   24 ++--
 fix_xerox_mfp_color_mode.patch |   21 +
 2 files changed, 35 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-07-03 14:55:42 UTC (rev 84678)
+++ PKGBUILD2010-07-03 15:09:26 UTC (rev 84679)
@@ -4,7 +4,7 @@
 
 pkgname=sane
 pkgver=1.0.21
-pkgrel=2
+pkgrel=3
 pkgdesc=Scanner Access Now Easy
 url=http://www.sane-project.org;
 arch=('i686' 'x86_64')
@@ -14,22 +14,24 @@
 
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,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)
+sane.xinetd
+fix_xerox_mfp_color_mode.patch)
 options=(!libtool)
 
 build() {
   cd ${srcdir}/${pkgname}-backends-${pkgver}
-  patch -Np1 -i ../sane-backends-1.0.21-i18n.patch || return 1
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var 
--with-docdir=/usr/share/doc/sane --enable-avahi || return 1
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
+  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
+  make DESTDIR=${pkgdir} install
   # fix hp officejets
-  echo #hpaio  ${pkgdir}/etc/sane.d/dll.conf || return 1
+  echo #hpaio  ${pkgdir}/etc/sane.d/dll.conf
   # install udev files
   install -D -m0644 tools/udev/libsane.rules \
-${pkgdir}/lib/udev/rules.d/53-sane.rules || return 1
+${pkgdir}/lib/udev/rules.d/53-sane.rules
   # fix udev rules
-  sed -i 's|NAME=%k, ||g' ${pkgdir}/lib/udev/rules.d/53-sane.rules || return 
1
+  sed -i 's|NAME=%k, ||g' ${pkgdir}/lib/udev/rules.d/53-sane.rules
   # fix group on /var/lock
   mkdir -p ${pkgdir}/var/lock/sane
   chgrp 0 ${pkgdir}/var
@@ -43,4 +45,6 @@
 }
 md5sums=('be586a23633949cf2ecf0c9c6d769130'
  '8a6443b731f04dada814e268c42b139a'
- 'da946cc36fb83612162cf9505986d4b2')
+ 'da946cc36fb83612162cf9505986d4b2'
+ 'd6542c340c2acf30ccb7ead7094ab9d9')
+

Added: fix_xerox_mfp_color_mode.patch
===
--- fix_xerox_mfp_color_mode.patch  (rev 0)
+++ fix_xerox_mfp_color_mode.patch  2010-07-03 15:09:26 UTC (rev 84679)
@@ -0,0 +1,21 @@
+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=detailatid=410366aid=312485group_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.0 +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

[arch-commits] Commit in sane/trunk (PKGBUILD sane.install)

2010-05-02 Thread Tobias Powalowski 
Date: Sunday, May 2, 2010 @ 10:37:34
  Author: tpowa
Revision: 79266

upgpkg: sane 1.0.21-2
fix install message

Modified:
  sane/trunk/PKGBUILD
  sane/trunk/sane.install

--+
 PKGBUILD |2 +-
 sane.install |6 --
 2 files changed, 1 insertion(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-05-02 14:08:11 UTC (rev 79265)
+++ PKGBUILD2010-05-02 14:37:34 UTC (rev 79266)
@@ -4,7 +4,7 @@
 
 pkgname=sane
 pkgver=1.0.21
-pkgrel=1
+pkgrel=2
 pkgdesc=Scanner Access Now Easy
 url=http://www.sane-project.org;
 arch=('i686' 'x86_64')

Modified: sane.install
===
--- sane.install2010-05-02 14:08:11 UTC (rev 79265)
+++ sane.install2010-05-02 14:37:34 UTC (rev 79266)
@@ -8,12 +8,6 @@
 THEEND
 }
 
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  post_install $1
-}
-
 # arg 1:  the old package version
 pre_remove() {
   usr/sbin/groupdel scanner /dev/null

[arch-commits] Commit in sane/trunk (PKGBUILD)

2010-04-30 Thread Tobias Powalowski 
Date: Friday, April 30, 2010 @ 03:49:49
  Author: tpowa
Revision: 79088

upgpkg: sane 1.0.21-1
bump to latest version

Modified:
  sane/trunk/PKGBUILD

--+
 PKGBUILD |   13 -
 1 file changed, 8 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-04-30 07:32:45 UTC (rev 79087)
+++ PKGBUILD2010-04-30 07:49:49 UTC (rev 79088)
@@ -3,23 +3,23 @@
 # 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.20
-pkgrel=5
+pkgver=1.0.21
+pkgrel=1
 pkgdesc=Scanner Access Now Easy
 url=http://www.sane-project.org;
 arch=('i686' 'x86_64')
 license=('GPL')
 depends=('libtiff=3.9.2-2' 'libgphoto2=2.4.7-2' 'libjpeg=8' 'libieee1284' 
'libusb' 'libv4l' 'avahi' 'bash')
 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,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,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,v4l.conf}
 etc/xinetd.d/sane)
+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,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)
 options=(!libtool)
-md5sums=('a0cfdfdebca2feb4f2ba5d3418b15a42'
- 'da946cc36fb83612162cf9505986d4b2')
 
 build() {
   cd ${srcdir}/${pkgname}-backends-${pkgver}
+  patch -Np1 -i ../sane-backends-1.0.21-i18n.patch || return 1
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var 
--with-docdir=/usr/share/doc/sane --enable-avahi || return 1
   make || return 1
   make DESTDIR=${pkgdir} install || return 1
@@ -41,3 +41,6 @@
   # install xinetd file
   install -D -m644 ${srcdir}/sane.xinetd ${pkgdir}/etc/xinetd.d/sane
 }
+md5sums=('be586a23633949cf2ecf0c9c6d769130'
+ '8a6443b731f04dada814e268c42b139a'
+ 'da946cc36fb83612162cf9505986d4b2')

[arch-commits] Commit in sane/trunk (PKGBUILD)

2010-01-31 Thread Tobias Powalowski 
Date: Sunday, January 31, 2010 @ 04:30:33
  Author: tpowa
Revision: 66452

upgpkg: sane 1.0.20-5
fixed udev rule syntax

Modified:
  sane/trunk/PKGBUILD

--+
 PKGBUILD |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-01-31 09:26:49 UTC (rev 66451)
+++ PKGBUILD2010-01-31 09:30:33 UTC (rev 66452)
@@ -4,7 +4,7 @@
 
 pkgname=sane
 pkgver=1.0.20
-pkgrel=4
+pkgrel=5
 pkgdesc=Scanner Access Now Easy
 url=http://www.sane-project.org;
 arch=('i686' 'x86_64')
@@ -28,6 +28,8 @@
   # install udev files
   install -D -m0644 tools/udev/libsane.rules \
 ${pkgdir}/lib/udev/rules.d/53-sane.rules || return 1
+  # fix udev rules
+  sed -i 's|NAME=%k, ||g' ${pkgdir}/lib/udev/rules.d/53-sane.rules || return 
1
   # fix group on /var/lock
   mkdir -p ${pkgdir}/var/lock/sane
   chgrp 0 ${pkgdir}/var

[arch-commits] Commit in sane/trunk (PKGBUILD)

2010-01-17 Thread Andrea Scarpino 
Date: Sunday, January 17, 2010 @ 08:37:23
  Author: andrea
Revision: 63412

upgpkg: sane 1.0.20-4
libjpeg rebuild

Modified:
  sane/trunk/PKGBUILD

--+
 PKGBUILD |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-01-17 13:34:38 UTC (rev 63411)
+++ PKGBUILD2010-01-17 13:37:23 UTC (rev 63412)
@@ -4,16 +4,16 @@
 
 pkgname=sane
 pkgver=1.0.20
-pkgrel=3
+pkgrel=4
 pkgdesc=Scanner Access Now Easy
-arch=(i686 x86_64)
+url=http://www.sane-project.org;
+arch=('i686' 'x86_64')
 license=('GPL')
-depends=('libtiff=3.8.2-5' 'libgphoto2=2.4.6-2' 'libjpeg=7' 'libieee1284' 
'libusb' 'libv4l' 'avahi' 'bash')
+depends=('libtiff=3.9.2-2' 'libgphoto2=2.4.7-2' 'libjpeg=8' 'libieee1284' 
'libusb' 'libv4l' 'avahi' 'bash')
+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,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,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,v4l.conf}
 etc/xinetd.d/sane)
 
source=(ftp://ftp.sane-project.org/pub/sane/$pkgname-backends-$pkgver/$pkgname-backends-$pkgver.tar.gz
 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_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,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,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,v4l.conf}
 etc/xinetd.d/sane)
 options=(!libtool)
 md5sums=('a0cfdfdebca2feb4f2ba5d3418b15a42'
  'da946cc36fb83612162cf9505986d4b2')