Merge branch 'release/debian/1.0.31-1_experimental1' into masterdebian/1.0.31-1_experimental1

2 files changed, 68 insertions, 4 deletions

diff --git a/doc/descriptions-external/epkowa.desc b/doc/descriptions-external/epkowa.desc
index 9217aaf..5bc43bf 100644
--- a/doc/descriptions-external/epkowa.desc
+++ b/doc/descriptions-external/epkowa.desc
@@ -1,5 +1,6 @@
 ;;;  epkowa.desc			-*- emacs-lisp -*- (eh, sort of)
 ;;;  Copyright (C) 2004--2015  Olaf Meeuwissen
+;;;  Copyright (C) 2019 SEIKO EPSON Corporation
 ;;;
 ;;;  This file is part of the "Image Scan!" documentation.
 ;;;
@@ -40,7 +41,7 @@
 ;;  Backend data.
 ;;
 :backend "epkowa"
-:version "iscan 2.30.1/iscan-data 1.36.0"
+:version "iscan 2.30.4/iscan-data 1.39.1"
 :url     "http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
 
 
@@ -223,6 +224,11 @@
 :status    :complete
 :comment   "requires DFSG non-free iscan-plugin-ds-30"
 
+:model     "DS-G20000"
+:interface "USB"
+:usbid     "0x04b8" "0x015b"
+:status    :good
+
 :model     "EP-702A"
 :interface "USB"
 :usbid     "0x04b8" "0x0850"
@@ -650,6 +656,12 @@
 :status    :good
 :comment   "overseas version of the ES-G11000"
 
+:model     "Expression 12000XL"
+:interface "USB"
+:usbid     "0x04b8" "0x015b"
+:status    :good
+:comment   "overseas version of the DS-G20000"
+
 :model     "F-3200"			; product spec (JP)
 :interface "USB IEEE1394"
 :usbid     "0x04b8" "0x080a"
@@ -1198,19 +1210,25 @@
 :interface "USB"
 :usbid     "0x04b8" "0x08ad"
 :status    :good
-:comment   "network interface not supported<br>business all-in-one"
+:comment   "network interface supported via DFSG non-free iscan-network-nt package<br>business all-in-one"
 
 :model     "LP-M8040A"
 :interface "USB"
 :usbid     "0x04b8" "0x08ad"
 :status    :good
-:comment   "network interface not supported<br>business all-in-one"
+:comment   "network interface supported via DFSG non-free iscan-network-nt package<br>business all-in-one"
 
 :model     "LP-M8040F"
 :interface "USB"
 :usbid     "0x04b8" "0x08ad"
 :status    :good
-:comment   "network interface not supported<br>business all-in-one"
+:comment   "network interface supported via DFSG non-free iscan-network-nt package<br>business all-in-one"
+
+:model     "LP-M8170"
+:interface "USB"
+:usbid     "0x04b8" "0x1111"
+:status    :good
+:comment   "network interface supported via DFSG non-free iscan-network-nt package<br>business all-in-one"
 
 :model     "M200 Series"
 :interface "USB"
diff --git a/doc/descriptions-external/utsushi.desc b/doc/descriptions-external/utsushi.desc
index 105b0c7..231711d 100644
--- a/doc/descriptions-external/utsushi.desc
+++ b/doc/descriptions-external/utsushi.desc
@@ -282,6 +282,11 @@
 :usbid     "0x04b8" "0x112e"
 :status    :good
 
+:model     "WF-2850"
+:interface "USB"
+:usbid     "0x04b8" "0x1138"
+:status    :good
+
 :model     "WF-4720"
 :interface "USB"
 :usbid     "0x04b8" "0x1125"
@@ -297,6 +302,11 @@
 :usbid     "0x04b8" "0x08cf"
 :status    :good
 
+:model     "WF-7720"
+:interface "USB"
+:usbid     "0x04b8" "0x112d"
+:status    :good
+
 :model     "WF-8510"
 :interface "USB"
 :usbid     "0x04b8" "0x08bc"
@@ -998,6 +1008,24 @@
 :status    :good
 :comment   "ET-16xxx"
 
+:model     "PID 1171"
+:interface "USB"
+:usbid     "0x04b8" "0x1171"
+:status    :good
+:comment   "WFC2xxxx"
+
+:model     "PID 1172"
+:interface "USB"
+:usbid     "0x04b8" "0x1172"
+:status    :good
+:comment   "WFC2xxxx"
+
+:model     "PID 1173"
+:interface "USB"
+:usbid     "0x04b8" "0x1173"
+:status    :good
+:comment   "WFC2xxxx"
+
 :model     "PID 1174"
 :interface "USB"
 :usbid     "0x04b8" "0x1174"
@@ -1021,3 +1049,21 @@
 :usbid     "0x04b8" "0x1177"
 :status    :good
 :comment   "ET-16xxx"
+
+:model     "PID 117A"
+:interface "USB"
+:usbid     "0x04b8" "0x117a"
+:status    :good
+:comment   "WF-48xx"
+
+:model     "PID 117B"
+:interface "USB"
+:usbid     "0x04b8" "0x117b"
+:status    :good
+:comment   "WF-48xx"
+
+:model     "PID 117C"
+:interface "USB"
+:usbid     "0x04b8" "0x117c"
+:status    :good
+:comment   "WF-48xx"