rpms/sane-backends/F-12 import.log, NONE, 1.1 sane-backends-1.0.21-automake.patch, NONE, 1.1 sane-backends-1.0.21-docs-utf8.patch, NONE, 1.1 sane-backends-1.0.21-epson-expression800.patch, NONE, 1.1 sane-backends-1.0.21-i18n.patch, NONE, 1.1 sane-backends-1.0.21-man-encoding.patch, NONE, 1.1 sane-backends-1.0.21-pkgconfig.patch, NONE, 1.1 sane-backends-1.0.21-udev.patch, NONE, 1.1 .cvsignore, 1.19, 1.20 sane-backends.spec, 1.136, 1.137 sources, 1.21, 1.22 hal-usb-scanner-add, 1.1, NONE sane-backends-1.0.20-epson-expression800.patch, 1.1, NONE sane-backends-1.0.20-genesys-gl841-registers.patch, 1.1, NONE sane-backends-1.0.20-hal.patch, 1.2, NONE sane-backends-1.0.20-man-utf8.patch, 1.1, NONE sane-backends-1.0.20-pkgconfig.patch, 1.2, NONE sane-backends-1.0.20-rpath.patch, 1.3, NONE sane-backends-1.0.20-udev.patch, 1.3, NONE

Nils Philippsen nphilipp at fedoraproject.org
Wed May 5 12:03:30 UTC 2010 

Author: nphilipp

Update of /cvs/pkgs/rpms/sane-backends/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv27857/F-12

Modified Files:
	.cvsignore sane-backends.spec sources 
Added Files:
	import.log sane-backends-1.0.21-automake.patch 
	sane-backends-1.0.21-docs-utf8.patch 
	sane-backends-1.0.21-epson-expression800.patch 
	sane-backends-1.0.21-i18n.patch 
	sane-backends-1.0.21-man-encoding.patch 
	sane-backends-1.0.21-pkgconfig.patch 
	sane-backends-1.0.21-udev.patch 
Removed Files:
	hal-usb-scanner-add 
	sane-backends-1.0.20-epson-expression800.patch 
	sane-backends-1.0.20-genesys-gl841-registers.patch 
	sane-backends-1.0.20-hal.patch 
	sane-backends-1.0.20-man-utf8.patch 
	sane-backends-1.0.20-pkgconfig.patch 
	sane-backends-1.0.20-rpath.patch 
	sane-backends-1.0.20-udev.patch 
Log Message:
version 1.0.21
remove obsolete rpath, hal, genesys-gl841-registers patches
update pkgconfig, udev, man-utf8->man-encoding, epson-expression800 patches
remove hal conditional
package man pages
convert some documentation files to UTF-8
fix permissions of pkgconfig file



--- NEW FILE import.log ---
sane-backends-1_0_21-1_fc14:F-12:sane-backends-1.0.21-1.fc14.src.rpm:1273060975

sane-backends-1.0.21-automake.patch:
 backend/Makefile.in |    3 +-
 tools/Makefile.in   |   62 ++++++++++++++++++++++++++++++++++++++++------------
 2 files changed, 50 insertions(+), 15 deletions(-)

--- NEW FILE sane-backends-1.0.21-automake.patch ---
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 at 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)
 

sane-backends-1.0.21-docs-utf8.patch:
 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                     |    3 
 11 files changed, 77 insertions(+), 78 deletions(-)

--- NEW FILE sane-backends-1.0.21-docs-utf8.patch ---
>From ad6d50c9e6cab61dbe027a2ab176a37cd6dd2289 Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils at 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 at 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 at jon.demon.co.uk>
 Jonathan Bravo Lopez <jkdsoft at gmail.com>
 Juergen G. Schimmer <schimmi at nbgm.siemens.de>
 Julien Blache <jb at jblache.org>
-Karl Anders Øygard <karlo at opera.no>
+Karl Anders Øygard <karlo at opera.no>
 Karl Heinz Kremer <khk at khk.net>
 Karsten Festag <karsten.festag at gmx.de>
 Kazuhiro Sasayama <kaz at hypercore.co.jp>
