rpms/sane-backends
7
0
Fork 0
Code Issues Pull Requests Releases Activity

version 1.0.22

Browse Source 
remove obsolete i18n, xerox-mfp-color-mode, epson2-fixes, open-macro patches
update pkgconfig, udev, docs-utf8, v4l, man-encoding patches
submit patches upstream where this is applicable, add comments
manually install pkg-config file
This commit is contained in:
Nils Philippsen 2011-03-16 18:17:05 +01:00
parent 96b986d076
commit 4c4b8135b8
18 changed files with 869 additions and 1543 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1 +1,2 @@
sane-backends-1.0.21.tar.gz
/sane-backends-1.0.22.tar.gz

66
sane-backends-1.0.20-open-macro.patch
View File

@ -1,66 +0,0 @@
commit 7987b0332e6b660ac7992176daeede40cab98390
Author: Nils Philippsen <nils@redhat.com>
Date: Tue Jun 16 17:02:49 2009 +0200
patch: open-macro
Squashed commit of the following:
commit ab8fe801c4f82017988cb44cb79d82d286aa0de4
Author: Nils Philippsen <nils@redhat.com>
Date: Tue Jun 9 17:57:45 2009 +0200
don't inadvertently use glibc open() macro
diff --git a/backend/mustek_pp.c b/backend/mustek_pp.c
index 8c3f06a..7e9d094 100644
--- a/backend/mustek_pp.c
+++ b/backend/mustek_pp.c
@@ -1152,7 +1152,7 @@ sane_open (SANE_String_Const devicename, SANE_Handle * handle)
}
- if ((status = dev->func->open (dev->port, dev->caps, &fd)) != SANE_STATUS_GOOD) {
+ if ((status = (dev->func->open) (dev->port, dev->caps, &fd)) != SANE_STATUS_GOOD) {
DBG (1, "sane_open: could not open device (%s)\n",
sane_strstatus (status));
diff --git a/backend/pixma_common.c b/backend/pixma_common.c
index 2bcb3c1..c5e1e96 100644
--- a/backend/pixma_common.c
+++ b/backend/pixma_common.c
@@ -511,7 +511,7 @@ pixma_open (unsigned devnr, pixma_t ** handle)
strncpy (s->id, pixma_get_device_id (devnr), sizeof (s->id) - 1);
s->ops = s->cfg->ops;
s->scanning = 0;
- error = s->ops->open (s);
+ error = (s->ops->open) (s);
if (error < 0)
goto rollback;
error = pixma_deactivate (s->io);
diff --git a/backend/plustek_pp.c b/backend/plustek_pp.c
index 13d1443..629e238 100644
--- a/backend/plustek_pp.c
+++ b/backend/plustek_pp.c
@@ -258,7 +258,7 @@ static int drvopen( Plustek_Device *dev )
DBG( _DBG_INFO, "drvopen()\n" );
- handle = dev->open((const char*)dev->name, (void *)dev );
+ handle = (dev->open)((const char*)dev->name, (void *)dev );
tsecs = 0;
diff --git a/sanei/sanei_scsi.c b/sanei/sanei_scsi.c
index 69d5859..a594aba 100644
--- a/sanei/sanei_scsi.c
+++ b/sanei/sanei_scsi.c
@@ -5328,7 +5328,7 @@ sanei_scsi_find_devices (const char *findvendor, const char *findmodel,
(*plugInInterface)->Release (plugInInterface);
IOObjectRelease (scsiDevice);
- ioReturnValue = (*scsiDeviceInterface)->open (scsiDeviceInterface);
+ ioReturnValue = ((*scsiDeviceInterface)->open) (scsiDeviceInterface);
if (ioReturnValue != kIOReturnSuccess)
{
DBG (5, "Error opening SCSI interface (0x%08x)\n", ioReturnValue);

166
sane-backends-1.0.21-automake.patch
View File

@ -1,166 +0,0 @@
diff -up sane-backends-1.0.21/backend/Makefile.in.automake sane-backends-1.0.21/backend/Makefile.in
--- sane-backends-1.0.21/backend/Makefile.in.automake 2010-05-05 13:27:58.924821528 +0200
+++ sane-backends-1.0.21/backend/Makefile.in 2010-05-05 13:28:43.237080981 +0200
@@ -4720,7 +4720,8 @@ install-firmware-path:
done
install-lockpath:
- $(mkinstalldirs) -m 775 -g $(LOCKPATH_GROUP) $(DESTDIR)$(locksanedir)
+ $(mkinstalldirs) -m 775 -g $(LOCKPATH_GROUP) $(DESTDIR)$(locksanedir) || \
+ $(mkinstalldirs) -m 775 $(DESTDIR)$(locksanedir)
uninstall-hook:
rm -rf $(DESTDIR)$(libdir)/sane $(DESTDIR)$(configdir) $(DESTDIR)$(locksanedir)
diff -up sane-backends-1.0.21/tools/Makefile.in.automake sane-backends-1.0.21/tools/Makefile.in
--- sane-backends-1.0.21/tools/Makefile.in.automake 2010-05-05 13:28:20.439822508 +0200
+++ sane-backends-1.0.21/tools/Makefile.in 2010-05-05 13:28:43.886070205 +0200
@@ -16,6 +16,7 @@
@SET_MAKE@
+
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
@@ -50,7 +51,8 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/m
CONFIG_HEADER = $(top_builddir)/include/sane/config.h
CONFIG_CLEAN_FILES = sane-config sane-backends.pc
CONFIG_CLEAN_VPATH_FILES =
-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)"
+am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" \
+ "$(DESTDIR)$(pkgconfigdir)"
PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
am_gamma4scanimage_OBJECTS = gamma4scanimage.$(OBJEXT)
gamma4scanimage_OBJECTS = $(am_gamma4scanimage_OBJECTS)
@@ -105,6 +107,7 @@ SOURCES = $(gamma4scanimage_SOURCES) $(s
$(sane_find_scanner_SOURCES) $(umax_pp_SOURCES)
DIST_SOURCES = $(gamma4scanimage_SOURCES) $(sane_desc_SOURCES) \
$(sane_find_scanner_SOURCES) $(umax_pp_SOURCES)
+DATA = $(pkgconfig_DATA)
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -274,6 +277,8 @@ top_srcdir = @top_srcdir@
AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_builddir)/include \
-I$(top_srcdir)/include
+SUFFIXES = .pc.in .pc
+pkgconfigdir = ${libdir}/pkgconfig
@CROSS_COMPILING_FALSE@HOTPLUG = hal/libsane.fdi hotplug/libsane.usermap hotplug-ng/libsane.db \
@CROSS_COMPILING_FALSE@ udev/libsane.rules
@@ -286,9 +291,10 @@ bin_SCRIPTS = sane-config
noinst_SCRIPTS = $(HOTPLUG)
BUILT_SOURCES = $(HOTPLUG_DIR)
CLEANFILES = $(bin_SCRIPTS) $(dist_noinst_SCRIPTS)
+pkgconfig_DATA = sane-backends.pc
EXTRA_DIST = check-po.awk libtool-get-dll-ext mustek600iin-off.c \
- RenSaneDlls.cmd README xerox hotplug/README \
- hotplug/libusbscanner hotplug-ng/README \
+ RenSaneDlls.cmd README xerox sane-backends.pc.in \
+ hotplug/README hotplug/libusbscanner hotplug-ng/README \
hotplug-ng/libsane.hotplug openbsd/attach openbsd/detach
sane_find_scanner_SOURCES = sane-find-scanner.c check-usb-chip.c \
../backend/sane_strstatus.c
@@ -307,7 +313,7 @@ all: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) all-am
.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
+.SUFFIXES: .pc.in .pc .c .lo .o .obj
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
@@ -523,6 +529,26 @@ mostlyclean-libtool:
clean-libtool:
-rm -rf .libs _libs
+install-pkgconfigDATA: $(pkgconfig_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"
+ @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \
+ done
+
+uninstall-pkgconfigDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ test -n "$$files" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -609,9 +635,9 @@ distdir: $(DISTFILES)
check-am: all-am
check: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) check-am
-all-am: Makefile $(PROGRAMS) $(SCRIPTS)
+all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(DATA)
installdirs:
- for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)"; do \
+ for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkgconfigdir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: $(BUILT_SOURCES)
@@ -665,7 +691,7 @@ info: info-am
info-am:
-install-data-am:
+install-data-am: install-pkgconfigDATA
install-dvi: install-dvi-am
@@ -711,7 +737,8 @@ ps: ps-am
ps-am:
-uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS
+uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \
+ uninstall-pkgconfigDATA
.MAKE: all check install install-am install-strip
@@ -723,14 +750,19 @@ uninstall-am: uninstall-binPROGRAMS unin
install-binSCRIPTS install-data install-data-am install-dvi \
install-dvi-am install-exec install-exec-am install-html \
install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
- pdf pdf-am ps ps-am tags uninstall uninstall-am \
- uninstall-binPROGRAMS uninstall-binSCRIPTS
+ install-pdf install-pdf-am install-pkgconfigDATA install-ps \
+ install-ps-am install-strip installcheck installcheck-am \
+ installdirs maintainer-clean maintainer-clean-generic \
+ mostlyclean mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+ uninstall-am uninstall-binPROGRAMS uninstall-binSCRIPTS \
+ uninstall-pkgconfigDATA
+.pc.in.pc:
+ cd $(top_builddir) \
+ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
# When build directory is not same as source directory then any
# subdirectories that targets use must be manually created (under
# the build directory that is).
@@ -755,6 +787,8 @@ hal/libsane.fdi: $(wildcard ${top_srcdir
@./sane-desc -m hal -s ${top_srcdir}/doc/descriptions:${top_srcdir}/doc/descriptions-external \
-d 0 > $@
+sane-backends.pc: $(top_builddir)/config.status
+
clean-local:
rm -f $(HOTPLUG)

639
sane-backends-1.0.21-docs-utf8.patch
View File

@ -1,639 +0,0 @@
From ad6d50c9e6cab61dbe027a2ab176a37cd6dd2289 Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils@redhat.com>
Date: Wed, 5 May 2010 13:11:58 +0200
Subject: [PATCH] patch: docs-utf8
Squashed commit of the following:
commit b2161eec3aaca96c497108c644fd82af78a81b24
Author: Nils Philippsen <nils@redhat.com>
Date: Wed May 5 13:11:19 2010 +0200
convert some doc files to UTF-8
---
AUTHORS | 20 +++---
ChangeLog | 116 +++++++++++++++++-----------------
NEWS | 2 +-
doc/descriptions.txt | 2 +-
doc/gt68xx/gt68xx.CHANGES | 2 +-
doc/mustek/mustek.CHANGES | 2 +-
doc/plustek/Plustek-PARPORT-TODO.txt | 2 +-
doc/plustek/Plustek-PARPORT.txt | 2 +-
doc/plustek/Plustek-USB.txt | 2 +-
doc/u12/U12.changes | 2 +-
doc/u12/U12.todo | 2 +-
11 files changed, 77 insertions(+), 77 deletions(-)
diff --git a/AUTHORS b/AUTHORS
index f976422..8286bcb 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -9,7 +9,7 @@ Java API:
Backends:
abaton: David Huggins-Daines
- agfafocus: Karl Anders Øygard
+ agfafocus: Karl Anders Øygard
apple: Milon Firikis
artec: Chris Pinkham
artec_eplus48u:Sergey Vlasov, Andreas Nowack, David Stevenson, and
@@ -38,7 +38,7 @@ Backends:
fujitsu: Randolph Bentson, Frederik Ramm, Oliver Schirrmeister (*),
m. allan noah (*)
gphoto2: Peter Fales (*)
- genesys: Henning Geinitz (*), Gerhard Jaeger (*), Stéphane Voltz (*),
+ genesys: Henning Geinitz (*), Gerhard Jaeger (*), Stéphane Voltz (*),
Pierre Willenbrock (*)
gt68xx: Sergey Vlasov, Andreas Nowack, David Stevenson, and
Henning Geinitz (*)
@@ -51,11 +51,11 @@ Backends:
Frank Zago, Henning Geinitz (*)
hp5400: Martijn van Oosterhout, Thomas Soumarmon (*)
hp5590: Ilia Sotnikov (*)
- hpljm1005: Philippe Rétornaz
+ hpljm1005: Philippe Rétornaz
hs2p: Jeremy Johnson
ibm: M.F., Henning Geinitz (*)
leo: Frank Zago (*)
- lexmark: Fred Odendaal, Stéphane Voltz (*)
+ lexmark: Fred Odendaal, Stéphane Voltz (*)
ma1509: Henning Geinitz (*)
matsushita: Frank Zago (*)
microtek: Matthew Marjanovic (*)
@@ -68,7 +68,7 @@ Backends:
nec: Kazuya Fukuda (*)
net: Andreas Beck, David Mosberger, Julien Blache (*)
niash: Ullrich Sigwanz (*), Bertrik Sikken
- p5: Stéphane Voltz (*)
+ p5: Stéphane Voltz (*)
pie: Simon Munton (*)
pint: Gordon Matzigkeit
pixma: Wittawat Yamwong (*)
@@ -83,7 +83,7 @@ Backends:
despeckling filter by Patrick Reynolds,
B&W fixes by Andrew Kuchling
ricoh: Feico W. Dillema
- rts8891: Stéphane Voltz (*)
+ rts8891: Stéphane Voltz (*)
s9036: Ingo Schneider
sceptre: Frank Zago (*)
sharp: Kazuya Fukuda (*) and Abel Deuring (*)
@@ -101,7 +101,7 @@ Backends:
test: Henning Geinitz (*)
u12: Gerhard Jaeger (*)
umax: Oliver Rauch (*) and Michael K. Johnson
- umax_pp: Stéphane Voltz (*)
+ umax_pp: Stéphane Voltz (*)
umax1220u: Marcio L. Teixeira, Patrick Lessard
v4l: Juergen G. Schimmer, and Henning Geinitz (*)
xerox_mfp: Alex Belkin (*)
@@ -111,7 +111,7 @@ Frontends:
jscanimage: Jeff Freedman and Guido Muesch
saned: Andreas Beck, David Mosberger, Julien Blache (*)
scanimage: Andreas Beck, David Mosberger, Gordon Matzigkeit,
- m. allan noah (*), Julien Blache (*), Stéphane Voltz (*)
+ m. allan noah (*), Julien Blache (*), Stéphane Voltz (*)
tstbackend: Frank Zago (*)
Sanei internal code:
@@ -188,7 +188,7 @@ Jon Chambers <jon@jon.demon.co.uk>
Jonathan Bravo Lopez <jkdsoft@gmail.com>
Juergen G. Schimmer <schimmi@nbgm.siemens.de>
Julien Blache <jb@jblache.org>
-Karl Anders Øygard <karlo@opera.no>
+Karl Anders Øygard <karlo@opera.no>
Karl Heinz Kremer <khk@khk.net>
Karsten Festag <karsten.festag@gmx.de>
Kazuhiro Sasayama <kaz@hypercore.co.jp>
@@ -230,7 +230,7 @@ Sebastien Sable <Sebastien.Sable@snv.jussieu.fr>
Sergey Vlasov <vsu@altlinux.ru>
Simon Krix <kinsei@users.sourceforge.net>
Simon Munton <simon@munton.demon.co.uk>
-Stéphane Voltz <stef.dev@free.fr>
+Stéphane Voltz <stef.dev@free.fr>
Thomas Soumarmon <soumarmt@nerim.net>
Tom Martone <tom@martoneconsulting.com>
Tom Wang <tom.wang@mustek.com.tw>
diff --git a/ChangeLog b/ChangeLog
index 6c2ccd2..ccdb6ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -44,7 +44,7 @@
Add u_short to complete definition of u_* types which
helps out ming when we define _BSDTYPES_DEFINED.
-2010-03-25 Stéphane Voltz <stef.dev at free.fr>
+2010-03-25 Stéphane Voltz <stef.dev at free.fr>
* backend/p5.c backend/p5_device.[ch] backend/genesys_gl646.c:
replace u_int8_t and u_int16_t by uint8_t and uint16_t
@@ -68,7 +68,7 @@
2010-04-02 Chris Bagwell <chris at cnpbagwell dot com>
* po/Makefile.am: Remove unneeded distclean-local target.
-2010-03-25 Stéphane Voltz <stef.dev at free.fr>
+2010-03-25 Stéphane Voltz <stef.dev at free.fr>
* backend/kvs1025.c: compile fix
2010-03-25 m. allan noah <kitno455 at gmail dot com>
@@ -76,7 +76,7 @@
* doc/descriptions/kvs1025.desc, doc/sane-kvs1025.man: update docs
* backend/dll.conf.in, configure, configure.in: enable kvs1025 backend
-2010-03-16 Stéphane Voltz <stef.dev at free.fr>
+2010-03-16 Stéphane Voltz <stef.dev at free.fr>
* backend/rts8891.c: change register 0x11 settings for sensor type 1
2010-03-15 Nicolas Martin <nicols-guest at users.alioth.debian.org>
@@ -84,41 +84,41 @@
pixma: fix color shifts for MP990 up to 2400 dpi
updated and reorderd descs for several models.
-2010-03-15 Stéphane Voltz <stef.dev at free.fr>
+2010-03-15 Stéphane Voltz <stef.dev at free.fr>
* backend/genesys.[ch] backend/genesys_devices.c backend/genesys_low.h
backend/genesys_gl646.[ch] backend/genesys_gl841.c: full transparency
adaptor support for gl646 based scanners
-2010-03-11 Stéphane Voltz <stef.dev at free.fr>
+2010-03-11 Stéphane Voltz <stef.dev at free.fr>
* backend/rts8891.c: further register tweaking for 600 dpi scans
-2010-03-11 Stéphane Voltz <stef.dev at free.fr>
+2010-03-11 Stéphane Voltz <stef.dev at free.fr>
* backend/lexmark.c: minor bugfix when assigning possible dpi list
-2010-03-07 Stéphane Voltz <stef.dev at free.fr>
+2010-03-07 Stéphane Voltz <stef.dev at free.fr>
* backend/rts8891.c: tweak register settings at 600 dpi for HP4470
-2010-03-05 Stéphane Voltz <stef.dev at free.fr>
+2010-03-05 Stéphane Voltz <stef.dev at free.fr>
* backend/rts8891.c: fix HP4470 sensor detection
-2010-03-04 Stéphane Voltz <stef.dev at free.fr>
+2010-03-04 Stéphane Voltz <stef.dev at free.fr>
* backend/rts8891.c backend/rts8891.h: add debug traces for sensor
type handling
-2010-03-04 Stéphane Voltz <stef.dev at free.fr>
+2010-03-04 Stéphane Voltz <stef.dev at free.fr>
* doc/desc/genesys.desc: fix HP2400/G2410 USB id, update HP3670
status
-2010-03-01 Stéphane Voltz <stef.dev at free.fr>
+2010-03-01 Stéphane Voltz <stef.dev at free.fr>
* doc/sane-p5.man doc/sane-umax_pp.man doc/sane-rts8891.man
doc/sane-lexmark.man: fix author name accentuation and capitalization
-2010-03-01 Stéphane Voltz <stef.dev at free.fr>
+2010-03-01 Stéphane Voltz <stef.dev at free.fr>
* backend/genesys.c backend/genesys_gl646.c
backend/genesys_devices.h: enable warming up and calibration cache
for HP3670
-2010-02-28 Stéphane Voltz <stef.dev at free.fr>
+2010-02-28 Stéphane Voltz <stef.dev at free.fr>
* backend/genesys_devices.c backend/genesys_gl646.c
backend/genesys_gl646.h: tune HP2400/G2410 settings
@@ -133,15 +133,15 @@
add S1500M entry by Harald Weis
* tools/sane-desc.c: Condense warnings about half-baked .desc files
-2010-02-27 Stéphane Voltz <stef.dev at free.fr>
+2010-02-27 Stéphane Voltz <stef.dev at free.fr>
* backend/genesys.c backend/genesys_devices.c backend/genesys_gl646.c
backend/genesys_gl646.h: final work for HP3670 full support
-2010-02-25 Stéphane Voltz <stef.dev at free.fr>
+2010-02-25 Stéphane Voltz <stef.dev at free.fr>
* backend/genesys_gl646.c: fix regression for gl646 CCD scanners due
to incorrect color filter setting.
-2010-02-23 Stéphane Voltz <stef.dev at free.fr>
+2010-02-23 Stéphane Voltz <stef.dev at free.fr>
* backend/genesys.c backend/genesys_devices.c backend/genesys_gl646.c
backend/genesys_gl646.h: XP200 calibration rework. Some HP3670
improvements.
@@ -153,12 +153,12 @@
2010-02-22 Julien Blache <jb@jblache.org>
* doc/descriptions-external/epkowa.desc: Updated for iscan 2.24.0.
-2010-02-16 Stéphane Voltz <stef.dev at free.fr>
+2010-02-16 Stéphane Voltz <stef.dev at free.fr>
* backend/genesys.c backend/genesys_devices.c backend/genesys_gl646.c
backend/genesys_gl646.h backend/genesys_low.h: buttons and basic XPA
support for HP3670.
-2010-02-15 Stéphane Voltz <stef.dev at free.fr>
+2010-02-15 Stéphane Voltz <stef.dev at free.fr>
* backend/p5.c backend/p5.h backend/p5_device.c backend/p5_device.h
backend/p5.conf.in doc/descriptions/p5.desc doc/sane-p5.man: add new p5 backend for
Primax PagePartner
@@ -180,10 +180,10 @@
2010-02-12 m. allan noah <kitno455 at gmail dot com>
* backend/fujitsu.c: disable bg_color for S1500
-2010-02-12 Stéphane Voltz <stef.dev at free.fr>
+2010-02-12 Stéphane Voltz <stef.dev at free.fr>
* backend/genesys_gl646.c: fixed MD5345 calibration
-2010-02-12 Stéphane Voltz <stef.dev at free.fr>
+2010-02-12 Stéphane Voltz <stef.dev at free.fr>
* doc/descriptions/genesys.desc backend/genesys.c
backend/genesys_devices.c backend/genesys_gl646.c
backend/genesys_gl646.h: added support for hp3670, uncalibrated scans
@@ -224,7 +224,7 @@
- clean #include lines
* doc/sane.man: add missing backends
-2010-02-10 Stéphane Voltz <stef.dev ar free.fr>
+2010-02-10 Stéphane Voltz <stef.dev ar free.fr>
* doc/descriptions/genesys.desc: added G2410
2010-02-10 m. allan noah <kitno455 at gmail dot com>
@@ -243,25 +243,25 @@
backend/epjitsu.conf.in:
- cleanup #include lines, copyrights, manual, and supported scanners.
-2010-02-08 Stéphane Voltz <stef.dev ar free.fr>
+2010-02-08 Stéphane Voltz <stef.dev ar free.fr>
* backend/genesys.c backend/genesys.h backend/genesys_conv.c
backend/genesys_devices.c backend/genesys_gl646.c
backend/genesys_gl646.h: working uncalibrated 150/300 dpi modes for
HP3670. Enable custom gamma for gl841 based scanners. Turned dynamic
line-art to be default.
-2010-02-03 Stéphane Voltz <stef.dev at free.fr>
+2010-02-03 Stéphane Voltz <stef.dev at free.fr>
* backend/genesys_conv.c: add safeguards when doing gray normalization
2010-02-02 Nicolas Martin <nicols-guest at users.alioth.debian.org>
* doc/sane-pixma.man, doc/descriptions/pixma.desc:
pixma: updated docs for supported model ImageCLASS MF4350d.
-2010-01-31 Stéphane Voltz <stef.dev at free.fr>
+2010-01-31 Stéphane Voltz <stef.dev at free.fr>
* backend/genesys_conv.c: normalize gray data when doing dynamic
lineart.
-2010-01-30 Stéphane Voltz <stef.dev at free.fr>
+2010-01-30 Stéphane Voltz <stef.dev at free.fr>
* backend/genesys.conf.in backend/genesys_devices.c
doc/descriptions/genesys.desc doc/sane-genesys.man: add Xerox Travel
Scanner 100, work by Andrey Loginov <avloginov@gmail.com>
@@ -277,7 +277,7 @@
it to create a semaphore id. The new code is less platform dependent
and should also work on FreeBSD 8.0.
-2010-01-27 Stéphane Voltz <stef.dev at free.fr>
+2010-01-27 Stéphane Voltz <stef.dev at free.fr>
* backend/genesys.c backend/genesys.h backend/genesys_conv.c
backend/genesys_low.h backend/genesys_gl841.c: add dynamic lineart
scanning based on epjitsu code by m. allan noah.
@@ -287,25 +287,25 @@
pixma: changes for cropped area enhancement, supplied by Christian Scholtz
for generation 3+ devices.
-2010-01-19 Stéphane Voltz <stef.dev at free.fr>
+2010-01-19 Stéphane Voltz <stef.dev at free.fr>
* backend/genesys.c backend/genesys.conf.in backend/genesys.h
backend/genesys_conv.c backend/genesys_devices.c
backend/genesys_gl646.c backend/genesys_gl841.c backend/genesys_low.h
doc/descriptions/genesys.desc doc/sane-genesys.man: add Visioneer
OneTouch 7100 (patch by Jack McGill). Add software lineart option.
-2010-01-17 Stéphane Voltz <stef.dev at free.fr>
+2010-01-17 Stéphane Voltz <stef.dev at free.fr>
* backend/genesys.c backend/genesys_gl646.c: gray shading calibration
fix for CCD GL646 based scanners.
2010-01-17 Mattias Ellert <mattias.ellert@fysast.uu.se>
* po/sane-backends.sv.po: Updated Swedish translations.
-2010-01-16 Stéphane Voltz <stef.dev at free.fr>
+2010-01-16 Stéphane Voltz <stef.dev at free.fr>
* backend/genesys.c backend/genesys_gl646.c: re-enable threshold
option, fix wpl computing for HP2400
-2010-01-13 Stéphane Voltz <stef.dev at free.fr>
+2010-01-13 Stéphane Voltz <stef.dev at free.fr>
* backend/genesys.c backend/genesys_low.c backend/genesys_gl646.c
backend/genesys_gl841.c doc/sane-genesys.man : add true gray scanning
for CIS based scanners
@@ -314,7 +314,7 @@
* doc/sane-pixma.man, doc/descriptions/pixma.desc:
pixma: updated documentation for MP490 and MP550 (supported models).
-2009-12-30 Stéphane Voltz <stef.dev at free.fr>
+2009-12-30 Stéphane Voltz <stef.dev at free.fr>
* backend/lexmark_low.c: improve init time debug messages
2009-12-26 Nicolas Martin <nicols-guest at users.alioth.debian.org>
@@ -324,7 +324,7 @@
2009-12-24 Julien Blache <jb@jblache.org>
* frontend/saned.c: fix a bug in the standalone polling code.
-2009-12-05 Stéphane Voltz <stef.dev at free.fr>
+2009-12-05 Stéphane Voltz <stef.dev at free.fr>
* backend/genesys.c backend/genesys_gl841.c backend/genesys_low.h:
fixed amount of bytes left to read at document end for gl841 based
sheetfed scanners
@@ -340,7 +340,7 @@
pixma: bumped version, added compilation type debug message.
updated doc and desc (support for MX330)
-2009-12-05 Stéphane Voltz <stef.dev at free.fr>
+2009-12-05 Stéphane Voltz <stef.dev at free.fr>
* backend/genesys.c backend/genesys_gl841.c backend/genesys_devices.c
backend/genesys_low.h backend/genesys.conf.in
document/descriptions/genesys.desc: add full support for
@@ -351,18 +351,18 @@
* backend/pixma_mp150.c:
pixma: fix pixma backend bug for compilation with USE_PTHREAD/-lpthread
-2009-12-01 Stéphane Voltz <stef.dev at free.fr>
+2009-12-01 Stéphane Voltz <stef.dev at free.fr>
* backend/genesys_gl841.c: take amount of data in scanner's buffer
into account when detecting end of document
-2009-11-30 Stéphane Voltz <stef.dev at free.fr>
+2009-11-30 Stéphane Voltz <stef.dev at free.fr>
* backend/gt68xx.c backend/gt68xx_high.c backend/gt68xx_high.h
backend/gt68xx_low.h backend/gt68xx_gt6816.h backend/gt68xx_gt6816.c:
implement request '0x59' which detects document presence for 6816. Add
a sensor option to reports document presence, and test for document
before scan for 6816 sheetfed scanners.
-2009-11-29 Stéphane Voltz <stef.dev at free.fr>
+2009-11-29 Stéphane Voltz <stef.dev at free.fr>
* backend/gt68xx.c backend/gt68xx_high.c backend/gt68xx_high.h:
added 'clear calibration' button option and 'need calibration'
sensor option.
@@ -373,22 +373,22 @@
pixma: fix pixma backend (end of scan), when compiled with USE_PTHREAD/-lpthread
set support to complete for MP990 in documentation, as reported by Jean-Michel Poure.
-2009-11-28 Stéphane Voltz <stef.dev at free.fr>
+2009-11-28 Stéphane Voltz <stef.dev at free.fr>
* backend/gt68xx_generic.h backend/gt68xx_generic.c
backend/gt68xx_low.h backend/gt68xx_high.c backend/gt68xx_high.h
backend/gt68xx_devices.c backend/gt68xx.c
doc/descriptions/gt68xx.desc: added sheetfed calibration
-2009-11-25 Stéphane Voltz <stef.dev at free.fr>
+2009-11-25 Stéphane Voltz <stef.dev at free.fr>
* backend/genesys_gl841.c: use only signed vars in
gl841_detect_document_end with a few more debug traces
-2009-11-25 Stéphane Voltz <stef.dev at free.fr>
+2009-11-25 Stéphane Voltz <stef.dev at free.fr>
* backend/genesys.conf.in backend/genesys_gl841.c
backend/genesys_devices.c: added docketport 467 model and add
debug traces in gl841_detect_document_end
-2009-11-23 Stéphane Voltz <stef.dev at free.fr>
+2009-11-23 Stéphane Voltz <stef.dev at free.fr>
* backend/gt68xx_generic.h backend/gt68xx_generic.c
backend/gt68xx.conf.in backend/gt68xx_low.h backend/gt68xx_high.c
backend/gt68xx_devices.c backend/gt68xx.c: fixed gt6816 based sheetfed
@@ -401,12 +401,12 @@
pixma: updated Pixma MP250 status to supported. Changed desc status
from good to complete for well supported models.
-2009-11-16 Stéphane Voltz <stef.dev at free.fr>
+2009-11-16 Stéphane Voltz <stef.dev at free.fr>
* backend/genesys.conf.in backend/genesys_gl841.c
doc/descriptions/genesys.desc : applied fixes and status update from
Jack McGill.
-2009-11-16 Stéphane Voltz <stef.dev at free.fr>
+2009-11-16 Stéphane Voltz <stef.dev at free.fr>
* backend/genesys.c backend/genesys_devices.c backend/genesys_gl646.c
backend/genesys_gl841.c: add needed flags for DP485/487 and XP100
scanners. Use different thresholds in strip detection function. Do
@@ -415,9 +415,9 @@
2009-11-14 Julien Blache <jb@jblache.org>
* doc/descriptions/epson.desc: add the Perfection636 SCSI scanner, from
- Frédéric Brière <fbriere@fbriere.net>.
+ Frédéric Brière <fbriere@fbriere.net>.
-2009-11-06 Stéphane Voltz <stef.dev at free.fr>
+2009-11-06 Stéphane Voltz <stef.dev at free.fr>
* backend/genesys.c backend/genesys.h backend/genesys_devices.c
backend/genesys_gl646.c backend/genesys_gl646.h backend/genesys_gl841.c
backend/genesys_low.h doc/descriptions/genesys.desc
@@ -465,7 +465,7 @@
2009-10-03 Ilia Sotnikov <hostcc@gmail.com>
* backend/epjitsu.c: use own private function instead of roundf()
-2009-10-02 Stéphane Voltz <stef.dev at free.fr>
+2009-10-02 Stéphane Voltz <stef.dev at free.fr>
* backend/genesys_gl646.c: honor GENESYS_NO_CALIBRATION device
flag when setting registers for final scan
@@ -473,7 +473,7 @@
* backend/hp3900_sane.c:
fix bug 311991: "Bad option sizes let frontend (e.g. xsane) crash"
-2009-10-01 Stéphane Voltz <stef.dev at free.fr>
+2009-10-01 Stéphane Voltz <stef.dev at free.fr>
* backend/lexmark_low.c: fix a memleak in find_start_line(),
check success of memory allocation after calloc()
@@ -562,15 +562,15 @@
- support hardware based auto length detection
* doc/descriptions/fujitsu.desc: various status and comment updates
-2009-08-07 Stéphane Voltz <stef.dev at free.fr>
+2009-08-07 Stéphane Voltz <stef.dev at free.fr>
* backend/genesys_gl646.c backend/genesys_devices.c:
- small fixes for hp3670 support
-2009-08-05 Stéphane Voltz <stef.dev at free.fr>
+2009-08-05 Stéphane Voltz <stef.dev at free.fr>
* backend/genesys.c:
- fixed shading calibration for hp2300 when dpi <= 300
-2009-08-04 Stéphane Voltz <stef.dev at free.fr>
+2009-08-04 Stéphane Voltz <stef.dev at free.fr>
* backend/genesys.c backend/genesys_gl646.c backend/genesys_devices.c:
- fixed document end detection for gl646 cis scanners
- disable color filter fro gray mode for gl646 cis scanners
@@ -579,7 +579,7 @@
* doc/descriptions/pixma.desc, doc/sane-pixma.man:
- pixma backend: few cosmetic documentation updates.
-2009-08-02 Stéphane Voltz <stef.dev at free.fr>
+2009-08-02 Stéphane Voltz <stef.dev at free.fr>
* frontend/tstbackend.c: remove WARMING_UP_STATUS usage
2009-07-30 Jonathan Bravo Lopez <jkdsoft at gmail dot com>
@@ -624,17 +624,17 @@
2009-07-17 Alex Belkin <abc at telekom.ru>
* backend/xerox_mfp.c: more sanity checking for debug mode.
-2009-07-15 Stéphane Voltz <stef.dev at free.fr>
+2009-07-15 Stéphane Voltz <stef.dev at free.fr>
* backend/lexmark.h: disable deep debugging
-2009-07-10 Stéphane Voltz <stef.dev at free.fr>
+2009-07-10 Stéphane Voltz <stef.dev at free.fr>
* backend/genesys.c backend/genesys_gl646.c backend/genesys_low.h
backend/genesys_gl646.h backend/genesys_gl841.c
backend/genesys_devices.c backend/genesys.h:
- add shading calibration for sheetfed scanners
- shading calibration fix for all gl646 based scanners
-2009-07-06 Stéphane Voltz <stef.dev at free.fr>
+2009-07-06 Stéphane Voltz <stef.dev at free.fr>
* backend/lexmark.c backend/lexmark.h backend/lexmark_low.h:
do not use resolution higher than sensor resolution when doing
calibation.
@@ -682,7 +682,7 @@
* backend/pixma_imageclass.c, doc/descriptions/pixma.desc, doc/sane-pixma.man:
Added Canon imageCLASS D480 support to the pixma backend.
-2009-06-17 Stéphane Voltz <stef.dev at free.fr>
+2009-06-17 Stéphane Voltz <stef.dev at free.fr>
* backend/lexmark_low.c: f3/f4 registers assignement cleanup
2009-06-18 Nicolas Martin <nicols-guest at users.alioth.debian.org>
@@ -699,7 +699,7 @@
- remove old cancel() prototype
- small sleep before clearing usb halt condition
-2009-06-17 Stéphane Voltz <stef.dev at free.fr>
+2009-06-17 Stéphane Voltz <stef.dev at free.fr>
* backend/lexmark_low.c: cleanups, better logging in is_home_line()
and possible fix for bug #311862 by using f4 & f5 registers instead of
f3 & f4
@@ -733,7 +733,7 @@
only when we were always compiling internal getopt() functions.
Fix header filename.
-2009-06-09 Stéphane Voltz <stef.dev at free.fr>
+2009-06-09 Stéphane Voltz <stef.dev at free.fr>
* backend/lexmark.h backend/lexmark.c backend/lexmark_low.c:
cleanups, better 'fake usb' and possible fix for bug #311862
@@ -796,10 +796,10 @@
* backend/genesys_devices.c, backend/genesys_low.h:
Add Pentax DSmobile 600, Syscan 485, DCT 487
-2009-05-18 Stéphane Voltz <stef.dev at free.fr>
+2009-05-18 Stéphane Voltz <stef.dev at free.fr>
* backend/genesys_gl646.h: fixed missing part of the include
-2009-05-13 Stéphane Voltz <stef.dev at free.fr>
+2009-05-13 Stéphane Voltz <stef.dev at free.fr>
* backend/genesys_gl646.c backend/genesys_gl646.h: created a
genesys_gl646.h header file, moved all declarations from
genesys_gl646.c to this file.
diff --git a/NEWS b/NEWS
index 2880407..3116d94 100644
--- a/NEWS
+++ b/NEWS
@@ -448,7 +448,7 @@ New with 1.00:
Supports "Scan 300/GS" and may work with "Scan 300/S" but the
latter is untested.
-* New Agfa Focus backend (by Karl Anders Øygard)
+* New Agfa Focus backend (by Karl Anders Øygard)
Supports:
o AGFA Focus GS (6 bit gray scale) (untested)
o AGFA Focus Lineart (lineart) (untested)
diff --git a/doc/descriptions.txt b/doc/descriptions.txt
index c9eaad1..d4cab94 100644
--- a/doc/descriptions.txt
+++ b/doc/descriptions.txt
@@ -84,7 +84,7 @@ Example: `:interface "SCSI USB IEEE-1394"'
`:usbid' defines the USB vendor and product ids of the device. It has two
arguments which must be lower case hexadecimal (4 digits). The first one is the
-USB vendor id, the second one the USB üproduct id. The keyword refers to the
+USB vendor id, the second one the USB product id. The keyword refers to the
previous `:model', is optional, and applicable for devices with :interface "USB"
only, and should be used only once per model. The special parameter "ignore" can
be used if no vendor or product ids are given intentionally, e.g. for a group of
diff --git a/doc/gt68xx/gt68xx.CHANGES b/doc/gt68xx/gt68xx.CHANGES
index f20fb54..43f2e85 100644
--- a/doc/gt68xx/gt68xx.CHANGES
+++ b/doc/gt68xx/gt68xx.CHANGES
@@ -256,7 +256,7 @@ V 1.0-59 (2004-04-10)
* Added Genius Colorpage Vivid4 to .conf file. Changed status to good. Added
to man page.
* Fixed black mark for Mustek BearPaw 2448 TA Plus. This one and the Mustek A3
- fixes are from Jakub Dvo?ák <xdvorak@chello.cz>.
+ fixes are from Jakub Dvořák <xdvorak@chello.cz>.
* Status of BearPaw 2448 TA/CS Plus is "basic" now.
V 1.0-58 (2004-04-04)
diff --git a/doc/mustek/mustek.CHANGES b/doc/mustek/mustek.CHANGES
index 250f68f..b7c7e2b 100644
--- a/doc/mustek/mustek.CHANGES
+++ b/doc/mustek/mustek.CHANGES
@@ -763,7 +763,7 @@ CHANGES for the SANE Mustek backend
2000-06-04
* changed (again) Paragon 12000 SP linedistance handling, now 1.02 uses
normal LD corrections, all other use none. We'll see, if this works.
- Thanks to Reinhard Günzel who helped to debug this.
+ Thanks to Reinhard Günzel who helped to debug this.
* fixed some long lines (>80 chars)
2000-06-03
diff --git a/doc/plustek/Plustek-PARPORT-TODO.txt b/doc/plustek/Plustek-PARPORT-TODO.txt
index c66de8a..94ef5f7 100644
--- a/doc/plustek/Plustek-PARPORT-TODO.txt
+++ b/doc/plustek/Plustek-PARPORT-TODO.txt
@@ -1,4 +1,4 @@
-Plustek-PARPORT-TODO.txt (2003-29-10) Gerhard Jäger <gerhard@gjaeger.de>
+Plustek-PARPORT-TODO.txt (2003-29-10) Gerhard Jäger <gerhard@gjaeger.de>
========================================================================
TODO (in general):
diff --git a/doc/plustek/Plustek-PARPORT.txt b/doc/plustek/Plustek-PARPORT.txt
index 333c2d8..e5b6097 100644
--- a/doc/plustek/Plustek-PARPORT.txt
+++ b/doc/plustek/Plustek-PARPORT.txt
@@ -1,4 +1,4 @@
-Plustek-PARPRORT.txt (2004-03-28) Gerhard Jäger <gerhard@gjaeger.de>
+Plustek-PARPRORT.txt (2004-03-28) Gerhard Jäger <gerhard@gjaeger.de>
====================================================================
diff --git a/doc/plustek/Plustek-USB.txt b/doc/plustek/Plustek-USB.txt
index 89dfecf..e1ee793 100644
--- a/doc/plustek/Plustek-USB.txt
+++ b/doc/plustek/Plustek-USB.txt
@@ -1,4 +1,4 @@
-Plustek-USB.txt (2005-08-08) Gerhard Jäger <gerhard@gjaeger.de>
+Plustek-USB.txt (2005-08-08) Gerhard Jäger <gerhard@gjaeger.de>
===============================================================
NOTE:
diff --git a/doc/u12/U12.changes b/doc/u12/U12.changes
index b13cf27..b6d008f 100644
--- a/doc/u12/U12.changes
+++ b/doc/u12/U12.changes
@@ -1,4 +1,4 @@
-U12.changes - Gerhard Jäger <gerhard@gjaeger.de>
+U12.changes - Gerhard Jäger <gerhard@gjaeger.de>
================================================
V 0.01-1 (2004-09-01)
diff --git a/doc/u12/U12.todo b/doc/u12/U12.todo
index 5eea402..f10216e 100644
--- a/doc/u12/U12.todo
+++ b/doc/u12/U12.todo
@@ -1,4 +1,4 @@
-U12.todo (2004-19-01) Gerhard Jäger <gerhard@gjaeger.de>
+U12.todo (2004-19-01) Gerhard Jäger <gerhard@gjaeger.de>
=========================================================
OPEN:
--
1.6.6.1

200
sane-backends-1.0.21-epson2-fixes.patch
View File

@ -1,200 +0,0 @@
From 4387ef574d47f1a66c2798245ae4a02801adc030 Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils@redhat.com>
Date: Tue, 8 Feb 2011 10:53:50 +0100
Subject: [PATCH] patch: epson2-fixes
Squashed commit of the following:
commit c8975a03814cec2774fbcaf1cc511d073f13c140
Author: Alessandro Zummo <a.zummo@towertech.it>
Date: Sat Feb 5 18:13:24 2011 +0100
epson2: try to avoid a division by zero
(cherry picked from commit 71f68035b32dc90a5e5f5adbc55de5947bc350e4)
commit b24669ceaec25615ce0fe6a90ff600fc97131d42
Author: Olaf Meeuwissen <olaf.meeuwissen@avasys.jp>
Date: Sun Dec 12 16:25:17 2010 +0100
epson2: fixed issue when a scan is cancelled
(cherry picked from commit 9a89932ab4624925794532ab5e5610e3b0190d53)
commit 05904547c6a745570213db47a813f4354e16c640
Author: Alessandro Zummo <a.zummo@towertech.it>
Date: Sun Dec 12 15:55:17 2010 +0100
epson2: do not reset networked scanners after scan
(cherry picked from commit 98df227f22d560cf41589c5ee1f2b74d1690827e)
commit de8ee42fb19d617460a0aab56ce03df5222be399
Author: Alessandro Zummo <a.zummo@towertech.it>
Date: Sun Dec 12 13:56:52 2010 +0100
epson2: fixed segfault when attaching network devices
(cherry picked from commit 14d0ca4364a31e2c0ce2d03ce4fd5a391b12cae5)
commit 28836509cfff226fcdde3ca8ce1e29baf0c9b97c
Author: Nils Philippsen <nils@redhat.com>
Date: Tue Feb 8 10:49:40 2011 +0100
Fix list of supported commands for levels D1 and D2
(cherry picked from commit a0980a91aebc5a8dd43be5136b3cb5e7f2beb458)
Conflicts:
ChangeLog
commit 368e87dd5f01af8004c879fbc36a24723b1394ac
Author: Julien BLACHE <jb@jblache.org>
Date: Wed Jun 23 18:21:35 2010 +0200
epson2: use proper ISO C initializers
(cherry picked from commit 55879ed53918c6a99075f4661b7c9fd4a23d5dcc)
commit fd7a78a1447eb67f89bf46eddb414a42a323145f
Author: Julien BLACHE <jb@jblache.org>
Date: Wed Jun 23 18:21:35 2010 +0200
epson2: add missing prototype for esci_get_scanning_parameter()
(cherry picked from commit 1226081046ee9d0f7fe2b15d33741cc6a64b102f)
commit 88c24177599e1dd42124a1e9cc0ebe039ab9591a
Author: Julien BLACHE <jb@jblache.org>
Date: Wed Jun 23 18:21:35 2010 +0200
epson2: fix signed/unsigned type mismatch
(cherry picked from commit 37418beaabd77294f7f7bd78a5886df9d5d7258e)
---
backend/epson2-cct.c | 8 ++++++--
backend/epson2-commands.h | 1 +
backend/epson2-ops.c | 11 ++++++++---
backend/epson2.c | 2 +-
backend/epson2_net.c | 4 ++--
backend/epson2_net.h | 2 +-
6 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/backend/epson2-cct.c b/backend/epson2-cct.c
index 8692411..8ebed70 100644
--- a/backend/epson2-cct.c
+++ b/backend/epson2-cct.c
@@ -488,7 +488,11 @@ const struct epson_profile epson_cct_profiles[] = {
{1.0000, 0.0000, 0.0000, 0.0000, 1.0000, 0.0000, 0.0000, 0.0000, 1.0000},
{1.4431,-0.4193,-0.0238,-0.0915, 1.1507,-0.0592,-0.0226,-0.1978, 1.2204}}},
- { 0xFF, { } } /* terminator */
+ {0xFF, /* terminator */
+ {{0, 0, 0, 0, 0, 0, 0, 0, 0},
+ {0, 0, 0, 0, 0, 0, 0, 0, 0},
+ {0, 0, 0, 0, 0, 0, 0, 0, 0},
+ {0, 0, 0, 0, 0, 0, 0, 0, 0}}}
};
/* cat hw-data.c | grep '{"' | cut -d ',' -f1,2 | awk '{ print $0 " },"}' */
@@ -605,5 +609,5 @@ const struct epson_profile_map epson_cct_models[] = {
{"PID 0853", 0x9F },
{"GT-X820", 0xA1 },
- { } /* terminator */
+ {NULL, 0x00 } /* terminator */
};
diff --git a/backend/epson2-commands.h b/backend/epson2-commands.h
index 24ad9c1..4be065a 100644
--- a/backend/epson2-commands.h
+++ b/backend/epson2-commands.h
@@ -46,6 +46,7 @@ SANE_Status esci_request_status(SANE_Handle handle, unsigned char *scanner_statu
SANE_Status esci_request_extended_identity(SANE_Handle handle, unsigned char *buf);
SANE_Status esci_request_scanner_status(SANE_Handle handle, unsigned char *buf);
SANE_Status esci_set_scanning_parameter(SANE_Handle handle, unsigned char *buf);
+SANE_Status esci_get_scanning_parameter(SANE_Handle handle, unsigned char *buf);
SANE_Status esci_request_command_parameter(SANE_Handle handle, unsigned char *buf);
SANE_Status esci_request_focus_position(SANE_Handle handle,
unsigned char *position);
diff --git a/backend/epson2-ops.c b/backend/epson2-ops.c
index 0d2db5d..0b8a7ea 100644
--- a/backend/epson2-ops.c
+++ b/backend/epson2-ops.c
@@ -86,8 +86,8 @@ static struct EpsonCmd epson_cmd[] = {
{"B8",'I', 0 ,'F','S','C','G','D','R','H','A','L',{-4, 3, 0},'Z','B','M','@','g','d','K','z','Q','b','m','f','e','\f', 0x19,'!','s','N', 0 , 0 ,'t','p','q','I','F'},
/* XXX 'f' probably not supported on F5 */
{"F5",'I', 0 ,'F','S','C','G','D','R','H','A','L',{-3, 3, 0},'Z', 0 ,'M','@','g','d','K','z','Q', 0 ,'m','f','e','\f', 0 , 0 , 0 ,'N','T','P', 0 , 0 , 0 , 0 , 0 },
- {"D1",'I','i','F', 0 ,'C','G','D','R', 0 ,'A', 0 ,{ 0, 0, 0},'Z', 0 , 0 ,'@','g','d', 0 ,'z', 0 , 0 ,'m','f', 0 , 0 , 0 ,'!', 0 , 0 , 0 , 0 ,'t', 0 , 0 , 0 , 0 },
- {"D2",'I','i','F', 0 ,'C','G','D','R', 0 ,'A', 0 ,{ 0, 0, 0},'Z', 0 , 0 ,'@','g','d', 0 ,'z', 0 , 0 ,'m','f','e', 0 , 0 ,'!', 0 ,'N', 0 , 0 ,'t', 0 , 0 , 0 , 0 },
+ {"D1",'I','i','F', 0 ,'C','G','D','R', 0 ,'A', 0 ,{ 0, 0, 0},'Z', 0 , 0 ,'@','g','d', 0 ,'z', 0 , 0 , 0 ,'f', 0 , 0 , 0 ,'!', 0 , 0 , 0 , 0 ,'t', 0 , 0 , 0 , 0 },
+ {"D2",'I','i','F', 0 ,'C','G','D','R', 0 ,'A', 0 ,{ 0, 0, 0},'Z', 0 , 0 ,'@','g','d', 0 ,'z', 0 , 0 , 0 ,'f','e', 0 , 0 ,'!', 0 ,'N', 0 , 0 ,'t', 0 , 0 , 0 , 0 },
{"D7",'I','i','F', 0 ,'C','G','D','R', 0 ,'A', 0 ,{ 0, 0, 0},'Z', 0 , 0 ,'@','g','d', 0 ,'z', 0 , 0 , 0 ,'f','e','\f', 0 ,'!', 0 ,'N', 0 , 0 ,'t', 0 , 0 , 0 , 0 },
{"D8",'I','i','F', 0 ,'C','G','D','R', 0 ,'A', 0 ,{ 0, 0, 0},'Z', 0 , 0 ,'@','g','d', 0 ,'z', 0 , 0 , 0 ,'f','e','\f', 0 ,'!', 0 ,'N', 0 , 0 ,'t', 0 , 0 , 0 , 0 },
};
@@ -1342,6 +1342,9 @@ e2_init_parameters(Epson_Scanner * s)
#endif
}
+ if (s->params.bytes_per_line == 0)
+ return SANE_STATUS_INVAL;
+
/*
* Calculate correction for line_distance in D1 scanner:
* Start line_distance lines earlier and add line_distance lines at the end
@@ -1646,7 +1649,8 @@ e2_scan_finish(Epson_Scanner * s)
esci_eject(s);
/* XXX required? */
- esci_reset(s);
+ if (s->hw->connection != SANE_EPSON_NET)
+ esci_reset(s);
}
void
@@ -1721,6 +1725,7 @@ e2_ext_read(struct Epson_Scanner *s)
if (s->buf[buf_len] & FSG_STATUS_CANCEL_REQ) {
DBG(0, "%s: cancel request received\n", __func__);
+ e2_cancel(s);
return SANE_STATUS_CANCELLED;
}
diff --git a/backend/epson2.c b/backend/epson2.c
index 8e29f9f..bdd9c27 100644
--- a/backend/epson2.c
+++ b/backend/epson2.c
@@ -775,7 +775,7 @@ attach_one_usb(const char *dev)
static SANE_Status
attach_one_net(const char *dev)
{
- char name[18];
+ char name[39+4];
DBG(7, "%s: dev = %s\n", __func__, dev);
diff --git a/backend/epson2_net.c b/backend/epson2_net.c
index a0c0f89..c7b4873 100644
--- a/backend/epson2_net.c
+++ b/backend/epson2_net.c
@@ -52,10 +52,10 @@ sanei_epson_net_read_raw(Epson_Scanner *s, unsigned char *buf, size_t wanted,
}
int
-sanei_epson_net_read(Epson_Scanner *s, unsigned char *buf, size_t wanted,
+sanei_epson_net_read(Epson_Scanner *s, unsigned char *buf, ssize_t wanted,
SANE_Status * status)
{
- size_t size;
+ ssize_t size;
ssize_t read = 0;
unsigned char header[12];
diff --git a/backend/epson2_net.h b/backend/epson2_net.h
index d7df09a..6a6e8d8 100644
--- a/backend/epson2_net.h
+++ b/backend/epson2_net.h
@@ -4,7 +4,7 @@
#include <sys/types.h>
#include "../include/sane/sane.h"
-extern int sanei_epson_net_read(struct Epson_Scanner *s, unsigned char *buf, size_t buf_size,
+extern int sanei_epson_net_read(struct Epson_Scanner *s, unsigned char *buf, ssize_t buf_size,
SANE_Status *status);
extern int sanei_epson_net_write(struct Epson_Scanner *s, unsigned int cmd, const unsigned char *buf,
size_t buf_size, size_t reply_len,
--
1.7.4

129
sane-backends-1.0.21-i18n.patch
View File

@ -1,129 +0,0 @@
diff -Nur sane-backends-1.0.21/po/LINGUAS sane-backends-1.0.21.mod/po/LINGUAS
--- sane-backends-1.0.21/po/LINGUAS 1969-12-31 19:00:00.000000000 -0500
+++ sane-backends-1.0.21.mod/po/LINGUAS 2010-04-27 03:38:23.000000000 -0400
@@ -0,0 +1,21 @@
+# List of languages
+# try to keep this list ordered
+bg
+cs
+da
+de
+en_GB
+eo
+es
+fi
+fr
+gl
+it
+ja
+nb
+nl
+pl
+pt
+ru
+sv
+uk
diff -Nur sane-backends-1.0.21/po/POTFILES sane-backends-1.0.21.mod/po/POTFILES
--- sane-backends-1.0.21/po/POTFILES 1969-12-31 19:00:00.000000000 -0500
+++ sane-backends-1.0.21.mod/po/POTFILES 2010-04-27 03:38:16.000000000 -0400
@@ -0,0 +1,100 @@
+# List of source files containing translatable strings
+# paths relative to po
+../include/sane/saneopts.h
+../backend/sane_strstatus.c
+
+../backend/artec_eplus48u.c
+
+../backend/avision.h
+
+../backend/canon630u.c
+../backend/canon.c
+../backend/canon-sane.c
+
+../backend/canon_dr.c
+../backend/canon_dr.h
+
+../backend/cardscan.c
+../backend/cardscan.h
+
+../backend/epjitsu.c
+../backend/epjitsu.h
+
+../backend/epson.c
+../backend/epson.h
+../backend/epson2.c
+../backend/epson2.h
+
+../backend/fujitsu.c
+../backend/fujitsu.h
+
+../backend/genesys.c
+
+../backend/kodak.c
+../backend/kodak.h
+
+../backend/gt68xx.c
+../backend/gt68xx_low.h
+
+../backend/hp3500.c
+../backend/hp3900_sane.c
+../backend/hp5400_sane.c
+../backend/hp5590.c
+../backend/hp-option.c
+../backend/hp-option.h
+
+../backend/leo.c
+../backend/leo.h
+
+../backend/lexmark.c
+
+../backend/ma1509.c
+
+../backend/matsushita.c
+../backend/matsushita.h
+
+../backend/microtek2.c
+../backend/microtek2.h
+
+../backend/mustek.c
+../backend/mustek_usb.c
+../backend/mustek_usb2.c
+
+../backend/niash.c
+
+../backend/pixma.c
+../backend/pixma_sane_options.c
+
+../backend/plustek.c
+../backend/plustek_pp.c
+
+../backend/pnm.c
+
+../backend/rts8891.c
+
+../backend/sceptre.c
+../backend/sceptre.h
+
+../backend/sm3840.c
+
+../backend/snapscan.c
+../backend/snapscan-options.c
+
+../backend/stv680.c
+../backend/stv680.h
+
+../backend/teco1.c
+../backend/teco1.h
+../backend/teco2.c
+../backend/teco2.h
+../backend/teco3.c
+../backend/teco3.h
+
+../backend/test.c
+
+../backend/u12.c
+
+../backend/umax1220u.c
+../backend/umax.c
+../backend/umax_pp.c
+

29
sane-backends-1.0.21-man-encoding.patch
View File

@ -1,29 +0,0 @@
From c9a244eed22ac3d199f1d65f2b6b07af87b2d7f2 Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils@redhat.com>
Date: Wed, 5 May 2010 11:57:17 +0200
Subject: [PATCH] patch: man-encoding
Squashed commit of the following:
commit 4fb60cad54201c2ff971050bf2e32e5b5eeccad5
Author: Nils Philippsen <nils@redhat.com>
Date: Wed May 5 11:56:05 2010 +0200
don't use ISO-8859-1 encoding
---
doc/sane-hpljm1005.man | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/doc/sane-hpljm1005.man b/doc/sane-hpljm1005.man
index af6588f..ff1006a 100644
--- a/doc/sane-hpljm1005.man
+++ b/doc/sane-hpljm1005.man
@@ -34,4 +34,4 @@ support dynamic loading).
.BR sane\-usb (5),
.SH AUTHOR
-Philippe Rétornaz <couriousous@mandriva.org>
+Philippe R\['e]tornaz <couriousous@mandriva.org>
--
1.6.6.1

203
sane-backends-1.0.21-pkgconfig.patch
View File

@ -1,203 +0,0 @@
From 99d33809f7c02e4ace528edc4b8b6e2bb7e762aa Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils@redhat.com>
Date: Wed, 2 Jun 2010 14:16:56 +0200
Subject: [PATCH] patch: pkgconfig
Squashed commit of the following:
commit 248577ef557e36b9a326d93fd143e5e376f1a0f1
Author: Nils Philippsen <nils@redhat.com>
Date: Wed Jun 2 14:14:53 2010 +0200
use ${...} instead of $(...) (#598401)
commit d615848c499842c5923c3274370d2536dc650916
Author: Nils Philippsen <nils@redhat.com>
Date: Fri Feb 26 17:51:14 2010 +0100
pkgconfig file is data
(cherry picked from commit 1f0e85c705a42c7e6ccd938eaad69f531c63f63d)
Signed-off-by: Nils Philippsen <nils@redhat.com>
commit 119d5af1ddd82dac034d0106a1d86b6d7564f25e
Author: Nils Philippsen <nils@redhat.com>
Date: Wed Jun 17 13:09:51 2009 +0200
make sane-config multilib-aware on Linux
(cherry picked from commit 52ef5f47ccc0128c78ab3ad38ac7b7918dd7ac88)
Signed-off-by: Nils Philippsen <nils@redhat.com>
commit 7ee1cbef01d851aca95d86145ac5dda02d9e7354
Author: Nils Philippsen <nils@redhat.com>
Date: Wed May 5 10:22:15 2010 +0200
use pkg-config in sane-config
---
tools/Makefile.am | 14 +++++++++-
tools/sane-backends.pc.in | 6 ++--
tools/sane-config.in | 66 ++++++++++++++++++++++++++++++++++----------
3 files changed, 67 insertions(+), 19 deletions(-)
diff --git a/tools/Makefile.am b/tools/Makefile.am
index f52a39a..ab4e1b7 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -7,6 +7,10 @@
AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_builddir)/include \
-I$(top_srcdir)/include
+SUFFIXES = .pc.in .pc
+
+pkgconfigdir = ${libdir}/pkgconfig
+
bin_PROGRAMS = sane-find-scanner gamma4scanimage
noinst_PROGRAMS = sane-desc umax_pp
@@ -26,8 +30,14 @@ noinst_SCRIPTS = $(HOTPLUG)
BUILT_SOURCES = $(HOTPLUG_DIR)
CLEANFILES = $(bin_SCRIPTS) $(dist_noinst_SCRIPTS)
+pkgconfig_DATA = sane-backends.pc
+
+.pc.in.pc:
+ cd $(top_builddir) \
+ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
EXTRA_DIST = check-po.awk libtool-get-dll-ext mustek600iin-off.c \
- RenSaneDlls.cmd README xerox
+ RenSaneDlls.cmd README xerox sane-backends.pc.in
sane_find_scanner_SOURCES = sane-find-scanner.c check-usb-chip.c \
../backend/sane_strstatus.c
@@ -72,5 +82,7 @@ hal/libsane.fdi: $(wildcard ${top_srcdir}/doc/descriptions/*.desc) $(wildcard ${
@./sane-desc -m hal -s ${top_srcdir}/doc/descriptions:${top_srcdir}/doc/descriptions-external \
-d 0 > $@
+sane-backends.pc: $(top_builddir)/config.status
+
clean-local:
rm -f $(HOTPLUG)
diff --git a/tools/sane-backends.pc.in b/tools/sane-backends.pc.in
index 5781121..b4d9731 100644
--- a/tools/sane-backends.pc.in
+++ b/tools/sane-backends.pc.in
@@ -9,6 +9,6 @@ Name: SANE Backends
Description: Backends for SANE, the universal scanner interface
Version: @VERSION@
Requires:
-Libs: -L$(libdir) -lsane
-Libs.private: $(ldflags) $(libs)
-Cflags: -I$(includedir)
+Libs: -L${libdir} -lsane
+Libs.private: ${ldflags} ${libs}
+Cflags: -I${includedir}
diff --git a/tools/sane-config.in b/tools/sane-config.in
index 22c02b5..a9ce6fb 100644
--- a/tools/sane-config.in
+++ b/tools/sane-config.in
@@ -19,7 +19,7 @@ pkglibdir="@pkglibdir@"
includedir="@includedir@"
mandir="@mandir@"
infodir="@infodir@"
-libdir="@libdir@"
+#libdir=
localstatedir="@localstatedir@"
sysconfdir="@sysconfdir@"
datarootdir="@datarootdir@"
@@ -33,6 +33,30 @@ srcdir="@srcdir@"
top_srcdir="@top_srcdir@"
cflags=
+pkgconfig_package=sane-backends
+use_pkgconfig=0
+if test -x "@bindir@/pkg-config" && "@bindir@/pkg-config" --exists "$pkgconfig_package"; then
+ use_pkgconfig=1
+else
+ libdir=
+ if kernel="`uname -s 2>/dev/null`"; then
+ case "$kernel" in
+ Linux)
+ if hw="`uname -i 2>/dev/null`"; then
+ case "$hw" in
+ *64)
+ libdir="@exec_prefix@/lib64"
+ ;;
+ esac
+ fi
+ ;;
+ esac
+ fi
+ if test "x$libdir" = "x"; then
+ libdir="@exec_prefix@/lib"
+ fi
+fi
+
usage ()
{
echo "Usage: " 1>&2
@@ -60,7 +84,7 @@ if test $# -gt 0; then
if test $# -eq 1; then
usage
elif test $# -eq 2; then
- case $2 in
+ case $2 in
--cflags)
echo "Usage: $0 --cflags"
echo " Print C compiler flags for compiling code that uses SANE."
@@ -86,26 +110,38 @@ if test $# -gt 0; then
;;
--ldflags)
- if test -z "$LINKER_RPATH"; then
- echo "-L${libdir} @LDFLAGS@"
+ if test "x$use_pkgconfig" = "x0"; then
+ if test -z "$LINKER_RPATH"; then
+ echo "-L${libdir} @LDFLAGS@"
+ else
+ echo "-L${libdir} @LDFLAGS@ ${LINKER_RPATH}${libdir}"
+ fi
else
- echo "-L${libdir} @LDFLAGS@ ${LINKER_RPATH}${libdir}"
+ pkg-config --libs-only-L "$pkgconfig_package"
fi
;;
--libs)
- echo "-lsane ${LIBS}"
+ if test "x$use_pkgconfig" = "x0"; then
+ echo "-lsane ${LIBS}"
+ else
+ pkg-config --libs "$pkgconfig_package"
+ fi
;;
--cflags)
- unique_cflags=
- if test "${includedir}" != "/usr/include"; then
- unique_cflags="${unique_cflags} -I${includedir}"
- fi
- for i in $cflags; do
- if test "${i}" != "-I${includedir}"; then
- unique_cflags="${unique_cflags} $i"
+ if test "x$use_pkgconfig" = "x0"; then
+ unique_cflags=
+ if test "${includedir}" != "/usr/include"; then
+ unique_cflags="${unique_cflags} -I${includedir}"
fi
- done
- echo ${unique_cflags}
+ for i in $cflags; do
+ if test "${i}" != "-I${includedir}"; then
+ unique_cflags="${unique_cflags} $i"
+ fi
+ done
+ echo ${unique_cflags}
+ else
+ pkg-config --cflags "$pkgconfig_package"
+ fi
;;
--prefix)
echo ${prefix}
--
1.7.0.1

35
sane-backends-1.0.21-v4l.patch
View File

@ -1,35 +0,0 @@
diff -up sane-backends-1.0.21/backend/v4l.c.orig sane-backends-1.0.21/backend/v4l.c
--- sane-backends-1.0.21/backend/v4l.c.orig 2011-03-09 14:20:57.000000000 +0100
+++ sane-backends-1.0.21/backend/v4l.c 2011-03-09 14:21:05.000000000 +0100
@@ -84,10 +84,10 @@
#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;
static V4L_Device *first_dev;
diff -up sane-backends-1.0.21/backend/v4l.h.orig sane-backends-1.0.21/backend/v4l.h
--- sane-backends-1.0.21/backend/v4l.h.orig 2011-03-09 14:11:26.000000000 +0100
+++ sane-backends-1.0.21/backend/v4l.h 2011-03-09 14:11:39.000000000 +0100
@@ -29,6 +29,7 @@
#ifndef v4l_h
#define v4l_h
+#if 0
/* Kernel interface */
/* Only the stuff we need. For more features, more defines are needed */
@@ -165,6 +166,7 @@ struct video_channel
/* end of kernel interface */
+#endif
#include <../include/sane/sane.h>

34
sane-backends-1.0.21-xerox-mfp-color-mode.patch
View File

@ -1,34 +0,0 @@
From 609312a68d12033ba4c9da4638b16e664f2efe28 Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils@redhat.com>
Date: Wed, 3 Nov 2010 15:46:08 +0100
Subject: [PATCH] patch: xerox-mfp-color-mode
Squashed commit of the following:
commit 7962d7e7757e2b7b7ef64e17ee921af2f8df193d
Author: Alex Belkin <abc@telekom.ru>
Date: Mon May 3 04:28:47 2010 +0400
Corrected color mode malfunction.
Bug was introduced by mass change to SANE_VALUE macro, (commit ff048f41760c74e67dfea36a079c71fdb72bbf4c).
(cherry picked from commit 043cc4b1651fe602f1b7fb58e6592bd3bef0f4ac)
---
backend/xerox_mfp.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/backend/xerox_mfp.c b/backend/xerox_mfp.c
index cda6e82..e6ede0d 100644
--- a/backend/xerox_mfp.c
+++ b/backend/xerox_mfp.c
@@ -386,6 +386,7 @@ static int doc_source_to_code[] = {
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
--
1.7.3.2

13
sane-backends-1.0.22-automake.patch Normal file
View File

@ -0,0 +1,13 @@
diff -up sane-backends-1.0.22/backend/Makefile.in.automake sane-backends-1.0.22/backend/Makefile.in
--- sane-backends-1.0.22/backend/Makefile.in.automake 2011-01-30 19:50:55.000000000 +0100
+++ sane-backends-1.0.22/backend/Makefile.in 2011-03-14 15:46:47.946422433 +0100
@@ -4881,7 +4881,8 @@ install-firmware-path:
done
install-lockpath:
- $(mkinstalldirs) -m 775 -g $(LOCKPATH_GROUP) $(DESTDIR)$(locksanedir)
+ $(mkinstalldirs) -m 775 -g $(LOCKPATH_GROUP) $(DESTDIR)$(locksanedir) || \
+ $(mkinstalldirs) -m 775 $(DESTDIR)$(locksanedir)
uninstall-hook:
rm -rf $(DESTDIR)$(libdir)/sane $(DESTDIR)$(configdir) $(DESTDIR)$(locksanedir)

566
sane-backends-1.0.22-docs-utf8.patch Normal file
View File

@ -0,0 +1,566 @@
From e387e2de4d657001b24ac242dfe8465aa209de02 Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils@redhat.com>
Date: Wed, 16 Mar 2011 18:07:02 +0100
Subject: [PATCH] patch: docs-utf8
Squashed commit of the following:
commit c4a52aad8fb3cc933aea08af8add000fd1f3af74
Author: Nils Philippsen <nils@redhat.com>
Date: Wed Mar 16 18:00:55 2011 +0100
encode to UTF-8
---
AUTHORS | 20 ++++----
ChangeLog | 90 +++++++++++++++++-----------------
NEWS | 2 +-
doc/descriptions.txt | 2 +-
doc/gt68xx/gt68xx.CHANGES | 2 +-
doc/mustek/mustek.CHANGES | 2 +-
doc/plustek/Plustek-PARPORT-TODO.txt | 2 +-
doc/plustek/Plustek-PARPORT.txt | 2 +-
doc/plustek/Plustek-USB.txt | 2 +-
doc/u12/U12.changes | 2 +-
doc/u12/U12.todo | 2 +-
doc/umax/sane-umax-parport-doc.html | 2 +-
12 files changed, 65 insertions(+), 65 deletions(-)
diff --git a/AUTHORS b/AUTHORS
index c7a5b36..b07e737 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -9,7 +9,7 @@ Java API:
Backends:
abaton: David Huggins-Daines
- agfafocus: Karl Anders Øygard
+ agfafocus: Karl Anders Øygard
apple: Milon Firikis
artec: Chris Pinkham
artec_eplus48u:Sergey Vlasov, Andreas Nowack, David Stevenson, and
@@ -38,7 +38,7 @@ Backends:
fujitsu: Randolph Bentson, Frederik Ramm, Oliver Schirrmeister (*),
m. allan noah (*)
gphoto2: Peter Fales (*)
- genesys: Henning Geinitz (*), Gerhard Jaeger (*), Stéphane Voltz (*),
+ genesys: Henning Geinitz (*), Gerhard Jaeger (*), Stéphane Voltz (*),
Pierre Willenbrock (*)
gt68xx: Sergey Vlasov, Andreas Nowack, David Stevenson, and
Henning Geinitz (*)
@@ -51,11 +51,11 @@ Backends:
Frank Zago, Henning Geinitz (*)
hp5400: Martijn van Oosterhout, Thomas Soumarmon (*)
hp5590: Ilia Sotnikov (*)
- hpljm1005: Philippe Rétornaz
+ hpljm1005: Philippe Rétornaz
hs2p: Jeremy Johnson
ibm: M.F., Henning Geinitz (*)
leo: Frank Zago (*)
- lexmark: Fred Odendaal, Stéphane Voltz (*)
+ lexmark: Fred Odendaal, Stéphane Voltz (*)
ma1509: Henning Geinitz (*)
magicolor: Reinhold Kainhofer (based on epson2 backend)
matsushita: Frank Zago (*)
@@ -69,7 +69,7 @@ Backends:
nec: Kazuya Fukuda (*)
net: Andreas Beck, David Mosberger, Julien Blache (*)
niash: Ullrich Sigwanz (*), Bertrik Sikken
- p5: Stéphane Voltz (*)
+ p5: Stéphane Voltz (*)
pie: Simon Munton (*)
pint: Gordon Matzigkeit
pixma: Wittawat Yamwong (*)
@@ -84,7 +84,7 @@ Backends:
despeckling filter by Patrick Reynolds,
B&W fixes by Andrew Kuchling
ricoh: Feico W. Dillema
- rts8891: Stéphane Voltz (*)
+ rts8891: Stéphane Voltz (*)
s9036: Ingo Schneider
sceptre: Frank Zago (*)
sharp: Kazuya Fukuda (*) and Abel Deuring (*)
@@ -102,7 +102,7 @@ Backends:
test: Henning Geinitz (*)
u12: Gerhard Jaeger (*)
umax: Oliver Rauch (*) and Michael K. Johnson
- umax_pp: Stéphane Voltz (*)
+ umax_pp: Stéphane Voltz (*)
umax1220u: Marcio L. Teixeira, Patrick Lessard
v4l: Juergen G. Schimmer, and Henning Geinitz (*)
xerox_mfp: Alex Belkin (*)
@@ -112,7 +112,7 @@ Frontends:
jscanimage: Jeff Freedman and Guido Muesch
saned: Andreas Beck, David Mosberger, Julien Blache (*)
scanimage: Andreas Beck, David Mosberger, Gordon Matzigkeit,
- m. allan noah (*), Julien Blache (*), Stéphane Voltz (*)
+ m. allan noah (*), Julien Blache (*), Stéphane Voltz (*)
tstbackend: Frank Zago (*)
Sanei internal code:
@@ -189,7 +189,7 @@ Jon Chambers <jon@jon.demon.co.uk>
Jonathan Bravo Lopez <jkdsoft@gmail.com>
Juergen G. Schimmer <schimmi@nbgm.siemens.de>
Julien Blache <jb@jblache.org>
-Karl Anders Øygard <karlo@opera.no>
+Karl Anders Øygard <karlo@opera.no>
Karl Heinz Kremer <khk@khk.net>
Karsten Festag <karsten.festag@gmx.de>
Kazuhiro Sasayama <kaz@hypercore.co.jp>
@@ -232,7 +232,7 @@ Sebastien Sable <Sebastien.Sable@snv.jussieu.fr>
Sergey Vlasov <vsu@altlinux.ru>
Simon Krix <kinsei@users.sourceforge.net>
Simon Munton <simon@munton.demon.co.uk>
-Stéphane Voltz <stef.dev@free.fr>
+Stéphane Voltz <stef.dev@free.fr>
Thomas Soumarmon <soumarmt@nerim.net>
Tom Martone <tom@martoneconsulting.com>
Tom Wang <tom.wang@mustek.com.tw>
diff --git a/ChangeLog b/ChangeLog
index 0d4a741..b32913f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,15 +4,15 @@
* po/nl.po: updates from Martin Kho
* po/uk.po: updates from Yuri Chornoivan
-2011-02-04 Stéphane Voltz <stef.dev@free.fr>
+2011-02-04 Stéphane Voltz <stef.dev@free.fr>
* backend/genesys.c: disable image processing options at 16 bits since
they can't handle it.
-2011-02-02 Stéphane Voltz <stef.dev@free.fr>
+2011-02-02 Stéphane Voltz <stef.dev@free.fr>
* backend/genesys.c backend/genesys_low.c backend/genesys_gl843.c:
more asynchronous parking issues
-2011-01-31 Stéphane Voltz <stef.dev@free.fr>
+2011-01-31 Stéphane Voltz <stef.dev@free.fr>
* backend/genesys.c backend/genesys_low.[ch]: don't return EOF too
early when applying image processing functions, handle writing of
lineart data, improve asynchronous head parking
@@ -46,7 +46,7 @@
- ad usb ids for DR-6030C, CR-135i & CR-190i
* doc/descriptions/unsupported.desc: moved DR-2020U from canon_dr.desc
-2011-01-20 Stéphane Voltz <stef.dev@free.fr>
+2011-01-20 Stéphane Voltz <stef.dev@free.fr>
* backend/genesys_devices.c backend/genesys_gl646.h: tune resolution
list and add internal values matching them
@@ -63,7 +63,7 @@
* po/de.po: updated translation from Matthias Mailander
* backend/canon.conf.in: improved detection of scsi scanners
-2011-01-17 Stéphane Voltz <stef.dev@free.fr>
+2011-01-17 Stéphane Voltz <stef.dev@free.fr>
* doc/descriptions/genesys.desc: add DSmobile variant
2011-01-15 Reinhold Kainhofer <reinhold@kainhofer.com>
@@ -72,17 +72,17 @@
* backend/magicolor.c: Add new "magicolor" backend for KONICA MINOLTA
magicolor 1690MF devices
-2011-01-13 Stéphane Voltz <stef.dev@free.fr>
+2011-01-13 Stéphane Voltz <stef.dev@free.fr>
* backend/genesys_devices.c backend/genesys_gl124.c backend/genesys_gl124.h
doc/descriptions/genesys.desc: add 2400 dpi mode for LiDE 110 and 210
-2011-01-12 Stéphane Voltz <stef.dev@free.fr>
+2011-01-12 Stéphane Voltz <stef.dev@free.fr>
* backend/genesys.c backend/genesys_devices.c backend/genesys_gl124.c
backend/genesys_gl124.h backend/genesys_low.c backend/genesys_low.h :
prepare 2400 dpi modes for LiDE 210/110, add a wait for head to park
function and use it in sane_start().
-2011-01-06 Stéphane Voltz <stef.dev@free.fr>
+2011-01-06 Stéphane Voltz <stef.dev@free.fr>
* backend/genesys.c backend/genesys_devices.c
backend/genesys_gl847.c: fix lineart issue when yres is higher than
xres and dynamic lineart is enabled, make gl847 wait for head to
@@ -97,13 +97,13 @@
backend/pixma_common.c, backend/pixma_common.h:
pixma: several updates for MP830, MP990, memmove bug fix, and 64 bits image size.
-2011-01-04 Stéphane Voltz <stef.dev@free.fr>
+2011-01-04 Stéphane Voltz <stef.dev@free.fr>
* backend/genesys.c backend/genesys_devices.c
backend/genesys_gl124.c: fix 1200 dpi lineart issues for gl124,
reenable low resolutions for lineart for gl124, and geometry fine
tuning for LiDE 110/210
-2011-01-03 Stéphane Voltz <stef.dev@free.fr>
+2011-01-03 Stéphane Voltz <stef.dev@free.fr>
* backends/lexmark_low.c: fix compilation issue due to incorrect
place for a DBG statement.
@@ -126,30 +126,30 @@
disabled.
* sanei/Makefile.am: allow "make check" to work on cygwin.
-2010-12-28 Stéphane Voltz <stef.dev@free.fr>
+2010-12-28 Stéphane Voltz <stef.dev@free.fr>
* backend/genesys.conf.in backend/genesys_devices.c backend/genesys_gl646.c
backend/genesys_gl847.c backend/genesys_gl847.h:
fix HP2300 warming up problem, add LiDE 700F and 5600F to gl847
devices, smooth DSmobile 600 moves.
-2010-12-27 Stéphane Voltz <stef.dev@free.fr>
+2010-12-27 Stéphane Voltz <stef.dev@free.fr>
* backend/genesys.c backend/genesys.conf.in backend/genesys_devices.c
backend/genesys_gl841.c backend/genesys_low.h
doc/descriptions/genesys.desc doc/descriptions/unsupported.desc
doc/sane-genesys.man: add Plustek OpticBook 3600 support
by Chris Berry <s0457957@sms.ed.ac.uk> and Michael Rickmann <mrickma@gwdg.de>
-2010-12-27 Stéphane Voltz <stef.dev@free.fr>
+2010-12-27 Stéphane Voltz <stef.dev@free.fr>
* backend/genesys_devices.c backend/genesys_gl124.c backend/genesys.c
doc/descriptions/genesys.desc doc/sane-genesys.man: enable 16 bit gamma
for gl124 scanners, models and credits update.
-2010-12-24 Stéphane Voltz <stef.dev@free.fr>
+2010-12-24 Stéphane Voltz <stef.dev@free.fr>
* backend/genesys_devices.c backend/genesys_gl124.c backend/genesys.c
doc/descriptions/genesys.desc: GL847 shading area size fix, GL124
shading area tuning, descriptions update.
-2010-12-24 Stéphane Voltz <stef.dev@free.fr>
+2010-12-24 Stéphane Voltz <stef.dev@free.fr>
* backend/lexmark*.[ch]: applied X74 support patch by Torsten Houwaart
<ToHo@gmx.de>
@@ -170,15 +170,15 @@
* doc/descriptions/avision.desc:
- (Re)generated from avision.c.
-2010-12-19 Stéphane Voltz <stef.dev@free.fr>
+2010-12-19 Stéphane Voltz <stef.dev@free.fr>
* backend/genesys_gl124.h: LiDE 210 GPIO fix
-2010-12-16 Stéphane Voltz <stef.dev@free.fr>
+2010-12-16 Stéphane Voltz <stef.dev@free.fr>
* backend/genesys.c backend/genesys.conf.in backend/genesys_devices.c
backend/genesys_gl124.h:
LiDE 210 support (GL124 based)
-2010-12-14 Stéphane Voltz <stef.dev@free.fr>
+2010-12-14 Stéphane Voltz <stef.dev@free.fr>
* backend/genesys*.[ch] backend/genesys.conf.in backend/Makefile.am
backend/Makefile.in tools/check-usb-chip.c doc/desc/genesys.desc:
LiDE 110 support (GL124 based)
@@ -228,7 +228,7 @@
* doc/descriptions-external/epkowa.desc: update for iScan 2.26.1,
from Olaf Meeuwissen <olaf.meeuwissen@avasys.jp>.
-2010-11-17 Stéphane Voltz <stef.dev@free.fr>
+2010-11-17 Stéphane Voltz <stef.dev@free.fr>
* backend/genesys.c: don't write scan data unless specified by debug
level.
@@ -240,15 +240,15 @@
* backend/v4l.c: loop through the read buffers in the v4l backend so
we don't get stale frames.
-2010-11-06 Stéphane Voltz <stef.dev@free.fr>
+2010-11-06 Stéphane Voltz <stef.dev@free.fr>
* frontend/scanimage.c doc/scanimage.man: add -A/--all-options to list
all control options exposed by a backend.
-2010-11-01 Stéphane Voltz <stef.dev@free.fr>
+2010-11-01 Stéphane Voltz <stef.dev@free.fr>
* frontend/scanimage.c: don't print readonly device options since
they can't be set on command line
-2010-11-01 Stéphane Voltz <stef.dev@free.fr>
+2010-11-01 Stéphane Voltz <stef.dev@free.fr>
* backend/genesys.c backend/genesys_devices.c backend/genesys_gl843.c
backend/genesys_gl843.h backend/genesys_gl847.c: up build number to 41,
rework head parking,
@@ -265,7 +265,7 @@
Samsung SCX 4824 & 4825FN (Debian #601748). Resync desc file with
config file.
-2010-10-13 Stéphane Voltz <stef.dev@free.fr>
+2010-10-13 Stéphane Voltz <stef.dev@free.fr>
* backend/genesys_devices.c backend/genesys_gl843.c
backend/genesys_gl843.h: added 100, 150, 400 and 600 dpi modes for
G4050 and G4010. Added 500 and 400 dpi modes for KV-SS080
@@ -279,7 +279,7 @@
for xerox_mfp backend (by Alexander Kuznetsov). autoconf and automake reconfigure
to support new files.
-2010-09-28 Stéphane Voltz <stef.dev@free.fr>
+2010-09-28 Stéphane Voltz <stef.dev@free.fr>
* backend/genesys.c backend/genesys.conf.in backend/genesys_devices.c
backend/genesys_gl843.c backend/genesys_gl843.h: add minimal support
(200 and 300 dpi) for HP G4050. Add a device entry for G4010.
@@ -296,7 +296,7 @@
* doc/descriptions-external/epkowa.desc: update for iScan 2.26.0,
from Alesh Slovak <alesh.slovak@avasys.jp>.
-2010-09-17 Stéphane Voltz <stef.dev@free.fr>
+2010-09-17 Stéphane Voltz <stef.dev@free.fr>
* backend/genesys.c backend/genesys_low.h sanei/sanei_magic.c
backend/genesys_devices.c backend/genesys_gl843.c: do asynchronous head
parking for flatbed scanners to save scan time. Fix a couple of
@@ -307,15 +307,15 @@
* frontend/saned.c: exit Avahi process on error and when the poll
loop terminates.
-2010-09-13 Stéphane Voltz <stef.dev@free.fr>
+2010-09-13 Stéphane Voltz <stef.dev@free.fr>
* doc/descriptions/unsupported.desc: update status of scanners
now supported by the genesys backend.
-2010-09-13 Stéphane Voltz <stef.dev@free.fr>
+2010-09-13 Stéphane Voltz <stef.dev@free.fr>
* doc/sane-genesys.man doc/descriptions/genesys.desc
backend/genesys.con.in: update HP3690 status to supported
-2010-09-12 Stéphane Voltz <stef.dev@free.fr>
+2010-09-12 Stéphane Voltz <stef.dev@free.fr>
* backend/genesys_conv.c backend/genesys.c doc/sane-genesys.man
sanei/sanei_magic.c backend/genesys.h backend/genesys_low.h
backend/Makefile.in backend/Makefile.am: add software deskep, crop
@@ -334,15 +334,15 @@
* doc/sane-pixma.man:
pixma: man page update for devices as reported by Gernot Hassenpflug.
-2010-09-05 Stéphane Voltz <stef.dev@free.fr>
+2010-09-05 Stéphane Voltz <stef.dev@free.fr>
* backend/genesys_gl841.c: end of document detection rework for
sheetfed scanners.
-2010-09-04 Stéphane Voltz <stef.dev@free.fr>
+2010-09-04 Stéphane Voltz <stef.dev@free.fr>
* backend/genesys_devices.c backend/genesys.c backend/genesys_gl843.c:
1200 dpi resolution support for KV-SS080.
-2010-09-01 Stéphane Voltz <stef.dev@free.fr>
+2010-09-01 Stéphane Voltz <stef.dev@free.fr>
* backend/genesys_devices.c backend/genesys.c backend/genesys_gl843.c:
support for scan button, faster move to scan area and calibration fine
tuning.
@@ -353,13 +353,13 @@
pixma: changes supplied by Gernot Hassenpflug for Lineart support
to some Pixma devices, and desc updates.
-2010-08-31 Stéphane Voltz <stef.dev@free.fr>
+2010-08-31 Stéphane Voltz <stef.dev@free.fr>
* backend/genesys_devices.c backend/genesys.conf.in backend/genesys.c
backend/genesys_gl843.[ch] backend/Makefile.am backend/Makefile.in:
support for gl843 based scanners, starting with KV-SS080.
disable true gray for LIDE35/50 since it breaks scanning
-2010-08-02 Stéphane Voltz <stef.dev@free.fr>
+2010-08-02 Stéphane Voltz <stef.dev@free.fr>
* backend/genesys_devices.c backend/genesys.conf.in: add a device
entry for the Canoscan 5600f.
@@ -417,18 +417,18 @@
* tools/sane-desc.c: udev rules: set libsane_matched=yes for SCSI
devices too. Used by udev-acl later on.
-2010-06-21 Stéphane Voltz <stef.dev@free.fr>
+2010-06-21 Stéphane Voltz <stef.dev@free.fr>
* backend/genesys.c backend/genesys_devices.c backend/genesys_gl847.c
backend/genesys_low.h: improve scan quality by using double x
resolution internally at low resolution. Scan area geometry fine
tuning.
-2010-06-18 Stéphane Voltz <stef.dev@free.fr>
+2010-06-18 Stéphane Voltz <stef.dev@free.fr>
* backend/genesys.c backend/genesys_devices.c backend/genesys_gl847.c:
add 400, 200 and 100 dpi resolution to LiDE 100 and LiDE 200 . Disable
true gray until it really works.
-2010-06-15 Stéphane Voltz <stef.dev@free.fr>
+2010-06-15 Stéphane Voltz <stef.dev@free.fr>
* backend/genesys.c backend/genesys_devices.c backend/genesys_gl847.c
backend/genesys_gl847.h:
Canon LiDE 200 support up to 1200 DPI
@@ -438,7 +438,7 @@
Add Samsung SCX-4600 USB IDs
* backend/kvs20xx.h: use sys/param.h instead of endian.h
-2010-06-10 Stéphane Voltz <stef.dev@free.fr>
+2010-06-10 Stéphane Voltz <stef.dev@free.fr>
* backend/genesys.c:
calibration file name double free fix
@@ -446,7 +446,7 @@
* backend/niash.c: patch for HP3300 from Yves Jeanrenaud
* po/fr.po: updates from Yann E. MORIN
-2010-06-10 Stéphane Voltz <stef.dev@free.fr>
+2010-06-10 Stéphane Voltz <stef.dev@free.fr>
* backend/genesys_devices.c backend/genesys_gl847.c:
LiDE 100 motor settings rework
@@ -470,20 +470,20 @@
* backend/pixma_imageclass.c:
pixma: set #1 of modifiations for ImageClass MF65xx series.
-2010-06-07 Stéphane Voltz <stef.dev@free.fr>
+2010-06-07 Stéphane Voltz <stef.dev@free.fr>
* backend/genesys.c backend/genesys_devices.c backend/genesys_gl847.c:
LiDE 100 motor fine tuning
-2010-06-03 Stéphane Voltz <stef.dev@free.fr>
+2010-06-03 Stéphane Voltz <stef.dev@free.fr>
* backend/genesys.c backend/genesys_devices.c backend/genesys_gl847.c
doc/descriptions/genesys.desc:
final bits for full LiDE 100 support
-2010-05-31 Stéphane Voltz <stef.dev@free.fr>
+2010-05-31 Stéphane Voltz <stef.dev@free.fr>
* backend/genesys.c backend/genesys_devices.c backend/genesys_gl847.c:
shading calibration is working and led calibration has been tuned
-2010-05-30 Stéphane Voltz <stef.dev@free.fr>
+2010-05-30 Stéphane Voltz <stef.dev@free.fr>
* backend/genesys.c backend/genesys_devices.c backend/genesys_gl847.c
backend/genesys_low.h: Canon LiDE 100 working without shading
calibration which is the final bit to fix
@@ -491,7 +491,7 @@
2010-05-24 m. allan noah <kitno455 at gmail dot com>
* backend/avision.c, doc/descriptions/avision.desc: add Fujitsu fi-5015C
-2010-05-20 Stéphane Voltz <stef.dev@free.fr>
+2010-05-20 Stéphane Voltz <stef.dev@free.fr>
* backend/genesys.c backend/genesys_devices.c backend/genesys_gl847.c:
make led and shading calibration work for LiDE 100
@@ -500,12 +500,12 @@
to be told location of external libraries installed through
Ports.
-2010-05-16 Stéphane Voltz <stef.dev@free.fr>
+2010-05-16 Stéphane Voltz <stef.dev@free.fr>
* backend/genesys.[ch] backend/genesys_devices.c
backend/genesys.conf.in backend/genesys_gl847.[ch]
backend/Makefile.in: start of LiDE 100 and LIDE 200 support
-2010-05-16 Stéphane Voltz <stef.dev@free.fr>
+2010-05-16 Stéphane Voltz <stef.dev@free.fr>
* sanei/sanei_usb.c include/sane/sanei_usb.h: add a sanei_usb_reset()
function.
diff --git a/NEWS b/NEWS
index aad3ebe..53645b1 100644
--- a/NEWS
+++ b/NEWS
@@ -463,7 +463,7 @@ New with 1.00:
Supports "Scan 300/GS" and may work with "Scan 300/S" but the
latter is untested.
-* New Agfa Focus backend (by Karl Anders Øygard)
+* New Agfa Focus backend (by Karl Anders Øygard)
Supports:
o AGFA Focus GS (6 bit gray scale) (untested)
o AGFA Focus Lineart (lineart) (untested)
diff --git a/doc/descriptions.txt b/doc/descriptions.txt
index c9eaad1..d4cab94 100644
--- a/doc/descriptions.txt
+++ b/doc/descriptions.txt
@@ -84,7 +84,7 @@ Example: `:interface "SCSI USB IEEE-1394"'
`:usbid' defines the USB vendor and product ids of the device. It has two
arguments which must be lower case hexadecimal (4 digits). The first one is the
-USB vendor id, the second one the USB üproduct id. The keyword refers to the
+USB vendor id, the second one the USB product id. The keyword refers to the
previous `:model', is optional, and applicable for devices with :interface "USB"
only, and should be used only once per model. The special parameter "ignore" can
be used if no vendor or product ids are given intentionally, e.g. for a group of
diff --git a/doc/gt68xx/gt68xx.CHANGES b/doc/gt68xx/gt68xx.CHANGES
index f20fb54..43f2e85 100644
--- a/doc/gt68xx/gt68xx.CHANGES
+++ b/doc/gt68xx/gt68xx.CHANGES
@@ -256,7 +256,7 @@ V 1.0-59 (2004-04-10)
* Added Genius Colorpage Vivid4 to .conf file. Changed status to good. Added
to man page.
* Fixed black mark for Mustek BearPaw 2448 TA Plus. This one and the Mustek A3
- fixes are from Jakub Dvo?ák <xdvorak@chello.cz>.
+ fixes are from Jakub Dvořák <xdvorak@chello.cz>.
* Status of BearPaw 2448 TA/CS Plus is "basic" now.
V 1.0-58 (2004-04-04)
diff --git a/doc/mustek/mustek.CHANGES b/doc/mustek/mustek.CHANGES
index 250f68f..b7c7e2b 100644
--- a/doc/mustek/mustek.CHANGES
+++ b/doc/mustek/mustek.CHANGES
@@ -763,7 +763,7 @@ CHANGES for the SANE Mustek backend
2000-06-04
* changed (again) Paragon 12000 SP linedistance handling, now 1.02 uses
normal LD corrections, all other use none. We'll see, if this works.
- Thanks to Reinhard Günzel who helped to debug this.
+ Thanks to Reinhard Günzel who helped to debug this.
* fixed some long lines (>80 chars)
2000-06-03
diff --git a/doc/plustek/Plustek-PARPORT-TODO.txt b/doc/plustek/Plustek-PARPORT-TODO.txt
index c66de8a..94ef5f7 100644
--- a/doc/plustek/Plustek-PARPORT-TODO.txt
+++ b/doc/plustek/Plustek-PARPORT-TODO.txt
@@ -1,4 +1,4 @@
-Plustek-PARPORT-TODO.txt (2003-29-10) Gerhard Jäger <gerhard@gjaeger.de>
+Plustek-PARPORT-TODO.txt (2003-29-10) Gerhard Jäger <gerhard@gjaeger.de>
========================================================================
TODO (in general):
diff --git a/doc/plustek/Plustek-PARPORT.txt b/doc/plustek/Plustek-PARPORT.txt
index 333c2d8..e5b6097 100644
--- a/doc/plustek/Plustek-PARPORT.txt
+++ b/doc/plustek/Plustek-PARPORT.txt
@@ -1,4 +1,4 @@
-Plustek-PARPRORT.txt (2004-03-28) Gerhard Jäger <gerhard@gjaeger.de>
+Plustek-PARPRORT.txt (2004-03-28) Gerhard Jäger <gerhard@gjaeger.de>
====================================================================
diff --git a/doc/plustek/Plustek-USB.txt b/doc/plustek/Plustek-USB.txt
index 89dfecf..e1ee793 100644
--- a/doc/plustek/Plustek-USB.txt
+++ b/doc/plustek/Plustek-USB.txt
@@ -1,4 +1,4 @@
-Plustek-USB.txt (2005-08-08) Gerhard Jäger <gerhard@gjaeger.de>
+Plustek-USB.txt (2005-08-08) Gerhard Jäger <gerhard@gjaeger.de>
===============================================================
NOTE:
diff --git a/doc/u12/U12.changes b/doc/u12/U12.changes
index b13cf27..b6d008f 100644
--- a/doc/u12/U12.changes
+++ b/doc/u12/U12.changes
@@ -1,4 +1,4 @@
-U12.changes - Gerhard Jäger <gerhard@gjaeger.de>
+U12.changes - Gerhard Jäger <gerhard@gjaeger.de>
================================================
V 0.01-1 (2004-09-01)
diff --git a/doc/u12/U12.todo b/doc/u12/U12.todo
index 5eea402..f10216e 100644
--- a/doc/u12/U12.todo
+++ b/doc/u12/U12.todo
@@ -1,4 +1,4 @@
-U12.todo (2004-19-01) Gerhard Jäger <gerhard@gjaeger.de>
+U12.todo (2004-19-01) Gerhard Jäger <gerhard@gjaeger.de>
=========================================================
OPEN:
diff --git a/doc/umax/sane-umax-parport-doc.html b/doc/umax/sane-umax-parport-doc.html
index 330b7d6..5dd9f04 100644
--- a/doc/umax/sane-umax-parport-doc.html
+++ b/doc/umax/sane-umax-parport-doc.html
@@ -78,7 +78,7 @@ backend that provides acces to several UMAX-SCSI-scanners.
But there is an experimental
<a href="http://umax1220p.sourceforge.net">parallel port driver for UMAX scanners</a>.
<br>
-Don´t ask me about that driver - I do not know anything about this driver!
+Don't ask me about that driver - I do not know anything about this driver!
</blockquote>
</td>
--
1.7.4

43
sane-backends-1.0.22-man-encoding.patch Normal file
View File

@ -0,0 +1,43 @@
From 50bce37120e3a1f448e62dd88b0b8cce1f36d35b Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils@redhat.com>
Date: Wed, 16 Mar 2011 10:59:09 +0100
Subject: [PATCH] patch: man-encoding
Squashed commit of the following:
commit 54a279b424c39c0ab658acacb5e2c861b6f291a0
Author: Nils Philippsen <nils@redhat.com>
Date: Wed Mar 16 10:52:45 2011 +0100
don't use ISO-8859-1 encoding in man pages
---
doc/sane-hpljm1005.man | 2 +-
doc/sane-p5.man | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/doc/sane-hpljm1005.man b/doc/sane-hpljm1005.man
index af6588f..ff1006a 100644
--- a/doc/sane-hpljm1005.man
+++ b/doc/sane-hpljm1005.man
@@ -34,4 +34,4 @@ support dynamic loading).
.BR sane\-usb (5),
.SH AUTHOR
-Philippe Rétornaz <couriousous@mandriva.org>
+Philippe R\['e]tornaz <couriousous@mandriva.org>
diff --git a/doc/sane-p5.man b/doc/sane-p5.man
index b5ecbba..860a019 100644
--- a/doc/sane-p5.man
+++ b/doc/sane-p5.man
@@ -133,7 +133,7 @@ St\['e]phane Voltz <stef.dev@free.fr>
.SH "CREDITS"
Support for the Prima PagePartner has been made possible thank to an hardware donation
-by Sébastien Lange.
+by S\['e]bastien Lange.
.SH "BUG REPORTS"
If something doesn't work mail sane-devel@lists.alioth.debian.org or use the bug
--
1.7.4

127
sane-backends-1.0.22-pkgconfig.patch Normal file
View File

@ -0,0 +1,127 @@
From 867c994d6cb1b750cdaa7589de8d60f24e0738d0 Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils@redhat.com>
Date: Tue, 15 Mar 2011 14:42:07 +0100
Subject: [PATCH] patch: pkgconfig
Squashed commit of the following:
commit 7101c2b317274a25bb7d0cc459047b16318cb110
Author: Nils Philippsen <nils@redhat.com>
Date: Tue Mar 15 14:41:37 2011 +0100
use pkg-config in sane-config, make it multilib-aware
---
tools/sane-config.in | 69 +++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 54 insertions(+), 15 deletions(-)
diff --git a/tools/sane-config.in b/tools/sane-config.in
index 22c02b5..efa9169 100644
--- a/tools/sane-config.in
+++ b/tools/sane-config.in
@@ -19,7 +19,7 @@ pkglibdir="@pkglibdir@"
includedir="@includedir@"
mandir="@mandir@"
infodir="@infodir@"
-libdir="@libdir@"
+#libdir=
localstatedir="@localstatedir@"
sysconfdir="@sysconfdir@"
datarootdir="@datarootdir@"
@@ -33,6 +33,33 @@ srcdir="@srcdir@"
top_srcdir="@top_srcdir@"
cflags=
+pkgconfig_package=sane-backends
+use_pkgconfig=0
+if test -x "@bindir@/pkg-config" && "@bindir@/pkg-config" --exists "$pkgconfig_package"; then
+ use_pkgconfig=1
+else
+ libdir=
+ if kernel="`uname -s 2>/dev/null`"; then
+ case "$kernel" in
+ Linux)
+ if hw="`uname -i 2>/dev/null`"; then
+ case "$hw" in
+ ia64)
+ # Linux/ia64 uses /usr/lib
+ ;;
+ *64|s390x)
+ libdir="@exec_prefix@/lib64"
+ ;;
+ esac
+ fi
+ ;;
+ esac
+ fi
+ if test "x$libdir" = "x"; then
+ libdir="@exec_prefix@/lib"
+ fi
+fi
+
usage ()
{
echo "Usage: " 1>&2
@@ -60,7 +87,7 @@ if test $# -gt 0; then
if test $# -eq 1; then
usage
elif test $# -eq 2; then
- case $2 in
+ case $2 in
--cflags)
echo "Usage: $0 --cflags"
echo " Print C compiler flags for compiling code that uses SANE."
@@ -86,26 +113,38 @@ if test $# -gt 0; then
;;
--ldflags)
- if test -z "$LINKER_RPATH"; then
- echo "-L${libdir} @LDFLAGS@"
+ if test "x$use_pkgconfig" = "x0"; then
+ if test -z "$LINKER_RPATH"; then
+ echo "-L${libdir} @LDFLAGS@"
+ else
+ echo "-L${libdir} @LDFLAGS@ ${LINKER_RPATH}${libdir}"
+ fi
else
- echo "-L${libdir} @LDFLAGS@ ${LINKER_RPATH}${libdir}"
+ pkg-config --libs-only-L "$pkgconfig_package"
fi
;;
--libs)
- echo "-lsane ${LIBS}"
+ if test "x$use_pkgconfig" = "x0"; then
+ echo "-lsane ${LIBS}"
+ else
+ pkg-config --libs "$pkgconfig_package"
+ fi
;;
--cflags)
- unique_cflags=
- if test "${includedir}" != "/usr/include"; then
- unique_cflags="${unique_cflags} -I${includedir}"
- fi
- for i in $cflags; do
- if test "${i}" != "-I${includedir}"; then
- unique_cflags="${unique_cflags} $i"
+ if test "x$use_pkgconfig" = "x0"; then
+ unique_cflags=
+ if test "${includedir}" != "/usr/include"; then
+ unique_cflags="${unique_cflags} -I${includedir}"
fi
- done
- echo ${unique_cflags}
+ for i in $cflags; do
+ if test "${i}" != "-I${includedir}"; then
+ unique_cflags="${unique_cflags} $i"
+ fi
+ done
+ echo ${unique_cflags}
+ else
+ pkg-config --cflags "$pkgconfig_package"
+ fi
;;
--prefix)
echo ${prefix}
--
1.7.4

