diff --git a/sane-backends-1.0.20-docs-utf8.patch b/sane-backends-1.0.20-docs-utf8.patch new file mode 100644 index 0000000..9ff7a1d --- /dev/null +++ b/sane-backends-1.0.20-docs-utf8.patch @@ -0,0 +1,631 @@ +From 8e0044eff75fef563174452396f76d08658b6e88 Mon Sep 17 00:00:00 2001 +From: Nils Philippsen +Date: Fri, 26 Feb 2010 18:29:04 +0100 +Subject: [PATCH] patch: docs-utf8 + +Squashed commit of the following: + +commit 8abe8d3a461a769c4428c769c9c0f4ffd06b1931 +Author: Nils Philippsen +Date: Fri Feb 26 18:28:10 2010 +0100 + + convert some doc files to UTF-8 +--- + AUTHORS | 18 +++--- + ChangeLog | 110 +++++++++++++++++----------------- + NEWS | 2 +- + doc/gt68xx/gt68xx.CHANGES | 2 +- + doc/mustek/mustek.CHANGES | 2 +- + doc/plustek/Plustek-PARPORT-TODO.txt | 2 +- + doc/plustek/Plustek-USB.txt | 2 +- + doc/u12/U12.changes | 2 +- + doc/u12/U12.todo | 2 +- + 9 files changed, 71 insertions(+), 71 deletions(-) + +diff --git a/AUTHORS b/AUTHORS +index 7609bf2..72a050d 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 (*) +@@ -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 + Sergey Vlasov + Simon Krix + Simon Munton +-Stéphane Voltz ++Stéphane Voltz + Thomas Soumarmon + Tom Martone + Tom Wang +diff --git a/ChangeLog b/ChangeLog +index e83ca8c..dc531bc 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -27,7 +27,7 @@ + translation from Andrew Coles + * po/*.po: rebuilt with new strings + +-2009-04-29 Stéphane Voltz ++2009-04-29 Stéphane Voltz + * doc/sane-genesys.man doc/sane-rts8891.man: documentation updates and + cleanups + +@@ -41,20 +41,20 @@ + * backend/plustek-usbdevs.c: + Tweaked highspeed settings for Epson 1260 + +-2009-04-27 Stéphane Voltz ++2009-04-27 Stéphane Voltz + * backend/rts8891.c backend/rts8891.h backend/rts8891_devices.c + backend/rts8891_low.c backend/rts8891_low.h backend/rts88xx_lib.c + backend/rts88xx_lib.h: turn off scanner sharing option to off by default + to keep on the safe side, copyright and internal version updates. + +-2009-04-27 Stéphane Voltz ++2009-04-27 Stéphane Voltz + * backend/genesys.c backend/genesys_gl646.c backend/genesys_devices.c: + shading calibration fixes for HP2300 + + 2009-04-25 Alessandro Zummo + * backend/epson2.c: fixed TPU warmup retry + +-2009-04-23 Stéphane Voltz ++2009-04-23 Stéphane Voltz + * backend/genesys.c backend/genesys_gl646.c backend/genesys_devices.c: + y scan position and shading calibration fixes for MD5345/MD6471 + +@@ -93,12 +93,12 @@ + calibration in color mode on gl841. + * backend/genesys.c, backend/genesys_gl841.c: Fix bugs introduced above. + +-2009-04-16 Stéphane Voltz ++2009-04-16 Stéphane Voltz + * backend/genesys.h backend/genesys.c backend/genesys_gl646.c + backend/genesys_devices.c: y scan position fixes + - added a 'clear calibration cache button' + +-2009-04-15 Stéphane Voltz ++2009-04-15 Stéphane Voltz + * backend/genesys.c backend/genesys_gl646.c: calibration cache + activation for gl646 based scanners + +@@ -109,17 +109,17 @@ + - return cmd status for reads of sensor options + - allow rs to adjust read length for all bad status responses + +-2009-04-14 Stéphane Voltz ++2009-04-14 Stéphane Voltz + * backend/genesys.c backend/genesys_devices.c backend/genesys_gl646.c: + shading calibration rework for GL646 based scanners + + 2009-04-13 m. allan noah + * tools/sane-desc.c: fix double summing of untested column + +-2009-04-13 Stéphane Voltz ++2009-04-13 Stéphane Voltz + * backend/rts8891.c: minor version change to test commit scripts + +-2009-04-13 Stéphane Voltz ++2009-04-13 Stéphane Voltz + * backend/pnm.c: conditional handling of STATUS_HW_LOCKED + and STATUS_WARMING_UP + +@@ -316,14 +316,14 @@ + * backend/pixma.h, backend/pixma_common.c, backend/pixma_io_sanei.c: + Added a PIXMA_EOF error return code + +-2009-03-09 Stéphane Voltz ++2009-03-09 Stéphane Voltz + * backend/genesys.c backend/genesys.h backend/genesys_devices.c + backend/genesys_gl646.c doc/descriptions/lexmark.desc: cleanups + for genesys backend. Change in document detection for gl646 + sheetfed scanners. + - lexmark backend description update + +-2009-03-09 Stéphane Voltz ++2009-03-09 Stéphane Voltz + * backend/genesys.c backend/genesys_devices.c backend/genesys_gl646.c: + 1200 dpi scan fix and head positionning fixes + +@@ -378,7 +378,7 @@ + Add back in code to move LDFLAGS out of $GPHOTO2_LIBS and into + GPHOTO2_LDFLAGS. + +-2009-03-02 Stéphane Voltz ++2009-03-02 Stéphane Voltz + * backend/genesys_devices.c, backend/genesys_gl646.c: fix 400, 1200 + and 2400 dpi scan modes for MD5345/MD6471 + +@@ -401,7 +401,7 @@ + backend/genesys_low.h: Add support for Visioneer Roadwarrior + * backend/genesys_gl841.c: Adjust gl841 part to recent changes + +-2009-02-27 Stéphane Voltz ++2009-02-27 Stéphane Voltz + * backend/genesys.c backend/genesys.conf.in backend/genesys.h + backend/genesys_devices.c backend/genesys_gl646.c backend/genesys_gl841.c + backend/genesys_low.h: rewrite of gl646 internals to enable easy +@@ -722,7 +722,7 @@ + own compile rule simply to pass in -DSTUBS. Since its always + required, just define it in stubs.c + +-2009-01-22 Stéphane Voltz ++2009-01-22 Stéphane Voltz + * doc/Makefile.in doc/descriptions/genesys.desc : added the rts8891 + man page to the generation and install . added XP200 to the genesys + desc file. +@@ -744,7 +744,7 @@ + Fixed select_source message length, and typo bug in last update. + Set MP4600 series for inverted checksumming. + +-2009-01-19 Stéphane Voltz ++2009-01-19 Stéphane Voltz + * backend/genesys.c backend/genesys.conf.in backend/genesys.h + backend/genesys_devices.c backend/genesys_gl646.c + backend/genesys_gl841.c backend/genesys_low.h: add support for +@@ -898,7 +898,7 @@ + * doc/sane-pixma.man, doc/descriptions/pixma.desc: + Updated doc for pixma backend (ImageClass) + +-2008-12-31 Stéphane Voltz ++2008-12-31 Stéphane Voltz + * backend/genesys.c: restored warming up broken by a previuos commit + + 2008-12-28 Nicolas Martin +@@ -948,7 +948,7 @@ + config file and rework the comments. + * doc/saned.man: document the data_portrange option. + +-2008-12-11 Stéphane Voltz ++2008-12-11 Stéphane Voltz + * backend/rts8891.c doc/sane-rts8891.man doc/descriptions/rts8891.desc: + scan register setting fix, documentation update + +@@ -998,7 +998,7 @@ + and if that fails, we try getenv("USER") and if that fails we use + a default user string + +-2008-12-03 Stéphane Voltz ++2008-12-03 Stéphane Voltz + * backend/rts8891.c backend/rts8891_low.c: possible fix for + failed scan at 300 and 1200 dpi for HP4400, sensor type 2. + +@@ -1068,10 +1068,10 @@ + in pixma.desc. + Fixed some typos in French translations. + +-2008-11-20 Stéphane Voltz ++2008-11-20 Stéphane Voltz + * backend/rts8891.c: fixes 'commit scan value' for HP4400. + +-2008-11-20 Stéphane Voltz ++2008-11-20 Stéphane Voltz + * backend/rts8891.c: calibration fixes for HP4400 sensor type 3. + + 2008-11-18 Alessandro Zummo +@@ -1083,7 +1083,7 @@ + * doc/descriptions-external/epkowa.desc: + iscan 2.14.0 updates on behalf of olaf.meeuwissen@avasys.jp + +-2008-11-12 Stéphane Voltz ++2008-11-12 Stéphane Voltz + * backend/rts8891.c: sensor detection fix. Lamp setting + change for HP4400 sensor type 3. + +@@ -1144,7 +1144,7 @@ + backend/pixma_bjnp.c backend/bjnp_private.h + Marked local functions as static and removed them from ..private.h + +-2008-10-31 Stéphane Voltz ++2008-10-31 Stéphane Voltz + * backend/rts8891.c backend/rts8891_low.c backend/rts8891_low.h: + added 600 and 1200 dpi scan for HP4400 and HP4470 with 'xpa' + sensor. +@@ -1190,10 +1190,10 @@ + check for ifaddrs.h (necessary on different platforms BeOS, OS/2, ...) + Increment pixma backend version number. + +-2008-10-15 Stéphane Voltz ++2008-10-15 Stéphane Voltz + * backend/rts8891.c: added 300 dpi scan for HP4400 + +-2008-10-15 Stéphane Voltz ++2008-10-15 Stéphane Voltz + * backend/rts8891.c: fixed HP4400 sensor detection, added 150 + dpi scan mode for HP4400 + +@@ -1217,7 +1217,7 @@ + * backend/fujitsu.c: backend v80 + - front-side endorser uses data ID 0x80 + +-2008-10-06 Stéphane Voltz ++2008-10-06 Stéphane Voltz + * backend/rts8891.c backend/rts8891.h: fixed configuration option + bug + +@@ -1243,10 +1243,10 @@ + - increase scan height ~1/2 inch due to head offset + - change page length autodetection condition + +-2008-10-03 Stéphane Voltz ++2008-10-03 Stéphane Voltz + * include/sane/sane.h: added a SANE_CURRENT_MINOR define + +-2008-10-02 Stéphane Voltz ++2008-10-02 Stéphane Voltz + * backend/rts8891.c backend/rts8891.h backend/rts8891_low.h: + add a 'sensornumber' option to override detected sensor model + +@@ -1277,7 +1277,7 @@ + * doc/descriptions/gt68xx.desc: Added entry for OpticSlim 2400plus + * backends/gt68xx.conf.in: Added entry for OpticSlim 2400plus + +-2008-09-26 Stéphane Voltz ++2008-09-26 Stéphane Voltz + * backend/rts8891_low.c: fix HP4400 head parking + + 2008-09-25 m. allan noah +@@ -1297,10 +1297,10 @@ + * frontend/scanimage.c: fix broken unknown length (-1) binary scans, + fix invalid tiff height with unknown length scans, fix compiler warn + +-2008-09-20 Stéphane Voltz ++2008-09-20 Stéphane Voltz + * backend/rts8891.c: fix typo in HP4400 variant detection + +-2008-09-20 Stéphane Voltz ++2008-09-20 Stéphane Voltz + * backend/rts8891.c backend/rts8891_low.c backend/rts8891_low.h: more + fix for HP4400 head parking, 75 dpi support for another HP4400 sensor + variant, better variant detector and initial setting +@@ -1310,7 +1310,7 @@ + Changes in pixma backend for PIXMA MP970 at 4800 dpi (to be continued). + Declare MX7600 but yet untested. + +-2008-09-11 Stéphane Voltz ++2008-09-11 Stéphane Voltz + * backend/rts8891.c backend/rts8891_low.c backend/rts8891_low.h: fix + parking for HP4400, tune dark calibration for HP4400 + +@@ -1322,7 +1322,7 @@ + - Modified scan area adjustments to enhance frontend area selection fit + but to be confirmed that it does not bring backward compatibility issues. + +-2008-09-03 Stéphane Voltz ++2008-09-03 Stéphane Voltz + * backend/rts8891.c backend/rts8891_low.c backend/rts8891_low.h + backend/rts88xx_lib.c: minor changes for hp4400 support + +@@ -1330,7 +1330,7 @@ + * backend/pixma_mp150.c: + Some tweaks to have PIXMA MP810 supported by the pixma backend. + +-2008-08-29 Stéphane Voltz ++2008-08-29 Stéphane Voltz + * backend/genesys.c backend/genesys_gl646.c backend/genesys_devices.c: + - move to configuration framework + - fix GL646 GPO value usage +@@ -1362,18 +1362,18 @@ + * doc/descriptions/plustek.desc: Added entry for Strobe XP100 + * doc/descriptions/unsupported.desc: Removed entry for Strobe XP100 + +-2008-08-21 Stéphane Voltz ++2008-08-21 Stéphane Voltz + * backend/rts8891.c: calibration updating and 75 dpi scan for hp400 + + 2008-08-23 m. allan noah + * doc/descriptions/fujitsu.desc: set lots of scanners to complete :) + +-2008-08-21 Stéphane Voltz ++2008-08-21 Stéphane Voltz + * backend/rts8891.c backend/rts8891_devices.c backend/rts8891_low.c + backend/rts88xx_lib.c: add sensor type field and use it in geometry + detection. + +-2008-08-14 Stéphane Voltz ++2008-08-14 Stéphane Voltz + * backend/rts8891.c backend/rts88xx_lib.c: fix for hp4400 init + + 2008-08-13 m. allan noah +@@ -1395,7 +1395,7 @@ + * frontend/scanimage.c: fetch_options(), actually get option + descriptor 0 before attempting to get the value of option 0. + +-2008-08-04 Stéphane Voltz ++2008-08-04 Stéphane Voltz + * backend/umax_pp.c backend/umaxp_pp.h backend/umax_pp.conf.in: + use configuration framework + +@@ -1458,19 +1458,19 @@ + - fi-5330C and fi-5650C can't handle 10 bit LUT via USB + - fi-5900 has background color, though it reports otherwise + +-2008-07-10 Stéphane Voltz ++2008-07-10 Stéphane Voltz + * sanei/sanei_config.c: handle cases where config or callback + function is NULL + * backend/rts8891.c: use new configuration parsing framework + +-2008-07-10 Stéphane Voltz ++2008-07-10 Stéphane Voltz + * include/sane/sanei_config.h: doxygen fix for new function + +-2008-07-10 Stéphane Voltz ++2008-07-10 Stéphane Voltz + * backend/sanei_constrain_value.c: add support for SANE_Bool + in sanei_check_value + * backend/Makefile.in: add sanei_constrain_value.lo to libsane +-2008-07-10 Stéphane Voltz ++2008-07-10 Stéphane Voltz + * backend/sanei_constrain_value.c: add support for SANE_Bool + in sanei_check_value + * backend/Makefile.in: add sanei_constrain_value.lo to libsane +@@ -1563,20 +1563,20 @@ + Remove "experimental" in pixma buttons options and text. + Fix some French translation typos, and update man page. + +-2008-06-10 Stéphane Voltz ++2008-06-10 Stéphane Voltz + * backend/sanei_constrain_value.c: add support for arrays of SANE_Word + in sanei_constrain_value + * backend/umax_pp.c: remove now unneede 'hand made' constrain on + gamma tables + +-2008-06-09 Stéphane Voltz ++2008-06-09 Stéphane Voltz + * backend/rts8891.c: fix for model with 'XPA' sensor + + 2008-06-06 Julien Blache + * backend/net.c: lock the Avahi thread before stopping it and + tearing down the Avahi objects. + +-2008-06-03 Stéphane Voltz ++2008-06-03 Stéphane Voltz + * backend/genesys_gl646.c: fixed wrong offset for start + of scanarea for MD6471 scanner. + +@@ -1610,7 +1610,7 @@ + and device ID updates, including fixing uninitialized variables due + former defect merge and exposure control for film / dia scanners + +-2008-05-26 Stéphane Voltz ++2008-05-26 Stéphane Voltz + * backend/sane_strstatus.c: added new status and internationalization + support + * frontend/scanimage.c, frontend/tstbackend.c: added handling of status +@@ -1618,13 +1618,13 @@ + * backend/pnm.c: added 2 more virtual devices, one that is hardware + locked, and another that always do warming before scan. + +-2008-05-26 Stéphane Voltz ++2008-05-26 Stéphane Voltz + * backend/rts8891.[ch], backend/rts8891_low.[ch], + backend/rts88xx_lib.[ch]: renamed per frontend struct, made use of + new well-known option groups. Added warming-up handling in + sane_start(). + +-2008-05-22 Stéphane Voltz ++2008-05-22 Stéphane Voltz + * backend/genesys.c: + changed top of scan area detection for MD6228/MD6471 models + +@@ -1638,7 +1638,7 @@ + backend/hp3900_usb.c: Fixed reference position detection for + HP3800/HPG2710 scanners. Code clean up. + +-2008-05-22 Stéphane Voltz ++2008-05-22 Stéphane Voltz + * backend/rts8891.c: + minor tweak for scanjet 4470cx + +@@ -1665,7 +1665,7 @@ + * backend/qcam.c, backend/v4l.c, frontend/tstbackend.c: + remove undocumented and otherwise unused SANE_CAP_ALWAYS_SETTABLE + +-2008-05-19 Stéphane Voltz ++2008-05-19 Stéphane Voltz + * backend/rts8891.c: + 150/300 dpi shading calibration fixes for 'XPA' sensor HP4470 models + +@@ -1702,7 +1702,7 @@ + include/sane/sanei_thread.h, sanei/sanei_thread.c: + Fix for bug #306751: sanei-thread with pthreads on 64 bit + +-2008-05-12 Stéphane Voltz ++2008-05-12 Stéphane Voltz + * backend/rts8891.c + 150/300 dpi mode fixes for 'XPA' sensor HP4470 models + +@@ -1729,7 +1729,7 @@ + * doc/sane-sm3840.man: Add lineart and halftone options to page + * backend/sm3840*: Remove 64-bit compile warnings + +-2008-04-05 Stéphane Voltz ++2008-04-05 Stéphane Voltz + * backend/rts8891.c backend/rts8891_low.c + doc/descriptions/rts8891.desc: + 150 dpi mode fix for 'XPA' sensor HP4470 models, description +@@ -1920,7 +1920,7 @@ + sections (separate inetd configuration under the INETD + CONFIGURATION section). + +-2008-04-05 Stéphane Voltz ++2008-04-05 Stéphane Voltz + * backend/genesys.c backend/genesys.h backend/genesys_devices.c + backend/genesys_gl646.c backend/genesys_low.h: + Fixed double free problems, made OPT_COLOR_FILTER work for +@@ -1928,7 +1928,7 @@ + options, split sane_control_options to make it more readable, + fixed 'reset stream' problem for MD6471. + +-2008-04-05 Stéphane Voltz ++2008-04-05 Stéphane Voltz + * backend/rts8891.c: + split sane_control_option() to make it more readable + +@@ -1961,7 +1961,7 @@ + * sanei/sanei_scsi.c: fix bug in sanei_scsi_find_devices() which + caused early return if attach callback returned error. + +-2008-03-22 Stéphane Voltz ++2008-03-22 Stéphane Voltz + * AUTHORS configure configure.in backend/dll.conf.in + backend/Makefile.in backend/rts8891.c backend/rts8891.conf.in + backend/rts8891_devices.c backend/rts8891.h backend/rts8891_low.c +@@ -1986,7 +1986,7 @@ + 2008-03-15 Julien Blache + * include/sane/sanei_usb.h: typo fix. + +-2008-03-02 Stéphane Voltz ++2008-03-02 Stéphane Voltz + * doc/descriptions/lexmark.desc: added X1195 + * doc/descriptions/unsupported.desc: removed X11xx, X12xx and + Dell A920 which are to be handled by the lexmark backend +diff --git a/NEWS b/NEWS +index 5f7e035..9c7d13c 100644 +--- a/NEWS ++++ b/NEWS +@@ -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/doc/gt68xx/gt68xx.CHANGES b/doc/gt68xx/gt68xx.CHANGES +index f20fb54..5ffd6dc 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 . ++ fixes are from Jakub Dvo?ák . + * 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 ++Plustek-PARPORT-TODO.txt (2003-29-10) Gerhard Jäger + ======================================================================== + + TODO (in general): +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 ++Plustek-USB.txt (2005-08-08) Gerhard Jäger + =============================================================== + + 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 ++U12.changes - Gerhard Jäger + ================================================ + + 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 ++U12.todo (2004-19-01) Gerhard Jäger + ========================================================= + + OPEN: +-- +1.6.6.1 + diff --git a/sane-backends-1.0.20-pkgconfig.patch b/sane-backends-1.0.20-pkgconfig.patch index 635ec77..d69ace9 100644 --- a/sane-backends-1.0.20-pkgconfig.patch +++ b/sane-backends-1.0.20-pkgconfig.patch @@ -1,11 +1,11 @@ -From 633a32c630461dd45ace506f1b8f6a2f278b5273 Mon Sep 17 00:00:00 2001 +From ce4539752ed502cb1a5e10fa47890f42db964472 Mon Sep 17 00:00:00 2001 From: Nils Philippsen -Date: Fri, 26 Feb 2010 17:53:58 +0100 +Date: Fri, 26 Feb 2010 18:20:41 +0100 Subject: [PATCH] patch: pkgconfig Squashed commit of the following: -commit 6e62ef01acbefe004cd70c176b961a0b009d9672 +commit 1f0e85c705a42c7e6ccd938eaad69f531c63f63d Author: Nils Philippsen Date: Fri Feb 26 17:51:14 2010 +0100 @@ -24,10 +24,10 @@ Date: Fri Jun 5 12:55:39 2009 +0200 use pkg-config in sane-config --- configure.in | 3 ++ - tools/Makefile.am | 12 ++++++++ + tools/Makefile.am | 14 +++++++++- tools/sane-backends.pc.in | 14 ++++++++++ tools/sane-config.in | 64 +++++++++++++++++++++++++++++++++++---------- - 4 files changed, 79 insertions(+), 14 deletions(-) + 4 files changed, 80 insertions(+), 15 deletions(-) create mode 100644 tools/sane-backends.pc.in diff --git a/configure.in b/configure.in @@ -52,7 +52,7 @@ index 126edbf..7199c44 100644 dnl *********************************************************************** diff --git a/tools/Makefile.am b/tools/Makefile.am -index 0932e45..f4f070d 100644 +index 0932e45..b7fa670 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -7,6 +7,10 @@ @@ -66,19 +66,22 @@ index 0932e45..f4f070d 100644 bin_PROGRAMS = sane-find-scanner gamma4scanimage noinst_PROGRAMS = sane-desc umax_pp -@@ -26,6 +30,12 @@ noinst_SCRIPTS = $(HOTPLUG) +@@ -26,8 +30,14 @@ noinst_SCRIPTS = $(HOTPLUG) BUILT_SOURCES = $(HOTPLUG_DIR) CLEANFILES = $(bin_SCRIPTS) $(dist_noinst_SCRIPTS) +pkgconfig_DATA = sane-backends.pc -+sane_backends_pc_SOURCES = sane-backends.pc.in ++ +.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 ++ 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 > $@ diff --git a/sane-backends-1.0.20-utf-8.patch b/sane-backends-1.0.20-utf-8.patch deleted file mode 100644 index d5cf293..0000000 --- a/sane-backends-1.0.20-utf-8.patch +++ /dev/null @@ -1,322 +0,0 @@ -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 27e1595..cf9c56b 100644 --- a/sane-backends.spec +++ b/sane-backends.spec @@ -33,7 +33,7 @@ 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 -Patch9: sane-backends-1.0.20-utf-8.patch +Patch9: sane-backends-1.0.20-docs-utf8.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) @@ -108,7 +108,7 @@ want to access digital cameras. %patch6 -p1 -b .epson-expression800 %patch7 -p1 -b .lockdir %patch8 -p1 -b .genesys-gl841-registers -%patch9 -p1 -b .utf-8 +%patch9 -p1 -b .docs-utf8 %patch100 -p1 -b .autoreconf %build diff --git a/sources b/sources index c747139..3047ed6 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ a0cfdfdebca2feb4f2ba5d3418b15a42 sane-backends-1.0.20.tar.gz -18ea69cf3e1b8cccad06bdfe2af8b67c sane-backends-1.0.20-12-autoreconf.patch.bz2 +028a764a83662c99232be1cc09f64571 sane-backends-1.0.20-12-autoreconf.patch.bz2