@@ -230,7 +230,7 @@ Sebastien Sable <Sebastien.Sable at snv.jussieu.fr>
 Sergey Vlasov <vsu at altlinux.ru>
 Simon Krix <kinsei at users.sourceforge.net>
 Simon Munton <simon at munton.demon.co.uk>
-Stéphane Voltz <stef.dev at free.fr>
+Stéphane Voltz <stef.dev at free.fr>
 Thomas Soumarmon <soumarmt at nerim.net>
 Tom Martone <tom at martoneconsulting.com>
 Tom Wang <tom.wang at 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 at 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 at 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 at 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 at 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 at jblache.org>
 	* doc/descriptions/epson.desc: add the Perfection636 SCSI scanner, from
-	Frédéric Brière <fbriere at fbriere.net>.
+	Frédéric Brière <fbriere at 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 at 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 at chello.cz>.
+  fixes are from Jakub Dvořák <xdvorak at 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 at gjaeger.de>
+Plustek-PARPORT-TODO.txt (2003-29-10) Gerhard Jäger <gerhard at 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 at gjaeger.de>
+Plustek-PARPRORT.txt (2004-03-28) Gerhard Jäger <gerhard at 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 at gjaeger.de>
+Plustek-USB.txt (2005-08-08) Gerhard Jäger <gerhard at 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 at gjaeger.de>
+U12.changes - Gerhard Jäger <gerhard at 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 at gjaeger.de>
+U12.todo (2004-19-01) Gerhard Jäger <gerhard at gjaeger.de>
 =========================================================
 
 OPEN:
-- 
1.6.6.1


sane-backends-1.0.21-epson-expression800.patch:
 epson.desc  |    1 +
 epson2.desc |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE sane-backends-1.0.21-epson-expression800.patch ---
>From 305535e303032814b65bf6d889a95f00f08a9071 Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils at redhat.com>
Date: Wed, 5 May 2010 12:49:02 +0200
Subject: [PATCH] patch: epson-expression800

Squashed commit of the following:

commit 3b501d7499357438a1fbd63fefb2f977ae3051f5
Author: Nils Philippsen <nils at redhat.com>
Date:   Wed May 5 12:14:23 2010 +0200

    Improve Epson Expression 800

    Epson Expression 800 models announce themselves as "processor", not
    "scanner".
---
 doc/descriptions/epson.desc  |    1 +
 doc/descriptions/epson2.desc |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/doc/descriptions/epson.desc b/doc/descriptions/epson.desc
index a22325c..55a0136 100644
--- a/doc/descriptions/epson.desc
+++ b/doc/descriptions/epson.desc
@@ -174,6 +174,7 @@
 :model "Expression 800"
 :interface "SCSI"
 :status :complete
+:scsi "EPSON" "Expression800" "processor"
 
 :model "Expression 1600"
 :interface "SCSI USB IEEE-1394"
diff --git a/doc/descriptions/epson2.desc b/doc/descriptions/epson2.desc
index 9a14f4f..56cabcd 100644
--- a/doc/descriptions/epson2.desc
+++ b/doc/descriptions/epson2.desc
@@ -241,6 +241,7 @@
 :model      "Expression 800"		; command spec
 :interface  "SCSI"
 :status     :complete
+:scsi       "EPSON" "Expression800" "processor"
 :comment    "overseas version of the GT-9600"
 
 :model      "Expression 836XL"		; command spec
-- 
1.6.6.1


sane-backends-1.0.21-i18n.patch:
 LINGUAS  |   21 +++++++++++++
 POTFILES |  100 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 121 insertions(+)

--- NEW FILE sane-backends-1.0.21-i18n.patch ---
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
+

sane-backends-1.0.21-man-encoding.patch:
 sane-hpljm1005.man |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE sane-backends-1.0.21-man-encoding.patch ---
