Merge branch 'release/debian/1.3.0-1'debian/1.3.0-1

10 files changed, 364 insertions, 9 deletions

diff --git a/doc/descriptions/canon_lide70.desc b/doc/descriptions/canon_lide70.desc
index 3c1dc64..32157dc 100644
--- a/doc/descriptions/canon_lide70.desc
+++ b/doc/descriptions/canon_lide70.desc
@@ -10,7 +10,7 @@
 ;
 
 :backend "canon_lide70"          ; name of backend
-:new :yes
+:new :no
 :url "http://www.juergen-ernst.de/info_sane.html"
 :version "0"                     ; version of backend
 :manpage "sane-canon_lide70"     ; name of manpage (if it exists)
diff --git a/doc/descriptions/epson2.desc b/doc/descriptions/epson2.desc
index ad1d183..b5fc8e2 100644
--- a/doc/descriptions/epson2.desc
+++ b/doc/descriptions/epson2.desc
@@ -1055,6 +1055,11 @@
 :status     :complete
 :comment    "network interface supported via DFSG non-free iscan-network-nt package<br>all-in-one"
 
+:model      "L360 Series"
+:interface  "USB"
+:usbid      "0x04b8" "0x08d1"
+:status     :complete
+
 :model      "L365 Series"
 :interface  "USB"
 :usbid      "0x04b8" "0x08d2"
@@ -1724,7 +1729,7 @@
 :model      "Perfection 610"		; command spec
 :interface  "USB"
 :usbid      "0x04b8" "0x0103"
-:status     :basic
+:status     :complete
 :comment    "overseas version of the GT-6600U"
 
 :model      "Perfection 636S"
diff --git a/doc/descriptions/epsonds.desc b/doc/descriptions/epsonds.desc
index 989caf8..7e31a18 100644
--- a/doc/descriptions/epsonds.desc
+++ b/doc/descriptions/epsonds.desc
@@ -358,3 +358,18 @@
 :interface  "USB"
 :usbid      "0x04b8" "0x11b1"
 :status     :complete
+
+:model      "ES-C220"
+:interface  "USB"
+:usbid      "0x04b8" "0x0193"
+:status     :complete
+
+:model      "DS-C330"
+:interface  "USB"
+:usbid      "0x04b8" "0x018f"
+:status     :complete
+
+:model      "DS-C490"
+:interface  "USB"
+:usbid      "0x04b8" "0x0191"
+:status     :complete
diff --git a/doc/descriptions/fujitsu.desc b/doc/descriptions/fujitsu.desc
index 6cf8381..aa4b69c 100644
--- a/doc/descriptions/fujitsu.desc
+++ b/doc/descriptions/fujitsu.desc
@@ -11,13 +11,14 @@
 
 
 :backend "fujitsu"               ; name of backend
-:version "139"                   ; version of backend
+:version "140"                   ; version of backend
 :manpage "sane-fujitsu"          ; name of manpage (if it exists)
-:comment "Backend updated for SANE release 1.1.2, see sane-fujitsu manpage"
+:comment "This backend supports most Fujitsu and Ricoh fi-series and similar scanners. See manpage for details."
 :devicetype :scanner             ; start of a list of devices....
                                  ; other types:  :stillcam, :vidcam,
                                  ;               :meta, :api
 
+;==================================================
 :mfg "Fujitsu"                   ; name a manufacturer
 :url "http://www.fujitsu.com/"
 :url "https://fujitsuscanners.com/"
@@ -676,3 +677,150 @@
 :interface "USB"
 :status :good
 :usbid "0x04c5" "0x162e"
