Update upstream source from tag 'upstream/1.0.29'

Update to upstream version '1.0.29'
with Debian dir 2d358af604988ebe4348e38096245d66036fe5ed

6 files changed, 171 insertions, 53 deletions

diff --git a/doc/descriptions/escl.desc b/doc/descriptions/escl.desc
new file mode 100644
index 0000000..f654f75
--- /dev/null
+++ b/doc/descriptions/escl.desc
@@ -0,0 +1,7 @@
+:backend "escl"
+:new :yes
+:manpage "sane-escl"
+:url "https://support.apple.com/en-us/HT201311"
+:comment "The eSCL backend for sane supports AirScan/eSCL devices that announce themselves on mDNS as _uscan._utcp or _uscans._utcp"
+
+:devicetype :scanner
diff --git a/doc/descriptions/fujitsu.desc b/doc/descriptions/fujitsu.desc
index 99e5d7a..b858415 100644
--- a/doc/descriptions/fujitsu.desc
+++ b/doc/descriptions/fujitsu.desc
@@ -651,3 +651,9 @@
 :interface "USB"
 :status :untested
 :usbid "0x04c5" "0x1522"
+
+:model "ScanSnap iX1500"
+:interface "USB WiFi"
+:status :good
+:usbid "0x04c5" "0x159f"
+:comment "small, current, WiFi not supported."
diff --git a/doc/descriptions/genesys.desc b/doc/descriptions/genesys.desc
index 77c1fd8..888f252 100644
--- a/doc/descriptions/genesys.desc
+++ b/doc/descriptions/genesys.desc
@@ -17,6 +17,21 @@
 :status :basic
 :comment "Has a Primax USB ID"
 
+:model "OpticFilm 7200i"
+:interface "USB"
+:usbid "0x07b3" "0x0c04"
+:status :basic
+
+:model "OpticFilm 7300"
+:interface "USB"
+:usbid "0x07b3" "0x0c12"
+:status :basic
+
+:model "OpticFilm 7500i"
+:interface "USB"
+:usbid "0x07b3" "0x0c13"
+:status :basic
+
 ; -----------------------------------------------------------------------------
 
 :mfg "Medion/Lifetec/Tevion/Cytron"
@@ -64,7 +79,7 @@
 :status :basic
 :comment "clone of the HP 2400C"
 
-:model "ScanJet 3670C"
+:model "ScanJet 3670"
 :interface "USB"
 :usbid "0x03f0" "0x1405"
 :status :complete
@@ -74,7 +89,7 @@
 :interface "USB"
 :usbid "0x03f0" "0x1405"
 :status :complete
-:comment "1200x1200 dpi max, same as HP 3670C"
+:comment "1200x1200 dpi max, same as HP 3670"
 
 :model "ScanJet 4850C"
 :interface "USB"
@@ -169,11 +184,11 @@
 :status :complete
 :comment "GL124+ based, resolution from 75 to 4800 dpi"
 
-:model "CanoScan 4400f"
+:model "CanoScan 4400F"
 :interface "USB"
 :usbid "0x04a9" "0x2228"
-:status :unsupported
-:comment "GL843 based, to be added to the genesys backend"
+:status :basic
+:comment "GL843 based"
 
 :model "CanoScan 5600F"
 :interface "USB"
@@ -181,6 +196,13 @@
 :status :unsupported
 :comment "GL847 based, to be added to the genesys backend"
 
+:model "CanoScan 8400F"
+:url "unsupported/canon-8400f.html"
+:interface "USB"
+:usbid "0x04a9" "0x221e"
+:status :basic
+:comment "GL841 based, to be added to genesys backend"
+
 :model "CanoScan 8600F"
 :url "unsupported/canon-8600.html"
 :interface "USB"
diff --git a/doc/descriptions/pixma.desc b/doc/descriptions/pixma.desc
index be2ec1d..4366891 100644
--- a/doc/descriptions/pixma.desc
+++ b/doc/descriptions/pixma.desc
@@ -11,7 +11,7 @@
 ; See doc/descriptions.txt for details.
 
 :backend "pixma"                  ; name of backend
-:version "0.23.0"                 ; version of backend (or "unmaintained")
+:version "0.27.0"                 ; version of backend (or "unmaintained")
 :manpage "sane-pixma"             ; name of manpage (if it exists)
 ;:comment "Devices marked as experimantal are disabled by default. See the manual page for how to enable them."
 
@@ -88,6 +88,12 @@
 :status :untested
 :comment "Testers needed!"
 
+:model "PIXMA E3300 Series"
+:interface "USB"
+:usbid "0x04a9" "0x18a3"
+:status :untested
+:comment "Testers needed!"
+
 :model "PIXMA E4200 Series"
 :interface "USB WiFi"
 :usbid "0x04a9" "0x1855"
@@ -100,6 +106,12 @@
 :status :complete
 :comment "All resolutions supported (up to 600DPI)."
 
+:model "PIXMA G2010 Series"
+:interface "USB"
+:usbid "0x04a9" "0x183a"
+:status :complete
+:comment "All resolutions supported (up to 600DPI)."
+
 :model "PIXMA G2100"
 :interface "USB"
 :usbid "0x04a9" "0x1795"