>From c9a244eed22ac3d199f1d65f2b6b07af87b2d7f2 Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils at 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 at 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 at mandriva.org>
+Philippe R\['e]tornaz <couriousous at mandriva.org>
-- 
1.6.6.1


sane-backends-1.0.21-pkgconfig.patch:
 Makefile.am    |   14 +++++++++++
 sane-config.in |   67 +++++++++++++++++++++++++++++++++++++++++++--------------
 2 files changed, 64 insertions(+), 17 deletions(-)

--- NEW FILE sane-backends-1.0.21-pkgconfig.patch ---
>From de99bb00b0084e8a1862398270278a14e099b22b Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils at redhat.com>
Date: Wed, 5 May 2010 13:23:40 +0200
Subject: [PATCH] patch: pkgconfig

Squashed commit of the following:

commit d615848c499842c5923c3274370d2536dc650916
Author: Nils Philippsen <nils at 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 at redhat.com>

commit 119d5af1ddd82dac034d0106a1d86b6d7564f25e
Author: Nils Philippsen <nils at 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 at redhat.com>

commit 7ee1cbef01d851aca95d86145ac5dda02d9e7354
Author: Nils Philippsen <nils at redhat.com>
Date:   Wed May 5 10:22:15 2010 +0200

    use pkg-config in sane-config
---
 tools/Makefile.am    |   14 ++++++++++-
 tools/sane-config.in |   66 ++++++++++++++++++++++++++++++++++++++-----------
 2 files changed, 64 insertions(+), 16 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-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.6.6.1


sane-backends-1.0.21-udev.patch:
 sane-desc.c |   15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

--- NEW FILE sane-backends-1.0.21-udev.patch ---
>From ba900ddc747cb89c2600c60a1391862e918541d2 Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils at redhat.com>
Date: Wed, 5 May 2010 11:49:10 +0200
Subject: [PATCH] patch: udev

Squashed commit of the following:

commit eecfce287372abf2b336f0d6870611445170645b
Author: Nils Philippsen <nils at redhat.com>
Date:   Wed May 5 11:14:59 2010 +0200

    adapt generated udev rules for Fedora
---
 tools/sane-desc.c |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/tools/sane-desc.c b/tools/sane-desc.c
index 658555e..0b24e3b 100644
--- a/tools/sane-desc.c
+++ b/tools/sane-desc.c
@@ -56,9 +56,9 @@
 #define COLOR_NEW          "\"#F00000\""
 #define COLOR_UNKNOWN      "\"#000000\""
 
-#define DEVMODE  "0664"
+#define DEVMODE  "0644"
 #define DEVOWNER "root"
-#define DEVGROUP "scanner"
+#define DEVGROUP "root"
 
 #ifndef PATH_MAX
 # define PATH_MAX 1024
@@ -3525,8 +3525,8 @@ print_udev (void)
 	    }
 	}
       printf ("\n");
-      printf ("ATTRS{idVendor}==\"%s\", ATTRS{idProduct}==\"%s\", MODE=\"%s\", GROUP=\"%s\", ENV{libsane_matched}=\"yes\"\n",
-	      usbid->usb_vendor_id + 2,  usbid->usb_product_id + 2, DEVMODE, DEVGROUP);
+      printf ("ATTRS{idVendor}==\"%s\", ATTRS{idProduct}==\"%s\", ENV{libsane_matched}=\"yes\"\n",
+	      usbid->usb_vendor_id + 2,  usbid->usb_product_id + 2);
       usbid = usbid->next;
     }
 
@@ -3538,7 +3538,7 @@ print_udev (void)
   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\", ENV{libsane_matched}=\"yes\"\n");
   printf ("# Some scanners advertise themselves as SCSI device type 3\n");
 
   while (scsiid)
@@ -3571,8 +3571,8 @@ print_udev (void)
 	    }
         }
       printf ("\n");
-      printf ("KERNEL==\"sg[0-9]*\", ATTRS{type}==\"3\", ATTRS{vendor}==\"%s\", ATTRS{model}==\"%s\", MODE=\"%s\", GROUP=\"%s\"\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);
       scsiid = scsiid->next;
     }
   printf ("LABEL=\"libsane_scsi_rules_end\"\n\n");