+
+
+;==================================================
+:mfg "Ricoh"                   ; name a manufacturer
+:url "http://www.ricoh.com/"
+
+:model "fi-70F"
+:interface "USB"
+:status :untested
+:usbid "0x05ca" "0x0308"
+
+:model "fi-400F"
+:interface "USB"
+:status :untested
+:usbid "0x04c5" "0x151e"
+
+:model "fi-800R"
+:interface "USB"
+:status :good
+:usbid "0x04c5" "0x15fc"
+:comment "Both feed methods are supported."
+
+:model "fi-7300NX"
+:interface "USB"
+:status :good
+:usbid "0x04c5" "0x1575"
+:comment "Ethernet and WiFi not supported."
+
+:model "fi-7460"
+:interface "USB"
+:status :good
+:usbid "0x04c5" "0x14be"
+
+:model "fi-7480"
+:interface "USB"
+:status :good
+:usbid "0x04c5" "0x14b8"
+
+:model "fi-7600"
+:interface "USB"
+:status :good
+:usbid "0x04c5" "0x1521"
+
+:model "fi-7700"
+:interface "USB"
+:status :good
+:usbid "0x04c5" "0x1520"
+
+:model "fi-7700S"
+:interface "USB"
+:status :untested
+:usbid "0x04c5" "0x1522"
+
+:model "fi-7800"
+:interface "USB"
+:status :good
+:usbid "0x04c5" "0x160b"
+
+:model "fi-7900"
+:interface "USB"
+:status :good
+:usbid "0x04c5" "0x160a"
+
+:model "fi-8040"
+:interface "USB"
+:status :untested
+:usbid "0x05ca" "0x0307"
+
+:model "fi-8150"
+:interface "USB"
+:status :good
+:usbid "0x04c5" "0x1601"
+:comment "Ethernet not supported."
+
+:model "fi-8150U"
+:interface "USB"
+:status :good
+:usbid "0x04c5" "0x162d"
+
+:model "fi-8170"
+:interface "USB"
+:status :good
+:usbid "0x04c5" "0x15ff"
+:comment "Ethernet not supported."
+
+:model "fi-8190"
+:interface "USB"
+:status :good
+:usbid "0x04c5" "0x15fd"
+:comment "Ethernet not supported."
+
+:model "fi-8250"
+:interface "USB"
+:status :good
+:usbid "0x04c5" "0x1602"
+:comment "Ethernet not supported."
+
+:model "fi-8250U"
+:interface "USB"
+:status :good
+:usbid "0x04c5" "0x162e"
+
+:model "fi-8270"
+:interface "USB"
+:status :good
+:usbid "0x04c5" "0x1600"
+:comment "Ethernet not supported."
+
+:model "fi-8290"
+:interface "USB"
+:status :good
+:usbid "0x04c5" "0x15fe"
+:comment "Ethernet not supported."
+
+:model "N7100"
+:interface "USB Ethernet"
+:status :untested
+:usbid "0x04c5" "0x146f"
+
+:model "ScanSnap iX100"
+:interface "USB WiFi"
+:status :good
+:usbid "0x04c5" "0x13f4"
+:comment "WiFi not supported."
+
+:model "ScanSnap iX1300"
+:interface "USB WiFi"
+:status :good
+:usbid "0x04c5" "0x162c"
+:comment "WiFi not supported."
+
+:model "ScanSnap iX1400"
+:interface "USB"
+:status :untested
+:usbid "0x04c5" "0x1630"
+
+:model "ScanSnap iX1600"
+:interface "USB WiFi"
+:status :good
+:usbid "0x04c5" "0x1632"
+:comment "WiFi not supported."
+
+:model "ScanSnap SV600"
+:interface "USB"
+:status :unsupported
+:usbid "0x04c5" "0x128e"
+:comment "Also has a second USB VID 0x13ba. Will require some gymnastics to support."
diff --git a/doc/descriptions/genesys.desc b/doc/descriptions/genesys.desc
index 33fe735..740c246 100644
--- a/doc/descriptions/genesys.desc
+++ b/doc/descriptions/genesys.desc
@@ -253,7 +253,7 @@
 :status :complete
 :comment "300, 600, 1200 dpi resolutions supported in flatbed scanning mode; 300, 600, 1200, 2400, 4800 dpi resolutions are supported in transparency and infrared transparency scanning modes"
 
-:model "CanoScan 700F"
+:model "CanoScan LiDE 700F"
 :interface "USB"
 :usbid "0x04a9" "0x1907"
 :status :basic