@@ -130,6 +142,18 @@
 :status :untested
 :comment "Testers needed!"
 
+:model "PIXMA G6000"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x1865"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA G6080"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x1866"
+:status :untested
+:comment "Testers needed!"
+
 :model "PIXMA MG2100 Series"
 :interface "USB"
 :usbid "0x04a9" "0x1751"
@@ -163,8 +187,8 @@
 :model "PIXMA MG3000 Series"
 :interface "USB WiFi"
 :usbid "0x04a9" "0x180b"
-:status :untested
-:comment "Testers needed!"
+:status :good
+:comment "All resolutions supported (up to 600DPI). WiFi not working."
 
 :model "PIXMA MG3100 Series"
 :interface "USB WiFi"
@@ -875,6 +899,12 @@
 :status :good
 :comment "All resolutions supported (up to 600DPI). WiFi not working."
 
+:model "PIXMA TS3300 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x18a2"
+:status :untested
+:comment "Testers needed!"
+
 :model "PIXMA TS5000 Series"
 :interface "USB WiFi"
 :usbid "0x04a9" "0x1802"
@@ -887,6 +917,18 @@
 :status :untested
 :comment "Testers needed!"
 
+:model "PIXMA TS5300 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x188b"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA TS5380 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x188c"
+:status :untested
+:comment "Testers needed!"
+
 :model "PIXMA TS6000 Series"
 :interface "USB WiFi"
 :usbid "0x04a9" "0x1801"
@@ -914,8 +956,8 @@
 :model "PIXMA TS6200 Series"
 :interface "USB WiFi"
 :usbid "0x04a9" "0x1856"
-:status :untested
-:comment "Testers needed!"
+:status :good
+:comment "All resolutions supported (up to 1200DPI). WiFi not working."
 
 :model "PIXMA TS6230 Series"
 :interface "USB WiFi"
@@ -929,6 +971,30 @@
 :status :untested
 :comment "Testers needed!"
 
+:model "PIXMA TS6300 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x188b"
+:status :good
+:comment "Testers needed!"
+
+:model "PIXMA TS6330 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x1894"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA TS6380 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x188e"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA TS7330 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x188f"
+:status :untested
+:comment "Testers needed!"
+
 :model "PIXMA TS8000 Series"
 :interface "USB WiFi"
 :usbid "0x04a9" "0x1800"
@@ -971,6 +1037,24 @@
 :status :untested
 :comment "Testers needed!"
 
+:model "PIXMA TS8300 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x1890"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA TS8330 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x1892"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA TS8380 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x1891"
+:status :untested
+:comment "Testers needed!"
+
 :model "PIXMA TS9000 Series"
 :interface "USB WiFi"
 :usbid "0x04a9" "0x179f"
@@ -1019,6 +1103,12 @@
 :status :untested
 :comment "Testers needed!"
 
+:model "CanoScan XK 60"
+:interface "USB"
+:usbid "0x04a9" "0x1893"
+:status :untested
+:comment "Testers needed!"
+
 :model "PIXUS XK70 Series"
 :interface "USB WiFi"
 :usbid "0x04a9" "0x1847"
@@ -1058,8 +1148,8 @@
 :model "imageCLASS D570"
 :interface "USB"
 :usbid "0x04a9" "0x27e8"
-:status :untested
-:comment "Testers needed!"
+:status :complete
+:comment "All resolutions supported (up to 600DPI)"
 
 :model "i-SENSYS MF110 Series"
 :interface "USB Ethernet WiFi"
@@ -1130,14 +1220,26 @@
 :model "i-SENSYS MF630 Series"
 :interface "USB Ethernet WiFi"
 :usbid "0x04a9" "0x27e1"
-:status :untested
-:comment "Testers needed!"
+:status :complete
+:comment "Flatbed and ADF scan. All resolutions supported (up to 600DPI)."
+
+:model "imageCLASS MF634C"
+:interface "USB Ethernet WiFi"
+:usbid "0x04a9" "0x27e2"
+:status :complete
+:comment "Flatbed and ADF scan. All resolutions supported (up to 600DPI)."
 
 :model "i-SENSYS MF640 Series"
 :interface "USB Ethernet WiFi"
 :usbid "0x04a9" "0x27fe"
-:status :untested
-:comment "Testers needed!"
+:status :complete
+:comment "Flatbed and ADF scan. All resolutions supported (up to 600DPI)."
+
+:model "i-SENSYS MF645C"
+:interface "USB Ethernet WiFi"
+:usbid "0x04a9" "0x27fd"
+:status :complete
+:comment "Flatbed and ADF scan. All resolutions supported (up to 600DPI)."
 
 :model "i-SENSYS MF730 Series"
 :interface "USB Ethernet WiFi"
@@ -1145,14 +1247,6 @@
 :status :good
 :comment "Flatbed and ADF scan. All resolutions supported (up to 600DPI). Ethernet and WiFi not tested yet"
 
