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

1 files changed, 104 insertions, 57 deletions

diff --git a/doc/descriptions/epson2.desc b/doc/descriptions/epson2.desc
index 1af191f..ad1d183 100644
--- a/doc/descriptions/epson2.desc
+++ b/doc/descriptions/epson2.desc
@@ -8,8 +8,6 @@
 ; distributed with "Image Scan!" and released under GPL.
 
 :backend "epson2"
-:version "1.0.124 (unmaintained)"
-:new :no
 :manpage "sane-epson2"
 
 :devicetype :scanner
@@ -22,7 +20,6 @@
 :usbid      "0x04b8" "0x08ac"
 :status     :complete
 :comment    "network interface supported via DFSG non-free iscan-network-nt package<br>all-in-one"
-:url        "http://www.epson.com/"
 
 :model      "AL-MX300DNF Series"
 :interface  "USB"
@@ -164,7 +161,7 @@
 :model      "DS-G20000"
 :interface  "USB"
 :usbid      "0x04b8" "0x015b"
-:status     :good
+:status     :complete
 
 :model      "EP-702A"
 :interface  "USB"
@@ -528,10 +525,20 @@
 :status     :good
 :comment    "network interface supported via DFSG non-free iscan-network-nt package"
 
-:model      "ET-2600"
+:model      "ET-2500 Series"
+:interface  "USB"
+:usbid      "0x04b8" "0x1105"
+:status     :complete
+
+:model      "ET-2600 Series"
 :interface  "USB"
 :usbid      "0x04b8" "0x1122"
-:status     :good
+:status     :complete
+
+:model      "ET-2610 Series"
+:interface  "USB"
+:usbid      "0x04b8" "0x1122"
+:status     :complete
 
 :model      "ET-2650"
 :interface  "USB Ethernet"
@@ -606,7 +613,7 @@
 :model      "Expression 12000XL"
 :interface  "USB"
 :usbid      "0x04b8" "0x015b"
-:status     :good
+:status     :complete
 :comment    "overseas version of the DS-G20000"
 
 :model      "F-3200"			; product spec (JP)
@@ -698,12 +705,6 @@
 :status     :unsupported
 :comment    "supported by the epkowa backend plus non-free interpreter"
 
-:model      "GT-7400U"			; product spec (JP)
-:interface  "USB"
-:usbid      "0x04b8" "0x0120"
-:status     :unsupported
-:comment    "supported by the snapscan backend"
-
 :model      "GT-7600S"			; product spec (JP)
 :interface  "SCSI"
 :status     :complete
@@ -745,11 +746,6 @@
 :usbid      "0x04b8" "0x011e"
 :status     :complete
 
-:model      "GT-8400UF"			; product spec (JP)
-:interface  "USB"
-:usbid      "0x04b8" "0x011f"
-:status     :unsupported
-
 :model      "GT-8500"
 :status     :untested
 
@@ -761,7 +757,7 @@
 :model      "GT-8700F"			; product spec (JP)
 :interface  "SCSI USB"
 :usbid      "0x04b8" "0x010a"
-:status     :good
+:status     :complete
 :comment    "GT-8700U with TPU option bundled"
 
 :model      "GT-9000"
@@ -1059,11 +1055,36 @@
 :status     :complete
 :comment    "network interface supported via DFSG non-free iscan-network-nt package<br>all-in-one"
 
+:model      "L365 Series"
+:interface  "USB"
+:usbid      "0x04b8" "0x08d2"
+:status     :complete
+
+:model      "L366 Series"
+:interface  "USB"
+:usbid      "0x04b8" "0x08d2"
+:status     :complete
+
+:model      "L375 Series"
+:interface  "USB"
+:usbid      "0x04b8" "0x1105"
+:status     :complete
+
 :model      "L380"
 :interface  "USB"
 :usbid      "0x04b8" "0x1120"
 :status     :good
 
+:model      "L395 Series"
+:interface  "USB"
+:usbid      "0x04b8" "0x1122"
+:status     :complete
+
+:model      "L396 Series"
+:interface  "USB"
+:usbid      "0x04b8" "0x1122"
+:status     :complete
+
 :model      "L495"
 :interface  "USB Ethernet"
 :usbid      "0x04b8" "0x1121"
@@ -1081,6 +1102,36 @@
 :status     :complete
 :comment    "all-in-one"
 
+:model      "L3050 Series"
+:interface  "USB"
+:usbid      "0x04b8" "0x1122"
+:status     :complete
+
+:model      "L3060 Series"
+:interface  "USB"
+:usbid      "0x04b8" "0x1122"
+:status     :complete
+
+:model      "L3100 Series"
+:interface  "USB"
+:usbid      "0x04b8" "0x1141"
+:status     :complete
+
+:model      "L3110 Series"
+:interface  "USB"
+:usbid      "0x04b8" "0x1142"
+:status     :complete
+
+:model      "L3200 Series"
+:interface  "USB"
+:usbid      "0x04b8" "0x1189"
+:status     :complete
+
+:model      "L3210 Series"
+:interface  "USB"
+:usbid      "0x04b8" "0x1188"
+:status     :complete
+
 :model      "LP-7900CS"
 :status     :untested
 :comment    "business all-in-one; scanner is a ES-7000H"