29
sane-backends-1.0.21-udev.patch → sane-backends-1.0.22-udev.patch
View File

@ -1,21 +1,21 @@
From ba900ddc747cb89c2600c60a1391862e918541d2 Mon Sep 17 00:00:00 2001
From 89ca3fb1306f5e809c94c9d059b3c39b4fe50ec8 Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils@redhat.com>
Date: Wed, 5 May 2010 11:49:10 +0200
Date: Mon, 14 Mar 2011 17:15:20 +0100
Subject: [PATCH] patch: udev
Squashed commit of the following:
commit eecfce287372abf2b336f0d6870611445170645b
commit cad1db5c3a1f735e2425655db6005d2b05169288
Author: Nils Philippsen <nils@redhat.com>
Date: Wed May 5 11:14:59 2010 +0200
Date: Mon Mar 14 17:07:32 2011 +0100
adapt generated udev rules for Fedora
---
tools/sane-desc.c | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
tools/sane-desc.c | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/tools/sane-desc.c b/tools/sane-desc.c
index 658555e..0b24e3b 100644
index ad3a134..fea2f6b 100644
--- a/tools/sane-desc.c
+++ b/tools/sane-desc.c
@@ -56,9 +56,9 @@
@ -30,7 +30,7 @@ index 658555e..0b24e3b 100644
#ifndef PATH_MAX
# define PATH_MAX 1024
@@ -3525,8 +3525,8 @@ print_udev (void)
@@ -3525,20 +3525,20 @@ print_udev (void)
}
}
printf ("\n");
@ -41,11 +41,16 @@ index 658555e..0b24e3b 100644
usbid = usbid->next;
}
@@ -3538,7 +3538,7 @@ print_udev (void)
printf("\n# The following rule will disable USB autosuspend for the device\n");
- printf("ENV{libsane_matched}==\"yes\", RUN+=\"/bin/sh -c 'test -e /sys/$env{DEVPATH}/power/level && echo on > /sys/$env{DEVPATH}/power/level'\"\n");
+ printf("ENV{libsane_matched}==\"yes\", TEST==\"power/level\", ATTR{power/level}=\"on\"\n");
printf ("\nLABEL=\"libsane_usb_rules_end\"\n\n");
printf ("SUBSYSTEMS!=\"scsi\", GOTO=\"libsane_scsi_rules_end\"\n\n");
printf ("LABEL=\"libsane_scsi_rules_begin\"\n");
printf ("# Generic: SCSI device type 6 indicates a scanner\n");
- printf ("KERNEL==\"sg[0-9]*\", ATTRS{type}==\"6\", MODE=\"%s\", GROUP=\"%s\"\n", DEVMODE, DEVGROUP);
- printf ("KERNEL==\"sg[0-9]*\", ATTRS{type}==\"6\", MODE=\"%s\", GROUP=\"%s\", ENV{libsane_matched}=\"yes\"\n", DEVMODE, DEVGROUP);
+ printf ("KERNEL==\"sg[0-9]*\", ATTRS{type}==\"6\", ENV{libsane_matched}=\"yes\"\n");
printf ("# Some scanners advertise themselves as SCSI device type 3\n");
@ -54,7 +59,7 @@ index 658555e..0b24e3b 100644
}
}
printf ("\n");
- printf ("KERNEL==\"sg[0-9]*\", ATTRS{type}==\"3\", ATTRS{vendor}==\"%s\", ATTRS{model}==\"%s\", MODE=\"%s\", GROUP=\"%s\"\n",
- printf ("KERNEL==\"sg[0-9]*\", ATTRS{type}==\"3\", ATTRS{vendor}==\"%s\", ATTRS{model}==\"%s\", MODE=\"%s\", GROUP=\"%s\", ENV{libsane_matched}=\"yes\"\n",
- scsiid->scsi_vendor_id, scsiid->scsi_product_id, DEVMODE, DEVGROUP);
+ printf ("KERNEL==\"sg[0-9]*\", ATTRS{type}==\"3\", ATTRS{vendor}==\"%s\", ATTRS{model}==\"%s\", ENV{libsane_matched}=\"yes\"\n",
+ scsiid->scsi_vendor_id, scsiid->scsi_product_id);
@ -62,5 +67,5 @@ index 658555e..0b24e3b 100644
}
printf ("LABEL=\"libsane_scsi_rules_end\"\n\n");
--
1.6.6.1
1.7.4

