Hello community, here is the log from the commit of package iscan-free checked in at Thu Sep 21 22:28:24 CEST 2006. -------- --- iscan-free/iscan-free.changes 2006-07-04 10:38:33.000000000 +0200 +++ iscan-free/iscan-free.changes 2006-09-21 13:11:05.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Sep 21 13:09:38 CEST 2006 - jsmeix@suse.de + +- Updated to version 2.2.0-1 (results package version 2.2.0.1): + There are several more supported scanners. +- fix-buffer-overflow.patch is no longer needed (fixed in source). + +------------------------------------------------------------------- Old: ---- fix-buffer-overflow.patch iscan-free-2.1.0-1.c2.tar.bz2 New: ---- iscan-free-2.2.0-1.c2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ iscan-free.spec ++++++ --- /var/tmp/diff_new_pack.azPYH1/_old 2006-09-21 22:26:36.000000000 +0200 +++ /var/tmp/diff_new_pack.azPYH1/_new 2006-09-21 22:26:36.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package iscan-free (Version 2.1.0.1) +# spec file for package iscan-free (Version 2.2.0.1) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -18,11 +18,11 @@ Autoreqprov: on Summary: Free Image Scan Version with epkowa Driver for Epson Scanners # How to make Source0: -# Get the matching source from the iscan package (iscan-2.1.0-1.c2.tar.bz2) +# Get the matching source from the iscan package (iscan-2.2.0-1.c2.tar.bz2) # Unpack it: -# tar -xjvf iscan-2.1.0-1.c2.tar.bz2 +# tar -xjvf iscan-2.2.0-1.c2.tar.bz2 # Remove only the really non-free files: -# rm iscan-2.1.0/non-free/libesmod.so iscan-2.1.0/non-free/EAPL.*.txt +# rm iscan-2.2.0/non-free/libesmod.so iscan-2.2.0/non-free/EAPL.*.txt # The remaining file filter.hh and the Makefiles are free software. # The proprietary binary-only i386-only libesmod library is needed only # to make the /usr/bin/iscan frontend and the EAPL.*.txt license files @@ -30,21 +30,19 @@ # By using "configure --disable-frontend" it builds without the frontend # (i.e. without the non-free libesmod library). # Pack the remaining free sources: -# tar -cjvf iscan-free-2.1.0-1.c2.tar.bz2 iscan-2.1.0/* -Source0: iscan-free-2.1.0-1.c2.tar.bz2 +# tar -cjvf iscan-free-2.2.0-1.c2.tar.bz2 iscan-2.2.0/* +Source0: iscan-free-2.2.0-1.c2.tar.bz2 # A README regarding the changes of the free version: Source1: README # Patch1 adds forward declarations of friend functions: Patch1: fix-friend-declaration.diff -# Patch2 fixes a too small char array which causes a buffer overflow if SANE_DEBUG_EPKOWA is set: -Patch2: fix-buffer-overflow.patch # Patch3 replaces fixed HZ compile-time value by sysconf(_SC_CLK_TCK) runtime value: Patch3: replace-HZ-by-sysconf_SC_CLK_TCK.patch # Patch10 changes the "sane-epkowa" man page so that the no longer supported models are removed: Patch10: adapt-man-for-free.patch # Have Epson Avasys' release number at the end of the SUSE package Version: -Version: 2.1.0.1 -Release: 3 +Version: 2.2.0.1 +Release: 1 # See the post and triggerin sections what is pre-required: PreReq: coreutils, /bin/grep, /bin/sed Requires: sane @@ -62,13 +60,11 @@ %prep # The directory in the Source0 archive is different because # the package name is different and Version has the Epson Avasys' release number at the end: -%setup -q -n iscan-2.1.0 +%setup -q -n iscan-2.2.0 # Get the README regarding the changes of the free version: cp %{SOURCE1} . # Add forward declarations of friend functions: %patch1 -# Patch2 fixes a too small char array which causes a buffer overflow if SANE_DEBUG_EPKOWA is set: -%patch2 # Patch3 replaces fixed HZ compile-time value by sysconf(_SC_CLK_TCK) runtime value: %patch3 # Remove the no longer supported models from the man page: @@ -78,12 +74,12 @@ # when the package iscan-free is installed because the 'triggerin' section # replaces the description file and from this file YaST will re-build its database # using /usr/lib/YaST2/bin/create_scanner_database which tests if a comment -# contains 'requires a DFSG non-free module' and if yes it sets the package name +# contains 'requires DFSG non-free' and if yes it sets the package name # in the YaST database to iscan (otherwise to iscan-free) so that YaST can # test and install the right package even for the no longer supported models: -grep -q 'requires a DFSG non-free module' doc/epkowa.desc || exit 1 -sed -i -e '/requires a DFSG non-free module/s/^:comment[[:space:]][[:space:]]*"/:comment "unsupported by the iscan-free package<br>/' doc/epkowa.desc -sed -i -e 's/requires a DFSG non-free module/requires a DFSG non-free module in the iscan-proprietary-drivers package/' doc/epkowa.desc +grep -q 'requires DFSG non-free' doc/epkowa.desc || exit 1 +sed -i -e '/requires DFSG non-free/s/^:comment[[:space:]][[:space:]]*"/:comment "unsupported by the iscan-free package<br>/' doc/epkowa.desc +sed -i -e 's/requires DFSG non-free/requires DFSG non-free plugin in the iscan-proprietary-drivers package:/' doc/epkowa.desc %build autoreconf -fi @@ -184,46 +180,48 @@ software. The proprietary binary-only i386-only "libesint*" driver libraries are -available in the seperated package iscan-proprietary-drivers. +available in the separate package iscan-proprietary-drivers. -The "esfw*.bin" firmware files are available in the seperated package +The "esfw*.bin" firmware files are available in the separate package iscan-firmware. The proprietary binary-only i386-only "libesmod" library is removed -from this package. It is required by the "/usr/bin/iscan" frontend. -This package is built without the frontend. +from this package. It is required by the "/usr/bin/iscan" front-end. +This package is built without the front-end. -This package contains only the epkowa backend for SANE which compiles -and runs natively even on non-i386 platforms. For documentation see +This package contains only the epkowa back-end for SANE, which compiles +and runs natively even on non-i386 platforms. For documentation, see "man sane-epkowa". Drawbacks: -The free version of the epkowa backend cannot work for those scanners -which require proprietary binary-only i386-only libraries which are -available in the seperated package iscan-proprietary-drivers. At the -moment those scanners are the following models: Perfection 1250 / -Perfection 1250 PHOTO / GT-7200U, Perfection 1260 / Perfection 1260 -PHOTO / GT-7300U, Perfection 3170 PHOTO / GT-9400 / GT-9400UF, -Perfection 2480 PHOTO / Perfection 2580 PHOTO / GT-F500 / GT-F550, -Perfection 3490 PHOTO / Perfection 3590 PHOTO / GT-F520 / GT-F570, -Perfection 4180 PHOTO / GT-F600, Perfection 4490 PHOTO / GT-X750. Those -models don't work with the free iscan version. Those models require the -original iscan package and the iscan-proprietary-drivers package which -are only available for i386-compatible platforms. +The free version of the epkowa back-end cannot work for those scanners +that require proprietary binary-only i386-only libraries, available in +the separate package iscan-proprietary-drivers. At the moment, those +scanners are the following models: Perfection 1250 / Perfection 1250 +PHOTO / GT-7200U, Perfection 1260 / Perfection 1260 PHOTO / GT-7300U, +Perfection 3170 PHOTO / GT-9400 / GT-9400UF, Perfection 2480 PHOTO / +Perfection 2580 PHOTO / GT-F500 / GT-F550, Perfection 3490 PHOTO / +Perfection 3590 PHOTO / GT-F520 / GT-F570, Perfection 4180 PHOTO / +Perfection V100 PHOTO / Perfection V10 / GT-F600, Perfection 4490 PHOTO +/ GT-X750. Those models do not work with the free iscan version. Those +models require the original iscan package and the +iscan-proprietary-drivers package, which are only available for +i386-compatible platforms. -Some scanners require proprietary firmware files which are available in -the package iscan-firmware. At the moment those scanners are the +Some scanners require proprietary firmware files that are available in +the package iscan-firmware. At the moment, those scanners are the following models: Perfection 3170 PHOTO / GT-9400 / GT-9400UF, Perfection 2480 PHOTO / Perfection 2580 PHOTO / GT-F500 / GT-F550, -Perfection 4180 PHOTO / GT-F600, Perfection 3490 PHOTO / Perfection -3590 PHOTO / GT-F520 / GT-F570, Perfection 4490 PHOTO / GT-X750. +Perfection 4180 PHOTO / Perfection V100 PHOTO / Perfection V10 / +GT-F600, Perfection 3490 PHOTO / Perfection 3590 PHOTO / GT-F520 / +GT-F570, Perfection 4490 PHOTO / GT-X750. -The frontend /usr/bin/iscan was removed because it requires the +The front-end /usr/bin/iscan was removed because it requires the proprietary binary-only i386-only "libesmod" library. This should cause -no problem because the backend epkowa runs now natively even on -non-i386 platforms so that all the usual frontends (like scanimage, -xscanimage, xsane, kooka) can be used even on non-i386 platforms. +no problem because the back-end epkowa runs now natively even on +non-i386 platforms so that all the usual front-ends (like scanimage, +xscanimage, xsane, and kooka) can be used even on non-i386 platforms. @@ -239,6 +237,10 @@ %changelog -n iscan-free +* Thu Sep 21 2006 - jsmeix@suse.de +- Updated to version 2.2.0-1 (results package version 2.2.0.1): + There are several more supported scanners. +- fix-buffer-overflow.patch is no longer needed (fixed in source). * Tue Jul 04 2006 - jsmeix@suse.de - replace-HZ-by-sysconf_SC_CLK_TCK.patch replaces the fixed HZ compile-time value (no longer supported by new glibc) ++++++ README ++++++ --- iscan-free/README 2006-06-26 15:39:02.000000000 +0200 +++ iscan-free/README 2006-09-21 14:34:43.000000000 +0200 @@ -1,52 +1,49 @@ - This version of the Image Scan for Linux software contains only free software. The proprietary binary-only i386-only "libesint*" driver libraries -are available in the seperated package iscan-proprietary-drivers. +are available in the separate package iscan-proprietary-drivers. -The "esfw*.bin" firmware files are available in the seperated +The "esfw*.bin" firmware files are available in the separate package iscan-firmware. The proprietary binary-only i386-only "libesmod" library is removed -from this package. It is required by the "/usr/bin/iscan" frontend. -This package is built without the frontend. +from this package. It is required by the "/usr/bin/iscan" front-end. +This package is built without the front-end. -This package contains only the epkowa backend for SANE which compiles -and runs natively even on non-i386 platforms. -For documentation see "man sane-epkowa". +This package contains only the epkowa back-end for SANE, which +compiles and runs natively even on non-i386 platforms. +For documentation, see "man sane-epkowa". Drawbacks: -The free version of the epkowa backend cannot work for those scanners -which require proprietary binary-only i386-only libraries which are -available in the seperated package iscan-proprietary-drivers. -At the moment those scanners are the following models: +The free version of the epkowa back-end cannot work for those scanners +that require proprietary binary-only i386-only libraries, available +in the separate package iscan-proprietary-drivers. At the moment, +those scanners are the following models: Perfection 1250 / Perfection 1250 PHOTO / GT-7200U, Perfection 1260 / Perfection 1260 PHOTO / GT-7300U, Perfection 3170 PHOTO / GT-9400 / GT-9400UF, Perfection 2480 PHOTO / Perfection 2580 PHOTO / GT-F500 / GT-F550, Perfection 3490 PHOTO / Perfection 3590 PHOTO / GT-F520 / GT-F570, -Perfection 4180 PHOTO / GT-F600, +Perfection 4180 PHOTO / Perfection V100 PHOTO / Perfection V10 / GT-F600, Perfection 4490 PHOTO / GT-X750. -Those models don't work with the free iscan version. -Those models require the original iscan package and the -iscan-proprietary-drivers package which are only -available for i386-compatible platforms. - -Some scanners require proprietary firmware files which are available -in the package iscan-firmware. -At the moment those scanners are the following models: +Those models do not work with the free iscan version. Those models require +the original iscan package and the iscan-proprietary-drivers package, which +are only available for i386-compatible platforms. + +Some scanners require proprietary firmware files that are available +in the package iscan-firmware. At the moment, those scanners are the +following models: Perfection 3170 PHOTO / GT-9400 / GT-9400UF, Perfection 2480 PHOTO / Perfection 2580 PHOTO / GT-F500 / GT-F550, -Perfection 4180 PHOTO / GT-F600, +Perfection 4180 PHOTO / Perfection V100 PHOTO / Perfection V10 / GT-F600, Perfection 3490 PHOTO / Perfection 3590 PHOTO / GT-F520 / GT-F570, Perfection 4490 PHOTO / GT-X750. -The frontend /usr/bin/iscan was removed because it requires -the proprietary binary-only i386-only "libesmod" library. -This should cause no problem because the backend epkowa runs now -natively even on non-i386 platforms so that all the usual frontends -(like scanimage, xscanimage, xsane, kooka) can be used even on -non-i386 platforms. +The front-end /usr/bin/iscan was removed because it requires the proprietary +binary-only i386-only "libesmod" library. This should cause no problem +because the back-end epkowa runs now natively even on non-i386 platforms +so that all the usual front-ends (like scanimage, xscanimage, xsane, +and kooka) can be used even on non-i386 platforms. ++++++ adapt-man-for-free.patch ++++++ --- /var/tmp/diff_new_pack.azPYH1/_old 2006-09-21 22:26:36.000000000 +0200 +++ /var/tmp/diff_new_pack.azPYH1/_new 2006-09-21 22:26:36.000000000 +0200 @@ -1,5 +1,5 @@ ---- doc/sane-epkowa.man.orig 2006-06-26 15:17:02.000000000 +0200 -+++ doc/sane-epkowa.man 2006-06-26 15:21:30.000000000 +0200 +--- doc/sane-epkowa.man.orig 2006-08-11 02:23:23.000000000 +0200 ++++ doc/sane-epkowa.man 2006-09-21 14:25:28.000000000 +0200 @@ -24,14 +24,6 @@ .br GT-6700U Perfection 640U @@ -15,7 +15,7 @@ GT-7600S Perfection 1200S .br GT-7600U Perfection 1200U -@@ -52,26 +44,12 @@ +@@ -52,30 +44,12 @@ .br GT-9300UF Perfection 2400 PHOTO .br @@ -35,6 +35,10 @@ -.br -GT-F600 Perfection 4180 PHOTO -.br +- Perfection V100 PHOTO +-.br +- Perfection V10 +-.br GT-X700 Perfection 4870 PHOTO .br -GT-X750 Perfection 4490 PHOTO ++++++ iscan-free-2.1.0-1.c2.tar.bz2 -> iscan-free-2.2.0-1.c2.tar.bz2 ++++++ ++++ 1646 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/iscan-2.1.0/AUTHORS new/iscan-2.2.0/AUTHORS --- old/iscan-2.1.0/AUTHORS 2006-01-24 08:40:03.000000000 +0100 +++ new/iscan-2.2.0/AUTHORS 2006-07-04 04:08:34.000000000 +0200 @@ -25,6 +25,7 @@ Johannes Meixner provided some ideas to improve the RPM packaging thru his spec files for the iscan-free and iscan packages from SUSE; sent patches to fix compiler - warnings + warnings; found a buffer overflow in the backend + debugging code and confirmed the fix Dirk O. Siebnich provided the initial patch that inspired support for non-i386 builds diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/iscan-2.1.0/NEWS new/iscan-2.2.0/NEWS --- old/iscan-2.1.0/NEWS 2006-05-23 07:36:16.000000000 +0200 +++ new/iscan-2.2.0/NEWS 2006-08-11 02:23:23.000000000 +0200 @@ -1,6 +1,23 @@ NEWS -- an overview of user-visible changes with each release ---------------------------------------------------------------------- +iscan-2.2.0 (2006-08-11) +---------------------------------------------------------------------- + * adds support for the following scanners: + - ES-H300 + - GT-2500 + - ME200 + - Stylus CX2800 + - Stylus CX2900 + +---------------------------------------------------------------------- +iscan-2.1.1 (2006-08-10) +---------------------------------------------------------------------- + * adds support for the following scanners: + - Perfection V10 + - Perfection V100 PHOTO + +---------------------------------------------------------------------- iscan-2.1.0 (2006-05-22) ---------------------------------------------------------------------- * adds support for the following scanners: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/iscan-2.1.0/NEWS.ja new/iscan-2.2.0/NEWS.ja --- old/iscan-2.1.0/NEWS.ja 2006-05-23 07:36:16.000000000 +0200 +++ new/iscan-2.2.0/NEWS.ja 2006-08-11 02:23:23.000000000 +0200 @@ -1,6 +1,23 @@ NEWS.ja -- ³Æ¥ê¥ê¡Œ¥¹€Ë€ª€±€ëÊѹ¹€Î³µÍ× ---------------------------------------------------------------------- +iscan-2.2.0 (2006-08-11) +---------------------------------------------------------------------- + * °Ê²Œ€Î¥¹¥¥ã¥Ê€ËÂбþ: + - ES-H300 + - GT-2500 + - ME200 + - Stylus CX2800 + - Stylus CX2900 + +---------------------------------------------------------------------- +iscan-2.1.1 (2006-08-10) +---------------------------------------------------------------------- + * °Ê²Œ€Î¥¹¥¥ã¥Ê€ËÂбþ: + - Perfection V10 + - Perfection V100 PHOTO + +---------------------------------------------------------------------- iscan-2.1.0 (2006-05-22) ---------------------------------------------------------------------- * °Ê²Œ€Î¥¹¥¥ã¥Ê€ËÂбþ: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/iscan-2.1.0/README new/iscan-2.2.0/README --- old/iscan-2.1.0/README 2006-06-13 04:53:23.000000000 +0200 +++ new/iscan-2.2.0/README 2006-08-11 02:23:23.000000000 +0200 @@ -69,9 +69,12 @@ - Expression 1680 - Expression 1640XL - Expression 10000XL + - GT-2500 - GT-10000/GT-10000+ - GT-15000 - GT-30000 + - ME200 + - Stylus CX2800/Stylus CX2900 - Stylus CX3500/Stylus CX3600 - Stylus CX3700/Stylus CX3800/Stylus DX3800 - Stylus CX4100/Stylus CX4200/Stylus DX4200 @@ -103,6 +106,8 @@ - Perfection 3590 PHOTO - Perfection 4180 PHOTO - Perfection 4490 PHOTO + - Perfection V10 + - Perfection V100 PHOTO The required modules can be downloaded via: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/iscan-2.1.0/README.ja new/iscan-2.2.0/README.ja --- old/iscan-2.1.0/README.ja 2006-06-13 04:53:23.000000000 +0200 +++ new/iscan-2.2.0/README.ja 2006-07-12 09:09:48.000000000 +0200 @@ -69,6 +69,7 @@ ¡¡¡¡¡¡¡¡¡¡¡ŠES-7000H ¡¡¡¡¡¡¡¡¡¡¡ŠES-9000H ¡¡¡¡¡¡¡¡¡¡¡ŠES-10000G + ¡¡¡¡¡¡¡¡¡¡¡ŠES-H300 ¡¡¡¡¡¡¡¡¡¡¡ŠCC-600PX ¡¡¡¡¡¡¡¡¡¡¡ŠPM-A700 ¡¡¡¡¡¡¡¡¡¡¡ŠPM-A750 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/iscan-2.1.0/backend/epkowa.c new/iscan-2.2.0/backend/epkowa.c --- old/iscan-2.1.0/backend/epkowa.c 2006-06-13 04:53:23.000000000 +0200 +++ new/iscan-2.2.0/backend/epkowa.c 2006-08-24 06:34:25.000000000 +0200 @@ -24,8 +24,8 @@ */ #define SANE_EPSON_VERSION \ - "EPKOWA SANE Backend " PACKAGE_VERSION " - 2006-05-22" -#define SANE_EPSON_BUILD 202 + "EPKOWA SANE Backend " PACKAGE_VERSION " - 2006-08-11" +#define SANE_EPSON_BUILD 204 /* This file is part of the EPKOWA SANE backend. @@ -834,6 +834,26 @@ {1.0000, 0.0000, 0.0000, 0.0000, 1.0000, 0.0000, 0.0000, 0.0000, 1.0000}, {1.3111, -0.2979, -0.0132, -0.0441, 1.1148, -0.0707, -0.0348, -0.2971, 1.3319}}}, /* GT-X900 */ + {0x66, + {{1.0878, -0.0667, -0.0211, -0.0892, 1.1513, -0.0622, -0.0654, -0.5175, + 1.5829}, + {1.0208, -0.0209, 0.0000, -0.0923, 1.2017, -0.1093, -0.0020, -0.1290, + 1.1310}, + {1.0000, 0.0000, 0.0000, 0.0000, 1.0000, 0.0000, 0.0000, 0.0000, 1.0000}, + {1.2688, -0.2522, -0.0166, -0.0559, 1.1291, -0.0733, -0.0377, -0.3519, + 1.3896}}}, /* Perfection V10/V100 */ + {0x6A, + {{0.9828, 0.0924, -0.0752, 0.0255, 1.1510, -0.1765, 0.0049, -0.3250, + 1.3201}, + {1.0000, 0.0000, 0.0000, 0.0000, 1.0000, 0.0000, 0.0000, 0.0000, 1.0000}, + {1.0000, 0.0000, 0.0000, 0.0000, 1.0000, 0.0000, 0.0000, 0.0000, 1.0000}, + {1.0000, 0.0000, 0.0000, 0.0000, 1.0000, 0.0000, 0.0000, 0.0000, 1.0000}}}, /* Stylus CX2800/CX2900/ME200 */ + {0x65, + {{1.0359, -0.0146, -0.0213, -0.0752, 1.0963, -0.0211, -0.0456, -0.3238, + 1.3693}, + {1.0000, 0.0000, 0.0000, 0.0000, 1.0000, 0.0000, 0.0000, 0.0000, 1.0000}, + {1.0000, 0.0000, 0.0000, 0.0000, 1.0000, 0.0000, 0.0000, 0.0000, 1.0000}, + {1.0000, 0.0000, 0.0000, 0.0000, 1.0000, 0.0000, 0.0000, 0.0000, 1.0000}}}, /* ES-H300 */ }; const struct ScannerData scanner_data[] = { @@ -895,9 +915,12 @@ {"CX4800", 0x58, 0x01, {"Stylus CX4700/CX4800/DX4800", "PX-A650"}}, {"CX4200", 0x59, 0x01, {"Stylus CX4100/CX4200/DX4200", NULL}}, {"PM-A950", 0x61, 0x01, {NULL, "PM-A950"}}, - {"PM-A890", 0x5F, 0x01, {"Stylus Photo Rx640/RX650", "PM-A890"}}, + {"PM-A890", 0x5F, 0x01, {"Stylus Photo RX640/RX650", "PM-A890"}}, {"GT-X900", 0x63, 0x01, {"Perfection V700/V750", "GT-X900"}}, - /* array terminator */ + {"GT-S600", 0x66, 0x01, {"Perfection V10/V100", NULL}}, + {"CX3000v", 0x6A, 0x01, {"Stylus CX2800/CX2900/ME200", NULL}}, + {"ES-H300", 0x65, 0x01, {"GT-2500", "ES-H300"}}, +/* array terminator */ {NULL, 0x00, 0x00, {NULL, NULL}}, }; @@ -1847,7 +1870,7 @@ { for (i = 0; i < 256; i += 16) { - char gammaValues[16 * 3 + 1], newValue[3]; + char gammaValues[16 * 3 + 1], newValue[4]; gammaValues[0] = '\0'; @@ -2791,8 +2814,7 @@ i++; } - if (!is_valid) /* try interpreter-based support */ - { + { /* try interpreter-based support */ status = create_interpreter (s->hw, product); if (SANE_STATUS_GOOD != status) { @@ -2801,7 +2823,10 @@ delete (dev); return status; } - is_valid = (NULL != s->hw->interpreter); + if (!is_valid) + { + is_valid = (NULL != s->hw->interpreter); + } } if (is_valid == SANE_FALSE) @@ -5445,8 +5470,17 @@ bytes_per_pixel++; } - /* pixels_per_line is rounded to the next 8bit boundary */ - s->params.pixels_per_line = s->params.pixels_per_line & ~7; + /* All models require alignment on a multiple of 8 pixels per line. + However, some models require multiples of 32 pixels instead of 8 + when scanning in monochrome mode. + We use the largest multiple that is not larger than the original + value. + */ + s->params.pixels_per_line &= ~7; + if (1 == s->params.depth) + { + s->params.pixels_per_line &= ~31; + } s->params.last_frame = SANE_TRUE; @@ -5972,6 +6006,13 @@ { ndpi = 1800; } + else if (0x012b == s->hw->productID /* GT-2500/ES-H300 */ + && s->hw->ADF && s->hw->use_extension + && s->val[OPT_RESOLUTION].w >= 600) + { + ndpi = 600; + s->val[OPT_RESOLUTION].w = ndpi; + } else { ndpi = s->val[OPT_RESOLUTION].w; @@ -6451,9 +6492,14 @@ We hack around non-compliant behaviour by looping until 'ESC G' succeeds or our patience runs out. In the latter case we just claim that the device is busy. + + However, when the ADF function is used, and the last paper is + scanned, we do not need looping any more. */ ticks = 0; while (result->status & (STATUS_FER | STATUS_NOT_READY) + && !(s->hw->ADF && s->hw->use_extension + && (result->status & STATUS_AREA_END)) && ticks++ < limit) { DBG (1, "fatal error - Status = %02x\n", result->status); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/iscan-2.1.0/backend/epkowa_ip.c new/iscan-2.2.0/backend/epkowa_ip.c --- old/iscan-2.1.0/backend/epkowa_ip.c 2006-01-24 03:09:58.000000000 +0100 +++ new/iscan-2.2.0/backend/epkowa_ip.c 2006-08-11 02:23:23.000000000 +0200 @@ -93,6 +93,8 @@ /* GT-F550 / Perfection 2580 */ {0x0122, "libesint52"}, /* GT-F520 / Perfection 3490 */ /* GT-F570 / Perfection 3590 */ + {0x012d, "libesint66"}, /* Perfection V10 */ + /* Perfection V100 */ {0x0119, "libesint54"}, /* GT-X750 / Perfection 4490 */ {0x0000, NULL}, /* terminator */ }; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/iscan-2.1.0/backend/epkowa_usb.c new/iscan-2.2.0/backend/epkowa_usb.c --- old/iscan-2.1.0/backend/epkowa_usb.c 2006-05-22 08:18:42.000000000 +0200 +++ new/iscan-2.2.0/backend/epkowa_usb.c 2006-07-26 03:53:09.000000000 +0200 @@ -22,6 +22,7 @@ 0x128, /* GT-X700 / Perfection 4870 */ 0x129, /* ES-10000G / Expression 10000XL */ 0x12a, /* GT-X800 / Perfection 4990 */ + 0x12b, /* ES-H300 / GT-2500 */ 0x12c, /* GT-X900 / Perfection V700/V750 */ 0x801, /* CC-600 / Stylus CX5100/CX5200/CX5300/CX5400 */ 0x802, /* CC-570 / Stylus CX3100/CX3200 */ @@ -44,6 +45,7 @@ 0x81d, /* PM-A950 */ 0x81f, /* / Stylus CX7700/CX7800 */ 0x820, /* / Stylus CX4100/CX4200/DX4200 */ + 0x830, /* / Stylus CX2800/CX2900/ME200 */ 0 /* last entry - this is used for devices that are specified in the config file as "usb <vendor> <product>" */ }; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/iscan-2.1.0/configure.ac new/iscan-2.2.0/configure.ac --- old/iscan-2.1.0/configure.ac 2006-06-13 06:02:14.000000000 +0200 +++ new/iscan-2.2.0/configure.ac 2006-08-23 01:51:46.000000000 +0200 @@ -24,7 +24,7 @@ AC_PREREQ(2.57) AC_INIT([Image Scan! for Linux], - [2.1.0], [pipsnews@avasys.jp], [iscan]) + [2.2.0], [pipsnews@avasys.jp], [iscan]) AC_SUBST(PACKAGE_RELEASE,1) dnl keep ALL versioning info in dnl one location diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/iscan-2.1.0/doc/epkowa.desc new/iscan-2.2.0/doc/epkowa.desc --- old/iscan-2.1.0/doc/epkowa.desc 2006-05-22 08:18:42.000000000 +0200 +++ new/iscan-2.2.0/doc/epkowa.desc 2006-08-11 02:23:23.000000000 +0200 @@ -22,35 +22,28 @@ ;;; This list of devices was compiled from the following sources: ;;; -;;; * iscan-2.1.0/NEWS -;;; * iscan-2.1.0/doc/sane-epkowa.man -;;; * iscan-2.1.0/backend/epkowa_usb.c -;;; * sane-backends-1.0.15/backend/epson_usb.c -;;; * sane-backends-1.0.15/doc/descriptions/epson.desc +;;; * iscan-2.2.0/NEWS +;;; * iscan-2.2.0/doc/sane-epkowa.man +;;; * iscan-2.2.0/backend/epkowa_usb.c +;;; * sane-backends/backend/epson_usb.c (CVS 1.18) +;;; * sane-backends/doc/descriptions/epson.desc (CVS 1.26) ;;; * http://www.freecolormanagement.com/sane/supported.html ;;; * http://www.sane-project.org/lists/sane-mfgs-cvs.html#Z-EPSON ;;; * http://www.epsondevelopers.com/ ;;; * http://www.epson.com/ (several representative countries) ;;; * http://www.i-love-epson.co.jp/ +;;; * messages on the sane-devel and LinuxPrinting.org epson-list +;;; mailing lists ;; Backend data. ;; :backend "epkowa" -:version "2.0.0" -:url "http://www.avasys.jp/english/linux_e/dl_scan.html" +:version "2.2.0" +:url "http://www.avasys.jp/english/linux_e/index.html" -:comment "Based on the epson backend of sane-backends-1.0.15." +;:comment "Based on the epson backend of sane-backends-1.0.15." -; AFAIK, all devices listed on the sane-epkowa.man page have been -; tested by EPSON AVASYS Corporation but _only_ for SCSI and USB -; interfaces. The IEEE1394 and parallel interfaces have never been -; tested. These models have all been marked :complete (even though -; some are not really quite :complete). All other devices have, in -; principle, been marked as :unsupported. -; Devices supported by the epson backend (as of version 1.0.15 of -; sane-backends) as well as overseas versions of supported models -; have been marked :untested. ;; Device and manufacturer information. ;; @@ -78,16 +71,22 @@ ;; :model "Actionscanner II" -:interface "parallel" -:status :untested ; :good +:interface "parallel SCSI" +:status :good :comment "overseas version of the GT-5000" :model "AcuLaser CX11" :interface "USB" :usbid "0x04b8" "0x0815" -:status :complete +:status :good :comment "overseas version of the LP-A500" +:model "AcuLaser CX11NF" +:interface "USB" +:usbid "0x04b8" "0x0815" +:status :good +:comment "AcuLaser CX11 with network interface and fax<br>network interface not supported" + :model "CC-500L" ; product spec (JP) :interface "USB" :status :unsupported @@ -101,13 +100,13 @@ :model "CC-570L" ; product spec (JP) :interface "USB" :usbid "0x04b8" "0x0802" -:status :untested ; :good +:status :good :comment "all-in-one" :model "CC-600PX" ; product spec (JP) :interface "USB" :usbid "0x04b8" "0x0801" -:status :complete +:status :good :comment "all-in-one" :model "CC-700" ; product spec (JP) @@ -117,17 +116,21 @@ :model "ES-300C" :interface "SCSI parallel" -:status :untested ; :good +:status :good :comment "overseas version of the GT-6000" +:model "ES-300GS" +:interface "SCSI" +:status :good + :model "ES-600C" :interface "parallel" -:status :untested ; :good +:status :good :comment "overseas version of the GT-5400" :model "ES-800C" :interface "SCSI" -:status :untested ; :good +:status :good :comment "overseas version of the GT-8000" :model "ES-1000C" @@ -136,7 +139,7 @@ :model "ES-1200C" :interface "parallel" -:status :untested ; :good +:status :good :comment "overseas version of the GT-9000" :model "ES-2000" ; product spec (JP) @@ -153,22 +156,22 @@ :model "ES-6000" ; product spec (JP) :interface "SCSI" -:status :complete +:status :good :model "ES-6000H" ; product spec (JP) :interface "SCSI" -:status :complete +:status :good :comment "IEEE1394 untested" :model "ES-6000HS" ; product spec (JP) :interface "SCSI" -:status :complete +:status :good :comment "IEEE1394 untested" :model "ES-7000H" ; product spec (JP) :interface "SCSI USB" :usbid "0x04b8" "0x0126" -:status :complete +:status :good :comment "IEEE1394 untested; 100Base-TX/10Base-T unsupported" :model "ES-8000" @@ -178,28 +181,34 @@ :model "ES-8500" ; product spec (JP) :interface "SCSI USB" :usbid "0x04b8" "0x0109" -:status :complete +:status :good :comment "IEEE1394 untested" :model "ES-9000H" ; product spec (JP) :interface "SCSI" -:status :complete +:status :good :comment "IEEE1394 untested" :model "ES-10000G" ; product spec (JP) :interface "USB" :usbid "0x04b8" "0x0129" -:status :complete +:status :good :comment "IEEE1394 untested<br>100Base-TX/10Base-T unsupported" +:model "ES-H300" +:interface "USB" +:usbid "0x04b8" "0x012b" +:status :good +:comment "simplex ADF support only<br>Ethernet option not supported" + :model "Expression 636" :interface "SCSI" -:status :untested ; :complete +:status :complete :comment "overseas version of the GT-9500" :model "Expression 800" ; command spec :interface "SCSI" -:status :untested ; :complete +:status :complete :comment "overseas version of the GT-9600" :model "Expression 836XL" ; command spec @@ -216,7 +225,7 @@ :model "Expression 1640XL" ; command spec :interface "SCSI USB" :usbid "0x04b8" "0x0109" -:status :complete +:status :good :comment "overseas version of the ES-8500<br>IEEE1394 untested" :model "Expression 1680" ; command spec @@ -237,7 +246,7 @@ :model "Expression 10000XL" ; command spec :interface "USB" :usbid "0x04b8" "0x0129" -:status :complete +:status :good :comment "overseas version of the ES-10000G<br>IEEE1394 untested; 100Base-TX/10Base-T unsupported" :model "Expression 10000XL Graphic Arts" @@ -263,29 +272,41 @@ :interface "SCSI" :status :unsupported :comment "A better backend for the FilmScan 200 can be found at http://www.vjet.demon.co.uk/scanner/\">http://www.vjet.demon.co.uk/scanner/</A>." +:url "http://www.vjet.demon.co.uk/scanner/" + +:model "GT-2200" +:interface "USB" +:usbid "0x04b8" "0x0102" +:status :unsupported + +:model "GT-2500" +:interface "USB" +:usbid "0x04b8" "0x012b" +:status :good +:comment "overseas version of the ES-H300<br>simplex ADF support only<br>Ethernet option not supported" :model "GT-4000" :status :untested :model "GT-5000" -:interface "parallel" -:status :untested ; :good +:interface "parallel SCSI" +:status :good :model "GT-5400" :interface "parallel" -:status :untested ; :good +:status :good :model "GT-5500" :interface "SCSI" -:status :untested ; :good +:status :good :model "GT-6000" :interface "SCSI Parport" -:status :untested ; :good +:status :good :model "GT-6500" :interface "parallel" -:status :untested ; :good +:status :good :comment "overseas version of the GT-5400" :model "GT-6600U" ; product spec (JP) @@ -300,24 +321,26 @@ :model "GT-7000S" :interface "SCSI" -:status :untested ; :complete +:status :complete :model "GT-7000U" :interface "USB" :usbid "0x04b8" "0x0101" -:status :untested ; :complete +:status :complete :model "GT-7200U" ; product spec (JP) :interface "USB" :usbid "0x04b8" "0x010f" -:status :complete -:comment "requires a DFSG non-free module<br>also supported by the plustek backend" +:status :good +:comment "requires DFSG non-free iscan-plugin-gt-7200<br>also supported by the plustek backend" +:url "http://www.avasys.jp/english/linux_e/dl_scan.html" :model "GT-7300U" ; product spec (JP) :interface "USB" :usbid "0x04b8" "0x011d" -:status :complete -:comment "requires a DFSG non-free module<br>also supported by the plustek backend" +:status :good +:comment "requires DFSG non-free iscan-plugin-gt-7300<br>also supported by the plustek backend" +:url "http://www.avasys.jp/english/linux_e/dl_scan.html" :model "GT-7400U" ; product spec (JP) :interface "USB" @@ -348,7 +371,7 @@ :model "GT-8000" :interface "SCSI" -:status :untested ; :good +:status :good :model "GT-8200U" ; product spec (JP) :interface "USB" @@ -358,7 +381,7 @@ :model "GT-8200UF" ; product spec (JP) :interface "USB" :usbid "0x04b8" "0x0110" -:status :complete +:status :good :model "GT-8300UF" ; product spec (JP) :interface "USB" @@ -380,12 +403,12 @@ :model "GT-8700F" ; product spec (JP) :interface "SCSI USB" :usbid "0x04b8" "0x010a" -:status :complete +:status :good :comment "GT-8700U with TPU option bundled" :model "GT-9000" :interface "parallel" -:status :untested ; :good +:status :good :model "GT-9300UF" ; product spec (JP) :interface "USB" @@ -395,16 +418,17 @@ :model "GT-9400UF" ; product spec (JP) :interface "USB" :usbid "0x04b8" "0x0116" -:status :complete -:comment "requires a DFSG non-free module" +:status :good +:comment "requires DFSG non-free iscan-plugin-gt-9400" +:url "http://www.avasys.jp/english/linux_e/dl_scan.html" :model "GT-9500" :interface "SCSI" -:status :untested ; :complete +:status :complete :model "GT-9600" :interface "SCSI" -:status :untested ; :complete +:status :complete :model "GT-9700F" ; product spec (JP) :interface "USB" @@ -420,12 +444,12 @@ :model "GT-10000" :interface "SCSI" -:status :complete +:status :good :comment "overseas version of the ES-6000" :model "GT-10000+" ; command spec :interface "SCSI" -:status :complete +:status :good :comment "overseas version of the ES-6000H<br>IEEE1394 untested" :model "GT-12000" @@ -436,43 +460,48 @@ :model "GT-15000" ; command spec :interface "SCSI USB" :usbid "0x04b8" "0x0126" -:status :complete +:status :good :comment "overseas version of the ES-7000H<br>IEEE1394 untested" :model "GT-30000" ; command spec :interface "SCSI" -:status :complete +:status :good :comment "overseas version of the ES-9000H<br>IEEE1394 untested" :model "GT-F500" ; product spec (JP) :interface "USB" :usbid "0x04b8" "0x0121" :status :good -:comment "multi photo feeder not supported<br>requires a DFSG non-free module<br>should also be supported by the snapscan backend" +:comment "multi photo feeder not supported<br>requires DFSG non-free iscan-plugin-gt-f500<br>also supported by the snapscan backend" +:url "http://www.avasys.jp/english/linux_e/dl_scan.html" :model "GT-F520" :interface "USB" :usbid "0x04b8" "0x0122" :status :good -:comment "multi photo feeder not supported<br>requires a DFSG non-free module<br>may be supported by the snapscan backend" +:comment "multi photo feeder not supported<br>requires DFSG non-free iscan-plugin-gt-f520<br>also supported by the snapscan backend" +:url "http://www.avasys.jp/english/linux_e/dl_scan.html" :model "GT-F550" ; product spec (JP) :interface "USB" :usbid "0x04b8" "0x0121" :status :good -:comment "auto film loader not supported<br>requires a DFSG non-free module<br>should also be supported by the snapscan backend" +:comment "auto film loader not supported<br>requires DFSG non-free iscan-plugin-gt-f500<br>also supported by the snapscan backend" +:url "http://www.avasys.jp/english/linux_e/dl_scan.html" :model "GT-F570" :interface "USB" :usbid "0x04b8" "0x0122" :status :good -:comment "auto film loader not supported<br>requires a DFSG non-free module<br>may be supported by the snapscan backend" +:comment "auto film loader not supported<br>requires DFSG non-free iscan-plugin-gt-f520<br>also supported by the snapscan backend" +:url "http://www.avasys.jp/english/linux_e/dl_scan.html" :model "GT-F600" ; product spec (JP) :interface "USB" :usbid "0x04b8" "0x0118" :status :good -:comment "only scans up to 2400dpi<br>requires a DFSG non-free module" +:comment "only scans up to 2400dpi<br>requires DFSG non-free iscan-plugin-gt-f600" +:url "http://www.avasys.jp/english/linux_e/dl_scan.html" :model "GT-X700" ; product spec (JP) :interface "USB" @@ -483,13 +512,14 @@ :model "GT-X750" :interface "USB" :usbid "0x04b8" "0x0119" -:status :complete -:comment "requires a DFSG non-free module" +:status :good +:comment "requires DFSG non-free iscan-plugin-gt-x750" +:url "http://www.avasys.jp/english/linux_e/dl_scan.html" :model "GT-X800" ; product spec (JP) :interface "USB IEEE1394" :usbid "0x04b8" "0x012a" -:status :good +:status :complete :comment "IEEE1394 untested<br>film area guide mode not supported" :model "GT-X900" @@ -541,73 +571,79 @@ :model "LP-A500" :interface "USB" :usbid "0x04b8" "0x0815" -:status :complete +:status :good :comment "business all-in-one<br>network interface not supported" :model "LP-M5500" :interface "USB" :usbid "0x04b8" "0x0817" -:status :complete +:status :good :comment "business all-in-one<br>network interface not supported" :model "LP-M5500F" :interface "USB" :usbid "0x04b8" "0x0817" -:status :complete +:status :good :comment "business all-in-one<br>LP-M5500 with the fax option bundled<br>network interface not supported" +:model "ME200" +:interface "USB" +:usbid "0x04b8" "0x0830" +:status :good +:comment "all-in-one" + :model "PM-A700" ; product spec (JP) :interface "USB" :usbid "0x04b8" "0x0814" -:status :complete +:status :good :comment "all-in-one" :model "PM-A750" :interface "USB" :usbid "0x04b8" "0x081a" -:status :complete +:status :good :comment "all-in-one" :model "PM-A850" ; product spec (JP) :interface "USB" :usbid "0x04b8" "0x0806" -:status :complete +:status :good :comment "all-in-one" :model "PM-A870" ; product spec (JP) :interface "USB" :usbid "0x04b8" "0x0811" -:status :complete +:status :good :comment "all-in-one" :model "PM-A890" :interface "USB" :usbid "0x04b8" "0x081c" -:status :complete +:status :good :comment "all-in-one" :model "PM-A900" ; product spec (JP) :interface "USB" :usbid "0x04b8" "0x0810" -:status :complete +:status :good :comment "all-in-one" :model "PM-A950" :interface "USB" :usbid "0x04b8" "0x081d" -:status :complete +:status :good :comment "all-in-one" :model "PX-A550" ; product spec (JP) :interface "USB" :usbid "0x04b8" "0x080e" -:status :complete +:status :good :comment "all-in-one" :model "PX-A650" :interface "USB" :usbid "0x04b8" "0x0819" -:status :complete +:status :good :comment "all-in-one" :model "Perfection 600" @@ -623,13 +659,13 @@ :model "Perfection 636S" :interface "SCSI" -:status :untested ; :complete +:status :complete :comment "overseas version of the GT-7000S" :model "Perfection 636U" ; command spec :interface "USB" :usbid "0x04b8" "0x0101" -:status :untested ; :complete +:status :complete :comment "overseas version of the GT-7000U" :model "Perfection 640U" ; command spec @@ -659,7 +695,7 @@ :interface "USB" :usbid "0x04b8" "0x0104" :status :complete -:comment "overseas version of the GT-7600UF" +:comment "overseas version of the GT-7600UF<br>Perfection 1200U with TPU option bundled" :model "Perfection 1240U" ; command spec :interface "USB" @@ -670,31 +706,36 @@ :model "Perfection 1250" :interface "USB" :usbid "0x04b8" "0x010f" -:status :complete -:comment "overseas version of the GT-7200U<br>requires a DFSG non-free module<br>also supported by the plustek backend" +:status :good +:comment "overseas version of the GT-7200U<br>requires DFSG non-free iscan-plugin-gt-7200<br>also supported by the plustek backend" +:url "http://www.avasys.jp/english/linux_e/dl_scan.html" :model "Perfection 1250 PHOTO" :interface "USB" :usbid "0x04b8" "0x010f" -:status :complete -:comment "Perfection 1250 with TPU option bundled<br>requires a DFSG non-free module<br>also supported by the plustek backend" +:status :good +:comment "Perfection 1250 with TPU option bundled<br>requires DFSG non-free iscan-plugin-gt-7200<br>also supported by the plustek backend" +:url "http://www.avasys.jp/english/linux_e/dl_scan.html" :model "Perfection 1260" :interface "USB" :usbid "0x04b8" "0x011d" -:status :complete -:comment "overseas version of the GT-7300U<br>requires a DFSG non-free module<br>also supported by the plustek backend" +:status :good +:comment "overseas version of the GT-7300U<br>requires DFSG non-free iscan-plugin-gt-7300<br>also supported by the plustek backend" +:url "http://www.avasys.jp/english/linux_e/dl_scan.html" :model "Perfection 1260 PHOTO" :interface "USB" :usbid "0x04b8" "0x011d" -:status :complete -:comment "Perfection 1260 with TPU option bundled<br>requires a DFSG non-free module<br>also supported by the plustek backend" +:status :good +:comment "Perfection 1260 with TPU option bundled<br>requires DFSG non-free iscan-plugin-gt-7300<br>also supported by the plustek backend" +:url "http://www.avasys.jp/english/linux_e/dl_scan.html" :model "Perfection 1270" :interface "USB" +:usbid "0x04b8" "0x0120" :status :unsupported -:comment "may be supported by the snapscan backend" +:comment "supported by the snapscan backend" :model "Perfection 1600" :interface "SCSI" @@ -709,7 +750,7 @@ :model "Perfection 1640SU PHOTO" :interface "SCSI USB" :usbid "0x04b8" "0x010a" -:status :complete +:status :good :comment "overseas version of the GT-8700F" :model "Perfection 1650" ; command spec @@ -721,7 +762,7 @@ :model "Perfection 1650 PHOTO" :interface "USB" :usbid "0x04b8" "0x0110" -:status :complete +:status :good :comment "overseas version of the GT-8200UF" :model "Perfection 1660 PHOTO" ; command spec @@ -740,7 +781,7 @@ :interface "USB" :usbid "0x04b8" "0x011f" :status :unsupported -:comment "may be supported by the snapscan backend" +:comment "supported by the snapscan backend" :model "Perfection 2400 PHOTO" ; command spec :interface "USB" @@ -758,19 +799,22 @@ :interface "USB" :usbid "0x04b8" "0x0121" :status :good -:comment "overseas version of the GT-F500<br>multi photo feeder not supported<br>requires a DFSG non-free module<br>also supported by the snapscan backend" +:comment "overseas version of the GT-F500<br>multi photo feeder not supported<br>requires DFSG non-free iscan-plugin-gt-f500<br>also supported by the snapscan backend" +:url "http://www.avasys.jp/english/linux_e/dl_scan.html" :model "Perfection 2580 PHOTO" :interface "USB" :usbid "0x04b8" "0x0121" :status :good -:comment "overseas version of the GT-F550<br>auto film loader not supported<br>requires a DFSG non-free module<br>also supported by the snapscan backend" +:comment "overseas version of the GT-F550<br>auto film loader not supported<br>requires DFSG non-free iscan-plugin-gt-f500<br>also supported by the snapscan backend" +:url "http://www.avasys.jp/english/linux_e/dl_scan.html" :model "Perfection 3170 PHOTO" :interface "USB" :usbid "0x04b8" "0x0116" -:status :complete -:comment "overseas version of the GT-9400UF<br>requires a DFSG non-free module" +:status :good +:comment "overseas version of the GT-9400UF<br>requires DFSG non-free iscan-plugin-gt-9400" +:url "http://www.avasys.jp/english/linux_e/dl_scan.html" :model "Perfection 3200 PHOTO" ; command spec :interface "USB" @@ -782,25 +826,29 @@ :interface "USB" :usbid "0x04b8" "0x0122" :status :good -:comment "overseas version of the GT-F520<br>multi photo feeder not supported<br>requires a DFSG non-free module<br>may be supported by the snapscan backend" +:comment "overseas version of the GT-F520<br>multi photo feeder not supported<br>requires DFSG non-free iscan-plugin-gt-f520<br>also supported by the snapscan backend" +:url "http://www.avasys.jp/english/linux_e/dl_scan.html" :model "Perfection 3590 PHOTO" :interface "USB" :usbid "0x04b8" "0x0122" :status :good -:comment "overseas version of the GT-F570<br>auto film loader not supported<br>requires a DFSG non-free module<br>may be supported by the snapscan backend" +:comment "overseas version of the GT-F570<br>auto film loader not supported<br>requires DFSG non-free iscan-plugin-gt-f520<br>also supported by the snapscan backend" +:url "http://www.avasys.jp/english/linux_e/dl_scan.html" :model "Perfection 4180 PHOTO" :interface "USB" :usbid "0x04b8" "0x0118" :status :good -:comment "overseas version of the GT-F600<br>only scans up to 2400dpi<br>requires a DFSG non-free module" +:comment "overseas version of the GT-F600<br>only scans up to 2400dpi<br>requires DFSG non-free iscan-plugin-gt-f600" +:url "http://www.avasys.jp/english/linux_e/dl_scan.html" :model "Perfection 4490 PHOTO" :interface "USB" :usbid "0x04b8" "0x0119" -:status :complete -:comment "overseas version of the GT-X750<br>requires a DFSG non-free module" +:status :good +:comment "overseas version of the GT-X750<br>requires DFSG non-free iscan-plugin-gt-x750" +:url "http://www.avasys.jp/english/linux_e/dl_scan.html" :model "Perfection 4870 PHOTO" ; command spec :interface "USB" @@ -819,6 +867,18 @@ :status :untested :comment "seems to be a 4990 PHOTO with additional software" +:model "Perfection V10" +:interface "USB" +:usbid "0x04b8" "0x012d" +:status :good +:comment "requires DFSG non-free iscan-plugin-gt-s600" + +:model "Perfection V100 PHOTO" +:interface "USB" +:usbid "0x04b8" "0x012d" +:status :good +:comment "requires DFSG non-free iscan-plugin-gt-s600" + :model "Perfection V700" :interface "USB IEEE1394" :usbid "0x04b8" "0x012c" @@ -833,49 +893,62 @@ :model "Stylus CX1500" ; Australia :interface "USB" +:usbid "0x04b8" "0x080c" :status :unsupported +:comment "all-in-one<br>supported by the snapscan backend" + +:model "Stylus CX2800" +:interface "USB" +:usbid "0x04b8" "0x0830" +:status :good +:comment "all-in-one" + +:model "Stylus CX2900" +:interface "USB" +:usbid "0x04b8" "0x0830" +:status :good :comment "all-in-one" :model "Stylus CX3100" :interface "USB" :usbid "0x04b8" "0x0802" -:status :untested ; :good +:status :good :comment "overseas version of the CC-570<br>all-in-one" :model "Stylus CX3200" :interface "USB" :usbid "0x04b8" "0x0802" -:status :untested ; :good +:status :good :comment "overseas version of the CC-570<br>all-in-one" :model "Stylus CX3500" ; Australia :interface "USB" :usbid "0x04b8" "0x080e" -:status :complete +:status :good :comment "all-in-one" :model "Stylus CX3600" ; UK :interface "USB" :usbid "0x04b8" "0x080e" -:status :complete +:status :good :comment "all-in-one" :model "Stylus CX3650" ; France :interface "USB" :usbid "0x04b8" "0x080e" -:status :unsupported +:status :good :comment "all-in-one" :model "Stylus CX3700" :interface "USB" :usbid "0x04b8" "0x0818" -:status :complete +:status :good :comment "all-in-one" :model "Stylus CX3800" :interface "USB" :usbid "0x04b8" "0x0818" -:status :complete +:status :good :comment "all-in-one" :model "Stylus CX3810" @@ -886,222 +959,222 @@ :model "Stylus CX4100" :interface "USB" :usbid "0x04b8" "0x0820" -:status :complete +:status :good :comment "all-in-one" :model "Stylus CX4200" :interface "USB" :usbid "0x04b8" "0x0820" -:status :complete +:status :good :comment "all-in-one" :model "Stylus CX4500" :interface "USB" :usbid "0x04b8" "0x080d" -:status :complete +:status :good :comment "all-in-one" :model "Stylus CX4600" :interface "USB" :usbid "0x04b8" "0x080d" -:status :complete +:status :good :comment "all-in-one" :model "Stylus CX4700" :interface "USB" :usbid "0x04b8" "0x0819" -:status :complete +:status :good :comment "all-in-one<br>overseas version of the PX-A650" :model "Stylus CX4800" :interface "USB" :usbid "0x04b8" "0x0819" -:status :complete +:status :good :comment "all-in-one<br>overseas version of the PX-A650" :model "Stylus CX5100" :interface "USB" :usbid "0x04b8" "0x0801" -:status :complete +:status :good :comment "overseas version of the CC-600PX<br>all-in-one" :model "Stylus CX5200" :interface "USB" :usbid "0x04b8" "0x0801" -:status :complete +:status :good :comment "overseas version of the CC-600PX<br>all-in-one" :model "Stylus CX5300" :interface "USB" :usbid "0x04b8" "0x0801" -:status :complete +:status :good :comment "overseas version of the CC-600PX<br>all-in-one" :model "Stylus CX5400" :interface "USB" :usbid "0x04b8" "0x0801" -:status :complete -:comment "overseas version of the CC-600PX<br>all-in-one" - -:model "Stylus CX5700F" -:interface "USB" -:comment "all-in-one" - -:model "Stylus CX5800F" -:interface "USB" -:comment "all-in-one" +:status :good +:comment "overseas version of the CC-600PX<br>all-in-one<br>epson backend claims 0x0808 USB product ID" :model "Stylus CX6300" :interface "USB" :usbid "0x04b8" "0x0805" -:status :complete +:status :good :comment "all-in-one<br>mistakenly thinks its a PX-A650" :model "Stylus CX6400" :interface "USB" :usbid "0x04b8" "0x0805" -:status :complete +:status :good :comment "all-in-one<br>mistakenly thinks its a PX-A650" :model "Stylus CX6500" :interface "USB" :usbid "0x04b8" "0x0805" -:status :complete +:status :good :comment "all-in-one" :model "Stylus CX6600" :interface "USB" :usbid "0x04b8" "0x0805" -:status :complete +:status :good :comment "all-in-one" :model "Stylus CX6600" :interface "USB" :usbid "0x04b8" "0x0813" -:status :complete +:status :good :comment "all-in-one" :model "Stylus CX7700" :interface "USB" :usbid "0x04b8" "0x081f" -:status :complete +:status :good :comment "all-in-one" :model "Stylus CX7800" :interface "USB" :usbid "0x04b8" "0x081f" -:status :complete +:status :good :comment "all-in-one" :model "Stylus DX3800" :interface "USB" :usbid "0x04b8" "0x0818" -:status :complete +:status :good +:comment "all-in-one" + +:model "Stylus DX3850" +:interface "USB" +;:usbid "0x04b8" "0x0818" +:status :good :comment "all-in-one" :model "Stylus DX4200" :interface "USB" :usbid "0x04b8" "0x0820" -:status :complete +:status :good :comment "all-in-one" :model "Stylus DX4800" :interface "USB" :usbid "0x04b8" "0x0819" -:status :complete +:status :good :comment "all-in-one<br>overseas version of the PX-A650" :model "Stylus DX4850" :interface "USB" :usbid "0x04b8" "0x0819" -:status :complete +:status :good :comment "DX4800 + card reader<br>all-in-one" :model "Stylus Photo RX420" :interface "USB" :usbid "0x04b8" "0x080f" -:status :complete +:status :good :comment "all-in-one" :model "Stylus Photo RX425" ; France :interface "USB" :usbid "0x04b8" "0x080f" -:status :unsupported +:status :good :comment "all-in-one" :model "Stylus Photo RX430" ; Australia :interface "USB" :usbid "0x04b8" "0x080f" -:status :complete +:status :good :comment "all-in-one" :model "Stylus Photo RX500" :interface "USB" :usbid "0x04b8" "0x0807" -:status :complete +:status :good :comment "all-in-one" :model "Stylus Photo RX510" :interface "USB" :usbid "0x04b8" "0x0807" -:status :complete +:status :good :comment "all-in-one" :model "Stylus Photo RX520" :interface "USB" :usbid "0x04b8" "0x081a" -:status :complete +:status :good :comment "all-in-one" :model "Stylus Photo RX530" :interface "USB" :usbid "0x04b8" "0x081a" -:status :complete +:status :good :comment "all-in-one" :model "Stylus Photo RX600" :interface "USB" :usbid "0x04b8" "0x0806" -:status :complete +:status :good :comment "overseas version of the PM-A850<br>all-in-one" :model "Stylus Photo RX610" :interface "USB" :usbid "0x04b8" "0x0806" -:status :complete +:status :good :comment "overseas version of the PM-A850<br>all-in-one" :model "Stylus Photo RX620" :interface "USB" :usbid "0x04b8" "0x0811" -:status :complete +:status :good :comment "overseas version of the PM-A870<br>all-in-one" :model "Stylus Photo RX630" :interface "USB" :usbid "0x04b8" "0x0811" -:status :complete +:status :good :comment "overseas version of the PM-A870<br>all-in-one" :model "Stylus Photo RX640" :interface "USB" :usbid "0x04b8" "0x081c" -:status :complete +:status :good :comment "all-in-one<br>overseas version of the PM-A890" :model "Stylus Photo RX650" :interface "USB" :usbid "0x04b8" "0x081c" -:status :complete +:status :good :comment "all-in-one<br>overseas version of the PM-A890" :model "Stylus Photo RX700" :interface "USB" :usbid "0x04b8" "0x0810" -:status :complete +:status :good :comment "overseas version of the PM-A900<br>all-in-one" :model "Stylus Scan 2000" +:interface "USB" +:usbid "0x04b8" "0x0105" :status :untested :comment "apparently mostly the same as the Stylus Scan 2500" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/iscan-2.1.0/doc/sane-epkowa.man new/iscan-2.2.0/doc/sane-epkowa.man --- old/iscan-2.1.0/doc/sane-epkowa.man 2006-05-22 08:18:42.000000000 +0200 +++ new/iscan-2.2.0/doc/sane-epkowa.man 2006-08-11 02:23:23.000000000 +0200 @@ -68,6 +68,10 @@ .br GT-F600 Perfection 4180 PHOTO .br + Perfection V100 PHOTO +.br + Perfection V10 +.br GT-X700 Perfection 4870 PHOTO .br GT-X750 Perfection 4490 PHOTO @@ -94,6 +98,10 @@ .br ES-10000G Expression 10000XL .br +ES-H300 GT-2500 +.br + Stylus CX2800/CX2900/ME200 +.br PX-A550 Stylus CX3500/CX3600 .br Stylus CX3700/CX3800/DX3800 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/iscan-2.1.0/iscan.spec new/iscan-2.2.0/iscan.spec --- old/iscan-2.1.0/iscan.spec 2006-06-13 06:19:06.000000000 +0200 +++ new/iscan-2.2.0/iscan.spec 2006-08-24 07:20:27.000000000 +0200 @@ -23,7 +23,7 @@ # Some handy macro definitions. # %define pkg iscan -%define ver 2.1.0 +%define ver 2.2.0 %define rel 1.c2 %define msg %{_tmppath}/%{pkg}-%{ver}-%{rel}.msg Binary files old/iscan-2.1.0/po/de.gmo and new/iscan-2.2.0/po/de.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/iscan-2.1.0/po/de.po new/iscan-2.2.0/po/de.po --- old/iscan-2.1.0/po/de.po 2006-06-13 06:19:17.000000000 +0200 +++ new/iscan-2.2.0/po/de.po 2006-08-24 07:20:37.000000000 +0200 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: iscan 1.9.0\n" "Report-Msgid-Bugs-To: pipsnews@avasys.jp\n" -"POT-Creation-Date: 2006-06-13 13:19+0900\n" +"POT-Creation-Date: 2006-08-24 14:20+0900\n" "PO-Revision-Date: 2004-05-13 06:36+0900\n" "Last-Translator: unknown\n" "Language-Team: German\n" Binary files old/iscan-2.1.0/po/en@boldquot.gmo and new/iscan-2.2.0/po/en@boldquot.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/iscan-2.1.0/po/en@boldquot.po new/iscan-2.2.0/po/en@boldquot.po --- old/iscan-2.1.0/po/en@boldquot.po 2006-06-13 06:19:18.000000000 +0200 +++ new/iscan-2.2.0/po/en@boldquot.po 2006-08-24 07:20:38.000000000 +0200 @@ -30,10 +30,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Image Scan! for Linux 2.1.0\n" +"Project-Id-Version: Image Scan! for Linux 2.2.0\n" "Report-Msgid-Bugs-To: pipsnews@avasys.jp\n" -"POT-Creation-Date: 2006-06-13 13:19+0900\n" -"PO-Revision-Date: 2006-06-13 13:19+0900\n" +"POT-Creation-Date: 2006-08-24 14:20+0900\n" +"PO-Revision-Date: 2006-08-24 14:20+0900\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" "MIME-Version: 1.0\n" Binary files old/iscan-2.1.0/po/en@quot.gmo and new/iscan-2.2.0/po/en@quot.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/iscan-2.1.0/po/en@quot.po new/iscan-2.2.0/po/en@quot.po --- old/iscan-2.1.0/po/en@quot.po 2006-06-13 06:19:18.000000000 +0200 +++ new/iscan-2.2.0/po/en@quot.po 2006-08-24 07:20:37.000000000 +0200 @@ -27,10 +27,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Image Scan! for Linux 2.1.0\n" +"Project-Id-Version: Image Scan! for Linux 2.2.0\n" "Report-Msgid-Bugs-To: pipsnews@avasys.jp\n" -"POT-Creation-Date: 2006-06-13 13:19+0900\n" -"PO-Revision-Date: 2006-06-13 13:19+0900\n" +"POT-Creation-Date: 2006-08-24 14:20+0900\n" +"PO-Revision-Date: 2006-08-24 14:20+0900\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" "MIME-Version: 1.0\n" Binary files old/iscan-2.1.0/po/es.gmo and new/iscan-2.2.0/po/es.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/iscan-2.1.0/po/es.po new/iscan-2.2.0/po/es.po --- old/iscan-2.1.0/po/es.po 2006-06-13 06:19:17.000000000 +0200 +++ new/iscan-2.2.0/po/es.po 2006-08-24 07:20:37.000000000 +0200 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: iscan 1.9.0\n" "Report-Msgid-Bugs-To: pipsnews@avasys.jp\n" -"POT-Creation-Date: 2006-06-13 13:19+0900\n" +"POT-Creation-Date: 2006-08-24 14:20+0900\n" "PO-Revision-Date: 2004-06-20 18:19+0900\n" "Last-Translator: unknown\n" "Language-Team: Spanish\n" Binary files old/iscan-2.1.0/po/fr.gmo and new/iscan-2.2.0/po/fr.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/iscan-2.1.0/po/fr.po new/iscan-2.2.0/po/fr.po --- old/iscan-2.1.0/po/fr.po 2006-06-13 06:19:17.000000000 +0200 +++ new/iscan-2.2.0/po/fr.po 2006-08-24 07:20:37.000000000 +0200 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: iscan 1.9.0\n" "Report-Msgid-Bugs-To: pipsnews@avasys.jp\n" -"POT-Creation-Date: 2006-06-13 13:19+0900\n" +"POT-Creation-Date: 2006-08-24 14:20+0900\n" "PO-Revision-Date: 2004-05-13 06:36+0900\n" "Last-Translator: Unknown\n" "Language-Team: French\n" Binary files old/iscan-2.1.0/po/it.gmo and new/iscan-2.2.0/po/it.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/iscan-2.1.0/po/it.po new/iscan-2.2.0/po/it.po --- old/iscan-2.1.0/po/it.po 2006-06-13 06:19:17.000000000 +0200 +++ new/iscan-2.2.0/po/it.po 2006-08-24 07:20:37.000000000 +0200 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: iscan 1.9.0\n" "Report-Msgid-Bugs-To: pipsnews@avasys.jp\n" -"POT-Creation-Date: 2006-06-13 13:19+0900\n" +"POT-Creation-Date: 2006-08-24 14:20+0900\n" "PO-Revision-Date: 2004-05-13 06:36+0900\n" "Last-Translator: unknown\n" "Language-Team: Italian\n" Binary files old/iscan-2.1.0/po/ja.gmo and new/iscan-2.2.0/po/ja.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/iscan-2.1.0/po/ja.po new/iscan-2.2.0/po/ja.po --- old/iscan-2.1.0/po/ja.po 2006-06-13 06:19:17.000000000 +0200 +++ new/iscan-2.2.0/po/ja.po 2006-08-24 07:20:37.000000000 +0200 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: iscan 1.9.0\n" "Report-Msgid-Bugs-To: pipsnews@avasys.jp\n" -"POT-Creation-Date: 2006-06-13 13:19+0900\n" +"POT-Creation-Date: 2006-08-24 14:20+0900\n" "PO-Revision-Date: 2005-08-03 10:37+0900\n" "Last-Translator: unknown\n" "Language-Team: Japanese\n" Binary files old/iscan-2.1.0/po/ko.gmo and new/iscan-2.2.0/po/ko.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/iscan-2.1.0/po/ko.po new/iscan-2.2.0/po/ko.po --- old/iscan-2.1.0/po/ko.po 2006-06-13 06:19:17.000000000 +0200 +++ new/iscan-2.2.0/po/ko.po 2006-08-24 07:20:37.000000000 +0200 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: iscan 1.9.0\n" "Report-Msgid-Bugs-To: pipsnews@avasys.jp\n" -"POT-Creation-Date: 2006-06-13 13:19+0900\n" +"POT-Creation-Date: 2006-08-24 14:20+0900\n" "PO-Revision-Date: 2004-05-13 06:32+0900\n" "Last-Translator: Kim young-bae\n" "Language-Team: Korean\n" Binary files old/iscan-2.1.0/po/nl.gmo and new/iscan-2.2.0/po/nl.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/iscan-2.1.0/po/nl.po new/iscan-2.2.0/po/nl.po --- old/iscan-2.1.0/po/nl.po 2006-06-13 06:19:17.000000000 +0200 +++ new/iscan-2.2.0/po/nl.po 2006-08-24 07:20:37.000000000 +0200 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: iscan 1.9.0\n" "Report-Msgid-Bugs-To: pipsnews@avasys.jp\n" -"POT-Creation-Date: 2006-06-13 13:19+0900\n" +"POT-Creation-Date: 2006-08-24 14:20+0900\n" "PO-Revision-Date: 2004-05-13 06:34+0900\n" "Last-Translator: unknown\n" "Language-Team: Dutch\n" Binary files old/iscan-2.1.0/po/pt.gmo and new/iscan-2.2.0/po/pt.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/iscan-2.1.0/po/pt.po new/iscan-2.2.0/po/pt.po --- old/iscan-2.1.0/po/pt.po 2006-06-13 06:19:17.000000000 +0200 +++ new/iscan-2.2.0/po/pt.po 2006-08-24 07:20:37.000000000 +0200 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: iscan 1.9.0\n" "Report-Msgid-Bugs-To: pipsnews@avasys.jp\n" -"POT-Creation-Date: 2006-06-13 13:19+0900\n" +"POT-Creation-Date: 2006-08-24 14:20+0900\n" "PO-Revision-Date: 2004-05-13 06:35+0900\n" "Last-Translator: unknown\n" "Language-Team: Portuguese\n" Binary files old/iscan-2.1.0/po/zh_CN.gmo and new/iscan-2.2.0/po/zh_CN.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/iscan-2.1.0/po/zh_CN.po new/iscan-2.2.0/po/zh_CN.po --- old/iscan-2.1.0/po/zh_CN.po 2006-06-13 06:19:17.000000000 +0200 +++ new/iscan-2.2.0/po/zh_CN.po 2006-08-24 07:20:37.000000000 +0200 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: iscan 1.9.0\n" "Report-Msgid-Bugs-To: pipsnews@avasys.jp\n" -"POT-Creation-Date: 2006-06-13 13:19+0900\n" +"POT-Creation-Date: 2006-08-24 14:20+0900\n" "PO-Revision-Date: 2004-05-13 06:30+0900\n" "Last-Translator: Meng Bo\n" "Language-Team: Chinese (Simplified)\n" Binary files old/iscan-2.1.0/po/zh_TW.gmo and new/iscan-2.2.0/po/zh_TW.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/iscan-2.1.0/po/zh_TW.po new/iscan-2.2.0/po/zh_TW.po --- old/iscan-2.1.0/po/zh_TW.po 2006-06-13 06:19:18.000000000 +0200 +++ new/iscan-2.2.0/po/zh_TW.po 2006-08-24 07:20:37.000000000 +0200 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: iscan 1.9.0\n" "Report-Msgid-Bugs-To: pipsnews@avasys.jp\n" -"POT-Creation-Date: 2006-06-13 13:19+0900\n" +"POT-Creation-Date: 2006-08-24 14:20+0900\n" "PO-Revision-Date: 2004-05-13 06:30+0900\n" "Last-Translator: Mindy Yu\n" "Language-Team: Chinese (Traditional)\n" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/iscan-2.1.0/utils/hotplug/iscan.usermap new/iscan-2.2.0/utils/hotplug/iscan.usermap --- old/iscan-2.1.0/utils/hotplug/iscan.usermap 2006-05-22 08:18:42.000000000 +0200 +++ new/iscan-2.2.0/utils/hotplug/iscan.usermap 2006-08-11 02:23:23.000000000 +0200 @@ -89,8 +89,12 @@ iscan-device 0x0003 0x04b8 0x0129 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # SEIKO EPSON Corporation | Perfection 4990 (GT-X800) iscan-device 0x0003 0x04b8 0x012a 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# SEIKO EPSON Corporation | GT-2500 (ES-H300) +iscan-device 0x0003 0x04b8 0x012b 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # SEIKO EPSON Corporation | Perfection V700/V750 (GT-X900) iscan-device 0x0003 0x04b8 0x012c 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# SEIKO EPSON Corporation | Perfection V10/V100 +iscan-device 0x0003 0x04b8 0x012d 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # SEIKO EPSON Corporation | Stylus CX5100/5200/5300/5400 (CC-600) iscan-device 0x0003 0x04b8 0x0801 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # SEIKO EPSON Corporation | Stylus CX3100/3200 (CC-570) @@ -133,3 +137,5 @@ iscan-device 0x0003 0x04b8 0x081f 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # SEIKO EPSON Corporation | Stylus CX4100/CX4200/DX4200 iscan-device 0x0003 0x04b8 0x0820 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# SEIKO EPSON Corporation | Stylus CX2800/CX2900/ME200 +iscan-device 0x0003 0x04b8 0x0830 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@suse.de