diff --git a/.cvsignore b/.cvsignore index a778e13..7059b91 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ sane-backends-1.0.20.tar.gz -sane-backends-1.0.20-11-autoreconf.patch.bz2 +sane-backends-1.0.20-12-autoreconf.patch.bz2 diff --git a/sane-backends-1.0.20-pkgconfig.patch b/sane-backends-1.0.20-pkgconfig.patch index ac4ac13..635ec77 100644 --- a/sane-backends-1.0.20-pkgconfig.patch +++ b/sane-backends-1.0.20-pkgconfig.patch @@ -1,22 +1,34 @@ -commit e4a01aa9f45cd2420bed7a9131a6d0044c182a05 -Author: Nils Philippsen -Date: Wed Jun 17 13:10:47 2009 +0200 +From 633a32c630461dd45ace506f1b8f6a2f278b5273 Mon Sep 17 00:00:00 2001 +From: Nils Philippsen +Date: Fri, 26 Feb 2010 17:53:58 +0100 +Subject: [PATCH] patch: pkgconfig - patch: pkgconfig - - Squashed commit of the following: - - commit 52ef5f47ccc0128c78ab3ad38ac7b7918dd7ac88 - Author: Nils Philippsen - Date: Wed Jun 17 13:09:51 2009 +0200 - - make sane-config multilib-aware on Linux - - commit 7787640dd567b93dd0a458fd5fb662bb7b85ff36 - Author: Nils Philippsen - Date: Fri Jun 5 12:55:39 2009 +0200 - - use pkg-config in sane-config +Squashed commit of the following: + +commit 6e62ef01acbefe004cd70c176b961a0b009d9672 +Author: Nils Philippsen +Date: Fri Feb 26 17:51:14 2010 +0100 + + pkgconfig file is data + +commit 52ef5f47ccc0128c78ab3ad38ac7b7918dd7ac88 +Author: Nils Philippsen +Date: Wed Jun 17 13:09:51 2009 +0200 + + make sane-config multilib-aware on Linux + +commit 7787640dd567b93dd0a458fd5fb662bb7b85ff36 +Author: Nils Philippsen +Date: Fri Jun 5 12:55:39 2009 +0200 + + use pkg-config in sane-config +--- + configure.in | 3 ++ + tools/Makefile.am | 12 ++++++++ + tools/sane-backends.pc.in | 14 ++++++++++ + tools/sane-config.in | 64 +++++++++++++++++++++++++++++++++++---------- + 4 files changed, 79 insertions(+), 14 deletions(-) + create mode 100644 tools/sane-backends.pc.in diff --git a/configure.in b/configure.in index 126edbf..7199c44 100644 @@ -40,7 +52,7 @@ index 126edbf..7199c44 100644 dnl *********************************************************************** diff --git a/tools/Makefile.am b/tools/Makefile.am -index 0932e45..bd6dd9d 100644 +index 0932e45..f4f070d 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -7,6 +7,10 @@ @@ -58,7 +70,7 @@ index 0932e45..bd6dd9d 100644 BUILT_SOURCES = $(HOTPLUG_DIR) CLEANFILES = $(bin_SCRIPTS) $(dist_noinst_SCRIPTS) -+pkgconfig_PROGRAMS = sane-backends.pc ++pkgconfig_DATA = sane-backends.pc +sane_backends_pc_SOURCES = sane-backends.pc.in +.pc.in.pc: + cd $(top_builddir) \ @@ -191,3 +203,6 @@ index 85add1a..c0450d4 100644 ;; --prefix) echo ${prefix} +-- +1.6.6.1 + diff --git a/sane-backends-1.0.20-utf-8.patch b/sane-backends-1.0.20-utf-8.patch new file mode 100644 index 0000000..d5cf293 --- /dev/null +++ b/sane-backends-1.0.20-utf-8.patch @@ -0,0 +1,322 @@ +diff -up sane-backends-1.0.20/AUTHORS.utf-8 sane-backends-1.0.20/AUTHORS +--- sane-backends-1.0.20/AUTHORS.utf-8 2009-01-18 19:45:37.000000000 +0100 ++++ sane-backends-1.0.20/AUTHORS 2009-01-18 19:45:37.000000000 +0100 +@@ -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 (*) +@@ -82,7 +82,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 (*) +@@ -100,7 +100,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 (*) +@@ -110,7 +110,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: +@@ -187,7 +187,7 @@ Jon Chambers + Jonathan Bravo Lopez + Juergen G. Schimmer + Julien Blache +-Karl Anders Øygard ++Karl Anders Øygard + Karl Heinz Kremer + Karsten Festag + Kazuhiro Sasayama +@@ -229,7 +229,7 @@ Sebastien Sable + Simon Krix + Simon Munton +-Stéphane Voltz ++Stéphane Voltz + Thomas Soumarmon + Tom Martone + Tom Wang +diff -U0 sane-backends-1.0.20/ChangeLog.utf-8 sane-backends-1.0.20/ChangeLog +--- sane-backends-1.0.20/ChangeLog.utf-8 2009-05-03 19:07:34.000000000 +0200 ++++ sane-backends-1.0.20/ChangeLog 2009-05-03 19:07:34.000000000 +0200 +@@ -30 +30 @@ +-2009-04-29 Stéphane Voltz ++2009-04-29 Stéphane Voltz +@@ -44 +44 @@ +-2009-04-27 Stéphane Voltz ++2009-04-27 Stéphane Voltz +@@ -50 +50 @@ +-2009-04-27 Stéphane Voltz ++2009-04-27 Stéphane Voltz +@@ -57 +57 @@ +-2009-04-23 Stéphane Voltz ++2009-04-23 Stéphane Voltz +@@ -96 +96 @@ +-2009-04-16 Stéphane Voltz ++2009-04-16 Stéphane Voltz +@@ -101 +101 @@ +-2009-04-15 Stéphane Voltz ++2009-04-15 Stéphane Voltz +@@ -112 +112 @@ +-2009-04-14 Stéphane Voltz ++2009-04-14 Stéphane Voltz +@@ -119 +119 @@ +-2009-04-13 Stéphane Voltz ++2009-04-13 Stéphane Voltz +@@ -122 +122 @@ +-2009-04-13 Stéphane Voltz ++2009-04-13 Stéphane Voltz +@@ -319 +319 @@ +-2009-03-09 Stéphane Voltz ++2009-03-09 Stéphane Voltz +@@ -326 +326 @@ +-2009-03-09 Stéphane Voltz ++2009-03-09 Stéphane Voltz +@@ -381 +381 @@ +-2009-03-02 Stéphane Voltz ++2009-03-02 Stéphane Voltz +@@ -404 +404 @@ +-2009-02-27 Stéphane Voltz ++2009-02-27 Stéphane Voltz +@@ -725 +725 @@ +-2009-01-22 Stéphane Voltz ++2009-01-22 Stéphane Voltz +@@ -747 +747 @@ +-2009-01-19 Stéphane Voltz ++2009-01-19 Stéphane Voltz +@@ -901 +901 @@ +-2008-12-31 Stéphane Voltz ++2008-12-31 Stéphane Voltz +@@ -951 +951 @@ +-2008-12-11 Stéphane Voltz ++2008-12-11 Stéphane Voltz +@@ -1001 +1001 @@ +-2008-12-03 Stéphane Voltz ++2008-12-03 Stéphane Voltz +@@ -1071 +1071 @@ +-2008-11-20 Stéphane Voltz ++2008-11-20 Stéphane Voltz +@@ -1074 +1074 @@ +-2008-11-20 Stéphane Voltz ++2008-11-20 Stéphane Voltz +@@ -1086 +1086 @@ +-2008-11-12 Stéphane Voltz ++2008-11-12 Stéphane Voltz +@@ -1147 +1147 @@ +-2008-10-31 Stéphane Voltz ++2008-10-31 Stéphane Voltz +@@ -1193 +1193 @@ +-2008-10-15 Stéphane Voltz ++2008-10-15 Stéphane Voltz +@@ -1196 +1196 @@ +-2008-10-15 Stéphane Voltz ++2008-10-15 Stéphane Voltz +@@ -1220 +1220 @@ +-2008-10-06 Stéphane Voltz ++2008-10-06 Stéphane Voltz +@@ -1246 +1246 @@ +-2008-10-03 Stéphane Voltz ++2008-10-03 Stéphane Voltz +@@ -1249 +1249 @@ +-2008-10-02 Stéphane Voltz ++2008-10-02 Stéphane Voltz +@@ -1280 +1280 @@ +-2008-09-26 Stéphane Voltz ++2008-09-26 Stéphane Voltz +@@ -1300 +1300 @@ +-2008-09-20 Stéphane Voltz ++2008-09-20 Stéphane Voltz +@@ -1303 +1303 @@ +-2008-09-20 Stéphane Voltz ++2008-09-20 Stéphane Voltz +@@ -1313 +1313 @@ +-2008-09-11 Stéphane Voltz ++2008-09-11 Stéphane Voltz +@@ -1325 +1325 @@ +-2008-09-03 Stéphane Voltz ++2008-09-03 Stéphane Voltz +@@ -1333 +1333 @@ +-2008-08-29 Stéphane Voltz ++2008-08-29 Stéphane Voltz +@@ -1365 +1365 @@ +-2008-08-21 Stéphane Voltz ++2008-08-21 Stéphane Voltz +@@ -1371 +1371 @@ +-2008-08-21 Stéphane Voltz ++2008-08-21 Stéphane Voltz +@@ -1376 +1376 @@ +-2008-08-14 Stéphane Voltz ++2008-08-14 Stéphane Voltz +@@ -1398 +1398 @@ +-2008-08-04 Stéphane Voltz ++2008-08-04 Stéphane Voltz +@@ -1461 +1461 @@ +-2008-07-10 Stéphane Voltz ++2008-07-10 Stéphane Voltz +@@ -1466 +1466 @@ +-2008-07-10 Stéphane Voltz ++2008-07-10 Stéphane Voltz +@@ -1469 +1469 @@ +-2008-07-10 Stéphane Voltz ++2008-07-10 Stéphane Voltz +@@ -1473 +1473 @@ +-2008-07-10 Stéphane Voltz ++2008-07-10 Stéphane Voltz +@@ -1566 +1566 @@ +-2008-06-10 Stéphane Voltz ++2008-06-10 Stéphane Voltz +@@ -1572 +1572 @@ +-2008-06-09 Stéphane Voltz ++2008-06-09 Stéphane Voltz +@@ -1579 +1579 @@ +-2008-06-03 Stéphane Voltz ++2008-06-03 Stéphane Voltz +@@ -1613 +1613 @@ +-2008-05-26 Stéphane Voltz ++2008-05-26 Stéphane Voltz +@@ -1621 +1621 @@ +-2008-05-26 Stéphane Voltz ++2008-05-26 Stéphane Voltz +@@ -1627 +1627 @@ +-2008-05-22 Stéphane Voltz ++2008-05-22 Stéphane Voltz +@@ -1641 +1641 @@ +-2008-05-22 Stéphane Voltz ++2008-05-22 Stéphane Voltz +@@ -1668 +1668 @@ +-2008-05-19 Stéphane Voltz ++2008-05-19 Stéphane Voltz +@@ -1705 +1705 @@ +-2008-05-12 Stéphane Voltz ++2008-05-12 Stéphane Voltz +@@ -1732 +1732 @@ +-2008-04-05 Stéphane Voltz ++2008-04-05 Stéphane Voltz +@@ -1923 +1923 @@ +-2008-04-05 Stéphane Voltz ++2008-04-05 Stéphane Voltz +@@ -1931 +1931 @@ +-2008-04-05 Stéphane Voltz ++2008-04-05 Stéphane Voltz +@@ -1964 +1964 @@ +-2008-03-22 Stéphane Voltz ++2008-03-22 Stéphane Voltz +@@ -1989 +1989 @@ +-2008-03-02 Stéphane Voltz ++2008-03-02 Stéphane Voltz +diff -up sane-backends-1.0.20/doc/gt68xx/gt68xx.CHANGES.utf-8 sane-backends-1.0.20/doc/gt68xx/gt68xx.CHANGES +--- sane-backends-1.0.20/doc/gt68xx/gt68xx.CHANGES.utf-8 2007-08-19 15:30:46.000000000 +0200 ++++ sane-backends-1.0.20/doc/gt68xx/gt68xx.CHANGES 2007-08-19 15:30:46.000000000 +0200 +@@ -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 . ++ fixes are from Jakub Dvo?ák . + * Status of BearPaw 2448 TA/CS Plus is "basic" now. + + V 1.0-58 (2004-04-04) +diff -up sane-backends-1.0.20/doc/mustek/mustek.CHANGES.utf-8 sane-backends-1.0.20/doc/mustek/mustek.CHANGES +--- sane-backends-1.0.20/doc/mustek/mustek.CHANGES.utf-8 2005-05-05 19:28:38.000000000 +0200 ++++ sane-backends-1.0.20/doc/mustek/mustek.CHANGES 2005-05-05 19:28:38.000000000 +0200 +@@ -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 -up sane-backends-1.0.20/doc/plustek/Plustek-PARPORT.changes.utf-8 sane-backends-1.0.20/doc/plustek/Plustek-PARPORT.changes +diff -up sane-backends-1.0.20/doc/plustek/Plustek-PARPORT-TODO.txt.utf-8 sane-backends-1.0.20/doc/plustek/Plustek-PARPORT-TODO.txt +--- sane-backends-1.0.20/doc/plustek/Plustek-PARPORT-TODO.txt.utf-8 2004-01-09 15:21:13.000000000 +0100 ++++ sane-backends-1.0.20/doc/plustek/Plustek-PARPORT-TODO.txt 2004-01-09 15:21:13.000000000 +0100 +@@ -1,4 +1,4 @@ +-Plustek-PARPORT-TODO.txt (2003-29-10) Gerhard Jäger ++Plustek-PARPORT-TODO.txt (2003-29-10) Gerhard Jäger + ======================================================================== + + TODO (in general): +diff -up sane-backends-1.0.20/doc/plustek/Plustek-PARPORT.txt.utf-8 sane-backends-1.0.20/doc/plustek/Plustek-PARPORT.txt +diff -up sane-backends-1.0.20/doc/plustek/Plustek-USB.txt.utf-8 sane-backends-1.0.20/doc/plustek/Plustek-USB.txt +--- sane-backends-1.0.20/doc/plustek/Plustek-USB.txt.utf-8 2005-08-08 09:35:49.000000000 +0200 ++++ sane-backends-1.0.20/doc/plustek/Plustek-USB.txt 2005-08-08 09:35:49.000000000 +0200 +@@ -1,4 +1,4 @@ +-Plustek-USB.txt (2005-08-08) Gerhard Jäger ++Plustek-USB.txt (2005-08-08) Gerhard Jäger + =============================================================== + + NOTE: +diff -up sane-backends-1.0.20/doc/u12/U12.changes.utf-8 sane-backends-1.0.20/doc/u12/U12.changes +--- sane-backends-1.0.20/doc/u12/U12.changes.utf-8 2006-08-09 14:47:58.000000000 +0200 ++++ sane-backends-1.0.20/doc/u12/U12.changes 2006-08-09 14:47:58.000000000 +0200 +@@ -1,4 +1,4 @@ +-U12.changes - Gerhard Jäger ++U12.changes - Gerhard Jäger + ================================================ + + V 0.01-1 (2004-09-01) +diff -up sane-backends-1.0.20/doc/u12/U12.todo.utf-8 sane-backends-1.0.20/doc/u12/U12.todo +--- sane-backends-1.0.20/doc/u12/U12.todo.utf-8 2004-04-14 21:19:16.000000000 +0200 ++++ sane-backends-1.0.20/doc/u12/U12.todo 2004-04-14 21:19:16.000000000 +0200 +@@ -1,4 +1,4 @@ +-U12.todo (2004-19-01) Gerhard Jäger ++U12.todo (2004-19-01) Gerhard Jäger + ========================================================= + + OPEN: +diff -up sane-backends-1.0.20/NEWS.utf-8 sane-backends-1.0.20/NEWS +--- sane-backends-1.0.20/NEWS.utf-8 2009-05-03 19:02:32.000000000 +0200 ++++ sane-backends-1.0.20/NEWS 2009-05-03 19:02:32.000000000 +0200 +@@ -430,7 +430,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/sane-backends.spec b/sane-backends.spec index 7b3711b..27e1595 100644 --- a/sane-backends.spec +++ b/sane-backends.spec @@ -15,7 +15,7 @@ Summary: Scanner access software Name: sane-backends Version: 1.0.20 -Release: 11%{?dist} +Release: 12%{?dist} # lib/ is LGPLv2+, backends are GPLv2+ with exceptions # Tools are GPLv2+, docs are public domain # see LICENSE for details @@ -33,7 +33,8 @@ 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 +Patch9: sane-backends-1.0.20-utf-8.patch +Patch100: sane-backends-1.0.20-12-autoreconf.patch.bz2 URL: http://www.sane-project.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%__id_u -n) BuildRequires: tetex-latex @@ -107,7 +108,8 @@ want to access digital cameras. %patch6 -p1 -b .epson-expression800 %patch7 -p1 -b .lockdir %patch8 -p1 -b .genesys-gl841-registers -%patch10 -p1 -b .autoreconf +%patch9 -p1 -b .utf-8 +%patch100 -p1 -b .autoreconf %build %configure \ @@ -194,6 +196,10 @@ rm -rf %{buildroot} %{_libdir}/pkgconfig/sane-backends.pc %changelog +* Fri Feb 26 2010 Nils Philippsen - 1.0.20-12 +- convert some documentation files to UTF-8 +- fix permissions of pkgconfig file + * Tue Dec 29 2009 Nils Philippsen - 1.0.20-11 - genesys_gl841: always send registers before trying to acquire a line (#527935) diff --git a/sources b/sources index 3bed519..c747139 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ a0cfdfdebca2feb4f2ba5d3418b15a42 sane-backends-1.0.20.tar.gz -b33b94acbfae50d9b31abb688573c17c sane-backends-1.0.20-11-autoreconf.patch.bz2 +18ea69cf3e1b8cccad06bdfe2af8b67c sane-backends-1.0.20-12-autoreconf.patch.bz2