-- 
1.6.6.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sane-backends/F-12/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	29 Dec 2009 13:29:14 -0000	1.19
+++ .cvsignore	5 May 2010 12:03:27 -0000	1.20
@@ -1,2 +1 @@
-sane-backends-1.0.20.tar.gz
-sane-backends-1.0.20-11-autoreconf.patch.bz2
+sane-backends-1.0.21.tar.gz


Index: sane-backends.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sane-backends/F-12/sane-backends.spec,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -p -r1.136 -r1.137
--- sane-backends.spec	29 Dec 2009 13:29:14 -0000	1.136
+++ sane-backends.spec	5 May 2010 12:03:29 -0000	1.137
@@ -1,21 +1,7 @@
-# Use the following --with/--without <option> switches to control how the
-# package will be built:
-#
-# udev: ship rules for udev (default for Fedora >= 12, RHEL >= 6)
-# hal:  ship rules for hal (default for Fedora < 12, RHEL < 6)
-
-%if 0%{?fedora}%{?rhel} == 0 || 0%{?fedora} >= 12 || 0%{?rhel} >= 6
-%bcond_without udev
-%bcond_with hal
-%else
-%bcond_with udev
-%bcond_without hal
-%endif
-
 Summary: Scanner access software
 Name: sane-backends
-Version: 1.0.20
-Release: 11%{?dist}
+Version: 1.0.21
+Release: 1%{?dist}
 # lib/ is LGPLv2+, backends are GPLv2+ with exceptions
 # Tools are GPLv2+, docs are public domain
 # see LICENSE for details
@@ -23,17 +9,17 @@ License: GPLv2+ and GPLv2+ with exceptio
 Group: System Environment/Libraries
 Source0: ftp://ftp.sane-project.org/pub/sane/%{name}-%{version}/%{name}-%{version}.tar.gz
 Source1: sane.png
-Source2: hal-usb-scanner-add
-Patch0: sane-backends-1.0.20-rpath.patch
-Patch1: sane-backends-1.0.20-pkgconfig.patch
+# 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.20-hal.patch
-Patch4: sane-backends-1.0.20-udev.patch
-Patch5: sane-backends-1.0.20-man-utf8.patch
-Patch6: sane-backends-1.0.20-epson-expression800.patch
-Patch7: sane-backends-1.0.20-lockdir.patch
-Patch8: sane-backends-1.0.20-genesys-gl841-registers.patch
-Patch10: sane-backends-1.0.20-11-autoreconf.patch.bz2
+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
+# may need rebuilding if one of the above changes:
+Patch100: sane-backends-1.0.21-automake.patch
 URL: http://www.sane-project.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%__id_u -n)
 BuildRequires: tetex-latex
@@ -44,12 +30,7 @@ BuildRequires: libtiff-devel
 BuildRequires: libv4l-devel
 BuildRequires: gettext
 BuildRequires: gphoto2-devel
-%if %{with udev}
 Requires: udev >= 143
-%endif
-%if %{with hal}
-Requires: hal >= 0.4.0
-%endif
 
 %description
 Scanner Access Now Easy (SANE) is a universal scanner interface.  The
@@ -98,16 +79,15 @@ want to access digital cameras.
 %prep
 %setup -q
 
-%patch0 -p1 -b .rpath
+%patch0 -p1 -b .i18n
 %patch1 -p1 -b .pkgconfig
 %patch2 -p1 -b .open-macro
-%patch3 -p1 -b .hal
-%patch4 -p1 -b .udev
-%patch5 -p1 -b .man-utf8
-%patch6 -p1 -b .epson-expression800
-%patch7 -p1 -b .lockdir
-%patch8 -p1 -b .genesys-gl841-registers
-%patch10 -p1 -b .autoreconf
+%patch3 -p1 -b .udev
+%patch4 -p1 -b .man-encoding
+%patch5 -p1 -b .epson-expression800
+%patch6 -p1 -b .lockdir
+%patch7 -p1 -b .docs-utf8
+%patch100 -p1 -b .automake
 
 %build
 %configure \