@@ -1421,6 +1472,16 @@
 :status     :complete
 :comment    "network interface supported via DFSG non-free iscan-network-nt package<br>all-in-one"
 
+:model      "PX-048A Series"
+:interface  "USB"
+:usbid      "0x04b8" "0x1102"
+:status     :complete
+
+:model      "PX-049A Series"
+:interface  "USB"
+:usbid      "0x04b8" "0x1116"
+:status     :complete
+
 :model      "PX-1600F"
 :interface  "USB"
 :usbid      "0x04b8" "0x0869"
@@ -1607,6 +1668,11 @@
 :status     :good
 :comment    "all-in-one"
 
+:model      "PX-M160T Series"
+:interface  "USB"
+:usbid      "0x04b8" "0x110f"
+:status     :complete
+
 :model      "PX-M350F"
 :interface  "USB"
 :usbid      "0x04b8" "0x08d0"
@@ -1655,11 +1721,6 @@
 :status     :complete
 :comment    "network interface supported via DFSG non-free iscan-network-nt package<br>all-in-one"
 
-:model      "Perfection 600"
-:interface  "SCSI"
-:status     :unsupported
-:comment    "supported by the umax backend<br>rebadged UMAX Astra 1200S"
-
 :model      "Perfection 610"		; command spec
 :interface  "USB"
 :usbid      "0x04b8" "0x0103"
@@ -1684,12 +1745,6 @@
 :status     :complete
 :comment    "overseas version of the GT-6700U"
 
-:model      "Perfection 660"
-:interface  "USB"
-:usbid      "0x04b8" "0x0114"
-:status     :unsupported
-:comment    "supported by the snapscan backend"
-
 :model      "Perfection 1200S"		; command spec
 :interface  "SCSI"
 :scsi       "EPSON" "Perfection1200" "processor"
@@ -1738,12 +1793,6 @@
 :status     :unsupported
 :comment    "supported by the epkowa backend plus non-free interpreter"
 
-:model      "Perfection 1270"
-:interface  "USB"
-:usbid      "0x04b8" "0x0120"
-:status     :unsupported
-:comment    "supported by the snapscan backend<br>overseas version of the GT-7400"
-
 :model      "Perfection 1600"
 :interface  "SCSI"
 :status     :unsupported
@@ -1759,7 +1808,7 @@
 :interface  "SCSI USB"
 :scsi       "EPSON" "Perfection1640" "processor"
 :usbid      "0x04b8" "0x010a"
-:status     :good
+:status     :complete
 :comment    "overseas version of the GT-8700F"
 
 :model      "Perfection 1650"		; command spec
@@ -1780,18 +1829,6 @@
 :status     :complete
 :comment    "overseas version of the GT-8300UF"
 
-:model      "Perfection 1670"
-:interface  "USB"
-:usbid      "0x04b8" "0x011f"
-:status     :unsupported
-:comment    "supported by the snapscan backend"
-
-:model      "Perfection 1670 PHOTO"
-:interface  "USB"
-:usbid      "0x04b8" "0x011f"
-:status     :unsupported
-:comment    "supported by the snapscan backend<br>overseas version of the GT-8400UF"
-
 :model      "Perfection 2400 PHOTO"	; command spec
 :interface  "USB"
 :usbid      "0x04b8" "0x011b"
@@ -1986,12 +2023,6 @@
 :status     :good
 :comment    "overseas version of the GT-X980"
 
-:model      "Stylus CX1500"		; Australia
-:interface  "USB"
-:usbid      "0x04b8" "0x080c"
-:status     :unsupported
-:comment    "supported by the snapscan backend<br>all-in-one"
-
 :model      "Stylus CX2800"
 :interface  "USB"
 :usbid      "0x04b8" "0x0830"
@@ -3377,10 +3408,20 @@
 :status     :complete
 :comment    "network interface supported via DFSG non-free iscan-network-nt package<br>all-in-one<br>overseas version of the PX-047A"
 
-:model      "XP-243 245 247 Series"
+:model      "XP-230 Series"
+:interface  "USB"
+:usbid      "0x04b8" "0x1102"
+:status     :complete
+
+:model      "XP-235 Series"
+:interface  "USB"
+:usbid      "0x04b8" "0x1102"
+:status     :complete
+
+:model      "XP-240 243 245 247 Series"
 :interface  "USB"
 :usbid      "0x04b8" "0x1116"
-:status     :good
+:status     :complete
 :comment    "network interface supported via DFSG non-free iscan-network-nt package<br>all-in-one"
 
 :model      "XP-255"
@@ -3430,6 +3471,12 @@
 :status     :good
 :comment    "network interface supported via DFSG non-free iscan-network-nt package<br>all-in-one"
 
+:model      "XP-452 455 Series"
+:interface  "USB"
+:usbid      "0x04b8" "0x113e"
+:status     :good
+:comment    "all-in-one"
+
 :model      "XP-600 Series"
 :interface  "USB"
 :usbid      "0x04b8" "0x089e"