Accepting request 41915 from home:jsmeix:branches:graphics

Copy from home:jsmeix:branches:graphics/sane-backends via accept of submit request 41915 revision 3. Request was accepted with message: Updated models.dat and enhanced epkowa.desc to have up-to-date model description files OBS-URL: https://build.opensuse.org/request/show/41915 OBS-URL: https://build.opensuse.org/package/show/graphics/sane-backends?expand=0&rev=27
2010-06-22 15:44:34 +00:00 · 2010-06-22 15:44:34 +00:00 · 427bf0e95f
commit 427bf0e95f
parent d91a456019
4 changed files with 2039 additions and 763 deletions
--- a/epkowa.desc
+++ b/epkowa.desc
@ -212,6 +212,13 @@
 :status    :good
 :comment   "100Base-TX/10Base-T unsupported<br>IEEE1394 untested"

+:model     "ES-D400"
+:interface "USB"
+:usbid     "0x04b8" "0x0136"
+:status    :good
+:comment   "requires DFSG non-free esci-interpreter-gt-s80"
+:url       "http://www.avasys.jp/lx-bin2/linux/scan/DL1.do"
+
 :model     "ES-H300"
 :interface "USB"
 :usbid     "0x04b8" "0x012b"
@ -292,6 +299,13 @@
 :comment   "A better backend for the FilmScan 200 can be found at <A HREF=\"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-1500"
+:interface "USB"
+:usbid     "0x04b8" "0x0133"
+:status    :good
+:comment   "requires DFSG non-free iscan-plugin-gt-1500<br>overseas version of the GT-D1000"
+:url       "http://www.avasys.jp/lx-bin2/linux/scan/DL1.do"
+
 :model     "GT-2200"
 :interface "USB"
 :usbid     "0x04b8" "0x0102"
@ -351,14 +365,14 @@
 :usbid     "0x04b8" "0x010f"
 :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"
+:url       "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do"

 :model     "GT-7300U"			; product spec (JP)
 :interface "USB"
 :usbid     "0x04b8" "0x011d"
 :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"
+:url       "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do"

 :model     "GT-7400U"			; product spec (JP)
 :interface "USB"
@ -440,7 +454,7 @@
 :usbid     "0x04b8" "0x0116"
 :status    :good
 :comment   "requires DFSG non-free iscan-plugin-gt-9400"
-:url       "http://www.avasys.jp/english/linux_e/dl_scan.html"
+:url       "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do"

 :model     "GT-9500"
 :interface "SCSI"
@ -488,68 +502,103 @@
 :status    :good
 :comment   "IEEE1394 untested<br>overseas version of the ES-9000H"

+:model     "GT-D1000"
+:interface "USB"
+:usbid     "0x04b8" "0x0133"
+:status    :good
+:comment   "requires DFSG non-free iscan-plugin-gt-1500"
+:url       "http://www.avasys.jp/lx-bin2/linux/scan/DL1.do"
+
 :model     "GT-F500"			; product spec (JP)
 :interface "USB"
 :usbid     "0x04b8" "0x0121"
 :status    :good
 :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"
+:url       "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do"

 :model     "GT-F520"
 :interface "USB"
 :usbid     "0x04b8" "0x0122"
 :status    :good
 :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"
+:url       "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do"

 :model     "GT-F550"			; product spec (JP)
 :interface "USB"
 :usbid     "0x04b8" "0x0121"
 :status    :good
 :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"
+:url       "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do"

 :model     "GT-F570"
 :interface "USB"
 :usbid     "0x04b8" "0x0122"
 :status    :good
 :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"
+:url       "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do"

 :model     "GT-F600"			; product spec (JP)
 :interface "USB"
 :usbid     "0x04b8" "0x0118"
 :status    :good
 :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"
+:url       "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do"

 :model     "GT-F650"
 :interface "USB"
 :usbid     "0x04b8" "0x012d"
 :status    :good
 :comment   "requires DFSG non-free iscan-plugin-gt-s600<br>GT-S600 with TPU"
-:url       "http://www.avasys.jp/english/linux_e/dl_scan.html"
+:url       "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do"

 :model     "GT-F670"
 :interface "USB"
 :usbid     "0x04b8" "0x012e"
 :status    :good
 :comment   "requires DFSG non-free iscan-plugin-gt-f670"
-:url       "http://www.avasys.jp/english/linux_e/dl_scan.html"
+:url       "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do"

 :model     "GT-F700"
 :interface "USB"
 :usbid     "0x04b8" "0x012f"
 :status    :good
 :comment   "requires DFSG non-free iscan-plugin-gt-f700"