64
sane-backends-1.0.22-v4l.patch Normal file
View File

@ -0,0 +1,64 @@
From 26c69b228b29f612faf4b0cc85db969ee7cc4ea6 Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils@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 <jb@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 <nils@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 100644
--- a/backend/v4l.h
+++ b/backend/v4l.h
@@ -29,6 +29,7 @@
#ifndef v4l_h
#define v4l_h
+#ifndef __LINUX_VIDEODEV_H
/* Kernel interface */
/* Only the stuff we need. For more features, more defines are needed */
@@ -165,7 +166,7 @@ struct video_channel
/* end of kernel interface */
-
+#endif /* !__LINUX_VIDEODEV_H */
#include <../include/sane/sane.h>
--
1.7.4

66
sane-backends.spec
View File

@ -1,7 +1,7 @@
Summary: Scanner access software
Name: sane-backends
Version: 1.0.21
Release: 8%{?dist}
Version: 1.0.22
Release: 1%{?dist}
# lib/ is LGPLv2+, backends are GPLv2+ with exceptions
# Tools are GPLv2+, docs are public domain
# see LICENSE for details
@ -9,22 +9,24 @@ License: GPLv2+ and GPLv2+ with exceptions and Public Domain
Group: System Environment/Libraries
Source0: ftp://ftp.sane-project.org/pub/sane/%{name}-%{version}/%{name}-%{version}.tar.gz
Source1: sane.png
# upstream forgot some files in the 1.0.21 tarball:
Patch0: ftp://ftp.sane-project.org/pub/sane/%{name}-%{version}/%{name}-%{version}-i18n.patch
Patch1: sane-backends-1.0.21-pkgconfig.patch
Patch2: sane-backends-1.0.20-open-macro.patch
Patch3: sane-backends-1.0.21-udev.patch
Patch4: sane-backends-1.0.21-man-encoding.patch
Patch5: sane-backends-1.0.21-epson-expression800.patch
Patch6: sane-backends-1.0.20-lockdir.patch
Patch7: sane-backends-1.0.21-docs-utf8.patch
Patch8: sane-backends-1.0.21-xerox-mfp-color-mode.patch
Patch9: sane-backends-1.0.21-SCX4500W.patch
Patch10: sane-backends-1.0.21-epson2-fixes.patch
# update for new libv4l
Patch11: sane-backends-1.0.21-v4l.patch
# Upstreamed at: https://alioth.debian.org/tracker/index.php?func=detail&aid=313038
Patch0: sane-backends-1.0.22-pkgconfig.patch
# Fedora-specific, not generally applicable:
Patch1: sane-backends-1.0.22-udev.patch
# Upstreamed at: https://alioth.debian.org/tracker/index.php?func=detail&aid=313039
Patch2: sane-backends-1.0.22-man-encoding.patch
# Upstreamed at: https://alioth.debian.org/tracker/index.php?func=detail&aid=313040
Patch3: sane-backends-1.0.21-epson-expression800.patch
# Upstreamed at: https://alioth.debian.org/tracker/index.php?func=detail&aid=313041
Patch4: sane-backends-1.0.20-lockdir.patch
# Upstreamed at: https://alioth.debian.org/tracker/index.php?func=detail&aid=313042
Patch5: sane-backends-1.0.22-docs-utf8.patch
# Upstreamed at: https://alioth.debian.org/tracker/index.php?func=detail&aid=313043
Patch6: sane-backends-1.0.21-SCX4500W.patch
# backported from upstream c5ca46c2d1be78c651afb843cc834cf2b5b24953
Patch7: sane-backends-1.0.22-v4l.patch
# may need rebuilding if one of the above changes:
Patch100: sane-backends-1.0.21-automake.patch
Patch100: sane-backends-1.0.22-automake.patch
URL: http://www.sane-project.org
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%__id_u -n)
BuildRequires: tetex-latex
@ -85,18 +87,14 @@ want to access digital cameras.
%prep
%setup -q
%patch0 -p1 -b .i18n
%patch1 -p1 -b .pkgconfig
%patch2 -p1 -b .open-macro
%patch3 -p1 -b .udev
%patch4 -p1 -b .man-encoding
%patch5 -p1 -b .epson-expression800
%patch6 -p1 -b .lockdir
%patch7 -p1 -b .docs-utf8
%patch8 -p1 -b .xerox-mfp-color-mode
%patch9 -p1 -b .SCX4500W
%patch10 -p1 -b .epson2-fixes
%patch11 -p1 -b .v4l
%patch0 -p1 -b .pkgconfig
%patch1 -p1 -b .udev
%patch2 -p1 -b .man-encoding
%patch3 -p1 -b .epson-expression800
%patch4 -p1 -b .lockdir
%patch5 -p1 -b .docs-utf8
%patch6 -p1 -b .SCX4500W
%patch7 -p1 -b .v4l
%patch100 -p1 -b .automake
@ -127,6 +125,9 @@ rm -f %{buildroot}%{_libdir}/libsane*.la %{buildroot}%{_libdir}/sane/*.la
mkdir -p %{buildroot}/lib/udev/rules.d
install -m 0644 tools/udev/libsane.rules %{buildroot}/lib/udev/rules.d/65-libsane.rules
mkdir -p %{buildroot}%{_libdir}/pkgconfig
install -m 0644 tools/sane-backends.pc %{buildroot}%{_libdir}/pkgconfig/
%find_lang %name
@ -174,6 +175,13 @@ rm -rf %{buildroot}
%{_libdir}/pkgconfig/sane-backends.pc
%changelog
* Wed Mar 16 2011 Nils Philippsen <nils@redhat.com> - 1.0.22-1
- version 1.0.22
- remove obsolete i18n, xerox-mfp-color-mode, epson2-fixes, open-macro patches
- update pkgconfig, udev, docs-utf8, v4l, man-encoding patches
- submit patches upstream where this is applicable, add comments
- manually install pkg-config file
* Wed Mar 09 2011 Dan Horák <dan[at]danny.cz> - 1.0.21-8
- updated for newer libv4l

2
sources
View File

@ -1 +1 @@
be586a23633949cf2ecf0c9c6d769130 sane-backends-1.0.21.tar.gz
fadf56a60f4776bfb24491f66b617cf5 sane-backends-1.0.22.tar.gz