[arch-commits] Commit in sane/repos (26 files)
Date: Friday, June 22, 2012 @ 08:59:38
Author: dreisner
Revision: 162163
db-move: moved sane from [testing] to [extra] ( i686, x86_64)
Added:
sane/repos/extra-i686/PKGBUILD
(from rev 162156, sane/repos/testing-i686/PKGBUILD)
sane/repos/extra-i686/libv4l-0.8.3.patch
(from rev 162156, sane/repos/testing-i686/libv4l-0.8.3.patch)
sane/repos/extra-i686/sane.install
(from rev 162156, sane/repos/testing-i686/sane.install)
sane/repos/extra-i686/sane.xinetd
(from rev 162156, sane/repos/testing-i686/sane.xinetd)
sane/repos/extra-i686/saned.service
(from rev 162156, sane/repos/testing-i686/saned.service)
sane/repos/extra-i686/saned.socket
(from rev 162156, sane/repos/testing-i686/saned.socket)
sane/repos/extra-i686/xerox_mfp_fix_usb_devices.patch
(from rev 162156, sane/repos/testing-i686/xerox_mfp_fix_usb_devices.patch)
sane/repos/extra-x86_64/PKGBUILD
(from rev 162156, sane/repos/testing-x86_64/PKGBUILD)
sane/repos/extra-x86_64/libv4l-0.8.3.patch
(from rev 162156, sane/repos/testing-x86_64/libv4l-0.8.3.patch)
sane/repos/extra-x86_64/sane.install
(from rev 162156, sane/repos/testing-x86_64/sane.install)
sane/repos/extra-x86_64/sane.xinetd
(from rev 162156, sane/repos/testing-x86_64/sane.xinetd)
sane/repos/extra-x86_64/saned.service
(from rev 162156, sane/repos/testing-x86_64/saned.service)
sane/repos/extra-x86_64/saned.socket
(from rev 162156, sane/repos/testing-x86_64/saned.socket)
sane/repos/extra-x86_64/xerox_mfp_fix_usb_devices.patch
(from rev 162156, sane/repos/testing-x86_64/xerox_mfp_fix_usb_devices.patch)
Deleted:
sane/repos/extra-i686/PKGBUILD
sane/repos/extra-i686/libv4l-0.8.3.patch
sane/repos/extra-i686/sane.install
sane/repos/extra-i686/sane.xinetd
sane/repos/extra-i686/xerox_mfp_fix_usb_devices.patch
sane/repos/extra-x86_64/PKGBUILD
sane/repos/extra-x86_64/libv4l-0.8.3.patch
sane/repos/extra-x86_64/sane.install
sane/repos/extra-x86_64/sane.xinetd
sane/repos/extra-x86_64/xerox_mfp_fix_usb_devices.patch
sane/repos/testing-i686/
sane/repos/testing-x86_64/
--+
extra-i686/PKGBUILD | 133 +---
extra-i686/libv4l-0.8.3.patch| 128 +++
extra-i686/sane.install | 14 +-
extra-i686/sane.xinetd | 22 ++--
extra-i686/saned.service |8 +
extra-i686/saned.socket |9 +
extra-i686/xerox_mfp_fix_usb_devices.patch | 134 -
extra-x86_64/PKGBUILD| 133 +---
extra-x86_64/libv4l-0.8.3.patch | 128 +++
extra-x86_64/sane.install| 14 +-
extra-x86_64/sane.xinetd | 22 ++--
extra-x86_64/saned.service |8 +
extra-x86_64/saned.socket|9 +
extra-x86_64/xerox_mfp_fix_usb_devices.patch | 134 -
14 files changed, 476 insertions(+), 420 deletions(-)
Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2012-06-22 12:59:21 UTC (rev 162162)
+++ extra-i686/PKGBUILD 2012-06-22 12:59:38 UTC (rev 162163)
@@ -1,61 +0,0 @@
-# $Id$
-# Maintainer: Tobias Powalowski
-# Contributor: Sarah Hay
-# Contributor: Simo L.
-# Contributor: eric
-
-pkgname=sane
-pkgver=1.0.22
-pkgrel=8
-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')
-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)
-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')
-md5
[arch-commits] Commit in sane/repos (26 files)
Date: Monday, June 3, 2013 @ 12:25:11
Author: tpowa
Revision: 187017
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
sane/repos/extra-i686/1.0.23-hp2400c.patch
(from rev 187016, sane/trunk/1.0.23-hp2400c.patch)
sane/repos/extra-i686/PKGBUILD
(from rev 187016, sane/trunk/PKGBUILD)
sane/repos/extra-i686/kodakaio.c.patch
(from rev 187016, sane/trunk/kodakaio.c.patch)
sane/repos/extra-i686/network.patch
(from rev 187016, sane/trunk/network.patch)
sane/repos/extra-i686/sane.xinetd
(from rev 187016, sane/trunk/sane.xinetd)
sane/repos/extra-i686/saned.service
(from rev 187016, sane/trunk/saned.service)
sane/repos/extra-i686/saned.socket
(from rev 187016, sane/trunk/saned.socket)
sane/repos/extra-x86_64/1.0.23-hp2400c.patch
(from rev 187016, sane/trunk/1.0.23-hp2400c.patch)
sane/repos/extra-x86_64/PKGBUILD
(from rev 187016, sane/trunk/PKGBUILD)
sane/repos/extra-x86_64/kodakaio.c.patch
(from rev 187016, sane/trunk/kodakaio.c.patch)
sane/repos/extra-x86_64/network.patch
(from rev 187016, sane/trunk/network.patch)
sane/repos/extra-x86_64/sane.xinetd
(from rev 187016, sane/trunk/sane.xinetd)
sane/repos/extra-x86_64/saned.service
(from rev 187016, sane/trunk/saned.service)
sane/repos/extra-x86_64/saned.socket
(from rev 187016, sane/trunk/saned.socket)
Deleted:
sane/repos/extra-i686/PKGBUILD
sane/repos/extra-i686/kodakaio.c.patch
sane/repos/extra-i686/network.patch
sane/repos/extra-i686/sane.xinetd
sane/repos/extra-i686/saned.service
sane/repos/extra-i686/saned.socket
sane/repos/extra-x86_64/PKGBUILD
sane/repos/extra-x86_64/kodakaio.c.patch
sane/repos/extra-x86_64/network.patch
sane/repos/extra-x86_64/sane.xinetd
sane/repos/extra-x86_64/saned.service
sane/repos/extra-x86_64/saned.socket
---+
/PKGBUILD | 160
/kodakaio.c.patch | 22
/network.patch| 84 ++
/sane.xinetd | 22
/saned.service| 16 +++
/saned.socket | 18
extra-i686/1.0.23-hp2400c.patch | 81 ++
extra-i686/PKGBUILD | 77 -
extra-i686/kodakaio.c.patch | 11 --
extra-i686/network.patch | 42 -
extra-i686/sane.xinetd| 11 --
extra-i686/saned.service |8 -
extra-i686/saned.socket |9 --
extra-x86_64/1.0.23-hp2400c.patch | 81 ++
extra-x86_64/PKGBUILD | 77 -
extra-x86_64/kodakaio.c.patch | 11 --
extra-x86_64/network.patch| 42 -
extra-x86_64/sane.xinetd | 11 --
extra-x86_64/saned.service|8 -
extra-x86_64/saned.socket |9 --
20 files changed, 484 insertions(+), 316 deletions(-)
Copied: sane/repos/extra-i686/1.0.23-hp2400c.patch (from rev 187016,
sane/trunk/1.0.23-hp2400c.patch)
===
--- extra-i686/1.0.23-hp2400c.patch (rev 0)
+++ extra-i686/1.0.23-hp2400c.patch 2013-06-03 10:25:11 UTC (rev 187017)
@@ -0,0 +1,81 @@
+From 9a8b640d8da2190ff1695169bfa45ce633b5e8c2 Mon Sep 17 00:00:00 2001
+From: =?utf8?q?St=C3=A9phane=20Voltz?=
+Date: Mon, 3 Jun 2013 06:33:08 +0200
+Subject: [PATCH] bug 314293 fix
+
+- don't use non-existent end of records
+---
+ ChangeLog |3 +++
+ backend/genesys_gl646.c | 14 +++---
+ 2 files changed, 10 insertions(+), 7 deletions(-)
+
+diff --git a/backend/genesys_gl646.c b/backend/genesys_gl646.c
+index c6a5af5..2d5cddc 100644
+--- a/backend/genesys_gl646.c
b/backend/genesys_gl646.c
+@@ -550,7 +550,7 @@ get_lowest_resolution (int sensor, SANE_Bool color)
+ i = 0;
+ dpi = 9600;
+ nb = sizeof (sensor_master) / sizeof (Sensor_Master);
+- while (sensor_master[i].sensor != -1 && i < nb)
++ while (i < nb)
+ {
+ /* computes distance and keep mode if it is closer than previous */
+ if (sensor == sensor_master[i].sensor
+@@ -584,7 +584,7 @@ get_closest_resolution (int sensor, int required,
SANE_Bool color)
+ dpi = 0;
+ dist = 9600;
+ nb = sizeof (sensor_master) / sizeof (Sensor_Master);
+- while (sensor_master[i].sensor != -1 && i < nb)
++ while (i < nb)
+ {
+ /* exit on perfect match */
+ if (sensor == sensor_master[i].sensor
+@@ -627,7 +627,7 @@ is_half_ccd (int sensor, int required, SANE_Bool color)
+
+ i = 0;
+ nb = sizeof (sensor_master) / sizeof (Sensor_Master);
+- while (sensor_master[i].sensor != -1 && i < nb)
++ while (i < nb)
+ {
+ /* exit on perfect match */
+ if (sensor == sensor_master[i].sensor
+@@ -658,7 +658,7 @@ get_cksel (int sensor, int required, SANE_Bool color)
+
+ i = 0;
+ nb = sizeof (sensor_master) / sizeof (Sensor_Master);
+- while (sensor_master[i
[arch-commits] Commit in sane/repos (26 files)
Date: Wednesday, April 10, 2013 @ 09:43:35
Author: tpowa
Revision: 182410
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
sane/repos/extra-i686/PKGBUILD
(from rev 182409, sane/trunk/PKGBUILD)
sane/repos/extra-i686/kodakaio.c.patch
(from rev 182409, sane/trunk/kodakaio.c.patch)
sane/repos/extra-i686/network.patch
(from rev 182409, sane/trunk/network.patch)
sane/repos/extra-i686/sane.xinetd
(from rev 182409, sane/trunk/sane.xinetd)
sane/repos/extra-i686/saned.service
(from rev 182409, sane/trunk/saned.service)
sane/repos/extra-i686/saned.socket
(from rev 182409, sane/trunk/saned.socket)
sane/repos/extra-x86_64/PKGBUILD
(from rev 182409, sane/trunk/PKGBUILD)
sane/repos/extra-x86_64/kodakaio.c.patch
(from rev 182409, sane/trunk/kodakaio.c.patch)
sane/repos/extra-x86_64/network.patch
(from rev 182409, sane/trunk/network.patch)
sane/repos/extra-x86_64/sane.xinetd
(from rev 182409, sane/trunk/sane.xinetd)
sane/repos/extra-x86_64/saned.service
(from rev 182409, sane/trunk/saned.service)
sane/repos/extra-x86_64/saned.socket
(from rev 182409, sane/trunk/saned.socket)
Deleted:
sane/repos/extra-i686/PKGBUILD
sane/repos/extra-i686/kodakaio.c.patch
sane/repos/extra-i686/network.patch
sane/repos/extra-i686/sane.install
sane/repos/extra-i686/sane.xinetd
sane/repos/extra-i686/saned.service
sane/repos/extra-i686/saned.socket
sane/repos/extra-x86_64/PKGBUILD
sane/repos/extra-x86_64/kodakaio.c.patch
sane/repos/extra-x86_64/network.patch
sane/repos/extra-x86_64/sane.install
sane/repos/extra-x86_64/sane.xinetd
sane/repos/extra-x86_64/saned.service
sane/repos/extra-x86_64/saned.socket
---+
/PKGBUILD | 152
/kodakaio.c.patch | 22 +
/network.patch| 84 ++
/sane.xinetd | 22 +
/saned.service| 16
/saned.socket | 18
extra-i686/PKGBUILD | 73 ---
extra-i686/kodakaio.c.patch | 11 --
extra-i686/network.patch | 42 ---
extra-i686/sane.install |7 -
extra-i686/sane.xinetd| 11 --
extra-i686/saned.service |8 --
extra-i686/saned.socket |9 --
extra-x86_64/PKGBUILD | 73 ---
extra-x86_64/kodakaio.c.patch | 11 --
extra-x86_64/network.patch| 42 ---
extra-x86_64/sane.install |7 -
extra-x86_64/sane.xinetd | 11 --
extra-x86_64/saned.service|8 --
extra-x86_64/saned.socket |9 --
20 files changed, 314 insertions(+), 322 deletions(-)
Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2013-04-10 07:43:20 UTC (rev 182409)
+++ extra-i686/PKGBUILD 2013-04-10 07:43:35 UTC (rev 182410)
@@ -1,73 +0,0 @@
-# $Id$
-# Maintainer: Tobias Powalowski
-# Contributor: Sarah Hay
-# Contributor: Simo L.
-# Contributor: eric
-
-pkgname=sane
-pkgver=1.0.23
-pkgrel=3
-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'
-'saned.socket'
-'saned.service'
-'kodakaio.c.patch'
-'network.patch')
-options=(!libtool)
-
-build() {
- cd "${srcdir}/${pkgname}-backends-${pkgver}"
-
- # fix FS#33657
- patch -Np0 -i ${srcdir}/kodakaio.c.patch
- # fix
http://vasks.debian.org/tracker/?func=detail&atid=410366&aid=313760&group_id=30186
- patch -Np1 -i ${srcdir}/network.patch
-
- ./configure --prefix=/usr \
---sysconfdir=/etc \
---localstatedir=/var \
---wit