-:url       "http://www.avasys.jp/english/linux_e/dl_scan.html"
+:url       "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do"
+
+:model     "GT-F720"
+:interface "USB"
+:usbid     "0x04b8" "0x0131"
+:status    :good
+:comment   "requires DFSG non-free esci-interpreter-gt-f720<br>GT-S620 with TPU"
+:url       "http://www.avasys.jp/lx-bin2/linux/scan/DL1.do"
+
+:model     "GT-S50"
+:interface "USB"
+:usbid     "0x04b8" "0x0137"
+:status    :good
+:comment   "requires DFSG non-free esci-interpreter-gt-s80"
+:url       "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do"
+
+:model     "GT-S80"
+:interface "USB"
+:usbid     "0x04b8" "0x0136"
+:status    :good
+:comment   "requires DFSG non-free esci-interpreter-gt-s80<br>overseas version of the ES-D400"
+:url       "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do"

 :model     "GT-S600"
 :interface "USB"
 :usbid     "0x04b8" "0x012d"
 :status    :good
 :comment   "requires DFSG non-free iscan-plugin-gt-s600"
-:url       "http://www.avasys.jp/english/linux_e/dl_scan.html"
+:url       "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do"
+
+:model     "GT-S620"
+:interface "USB"
+:usbid     "0x04b8" "0x0131"
+:status    :good
+:comment   "requires DFSG non-free esci-interpreter-gt-f720"
+:url       "http://www.avasys.jp/lx-bin2/linux/scan/DL1.do"

 :model     "GT-X700"			; product spec (JP)
 :interface "USB"
@ -562,7 +611,14 @@
 :usbid     "0x04b8" "0x0119"
 :status    :good
 :comment   "requires DFSG non-free iscan-plugin-gt-x750"
-:url       "http://www.avasys.jp/english/linux_e/dl_scan.html"
+:url       "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do"
+
+:model     "GT-X770"
+:interface "USB"
+:usbid     "0x04b8" "0x0130"
+:status    :good
+:comment   "requires DFSG non-free iscan-plugin-gt-x770"
+:url       "http://www.avasys.jp/lx-bin2/linux/scan/DL1.do"

 :model     "GT-X800"			; product spec (JP)
 :interface "USB IEEE1394"
@ -570,6 +626,13 @@
 :status    :complete
 :comment   "film area guide mode not supported<br>IEEE1394 untested"

+:model     "GT-X820"
+:interface "USB"
+:usbid     "0x04b8" "0x013a"
+:status    :good
+:comment   "requires DFSG non-free iscan-plugin-gt-x820"
+:url       "http://www.avasys.jp/lx-bin2/linux/scan/DL1.do"
+
 :model     "GT-X900"
 :interface "USB IEEE1394"
 :usbid     "0x04b8" "0x012c"
@ -822,28 +885,28 @@
 :usbid     "0x04b8" "0x010f"
 :status    :good
 :comment   "requires DFSG non-free iscan-plugin-gt-7200<br>also supported by the plustek backend<br>overseas version of the GT-7200U"
-:url       "http://www.avasys.jp/english/linux_e/dl_scan.html"
+:url       "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do"

 :model     "Perfection 1250 PHOTO"
 :interface "USB"
 :usbid     "0x04b8" "0x010f"
 :status    :good
 :comment   "requires DFSG non-free iscan-plugin-gt-7200<br>also supported by the plustek backend<br>Perfection 1250 with TPU option bundled"
-:url       "http://www.avasys.jp/english/linux_e/dl_scan.html"
+:url       "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do"

 :model     "Perfection 1260"
 :interface "USB"
 :usbid     "0x04b8" "0x011d"
 :status    :good
 :comment   "requires DFSG non-free iscan-plugin-gt-7300<br>also supported by the plustek backend<br>overseas version of the GT-7300U"
-:url       "http://www.avasys.jp/english/linux_e/dl_scan.html"
+:url       "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do"

 :model     "Perfection 1260 PHOTO"
 :interface "USB"
 :usbid     "0x04b8" "0x011d"
 :status    :good
 :comment   "requires DFSG non-free iscan-plugin-gt-7300<br>also supported by the plustek backend<br>Perfection 1260 with TPU option bundled"
-:url       "http://www.avasys.jp/english/linux_e/dl_scan.html"
+:url       "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do"

 :model     "Perfection 1270"
 :interface "USB"
@ -914,21 +977,21 @@
 :usbid     "0x04b8" "0x0121"
 :status    :good
 :comment   "multi photo feeder not supported<br>requires DFSG non-free iscan-plugin-gt-f500<br>also supported by the snapscan backend<br>overseas version of the GT-F500"