diff --git a/doc/descriptions/lexmark_x2600.desc b/doc/descriptions/lexmark_x2600.desc
new file mode 100644
index 0000000..0ff4efd
--- /dev/null
+++ b/doc/descriptions/lexmark_x2600.desc
@@ -0,0 +1,32 @@
+;
+; SANE Backend specification file
+;
+; It's basically emacs-lisp --- so ";" indicates comment to end of line.
+; All syntactic elements are keyword tokens, followed by a string or
+;  keyword argument, as specified.
+;
+; ":backend" *must* be specified.
+; All other information is optional (but what good is the file without it?).
+
+
+:backend "lexmark_x2600"          ; name of backend
+:version "1.0-0"   ; version of backend (or "unmaintained")
+:manpage "sane-lexmark_x2600"     ; name of manpage (if it exists)
+:url "https://gitlab.com/sane-project/backends/"
+                  ; backend's web page
+:new :yes
+:comment "This backend supports lexmark x2600 series scanners."
+                                  ; comment about the backend
+
+:devicetype :scanner              ; start of a list of devices....
+                                  ; other types:  :stillcam, :vidcam,
+                                  ;               :meta, :api
+
+:mfg "Lexmark"                   ; name a manufacturer
+:url "http://www.lexmark.com/"   ; manufacturer's URL
+
+:model "X2670"
+:interface "USB"
+:usbid "0x043d" "0x011d"
+:status :good
+:comment "Supports 75, 150, 300, 600 dpi"
diff --git a/doc/descriptions/pixma.desc b/doc/descriptions/pixma.desc
index b1a5657..07c4740 100644
--- a/doc/descriptions/pixma.desc
+++ b/doc/descriptions/pixma.desc
@@ -136,12 +136,24 @@
 :status :untested
 :comment "Testers needed!"
 
+:model "G2030 series"
+:interface "USB"
+:usbid "0x04a9" "0x1106"
+:status :untested
+:comment "Testers needed!"
+
 :model "PIXMA G2060"
 :interface "USB"
 :usbid "0x04a9" "0x18c1"
 :status :untested
 :comment "Testers needed!"
 
+:model "G2070 series"
+:interface "USB"
+:usbid "0x04a9" "0x18f5"
+:status :untested
+:comment "Testers needed!"
+
 :model "PIXMA G2100"
 :interface "USB"
 :usbid "0x04a9" "0x1795"
@@ -166,12 +178,24 @@
 :status :untested
 :comment "Testers needed!"
 
+:model "G3030 series"
+:interface "USB"
+:usbid "0x04a9" "0x1105"
+:status :untested
+:comment "Testers needed!"
+
 :model "PIXMA G3060"
 :interface "USB"
 :usbid "0x04a9" "0x18c3"
 :status :untested
 :comment "Testers needed!"
 
+:model "G3070 series"
+:interface "USB"
+:usbid "0x04a9" "0x18f4"
+:status :untested
+:comment "Testers needed!"
+
 :model "PIXMA G4000 Series"
 :interface "USB WiFi"
 :usbid "0x04a9" "0x181d"
@@ -184,6 +208,12 @@
 :status :untested
 :comment "Testers needed!"
 
+:model "G4070 series"
+:interface "USB"
+:usbid "0x04a9" "0x18f3"
+:status :untested
+:comment "Testers needed!"
+
 :model "PIXMA G4511"
 :interface "USB WiFi"
 :usbid "0x04a9" "0x183d"
@@ -226,12 +256,42 @@
 :status :untested
 :comment "Testers needed!"
 
+:model "PIXMA GX1000 series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x110b"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA GX2000 series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x110d"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA GX3000 Series"
+:interface "USB"
+:usbid "0x04a9" "0x18f1"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA GX4000"
+:interface "USB"
+:usbid "0x04a9" "0x18f2"
+:status :untested
+:comment "Testers needed!"
+
 :model "PIXMA GX6000 Series"
-:interface "USB Ethernet WiFi"
+:interface "USB"
 :usbid "0x04a9" "0x18a6"
 :status :untested
 :comment "Testers needed!"
 
+:model "PIXMA GX6500 series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x1148"
+:status :untested
+:comment "Testers needed!"
+
 :model "PIXMA GX7000"
 :interface "USB"
 :usbid "0x04a9" "0x18a8"
@@ -935,6 +995,18 @@
 :status :complete
 :comment "Flatbed and ADF scan. All resolutions supported (up to 4800DPI)"
 
+:model "TC-20M"
+:interface "USB"
+:usbid "0x04a9" "0x18fc"
+:status :untested
+:comment "Testers needed!"
+
+:model "TC-5200M"
+:interface "USB"
+:usbid "0x04a9" "0x18ff"
+:status :untested
+:comment "Testers needed!"
+
 :model "PIXMA TR4500 Series"
 :interface "USB WiFi"
 :usbid "0x04a9" "0x1854"
@@ -977,6 +1049,12 @@
 :status :untested
 :comment "Testers needed!"
 
+:model "PIXMA TR7800 series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x1151"
+:status :untested
+:comment "Testers needed!"
+
 :model "PIXMA TR8500 Series"
 :interface "USB Ethernet WiFi"
 :usbid "0x04a9" "0x1823"