-
-:model "imageCLASS MF634C"
-:interface "USB Ethernet WiFi"
-:usbid "0x04a9" "0x27e2"
-:status :complete
-:comment "Flatbed and ADF scan. All resolutions supported (up to 600DPI)."
-
-
 :model "imageCLASS MF733Cdw"
 :interface "USB Ethernet WiFi"
 :usbid "0x04a9" "0x27e5"
@@ -1171,6 +1265,12 @@
 :status :untested
 :comment "Testers needed!"
 
+:model "i-SENSYS MF741/743"
+:interface "USB Ethernet WiFi"
+:usbid "0x04a9" "0x27fc"
+:status :complete
+:comment "Flatbed and ADF scan. All resolutions supported (up to 600DPI)."
+
 :model "i-SENSYS MF810/820"
 :interface "USB Ethernet"
 :usbid "0x04a9" "0x27a6"
@@ -1462,8 +1562,8 @@
 :model "MAXIFY MB5000 Series"
 :interface "USB"
 :usbid "0x04a9" "0x1776"
-:status :good
-:comment "Flatbed works, All resolutions supported (up to 1200DPI), ADF does not work"
+:status :complete
+:comment "Flatbed and ADF scan. All resolutions supported (up to 1200DPI)."
 
 :model "MAXIFY MB5100 Series"
 :interface "USB Ethernet WiFi"
@@ -1480,8 +1580,8 @@
 :model "MAXIFY MB5400 Series"
 :interface "USB Ethernet WiFi"
 :usbid "0x04a9" "0x178f"
-:status :untested
-:comment "Testers needed!"
+:status :complete
+:comment "Flatbed and ADF scan. All resolutions supported (up to 1200DPI)."
 
 :model "CanoScan 8800F"
 :interface "USB"
@@ -1505,10 +1605,10 @@
 :interface "USB"
 :usbid "0x04a9" "0x1913"
 :status :complete
-:comment "Support up to 4800DPI (Note: does not have less than 300DPI support)"
+:comment "All resolutions supported (up to 2400DPI)"
 
 :model "CanoScan LiDE 400"
 :interface "USB"
 :usbid "0x04a9" "0x1912"
 :status :complete
-:comment "Support up to 4800DPI (Note: does not have less than 300DPI support)"
+:comment "All resolutions supported (up to 4800DPI)"
diff --git a/doc/descriptions/ricoh2.desc b/doc/descriptions/ricoh2.desc
index 55ee372..12a9b4c 100644
--- a/doc/descriptions/ricoh2.desc
+++ b/doc/descriptions/ricoh2.desc
@@ -12,8 +12,6 @@
 
 :backend "ricoh2"                 ; name of backend
 :version "1.0"                    ; version of backend (or "unmaintained")
-:new :yes                         ; Is the backend new to this SANE release?
-                                  ; :yes or :no
 :manpage "sane-ricoh2"            ; name of manpage (if it exists)
 :url "http://www.ricoh.com/"      ; backend's web page
 
@@ -24,6 +22,11 @@
 :mfg "Ricoh"                      ; name a manufacturer
 :url "http://www.ricoh.com/"      ; manufacturer's URL
 
+:model "SG-3100SFNw"
+:status :basic
+:interface "USB"
+:usbid "0x05ca" "0x0439"
+
 :model "SG-3100SNw"
 :status :basic
 :interface "USB"
@@ -34,7 +37,7 @@
 :interface "USB"
 :usbid "0x05ca" "0x042c"
 
-:model "SP-111SU"
+:model "SP-111SU/SP-112SU"
 :status :basic
 :interface "USB"
 :usbid "0x05ca" "0x0448"
diff --git a/doc/descriptions/unsupported.desc b/doc/descriptions/unsupported.desc
index 496ebea..e062682 100644
--- a/doc/descriptions/unsupported.desc
+++ b/doc/descriptions/unsupported.desc
@@ -305,13 +305,6 @@
 :status :unsupported
 :comment "Probably unsupported. See link."
 
-:model "CanoScan 4400F"
-:url "unsupported/canon-4400.html"
-:interface "USB"
-:usbid "0x04a9" "0x2228"
-:status :unsupported
-:comment "GL843 based, to be added to genesys backend"
-
 :model "CanoScan 5000F"
 :url "unsupported/canon-5000f.html"
 :interface "USB"
@@ -333,13 +326,6 @@
 :status :unsupported
 :comment "Not supported. See link for more information. With transparency adapter."
 
-:model "CanoScan 8400F"
-:url "unsupported/canon-8400f.html"
-:interface "USB"
-:usbid "0x04a9" "0x221e"
-:status :unsupported
-:comment "GL841 based, to be added to genesys backend"
-
 :model "CanoScan 9900F"
 :url "unsupported/canon-9900f.html"
 :interface "USB"
@@ -1766,12 +1752,6 @@
 :status :unsupported
 :comment "GL842 based, maybe to be added to genesys backend"
 
-:model "OpticFilm 7200i"
-:interface "USB"
-:usbid "0x07b3" "0x0c04"
-:status :unsupported
-:comment "GL843 based, maybe to be added to genesys backend"
-
 :model "OpticPro A3U"
 :interface "USB"
 :status :unsupported