-:url       "http://www.avasys.jp/english/linux_e/dl_scan.html"
+:url       "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do"

 :model     "Perfection 2580 PHOTO"
 :interface "USB"
 :usbid     "0x04b8" "0x0121"
 :status    :good
 :comment   "auto film loader not supported<br>requires DFSG non-free iscan-plugin-gt-f500<br>also supported by the snapscan backend<br>overseas version of the GT-F550"
-:url       "http://www.avasys.jp/english/linux_e/dl_scan.html"
+:url       "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do"

 :model     "Perfection 3170 PHOTO"
 :interface "USB"
 :usbid     "0x04b8" "0x0116"
 :status    :good
 :comment   "requires DFSG non-free iscan-plugin-gt-9400<br>overseas version of the GT-9400UF"
-:url       "http://www.avasys.jp/english/linux_e/dl_scan.html"
+:url       "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do"

 :model     "Perfection 3200 PHOTO"	; command spec
 :interface "USB"
@ -941,28 +1004,28 @@
 :usbid     "0x04b8" "0x0122"
 :status    :good
 :comment   "multi photo feeder not supported<br>requires DFSG non-free iscan-plugin-gt-f520<br>also supported by the snapscan backend<br>overseas version of the GT-F520"
-:url       "http://www.avasys.jp/english/linux_e/dl_scan.html"
+:url       "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do"

 :model     "Perfection 3590 PHOTO"
 :interface "USB"
 :usbid     "0x04b8" "0x0122"
 :status    :good
 :comment   "auto film loader not supported<br>requires DFSG non-free iscan-plugin-gt-f520<br>also supported by the snapscan backend<br>overseas version of the GT-F570"
-:url       "http://www.avasys.jp/english/linux_e/dl_scan.html"
+:url       "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do"

 :model     "Perfection 4180 PHOTO"
 :interface "USB"
 :usbid     "0x04b8" "0x0118"
 :status    :good
 :comment   "only scans up to 2400dpi<br>requires DFSG non-free iscan-plugin-gt-f600<br>overseas version of the GT-F600"
-:url       "http://www.avasys.jp/english/linux_e/dl_scan.html"
+:url       "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do"

 :model     "Perfection 4490 PHOTO"
 :interface "USB"
 :usbid     "0x04b8" "0x0119"
 :status    :good
 :comment   "requires DFSG non-free iscan-plugin-gt-x750<br>overseas version of the GT-X750"
-:url       "http://www.avasys.jp/english/linux_e/dl_scan.html"
+:url       "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do"

 :model     "Perfection 4870 PHOTO"	; command spec
 :interface "USB"
@ -986,28 +1049,56 @@
 :usbid     "0x04b8" "0x012d"
 :status    :good
 :comment   "requires DFSG non-free iscan-plugin-gt-s600<br>overseas version of the GT-S600"
-:url       "http://www.avasys.jp/english/linux_e/dl_scan.html"
+:url       "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do"
+
+:model     "Perfection V30"
+:interface "USB"
+:usbid     "0x04b8" "0x0131"
+:status    :good
+:comment   "requires DFSG non-free esci-interpreter-gt-f720<br>overseas version of the GT-S620"
+:url       "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do"

 :model     "Perfection V100 PHOTO"
 :interface "USB"
 :usbid     "0x04b8" "0x012d"
 :status    :good
 :comment   "requires DFSG non-free iscan-plugin-gt-s600<br>overseas version of the GT-F650"
-:url       "http://www.avasys.jp/english/linux_e/dl_scan.html"
+:url       "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do"

 :model     "Perfection V200 PHOTO"
 :interface "USB"
 :usbid     "0x04b8" "0x012e"
 :status    :good
 :comment   "requires DFSG non-free iscan-plugin-gt-f670<br>overseas version of the GT-F670"
-:url       "http://www.avasys.jp/english/linux_e/dl_scan.html"
+:url       "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do"
+
+:model     "Perfection V300 PHOTO"
+:interface "USB"
+:usbid     "0x04b8" "0x0131"
+:status    :good
+:comment   "requires DFSG non-free esci-interpreter-gt-f720<br>overseas version of the GT-F720"
+:url       "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do"

 :model     "Perfection V350 PHOTO"
 :interface "USB"
 :usbid     "0x04b8" "0x012f"
 :status    :good
 :comment   "requires DFSG non-free iscan-plugin-gt-f700<br>overseas version of the GT-F700"