@@ -128,19 +108,8 @@ rm -f %{buildroot}%{_mandir}/man1/gamma4
 rm -f %{buildroot}%{_libdir}/sane/*.a %{buildroot}%{_libdir}/*.a
 rm -f %{buildroot}%{_libdir}/libsane*.la %{buildroot}%{_libdir}/sane/*.la
 
-%if %{with udev}
 mkdir -p %{buildroot}/lib/udev/rules.d
 install -m 0644 tools/udev/libsane.rules %{buildroot}/lib/udev/rules.d/65-libsane.rules
-%endif
-
-%if %{with hal}
-mkdir -p %{buildroot}/%{_datadir}/hal/fdi/information/20thirdparty
-mkdir -p %{buildroot}/%{_datadir}/hal/fdi/policy/20thirdparty
-install -m 0644 tools/hal/libsane.fdi %{buildroot}/%{_datadir}/hal/fdi/information/20thirdparty/19-libsane.fdi
-install -m 0644 tools/hal/libsane-policy.fdi %{buildroot}/%{_datadir}/hal/fdi/policy/20thirdparty/19-libsane.fdi
-mkdir -p %{buildroot}/%{_libexecdir}
-install -m 0755 %{SOURCE2} %{buildroot}/%{_libexecdir}/hal-usb-scanner-add
-%endif
 
 %find_lang %name
 
@@ -156,15 +125,7 @@ rm -rf %{buildroot}
 %dir /etc/sane.d
 %dir /etc/sane.d/dll.d
 %config(noreplace) /etc/sane.d/*.conf
-%if %{with udev}
 /lib/udev/rules.d/65-libsane.rules
-%endif
-%if %{with hal}
-%{_datadir}/hal/fdi/information/20thirdparty/*.fdi
-%{_datadir}/hal/fdi/policy/20thirdparty/*.fdi
-%{_libexecdir}/hal-usb-scanner-add
-%endif
-%{_mandir}/*/*
 %{_datadir}/pixmaps/sane.png
 
 %{_bindir}/sane-find-scanner
@@ -172,6 +133,9 @@ rm -rf %{buildroot}
 %{_sbindir}/*
 
 %doc %{_docdir}/*
+%exclude %{_mandir}/man1/sane-config.1*
+
+%{_mandir}/*/*
 
 %files libs
 %defattr(-, root, root)
@@ -194,6 +158,18 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/sane-backends.pc
 
 %changelog
+* Wed May 05 2010 Nils Philippsen <nils at redhat.com> - 1.0.21-1
+- version 1.0.21
+- remove obsolete rpath, hal, genesys-gl841-registers patches
+- update pkgconfig, udev, man-utf8->man-encoding, epson-expression800,
+  docs-utf8 patches
+- remove hal conditional
+- package man pages
+
+* Fri Feb 26 2010 Nils Philippsen <nils at redhat.com> - 1.0.20-12
+- convert some documentation files to UTF-8
+- fix permissions of pkgconfig file
+
 * Tue Dec 29 2009 Nils Philippsen <nils at redhat.com> - 1.0.20-11
 - genesys_gl841: always send registers before trying to acquire a line
   (#527935)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sane-backends/F-12/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	29 Dec 2009 13:29:14 -0000	1.21
+++ sources	5 May 2010 12:03:30 -0000	1.22
@@ -1,2 +1 @@
-a0cfdfdebca2feb4f2ba5d3418b15a42  sane-backends-1.0.20.tar.gz
-b33b94acbfae50d9b31abb688573c17c  sane-backends-1.0.20-11-autoreconf.patch.bz2
+be586a23633949cf2ecf0c9c6d769130  sane-backends-1.0.21.tar.gz


--- hal-usb-scanner-add DELETED ---


--- sane-backends-1.0.20-epson-expression800.patch DELETED ---


--- sane-backends-1.0.20-genesys-gl841-registers.patch DELETED ---


--- sane-backends-1.0.20-hal.patch DELETED ---


--- sane-backends-1.0.20-man-utf8.patch DELETED ---


--- sane-backends-1.0.20-pkgconfig.patch DELETED ---


--- sane-backends-1.0.20-rpath.patch DELETED ---


--- sane-backends-1.0.20-udev.patch DELETED ---

More information about the scm-commits mailing list