@@ -1163,6 +1241,18 @@
 :status :good
 :comment "All resolutions supported (up to 1200DPI). WiFi not tested by Pixma as yet."
 
+:model "PIXMA TS6630 series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x114e"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA TS6730 series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x1150"
+:status :untested
+:comment "Testers needed!"
+
 :model "PIXMA TS7330 Series"
 :interface "USB WiFi"
 :usbid "0x04a9" "0x188f"
@@ -1193,6 +1283,30 @@
 :status :untested
 :comment "Testers needed!"
 
+:model "PIXMA TS7600i series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x114f"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA TS7700 series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x110f"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA TS7700A series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x1111"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA TS7700i series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x1152"
+:status :untested
+:comment "Testers needed!"
+
 :model "PIXMA TS8000 Series"
 :interface "USB WiFi"
 :usbid "0x04a9" "0x1800"
@@ -1265,6 +1379,18 @@
 :status :untested
 :comment "Testers needed!"
 
+:model "PIXMA TS8630 Series"
+:interface "USB"
+:usbid "0x04a9" "0x18f8"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA TS8700 series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x1118"
+:status :untested
+:comment "Testers needed!"
+
 :model "PIXMA TS9000 Series"
 :interface "USB WiFi"
 :usbid "0x04a9" "0x179f"
@@ -1337,6 +1463,18 @@
 :status :untested
 :comment "Testers needed!"
 
+:model "PIXUS XK110 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x18f9"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXUS XK120 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x1119"
+:status :untested
+:comment "Testers needed!"
+
 :model "PIXUS XK500 Series"
 :interface "USB WiFi"
 :usbid "0x04a9" "0x18df"
@@ -1505,6 +1643,12 @@
 :status :complete
 :comment "Flatbed and ADF scan. All resolutions supported (up to 600DPI)."
 
+:model "i-SENSYS MF750 Series"
+:interface "USB Ethernet WiFi"
+:usbid "0x04a9" "0x2885"
+:status :untested
+:comment "Testers needed!"
+
 :model "i-SENSYS MF810/820"
 :interface "USB Ethernet"
 :usbid "0x04a9" "0x27a6"
diff --git a/doc/descriptions/ricoh.desc b/doc/descriptions/ricoh.desc
index bdaea31..56b027e 100644
--- a/doc/descriptions/ricoh.desc
+++ b/doc/descriptions/ricoh.desc
@@ -17,12 +17,12 @@
 :mfg "Ricoh"                        ; name a manufacturer
 :url "http://www.ricoh.com/"
 
-:model "Ricoh IS50"                ; name models for above-specified mfg.
+:model "IS50"                ; name models for above-specified mfg.
 :interface "SCSI"
 :status :basic
 ;:comment "?"
 
-:model "Ricoh IS60"                ; name models for above-specified mfg.
+:model "IS60"                ; name models for above-specified mfg.
 :interface "SCSI"
 :status :basic
 ;:comment "?"
diff --git a/doc/descriptions/template.desc b/doc/descriptions/template.desc
index a6b6bab..d7b8eb3 100644
--- a/doc/descriptions/template.desc
+++ b/doc/descriptions/template.desc
@@ -12,7 +12,7 @@
 
 :backend "template"               ; name of backend
 :version "0.42"                   ; version of backend (or "unmaintained")
-:new :yes                         ; Is the backend new to this SANE release?
+:new :no                          ; Is the backend new to this SANE release?
                                   ; :yes or :no
 :manpage "sane-template"          ; name of manpage (if it exists)
 :url "http://www.luser.com/temp/" ; backend's web page
diff --git a/doc/descriptions/xerox_mfp.desc b/doc/descriptions/xerox_mfp.desc
index f78bf94..ad6355d 100644
--- a/doc/descriptions/xerox_mfp.desc
+++ b/doc/descriptions/xerox_mfp.desc
@@ -43,6 +43,12 @@
 :usbid "0x0924" "0x42dc"
 :status :good
 
+:model "WorkCentre 3335"
+:interface "USB"
+:usbid "0x0924" "0x42e2"
+:status :basic
+:comment "When scanning from automatic feeder, only the first page is scanned"
+
 :mfg "Dell"
 :url "http://www.dell.com/"
 
@@ -56,6 +62,11 @@
 :usbid "0x413c" "0x5310"
 :status :good
 
+:model "Dell 1135n"
+:interface "USB Ethernet"
+:usbid "0x413c" "0x5318"
+:status :good
+
 :mfg "Samsung"
 :url "http://www.samsung.com"