[sane-backends: 3/3] version 1.0.22
Nils Philippsen
nphilipp at fedoraproject.org
Wed Mar 16 17:18:01 UTC 2011
commit 4c4b8135b896ef9f00b926ce5f435ae5c9b156d5
Author: Nils Philippsen <nils at redhat.com>
Date: Wed Mar 16 18:17:05 2011 +0100
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
.gitignore | 1 +
sane-backends-1.0.20-open-macro.patch | 66 --
sane-backends-1.0.21-automake.patch | 166 -----
sane-backends-1.0.21-docs-utf8.patch | 639 --------------------
sane-backends-1.0.21-epson2-fixes.patch | 200 ------
sane-backends-1.0.21-i18n.patch | 129 ----
sane-backends-1.0.21-man-encoding.patch | 29 -
sane-backends-1.0.21-pkgconfig.patch | 203 -------
sane-backends-1.0.21-v4l.patch | 35 --
sane-backends-1.0.21-xerox-mfp-color-mode.patch | 34 -
sane-backends-1.0.22-automake.patch | 13 +
sane-backends-1.0.22-docs-utf8.patch | 566 +++++++++++++++++
sane-backends-1.0.22-man-encoding.patch | 43 ++
sane-backends-1.0.22-pkgconfig.patch | 127 ++++
...1-udev.patch => sane-backends-1.0.22-udev.patch | 29 +-
sane-backends-1.0.22-v4l.patch | 64 ++
sane-backends.spec | 66 ++-
sources | 2 +-
18 files changed, 869 insertions(+), 1543 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 46fec25..6609bfe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
sane-backends-1.0.21.tar.gz
+/sane-backends-1.0.22.tar.gz
diff --git a/sane-backends-1.0.22-automake.patch b/sane-backends-1.0.22-automake.patch
new file mode 100644
index 0000000..75249b7
--- /dev/null
+++ b/sane-backends-1.0.22-automake.patch
@@ -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)
diff --git a/sane-backends-1.0.22-docs-utf8.patch b/sane-backends-1.0.22-docs-utf8.patch
new file mode 100644
index 0000000..c0bc26f
--- /dev/null
+++ b/sane-backends-1.0.22-docs-utf8.patch
@@ -0,0 +1,566 @@
+From e387e2de4d657001b24ac242dfe8465aa209de02 Mon Sep 17 00:00:00 2001
+From: Nils Philippsen <nils at 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 at 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 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>
+@@ -232,7 +232,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 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 at free.fr>
++2011-02-04 Stéphane Voltz <stef.dev at 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 at free.fr>
++2011-02-02 Stéphane Voltz <stef.dev at 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 at free.fr>
++2011-01-31 Stéphane Voltz <stef.dev at 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 at free.fr>
++2011-01-20 Stéphane Voltz <stef.dev at 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 at free.fr>
++2011-01-17 Stéphane Voltz <stef.dev at free.fr>
+ * doc/descriptions/genesys.desc: add DSmobile variant
+
+ 2011-01-15 Reinhold Kainhofer <reinhold at 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 at free.fr>
++2011-01-13 Stéphane Voltz <stef.dev at 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 at free.fr>
++2011-01-12 Stéphane Voltz <stef.dev at 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 at free.fr>
++2011-01-06 Stéphane Voltz <stef.dev at 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 at free.fr>
++2011-01-04 Stéphane Voltz <stef.dev at 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 at free.fr>
++2011-01-03 Stéphane Voltz <stef.dev at 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 at free.fr>
++2010-12-28 Stéphane Voltz <stef.dev at 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 at free.fr>
++2010-12-27 Stéphane Voltz <stef.dev at 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 at sms.ed.ac.uk> and Michael Rickmann <mrickma at gwdg.de>
+
+-2010-12-27 Stéphane Voltz <stef.dev at free.fr>
++2010-12-27 Stéphane Voltz <stef.dev at 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 at free.fr>
++2010-12-24 Stéphane Voltz <stef.dev at 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 at free.fr>
++2010-12-24 Stéphane Voltz <stef.dev at free.fr>
+ * backend/lexmark*.[ch]: applied X74 support patch by Torsten Houwaart
+ <ToHo at gmx.de>
+
+@@ -170,15 +170,15 @@
+ * doc/descriptions/avision.desc:
+ - (Re)generated from avision.c.
+
+-2010-12-19 Stéphane Voltz <stef.dev at free.fr>
++2010-12-19 Stéphane Voltz <stef.dev at free.fr>
+ * backend/genesys_gl124.h: LiDE 210 GPIO fix
+
+-2010-12-16 Stéphane Voltz <stef.dev at free.fr>
++2010-12-16 Stéphane Voltz <stef.dev at 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 at free.fr>
++2010-12-14 Stéphane Voltz <stef.dev at 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 at avasys.jp>.
+
+-2010-11-17 Stéphane Voltz <stef.dev at free.fr>
++2010-11-17 Stéphane Voltz <stef.dev at 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 at free.fr>
++2010-11-06 Stéphane Voltz <stef.dev at 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 at free.fr>
++2010-11-01 Stéphane Voltz <stef.dev at 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 at free.fr>
++2010-11-01 Stéphane Voltz <stef.dev at 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 at free.fr>
++2010-10-13 Stéphane Voltz <stef.dev at 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 at free.fr>
++2010-09-28 Stéphane Voltz <stef.dev at 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 at avasys.jp>.
+
+-2010-09-17 Stéphane Voltz <stef.dev at free.fr>
++2010-09-17 Stéphane Voltz <stef.dev at 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 at free.fr>
++2010-09-13 Stéphane Voltz <stef.dev at free.fr>
+ * doc/descriptions/unsupported.desc: update status of scanners
+ now supported by the genesys backend.
+
+-2010-09-13 Stéphane Voltz <stef.dev at free.fr>
++2010-09-13 Stéphane Voltz <stef.dev at 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 at free.fr>
++2010-09-12 Stéphane Voltz <stef.dev at 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 at free.fr>
++2010-09-05 Stéphane Voltz <stef.dev at free.fr>
+ * backend/genesys_gl841.c: end of document detection rework for
+ sheetfed scanners.
+
+-2010-09-04 Stéphane Voltz <stef.dev at free.fr>
++2010-09-04 Stéphane Voltz <stef.dev at 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 at free.fr>
++2010-09-01 Stéphane Voltz <stef.dev at 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 at free.fr>
++2010-08-31 Stéphane Voltz <stef.dev at 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 at free.fr>
++2010-08-02 Stéphane Voltz <stef.dev at 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 at free.fr>
++2010-06-21 Stéphane Voltz <stef.dev at 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 at free.fr>
++2010-06-18 Stéphane Voltz <stef.dev at 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 at free.fr>
++2010-06-15 Stéphane Voltz <stef.dev at 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 at free.fr>
++2010-06-10 Stéphane Voltz <stef.dev at 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 at free.fr>
++2010-06-10 Stéphane Voltz <stef.dev at 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 at free.fr>
++2010-06-07 Stéphane Voltz <stef.dev at 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 at free.fr>
++2010-06-03 Stéphane Voltz <stef.dev at 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 at free.fr>
++2010-05-31 Stéphane Voltz <stef.dev at 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 at free.fr>
++2010-05-30 Stéphane Voltz <stef.dev at 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 at free.fr>
++2010-05-20 Stéphane Voltz <stef.dev at 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 at free.fr>
++2010-05-16 Stéphane Voltz <stef.dev at 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 at free.fr>
++2010-05-16 Stéphane Voltz <stef.dev at 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 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:
+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
+
diff --git a/sane-backends-1.0.22-man-encoding.patch b/sane-backends-1.0.22-man-encoding.patch
new file mode 100644
index 0000000..61c6dc8
--- /dev/null
+++ b/sane-backends-1.0.22-man-encoding.patch
@@ -0,0 +1,43 @@
+From 50bce37120e3a1f448e62dd88b0b8cce1f36d35b Mon Sep 17 00:00:00 2001
+From: Nils Philippsen <nils at 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 at 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 at mandriva.org>
++Philippe R\['e]tornaz <couriousous at 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 at 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 at lists.alioth.debian.org or use the bug
+--
+1.7.4
+
diff --git a/sane-backends-1.0.22-pkgconfig.patch b/sane-backends-1.0.22-pkgconfig.patch
new file mode 100644
index 0000000..cb795ab
--- /dev/null
+++ b/sane-backends-1.0.22-pkgconfig.patch
@@ -0,0 +1,127 @@
+From 867c994d6cb1b750cdaa7589de8d60f24e0738d0 Mon Sep 17 00:00:00 2001
+From: Nils Philippsen <nils at 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 at 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
+
diff --git a/sane-backends-1.0.21-udev.patch b/sane-backends-1.0.22-udev.patch
similarity index 70%
rename from sane-backends-1.0.21-udev.patch
rename to sane-backends-1.0.22-udev.patch
index 176008c..8b13374 100644
--- a/sane-backends-1.0.21-udev.patch
+++ b/sane-backends-1.0.22-udev.patch
@@ -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 at 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 at 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
diff --git a/sane-backends-1.0.22-v4l.patch b/sane-backends-1.0.22-v4l.patch
new file mode 100644
index 0000000..4e240e0
--- /dev/null
+++ b/sane-backends-1.0.22-v4l.patch
@@ -0,0 +1,64 @@
+From 26c69b228b29f612faf4b0cc85db969ee7cc4ea6 Mon Sep 17 00:00:00 2001
+From: Nils Philippsen <nils at 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 at 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 at 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
+
diff --git a/sane-backends.spec b/sane-backends.spec
index 66d4416..86348dd 100644
--- a/sane-backends.spec
+++ b/sane-backends.spec
@@ -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 at 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
diff --git a/sources b/sources
index ce19db6..1a49297 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-be586a23633949cf2ecf0c9c6d769130 sane-backends-1.0.21.tar.gz
+fadf56a60f4776bfb24491f66b617cf5 sane-backends-1.0.22.tar.gz
More information about the scm-commits
mailing list