-:url       "http://www.avasys.jp/english/linux_e/dl_scan.html"
+:url       "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do"
+
+:model     "Perfection V500 PHOTO"
+:interface "USB"
+:usbid     "0x04b8" "0x0130"
+:status    :good
+:comment   "requires DFSG non-free iscan-plugin-gt-x770<br>overseas version of the GT-X770"
+:url       "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do"
+
+:model     "Perfection V600 PHOTO"
+:interface "USB"
+:usbid     "0x04b8" "0x013a"
+:status    :good
+:comment   "requires DFSG non-free iscan-plugin-gt-x820<br>overseas version of the GT-X820"
+:url       "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do"

 :model     "Perfection V700"
 :interface "USB IEEE1394"
@ -1109,14 +1200,14 @@
 :usbid     "0x04b8" "0x083f"
 :status    :good
 :comment   "all-in-one<br>requires DFSG non-free iscan-plugin-cx4400"
-:url       "http://www.avasys.jp/english/linux_e/dl_scan.html"
+:url       "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do"

 :model     "Stylus CX4400"
 :interface "USB"
 :usbid     "0x04b8" "0x083f"
 :status    :good
 :comment   "all-in-one<br>requires DFSG non-free iscan-plugin-cx4400"
-:url       "http://www.avasys.jp/english/linux_e/dl_scan.html"
+:url       "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do"

 :model     "Stylus CX4500"
 :interface "USB"
@ -1183,14 +1274,14 @@
 :usbid     "0x04b8" "0x083f"
 :status    :good
 :comment   "all-in-one<br>requires DFSG non-free iscan-plugin-cx4400"
-:url       "http://www.avasys.jp/english/linux_e/dl_scan.html"
+:url       "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do"

 :model     "Stylus CX5600"
 :interface "USB"
 :usbid     "0x04b8" "0x083f"
 :status    :good
 :comment   "all-in-one<br>requires DFSG non-free iscan-plugin-cx4400"
-:url       "http://www.avasys.jp/english/linux_e/dl_scan.html"
+:url       "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do"

 :model     "Stylus CX5700F"
 :interface "USB"
@ -1329,7 +1420,7 @@
 :usbid     "0x04b8" "0x083f"
 :status    :good
 :comment   "all-in-one<br>requires DFSG non-free iscan-plugin-cx4400"
-:url       "http://www.avasys.jp/english/linux_e/dl_scan.html"
+:url       "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do"

 :model     "Stylus DX4800"
 :interface "USB"
--- a/models.dat
+++ b/models.dat
--- a/sane-backends.changes
+++ b/sane-backends.changes
@ -1,8 +1,20 @@
+-------------------------------------------------------------------
+Tue Jun 22 16:40:42 CEST 2010 - jsmeix@suse.de
+
+- Updated models.dat to the one from our current HPLIP version
+  so that the generated hpaio.desc matches to our HPLIP version.
+- Enhanced epkowa.desc only with models which require proprietary
+  software so that the supported models in epkowa.desc
+  still match to what is supported by our iscan-free package
+  but more users of models which require proprietary
+  software will be informed via yast2-scanner.
+
 -------------------------------------------------------------------
 Tue May 11 14:31:58 UTC 2010 - lnussel@suse.de

- remove disable-resmgr-support.patch. It's not needed as configure won't find
-  resmgr anyways
+- remove disable-resmgr-support.patch.
+  It's not needed as configure won't find resmgr anyways
+  (see Novell/Suse Bugzilla bnc#605914).

 -------------------------------------------------------------------
 Fri May  7 11:43:41 CEST 2010 - jsmeix@suse.de
--- a/sane-backends.spec
+++ b/sane-backends.spec
@ -41,8 +41,11 @@ Source102:      sane.reg
 # Source104 was our hpaio.desc file which was derived from scan/sane/hpaio.desc from the hplip sources
 # but as scan/sane/hpaio.desc was completely messed up Source104 is now dropped and we
 # create our hpaio.desc file directly from the models.dat file of HPLIP via Source109 and Source110.
-# Original iscan descriptions-external file for the epkowa backend (provided by the package iscan).
-# This file is a copy of doc/epkowa.desc in the sources of the iscan package:
+# Original iscan descriptions-external file for the epkowa backend (provided by the package iscan-free).
+# This file is based on a copy of doc/epkowa.desc in the sources of our iscan-free package.
+# Meanwhile there is a newer epkowa.desc in the sources of this sane-backends package.
+# Only the missing models from the newer epkowa.desc which require proprietary software
+# were added so that users of those models are informed via yast2-scanner.
 Source105:      epkowa.desc
 # Since openSUSE 10.3 "Source106: create_hal_global_fdi_for_scanners" is dropped because
 # it is replaced by "Source108: create_hal_global_fdi_from_libsane.rules".