From 0c96b0d283f368d4ecefcdca6da89664109ed43a8ee4a4def6218de2d2f71ee8 Mon Sep 17 00:00:00 2001 From: Johannes Meixner Date: Tue, 6 Oct 2015 11:40:01 +0000 Subject: [PATCH] Accepting request 336704 from home:jsmeix:branches:graphics sane-backends version upgrade to 1.0.25 OBS-URL: https://build.opensuse.org/request/show/336704 OBS-URL: https://build.opensuse.org/package/show/graphics/sane-backends?expand=0&rev=78 --- MG5550-works.patch | 60 --- adapt_epkowa.desc_for_yast2-scanner.patch | 627 +++++++++++++++++++--- avision.c.patch | 48 -- avision.conf.patch | 10 - dell1600n_net-fix-strncat.patch | 38 ++ fix-buffer-overflow.patch | 24 - fix-mustek_pp_ccd300.c.patch | 33 -- install-umax_pp-tool.patch | 13 - re-add-SANE_CAP_ALWAYS_SETTABLE.patch | 10 - sane-backends-1.0.24.tar.gz | 3 - sane-backends-1.0.25.tar.gz | 3 + sane-backends.changes | 50 ++ sane-backends.spec | 188 ++----- 13 files changed, 686 insertions(+), 421 deletions(-) delete mode 100644 MG5550-works.patch delete mode 100644 avision.c.patch delete mode 100644 avision.conf.patch create mode 100644 dell1600n_net-fix-strncat.patch delete mode 100644 fix-buffer-overflow.patch delete mode 100644 fix-mustek_pp_ccd300.c.patch delete mode 100644 install-umax_pp-tool.patch delete mode 100644 re-add-SANE_CAP_ALWAYS_SETTABLE.patch delete mode 100644 sane-backends-1.0.24.tar.gz create mode 100644 sane-backends-1.0.25.tar.gz diff --git a/MG5550-works.patch b/MG5550-works.patch deleted file mode 100644 index 7f09d3d..0000000 --- a/MG5550-works.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff -ur sane-backends-1.0.24.orig/backend/pixma_mp150.c sane-backends-1.0.24/backend/pixma_mp150.c ---- sane-backends-1.0.24.orig/backend/pixma_mp150.c 2013-09-18 02:43:00.000000000 +0200 -+++ sane-backends-1.0.24/backend/pixma_mp150.c 2015-01-11 12:45:24.644527570 +0100 -@@ -1139,6 +1139,7 @@ - && s->cfg->pid != MG3100_PID - && s->cfg->pid != MG2100_PID - && s->cfg->pid != MG5300_PID -+ && s->cfg->pid != MG5500_PID - && s->cfg->pid != MG6300_PID) - reorder_pixels (mp->linebuf, sptr, c, n, m, s->param->wx, line_size); - -diff -ur sane-backends-1.0.24.orig/ChangeLog sane-backends-1.0.24/ChangeLog ---- sane-backends-1.0.24.orig/ChangeLog 2013-10-01 03:23:49.000000000 +0200 -+++ sane-backends-1.0.24/ChangeLog 2015-01-11 12:22:30.607870381 +0100 -@@ -1,3 +1,7 @@ -+2014-09-18 Rolf Bensch -+ * backend/pixma_mp150.c, doc/descriptions/pixma.desc, doc/sane-pixma.man: -+ Canon Pixma MG5500 Series is working, bug #314819. -+ - ****** Release of sane-backends 1.0.24. End of code freeze ****** - - 2013-09-30 m. allan noah -diff -ur sane-backends-1.0.24.orig/doc/descriptions/pixma.desc sane-backends-1.0.24/doc/descriptions/pixma.desc ---- sane-backends-1.0.24.orig/doc/descriptions/pixma.desc 2013-10-01 02:10:43.000000000 +0200 -+++ sane-backends-1.0.24/doc/descriptions/pixma.desc 2015-01-11 12:32:20.834566730 +0100 -@@ -127,10 +127,10 @@ - :comment "Testers needed!" - - :model "PIXMA MG5500 Series" --:interface "USB" -+:interface "USB WiFi" - :usbid "0x04a9" "0x1771" --:status :untested --:comment "Testers needed!" -+:status :complete -+:comment "All resolutions supported (up to 1200DPI)." - - :model "PIXMA MG6100 Series" - :interface "USB" -diff -ur sane-backends-1.0.24.orig/doc/sane-pixma.man sane-backends-1.0.24/doc/sane-pixma.man ---- sane-backends-1.0.24.orig/doc/sane-pixma.man 2013-10-01 02:10:43.000000000 +0200 -+++ sane-backends-1.0.24/doc/sane-pixma.man 2015-01-11 12:39:28.205594376 +0100 -@@ -15,7 +15,7 @@ - Currently, the following models work with this backend: - .PP - .RS --PIXMA MG2100, MG3100, MG4200, MG5100, MG5200, MG5300 -+PIXMA MG2100, MG3100, MG4200, MG5100, MG5200, MG5300, MG5500 - .br - PIXMA MG6100, MG6200, MG6300, MG8200 - .br -@@ -77,7 +77,7 @@ - .RS - PIXMA E500, E510, E600, E610 - .br --PIXMA MG2200, MG2400, MG2500, MG3200, MG4100, MG5400, MG5500 -+PIXMA MG2200, MG2400, MG2500, MG3200, MG4100, MG5400 - .br - PIXMA MG6400, MG6500, MG7100, MG8100 - .br diff --git a/adapt_epkowa.desc_for_yast2-scanner.patch b/adapt_epkowa.desc_for_yast2-scanner.patch index a9d0696..3dc735c 100644 --- a/adapt_epkowa.desc_for_yast2-scanner.patch +++ b/adapt_epkowa.desc_for_yast2-scanner.patch @@ -1,5 +1,5 @@ ---- doc/descriptions-external/epkowa.desc.orig 2013-08-25 23:23:27.000000000 +0200 -+++ doc/descriptions-external/epkowa.desc 2013-12-03 11:59:54.000000000 +0100 +--- doc/descriptions-external/epkowa.desc.orig 2015-09-09 04:23:23.000000000 +0200 ++++ doc/descriptions-external/epkowa.desc 2015-10-05 14:50:31.000000000 +0200 @@ -47,7 +47,7 @@ ;; Device and manufacturer information. ;; @@ -9,7 +9,20 @@ :url "http://www.epson.com/" :comment "" -@@ -83,3042 +83,2946 @@ +@@ -84,3456 +84,3362 @@ + :interface "USB" + :usbid "0x04b8" "0x08ac" + :status :complete +-:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one" ++:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one" + + :model "AL-MX300DNF Series" + :interface "USB" + :usbid "0x04b8" "0x08ac" + :status :complete +-:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one" ++:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one" + :model "Actionscanner II" :interface "parallel SCSI" :status :good @@ -62,8 +75,8 @@ :interface "USB" :usbid "0x04b8" "0x0878" :status :complete --:comment "network interface option supported via DFSG non-free iscan-network-nt package
all-in-one
overseas version of the EP-704A" -+:comment "requires DFSG non-free Image Scan software from Epson
network interface option supported via DFSG non-free iscan-network-nt package
all-in-one
overseas version of the EP-704A" +-:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one
overseas version of the EP-704A" ++:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one
overseas version of the EP-704A" :model "Artisan 700" :interface "USB" @@ -171,43 +184,78 @@ :interface "USB" :usbid "0x04b8" "0x0862" :status :complete --:comment "network interface option supported via DFSG non-free iscan-network-nt package
all-in-one" -+:comment "requires DFSG non-free Image Scan software from Epson
network interface option supported via DFSG non-free iscan-network-nt package
all-in-one" +-:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one" ++:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one" :model "EP-704A" :interface "USB" :usbid "0x04b8" "0x0878" :status :complete --:comment "network interface option supported via DFSG non-free iscan-network-nt package
all-in-one" -+:comment "requires DFSG non-free Image Scan software from Epson
network interface option supported via DFSG non-free iscan-network-nt package
all-in-one" +-:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one" ++:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one" :model "EP-705A" :interface "USB" :usbid "0x04b8" "0x089f" :status :complete --:comment "network interface option supported via DFSG non-free iscan-network-nt package
all-in-one" -+:comment "requires DFSG non-free Image Scan software from Epson
network interface option supported via DFSG non-free iscan-network-nt package
all-in-one" +-:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one" ++:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one" + + :model "EP-706A" + :interface "USB" + :usbid "0x04b8" "0x08b7" + :status :complete +-:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one" ++:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one" + + :model "EP-707A" + :interface "USB" + :usbid "0x04b8" "0x08c9" + :status :complete +-:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one" ++:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one" :model "EP-774A" :interface "USB" :usbid "0x04b8" "0x0893" :status :complete --:comment "network interface option supported via DFSG non-free iscan-network-nt package
all-in-one" -+:comment "requires DFSG non-free Image Scan software from Epson
network interface option supported via DFSG non-free iscan-network-nt package
all-in-one" +-:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one" ++:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one" :model "EP-775A" :interface "USB" :usbid "0x04b8" "0x089e" :status :complete --:comment "network interface option supported via DFSG non-free iscan-network-nt package
all-in-one" -+:comment "requires DFSG non-free Image Scan software from Epson
network interface option supported via DFSG non-free iscan-network-nt package
all-in-one" +-:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one" ++:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one" :model "EP-775AW" :interface "USB" :usbid "0x04b8" "0x089e" :status :complete --:comment "network interface option supported via DFSG non-free iscan-network-nt package
all-in-one" -+:comment "requires DFSG non-free Image Scan software from Epson
network interface option supported via DFSG non-free iscan-network-nt package
all-in-one" +-:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one" ++:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one" + + :model "EP-776AB" + :interface "USB" + :usbid "0x04b8" "0x08b6" + :status :complete +-:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one" ++:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one" + + :model "EP-776AW" + :interface "USB" + :usbid "0x04b8" "0x08b6" + :status :complete +-:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one" ++:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one" + + :model "EP-777A" + :interface "USB" + :usbid "0x04b8" "0x08c8" + :status :complete +-:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one" ++:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one" :model "EP-801A" :interface "USB" @@ -277,6 +325,48 @@ :usbid "0x04b8" "0x089c" :status :complete -:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one" ++:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one" + + :model "EP-806AB" + :interface "USB" + :usbid "0x04b8" "0x08b5" + :status :complete +-:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one" ++:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one" + + :model "EP-806AR" + :interface "USB" + :usbid "0x04b8" "0x08b5" + :status :complete +-:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one" ++:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one" + + :model "EP-806AW" + :interface "USB" + :usbid "0x04b8" "0x08b5" + :status :complete +-:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one" ++:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one" + + :model "EP-807AB" + :interface "USB" + :usbid "0x04b8" "0x08c7" + :status :complete +-:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one" ++:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one" + + :model "EP-807AR" + :interface "USB" + :usbid "0x04b8" "0x08c7" + :status :complete +-:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one" ++:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one" + + :model "EP-807AW" + :interface "USB" + :usbid "0x04b8" "0x08c7" + :status :complete +-:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one" +:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one" :model "EP-901A" @@ -340,6 +430,34 @@ :usbid "0x04b8" "0x089a" :status :complete -:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one" ++:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one" + + :model "EP-906F" + :interface "USB" + :usbid "0x04b8" "0x08b4" + :status :complete +-:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one" ++:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one" + + :model "EP-907F" + :interface "USB" + :usbid "0x04b8" "0x08c6" + :status :complete +-:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one" ++:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one" + + :model "EP-976A3" + :interface "USB" + :usbid "0x04b8" "0x08b3" + :status :complete +-:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one" ++:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one" + + :model "EP-977A3" + :interface "USB" + :usbid "0x04b8" "0x08c5" + :status :complete +-:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one" +:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one" :model "ES-300C" @@ -410,8 +528,8 @@ :interface "SCSI USB" :usbid "0x04b8" "0x0126" :status :good --:comment "network interface unsupported
IEEE1394 untested" -+:comment "requires DFSG non-free Image Scan software from Epson
network interface unsupported
IEEE1394 untested" +-:comment "network interface not supported
IEEE1394 untested" ++:comment "requires DFSG non-free Image Scan software from Epson
network interface not supported
IEEE1394 untested" :model "ES-8000" :interface "SCSI" @@ -435,8 +553,8 @@ :interface "USB" :usbid "0x04b8" "0x0129" :status :good --:comment "network interface unsupported
IEEE1394 untested" -+:comment "requires DFSG non-free Image Scan software from Epson
network interface unsupported
IEEE1394 untested" +-:comment "network interface not supported
IEEE1394 untested" ++:comment "requires DFSG non-free Image Scan software from Epson
network interface not supported
IEEE1394 untested" :model "ES-D200" :interface "USB" @@ -956,6 +1074,13 @@ -:comment "requires DFSG non-free iscan-plugin-perfection-v370" +:comment "requires DFSG non-free Image Scan software from Epson
requires DFSG non-free iscan-plugin-perfection-v370" + :model "GT-S650" + :interface "USB" + :usbid "0x04b8" "0x013d" + :status :good +-:comment "requires DFSG non-free iscan-plugin-gt-s650" ++:comment "requires DFSG non-free Image Scan software from Epson
requires DFSG non-free iscan-plugin-gt-s650" + :model "GT-X700" ; product spec (JP) :interface "USB" :usbid "0x04b8" "0x0128" @@ -991,12 +1116,20 @@ -:comment "requires DFSG non-free iscan-plugin-gt-x820" +:comment "requires DFSG non-free Image Scan software from Epson
requires DFSG non-free iscan-plugin-gt-x820" + :model "GT-X830" + :interface "USB" + :usbid "0x04b8" "0x0153" + :status :good +-:comment "requires DFSG non-free iscan-plugin-gt-x830" ++:comment "requires DFSG non-free Image Scan software from Epson
requires DFSG non-free iscan-plugin-gt-x830" + :model "GT-X900" :interface "USB" :usbid "0x04b8" "0x012c" :status :good -:comment "IEEE1394 untested" +:comment "requires DFSG non-free Image Scan software from Epson
IEEE1394 untested" + :scsi "EPSON" "GT-X900" "processor" :model "GT-X970" :interface "USB" @@ -1005,6 +1138,12 @@ -:comment "IEEE1394 untested" +:comment "requires DFSG non-free Image Scan software from Epson
IEEE1394 untested" + :model "GT-X980" + :interface "USB" + :usbid "0x04b8" "0x0151" + :status :good ++:comment "requires DFSG non-free Image Scan software from Epson" + :model "K200 Series" :interface "USB" :usbid "0x04b8" "0x0871" @@ -1061,13 +1200,20 @@ -:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one" +:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one" - :model "L550" + :model "L550 Series" :interface "USB" :usbid "0x04b8" "0x08a9" :status :complete -:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one" +:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one" + :model "L850 Series" + :interface "USB" + :usbid "0x04b8" "0x08ca" + :status :complete +-:comment "all-in-one" ++:comment "requires DFSG non-free Image Scan software from Epson
all-in-one" + :model "LP-7900CS" :status :untested -:comment "business all-in-one; scanner is a ES-7000H" @@ -1165,6 +1311,27 @@ :usbid "0x04b8" "0x0834" :status :good -:comment "network interface not supported
business all-in-one" ++:comment "requires DFSG non-free Image Scan software from Epson
network interface not supported
business all-in-one" + + :model "LP-M8040" + :interface "USB" + :usbid "0x04b8" "0x08ad" + :status :good +-:comment "network interface not supported
business all-in-one" ++:comment "requires DFSG non-free Image Scan software from Epson
network interface not supported
business all-in-one" + + :model "LP-M8040A" + :interface "USB" + :usbid "0x04b8" "0x08ad" + :status :good +-:comment "network interface not supported
business all-in-one" ++:comment "requires DFSG non-free Image Scan software from Epson
network interface not supported
business all-in-one" + + :model "LP-M8040F" + :interface "USB" + :usbid "0x04b8" "0x08ad" + :status :good +-:comment "network interface not supported
business all-in-one" +:comment "requires DFSG non-free Image Scan software from Epson
network interface not supported
business all-in-one" :model "M200 Series" @@ -1234,8 +1401,8 @@ :interface "USB" :usbid "0x04b8" "0x0864" :status :complete --:comment "network interface option supported via DFSG non-free iscan-network-nt package
all-in-one" -+:comment "requires DFSG non-free Image Scan software from Epson
network interface option supported via DFSG non-free iscan-network-nt package
all-in-one" +-:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one" ++:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one" :model "ME OFFICE 570W Series" :interface "USB" @@ -1248,15 +1415,15 @@ :interface "USB" :usbid "0x04b8" "0x0848" :status :good --:comment "network interface option supported via DFSG non-free iscan-network-nt package
all-in-one" -+:comment "requires DFSG non-free Image Scan software from Epson
network interface option supported via DFSG non-free iscan-network-nt package
all-in-one" +-:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one" ++:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one" :model "ME OFFICE 620F Series" :interface "USB" :usbid "0x04b8" "0x0863" :status :complete --:comment "network interface option supported via DFSG non-free iscan-network-nt package
all-in-one" -+:comment "requires DFSG non-free Image Scan software from Epson
network interface option supported via DFSG non-free iscan-network-nt package
all-in-one" +-:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one" ++:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one" :model "ME OFFICE 650FN Series" :interface "USB" @@ -1433,6 +1600,20 @@ -:comment "all-in-one" +:comment "requires DFSG non-free Image Scan software from Epson
all-in-one" + :model "PX-046A" + :interface "USB" + :usbid "0x04b8" "0x08ae" + :status :complete +-:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one" ++:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one" + + :model "PX-047A" + :interface "USB" + :usbid "0x04b8" "0x08c0" + :status :complete +-:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one" ++:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one" + :model "PX-1600F" :interface "USB" :usbid "0x04b8" "0x0869" @@ -1494,6 +1675,20 @@ :usbid "0x04b8" "0x0898" :status :complete -:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one" ++:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one" + + :model "PX-436A" + :interface "USB" + :usbid "0x04b8" "0x08af" + :status :complete +-:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one" ++:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one" + + :model "PX-437A" + :interface "USB" + :usbid "0x04b8" "0x08bf" + :status :complete +-:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one" +:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one" :model "PX-501A" @@ -1626,20 +1821,76 @@ :interface "USB" :usbid "0x04b8" "0x087d" :status :complete --:comment "network interface option supported via DFSG non-free iscan-network-nt package
all-in-one" -+:comment "requires DFSG non-free Image Scan software from Epson
network interface option supported via DFSG non-free iscan-network-nt package
all-in-one" +-:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one" ++:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one" :model "PX-FA700" :interface "USB" :usbid "0x04b8" "0x083a" :status :good -:comment "all-in-one" ++:comment "requires DFSG non-free Image Scan software from Epson
all-in-one" + + :model "PX-M350F" + :interface "USB" + :usbid "0x04b8" "0x08d0" + :status :complete +-:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one" ++:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one" + + :model "PX-M5040F" + :interface "USB" + :usbid "0x04b8" "0x08b9" + :status :complete +-:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one" ++:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one" + + :model "PX-M5041F" + :interface "USB" + :usbid "0x04b8" "0x08b9" + :status :complete +-:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one" ++:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one" + + :model "PX-M650A" + :interface "USB" + :usbid "0x04b8" "0x08c3" + :status :complete +-:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one" ++:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one" + + :model "PX-M650F" + :interface "USB" + :usbid "0x04b8" "0x08c3" + :status :complete +-:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one" ++:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one" + + :model "PX-M740F" + :interface "USB" + :usbid "0x04b8" "0x08b8" + :status :complete +-:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one" ++:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one" + + :model "PX-M741F" + :interface "USB" + :usbid "0x04b8" "0x08b8" + :status :complete +-:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one" ++:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one" + + :model "PX-M840F" + :interface "USB" + :usbid "0x04b8" "0x08bd" + :status :complete +-:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one" - -:model "Perfection 600" -:interface "SCSI" -:status :unsupported -:comment "supported by the umax backend
rebadged UMAX Astra 1200S" -+:comment "requires DFSG non-free Image Scan software from Epson
all-in-one" ++:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one" :model "Perfection 610" ; command spec :interface "USB" @@ -1887,6 +2138,13 @@ -:comment "requires DFSG non-free iscan-plugin-gt-s600
overseas version of the GT-S600" +:comment "requires DFSG non-free Image Scan software from Epson
requires DFSG non-free iscan-plugin-gt-s600
overseas version of the GT-S600" + :model "Perfection V19" + :interface "USB" + :usbid "0x04b8" "0x013c" + :status :good +-:comment "requires DFSG non-free iscan-plugin-gt-s650" ++:comment "requires DFSG non-free Image Scan software from Epson
requires DFSG non-free iscan-plugin-gt-s650" + :model "Perfection V30" :interface "USB" :usbid "0x04b8" "0x0131" @@ -1908,6 +2166,13 @@ -:comment "requires DFSG non-free iscan-plugin-perfection-v370
overseas version of the GT-S640" +:comment "requires DFSG non-free Image Scan software from Epson
requires DFSG non-free iscan-plugin-perfection-v370
overseas version of the GT-S640" + :model "Perfection V39" + :interface "USB" + :usbid "0x04b8" "0x013d" + :status :good +-:comment "requires DFSG non-free iscan-plugin-gt-s650
overseas version of the GT-S650" ++:comment "requires DFSG non-free Image Scan software from Epson
requires DFSG non-free iscan-plugin-gt-s650
overseas version of the GT-S650" + :model "Perfection V100 Photo" :interface "USB" :usbid "0x04b8" "0x012d" @@ -1957,6 +2222,13 @@ -:comment "requires DFSG non-free iscan-plugin-gt-x770
overseas version of the GT-X770" +:comment "requires DFSG non-free Image Scan software from Epson
requires DFSG non-free iscan-plugin-gt-x770
overseas version of the GT-X770" + :model "Perfection V550 Photo" + :interface "USB" + :usbid "0x04b8" "0x013b" + :status :good +-:comment "requires DFSG non-free iscan-plugin-perfection-v550" ++:comment "requires DFSG non-free Image Scan software from Epson
requires DFSG non-free iscan-plugin-perfection-v550" + :model "Perfection V600 Photo" :interface "USB" :usbid "0x04b8" "0x013a" @@ -1970,19 +2242,34 @@ :status :good -:comment "IEEE1394 untested
overseas version of the GT-X900" +:comment "requires DFSG non-free Image Scan software from Epson
IEEE1394 untested
overseas version of the GT-X900" + :scsi "EPSON" "GT-X900" "processor" :model "Perfection V750 Photo" :interface "USB" :usbid "0x04b8" "0x012c" :status :good -:comment "IEEE1394 untested
overseas version of the GT-X900" ++:comment "requires DFSG non-free Image Scan software from Epson
IEEE1394 untested
overseas version of the GT-X900" + :scsi "EPSON" "GT-X900" "processor" + + :model "Perfection V800 Photo" + :interface "USB" + :usbid "0x04b8" "0x0151" + :status :good ++:comment "requires DFSG non-free Image Scan software from Epson" + + :model "Perfection V850 Pro" + :interface "USB" + :usbid "0x04b8" "0x0151" + :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
all-in-one" -+:comment "requires DFSG non-free Image Scan software from Epson
IEEE1394 untested
overseas version of the GT-X900" ++:comment "requires DFSG non-free Image Scan software from Epson
overseas version of the GT-X980" :model "Stylus CX2800" :interface "USB" @@ -2388,15 +2675,15 @@ :interface "USB" :usbid "0x04b8" "0x0848" :status :good --:comment "network interface option supported via DFSG non-free iscan-network-nt package
all-in-one" -+:comment "requires DFSG non-free Image Scan software from Epson
network interface option supported via DFSG non-free iscan-network-nt package
all-in-one" +-:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one" ++:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one" :model "Stylus Office BX305F" :interface "USB" :usbid "0x04b8" "0x0863" :status :complete --:comment "network interface option supported via DFSG non-free iscan-network-nt package
all-in-one" -+:comment "requires DFSG non-free Image Scan software from Epson
network interface option supported via DFSG non-free iscan-network-nt package
all-in-one" +-:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one" ++:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one" :model "Stylus Office BX305FW" :interface "USB" @@ -2493,15 +2780,15 @@ :interface "USB" :usbid "0x04b8" "0x0848" :status :good --:comment "network interface option supported via DFSG non-free iscan-network-nt package
all-in-one" -+:comment "requires DFSG non-free Image Scan software from Epson
network interface option supported via DFSG non-free iscan-network-nt package
all-in-one" +-:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one" ++:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one" :model "Stylus Office TX320F Series" :interface "USB" :usbid "0x04b8" "0x0863" :status :complete --:comment "network interface option supported via DFSG non-free iscan-network-nt package
all-in-one" -+:comment "requires DFSG non-free Image Scan software from Epson
network interface option supported via DFSG non-free iscan-network-nt package
all-in-one" +-:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one" ++:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one" :model "Stylus Office TX510FN Series" :interface "USB" @@ -2549,8 +2836,8 @@ :interface "USB" :usbid "0x04b8" "0x0862" :status :complete --:comment "network interface option supported via DFSG non-free iscan-network-nt package
all-in-one
overseas version of the EP-703A" -+:comment "requires DFSG non-free Image Scan software from Epson
network interface option supported via DFSG non-free iscan-network-nt package
all-in-one
overseas version of the EP-703A" +-:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one
overseas version of the EP-703A" ++:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one
overseas version of the EP-703A" :model "Stylus Photo PX700W" :interface "USB" @@ -2878,8 +3165,8 @@ :interface "USB" :usbid "0x04b8" "0x0848" :status :good --:comment "network interface option supported via DFSG non-free iscan-network-nt package
all-in-one" -+:comment "requires DFSG non-free Image Scan software from Epson
network interface option supported via DFSG non-free iscan-network-nt package
all-in-one" +-:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one" ++:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one" :model "Stylus NX330 Series" :interface "USB" @@ -2906,8 +3193,8 @@ :interface "USB" :usbid "0x04b8" "0x0864" :status :complete --:comment "network interface option supported via DFSG non-free iscan-network-nt package
all-in-one" -+:comment "requires DFSG non-free Image Scan software from Epson
network interface option supported via DFSG non-free iscan-network-nt package
all-in-one" +-:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one" ++:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one" :model "Stylus NX430W Series" :interface "USB" @@ -3039,8 +3326,8 @@ :interface "USB" :usbid "0x04b8" "0x0864" :status :complete --:comment "network interface option supported via DFSG non-free iscan-network-nt package
all-in-one" -+:comment "requires DFSG non-free Image Scan software from Epson
network interface option supported via DFSG non-free iscan-network-nt package
all-in-one" +-:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one" ++:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one" :model "Stylus SX430W Series" :interface "USB" @@ -3207,8 +3494,8 @@ :interface "USB" :usbid "0x04b8" "0x0864" :status :complete --:comment "network interface option supported via DFSG non-free iscan-network-nt package
all-in-one" -+:comment "requires DFSG non-free Image Scan software from Epson
network interface option supported via DFSG non-free iscan-network-nt package
all-in-one" +-:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one" ++:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one" :model "Stylus TX430W Series" :interface "USB" @@ -3266,6 +3553,27 @@ -:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one
overseas version of the PX-535F" +:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one
overseas version of the PX-535F" + :model "WF-2630 Series" + :interface "USB" + :usbid "0x04b8" "0x08c4" + :status :complete +-:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one" ++:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one" + + :model "WF-2650 Series" + :interface "USB" + :usbid "0x04b8" "0x08c3" + :status :complete +-:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one" ++:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one" + + :model "WF-2660 Series" + :interface "USB" + :usbid "0x04b8" "0x08c3" + :status :complete +-:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one" ++:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one" + :model "WF-3520 Series" :interface "USB" :usbid "0x04b8" "0x0899" @@ -3285,6 +3593,48 @@ :usbid "0x04b8" "0x0899" :status :complete -:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one" ++:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one" + + :model "WF-3620 Series" + :interface "USB" + :usbid "0x04b8" "0x08b8" + :status :complete +-:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one
overseas version of the PX-M740F" ++:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one
overseas version of the PX-M740F" + + :model "WF-3640 Series" + :interface "USB" + :usbid "0x04b8" "0x08b8" + :status :complete +-:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one
overseas version of the PX-M741F" ++:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one
overseas version of the PX-M741F" + + :model "WF-4630 Series" + :interface "USB" + :usbid "0x04b8" "0x08be" + :status :complete +-:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one" ++:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one" + + :model "WF-4640 Series" + :interface "USB" + :usbid "0x04b8" "0x08be" + :status :complete +-:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one" ++:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one" + + :model "WF-5620 Series" + :interface "USB" + :usbid "0x04b8" "0x08bd" + :status :complete +-:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one
overseas version of the PX-M840F" ++:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one
overseas version of the PX-M840F" + + :model "WF-5690 Series" + :interface "USB" + :usbid "0x04b8" "0x08bd" + :status :complete +-:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one" +:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one" :model "WF-7510 Series" @@ -3301,54 +3651,89 @@ -:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one
overseas version of the PX-1700F" +:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one
overseas version of the PX-1700F" + :model "WF-7610 Series" + :interface "USB" + :usbid "0x04b8" "0x08b9" + :status :complete +-:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one
overseas version of the PX-M5040F" ++:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one
overseas version of the PX-M5040F" + + :model "WF-7620 Series" + :interface "USB" + :usbid "0x04b8" "0x08b9" + :status :complete +-:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one
overseas version of the PX-M5041F" ++:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one
overseas version of the PX-M5041F" + :model "WF-M1560 Series" :interface "USB" :usbid "0x04b8" "0x08ab" :status :complete -:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one" ++:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one" + + :model "WF-M5690 Series" + :interface "USB" + :usbid "0x04b8" "0x08d0" + :status :complete +-:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one
overseas version of the PX-M350F" ++:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one
overseas version of the PX-M350F" + + :model "WF-R4640 Series" + :interface "USB" + :usbid "0x04b8" "0x08cd" + :status :complete +-:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one" ++:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one" + + :model "WF-R5690 Series" + :interface "USB" + :usbid "0x04b8" "0x08cd" + :status :complete +-:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one" +:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one" :model "WP-4511" :interface "USB" :usbid "0x04b8" "0x087d" :status :complete --:comment "network interface option supported via DFSG non-free iscan-network-nt package
all-in-one
overseas version of the PX-B750F" -+:comment "requires DFSG non-free Image Scan software from Epson
network interface option supported via DFSG non-free iscan-network-nt package
all-in-one
overseas version of the PX-B750F" +-:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one
overseas version of the PX-B750F" ++:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one
overseas version of the PX-B750F" :model "WP-4515" :interface "USB" :usbid "0x04b8" "0x087d" :status :complete --:comment "network interface option supported via DFSG non-free iscan-network-nt package
all-in-one" -+:comment "requires DFSG non-free Image Scan software from Epson
network interface option supported via DFSG non-free iscan-network-nt package
all-in-one" +-:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one" ++:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one" :model "WP-4521" :interface "USB" :usbid "0x04b8" "0x087d" :status :complete --:comment "network interface option supported via DFSG non-free iscan-network-nt package
all-in-one
overseas version of the PX-B750F" -+:comment "requires DFSG non-free Image Scan software from Epson
network interface option supported via DFSG non-free iscan-network-nt package
all-in-one
overseas version of the PX-B750F" +-:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one
overseas version of the PX-B750F" ++:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one
overseas version of the PX-B750F" :model "WP-4525" :interface "USB" :usbid "0x04b8" "0x087d" :status :complete --:comment "network interface option supported via DFSG non-free iscan-network-nt package
all-in-one
overseas version of the PX-B750F" -+:comment "requires DFSG non-free Image Scan software from Epson
network interface option supported via DFSG non-free iscan-network-nt package
all-in-one
overseas version of the PX-B750F" +-:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one
overseas version of the PX-B750F" ++:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one
overseas version of the PX-B750F" :model "WP-4530 Series" :interface "USB" :usbid "0x04b8" "0x087d" :status :complete --:comment "network interface option supported via DFSG non-free iscan-network-nt package
all-in-one
overseas version of the PX-B750F" -+:comment "requires DFSG non-free Image Scan software from Epson
network interface option supported via DFSG non-free iscan-network-nt package
all-in-one
overseas version of the PX-B750F" +-:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one
overseas version of the PX-B750F" ++:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one
overseas version of the PX-B750F" :model "WP-4540 Series" :interface "USB" :usbid "0x04b8" "0x087d" :status :complete --:comment "network interface option supported via DFSG non-free iscan-network-nt package
all-in-one
overseas version of the PX-B750F" -+:comment "requires DFSG non-free Image Scan software from Epson
network interface option supported via DFSG non-free iscan-network-nt package
all-in-one
overseas version of the PX-B750F" +-:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one
overseas version of the PX-B750F" ++:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one
overseas version of the PX-B750F" :model "WP-4590 Series" :interface "USB" @@ -3368,8 +3753,8 @@ :interface "USB" :usbid "0x04b8" "0x0863" :status :complete --:comment "network interface (option) supported via DFSG non-free iscan-network-nt package
some models in the series have a built-in network interface
all-in-one" -+:comment "requires DFSG non-free Image Scan software from Epson
network interface (option) supported via DFSG non-free iscan-network-nt package
some models in the series have a built-in network interface
all-in-one" +-:comment "network interface supported via DFSG non-free iscan-network-nt package
some models in the series have a built-in network interface
all-in-one" ++:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
some models in the series have a built-in network interface
all-in-one" :model "WorkForce 435" :interface "USB" @@ -3473,22 +3858,29 @@ :interface "USB" :usbid "0x04b8" "0x08ae" :status :complete --:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one" -+:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one" +-:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one
overseas version of the PX-046A" ++:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one
overseas version of the PX-046A" :model "XP-212" :interface "USB" :usbid "0x04b8" "0x08ae" :status :complete --:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one" -+:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one" +-:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one
overseas version of the PX-046A" ++:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one
overseas version of the PX-046A" :model "XP-215" :interface "USB" :usbid "0x04b8" "0x08ae" :status :complete --:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one" -+:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one" +-:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one
overseas version of the PX-046A" ++:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one
overseas version of the PX-046A" + + :model "XP-225" + :interface "USB" + :usbid "0x04b8" "0x08c0" + :status :complete +-:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one
overseas version of the PX-047A" ++:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one
overseas version of the PX-047A" :model "XP-300 Series" :interface "USB" @@ -3501,8 +3893,15 @@ :interface "USB" :usbid "0x04b8" "0x08af" :status :complete --:comment "network interface supported via DFSG non-free iscan-network-nt package" -+:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package" +-:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one
overseas version of the PX-436A" ++:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one
overseas version of the PX-436A" + + :model "XP-320 Series" + :interface "USB" + :usbid "0x04b8" "0x08bf" + :status :complete +-:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one
overseas version of the PX-437A" ++:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one
overseas version of the PX-437A" :model "XP-400 Series" :interface "USB" @@ -3516,6 +3915,13 @@ :usbid "0x04b8" "0x08b0" :status :complete -:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one" ++:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one" + + :model "XP-420 Series" + :interface "USB" + :usbid "0x04b8" "0x08c1" + :status :complete +-:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one" +:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one" :model "XP-600 Series" @@ -3525,6 +3931,34 @@ -:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one
overseas version of the EP-775A" +:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one
overseas version of the EP-775A" + :model "XP-510 Series" + :interface "USB" + :usbid "0x04b8" "0x08b7" + :status :complete +-:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one
overseas version of the EP-706A" ++:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one
overseas version of the EP-706A" + + :model "XP-520 Series" + :interface "USB" + :usbid "0x04b8" "0x08c8" + :status :complete +-:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one
overseas version of the EP-777A" ++:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one
overseas version of the EP-777A" + + :model "XP-610 Series" + :interface "USB" + :usbid "0x04b8" "0x08b6" + :status :complete +-:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one
overseas version of the EP-776AB/EP-776AW" ++:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one
overseas version of the EP-776AB/EP-776AW" + + :model "XP-620 Series" + :interface "USB" + :usbid "0x04b8" "0x08c8" + :status :complete +-:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one
overseas version of the EP-777A" ++:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one
overseas version of the EP-777A" + :model "XP-700 Series" :interface "USB" :usbid "0x04b8" "0x089d" @@ -3532,6 +3966,20 @@ -:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one" +:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one" + :model "XP-710 Series" + :interface "USB" + :usbid "0x04b8" "0x08b5" + :status :complete +-:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one
overseas version of the EP-806AB/EP-806AR/EP-806AW" ++:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one
overseas version of the EP-806AB/EP-806AR/EP-806AW" + + :model "XP-720 Series" + :interface "USB" + :usbid "0x04b8" "0x08c7" + :status :complete +-:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one
overseas version of the EP-807AB/EP-807AR/EP-807AW" ++:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one
overseas version of the EP-807AB/EP-807AR/EP-807AW" + :model "XP-750 Series" :interface "USB" :usbid "0x04b8" "0x089c" @@ -3539,6 +3987,13 @@ -:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one
overseas version of the EP-805A/EP-805AR/EP-805AW" +:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one
overseas version of the EP-805A/EP-805AR/EP-805AW" + :model "XP-760 Series" + :interface "USB" + :usbid "0x04b8" "0x08c7" + :status :complete +-:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one
overseas version of the EP-807AB/EP-807AR/EP-807AW" ++:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one
overseas version of the EP-807AB/EP-807AR/EP-807AW" + :model "XP-800 Series" :interface "USB" :usbid "0x04b8" "0x089b" @@ -3546,9 +4001,37 @@ -:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one
overseas version of the EP-905A" +:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one
overseas version of the EP-905A" + :model "XP-810 Series" + :interface "USB" + :usbid "0x04b8" "0x08b4" + :status :complete +-:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one
overseas version of the EP-906F" ++:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one
overseas version of the EP-906F" + + :model "XP-820 Series" + :interface "USB" + :usbid "0x04b8" "0x08c6" + :status :complete +-:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one
overseas version of the EP-907F" ++:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one
overseas version of the EP-907F" + :model "XP-850 Series" :interface "USB" :usbid "0x04b8" "0x089a" :status :complete -:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one
overseas version of the EP-905F" +:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one
overseas version of the EP-905F" + + :model "XP-860 Series" + :interface "USB" + :usbid "0x04b8" "0x08c6" + :status :complete +-:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one
overseas version of the EP-907F" ++:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one
overseas version of the EP-907F" + + :model "XP-950 Series" + :interface "USB" + :usbid "0x04b8" "0x08b3" + :status :complete +-:comment "network interface supported via DFSG non-free iscan-network-nt package
all-in-one
overseas version of the EP-976A3" ++:comment "requires DFSG non-free Image Scan software from Epson
network interface supported via DFSG non-free iscan-network-nt package
all-in-one
overseas version of the EP-976A3" diff --git a/avision.c.patch b/avision.c.patch deleted file mode 100644 index 89d9f81..0000000 --- a/avision.c.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- backend/avision.c.orig 2012-07-01 04:00:44.000000000 +0200 -+++ backend/avision.c 2013-09-15 13:24:31.150933718 +0200 -@@ -1273,6 +1273,12 @@ - static SANE_Bool force_a4 = SANE_FALSE; - static SANE_Bool force_a3 = SANE_FALSE; - -+/* <2013-09-15_PNu> -+ * HP Scanjet 8200 w/o ADF fails during the ADF reset loop in get_accessories_info() -+ * Brute force option enforce-no-adf -+ */ -+static SANE_Bool enforce_no_adf = SANE_FALSE; -+ - /* hardware resolutions to interpolate from */ - static const int hw_res_list_c5[] = - { -@@ -3208,6 +3214,17 @@ - - dev->inquiry_adf |= result [0]; - -+ /* <2013-09-15_PNu> -+ * HP Scanjet 8200 w/o ADF fails during the following ADF reset loop -+ */ -+ if (enforce_no_adf) { -+ if (result[0] == 0) { -+ result[2] = 0; /* to prevent fail of following loop */ -+ DBG (3, "get_accessories_info: no adf enforced!\n"); -+ } -+ } -+ /* */ -+ - if (dev->hw->feature_type2 & AV_ADF_FLIPPING_DUPLEX) - { - if (result[0] == 1) -@@ -7637,6 +7654,14 @@ - linenumber); - static_calib_list [2] = SANE_TRUE; - } -+ else if (strcmp (word, "enforce-no-adf") == 0) { -+ /* <2013-09-15_PNu> -+ * Brute force option enforce-no-adf -+ */ -+ DBG (3, "sane_reload_devices: config file line %d: enforce-no-adf\n", -+ linenumber); -+ enforce_no_adf = SANE_TRUE; -+ } - else - DBG (1, "sane_reload_devices: config file line %d: options unknown!\n", - linenumber); diff --git a/avision.conf.patch b/avision.conf.patch deleted file mode 100644 index 472daf2..0000000 --- a/avision.conf.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- backend/avision.conf.in.orig 2013-09-09 01:19:36.843243005 +0200 -+++ backend/avision.conf.in 2013-09-15 13:13:40.697769805 +0200 -@@ -8,6 +8,7 @@ - #option disable-gamma-table - #option disable-calibration - #option force-a4 -+#option enforce-no-adf - - #scsi AVISION - #scsi FCPA diff --git a/dell1600n_net-fix-strncat.patch b/dell1600n_net-fix-strncat.patch new file mode 100644 index 0000000..5655c8c --- /dev/null +++ b/dell1600n_net-fix-strncat.patch @@ -0,0 +1,38 @@ +--- backend/dell1600n_net.c.orig 2013-02-23 03:00:56.000000000 +0100 ++++ backend/dell1600n_net.c 2015-10-06 10:44:01.000000000 +0200 +@@ -943,7 +943,7 @@ HexDump (int debugLevel, const unsigned + + sprintf (itemBuf, "%02x ", (const unsigned int) buf[i]); + +- strncat (lineBuf, itemBuf, sizeof (lineBuf)); ++ strncat (lineBuf, itemBuf, sizeof (lineBuf) - strlen (lineBuf) - 1); + + if ((i + 1) % 16) + continue; +@@ -960,7 +960,7 @@ HexDump (int debugLevel, const unsigned + { + sprintf (itemBuf, "."); + } +- strncat (lineBuf, itemBuf, sizeof (lineBuf)); ++ strncat (lineBuf, itemBuf, sizeof (lineBuf) - strlen (lineBuf) - 1); + + } /* for j */ + +@@ -974,7 +974,7 @@ HexDump (int debugLevel, const unsigned + + for (j = (i % 16); j < 16; ++j) + { +- strncat (lineBuf, " ", sizeof (lineBuf)); ++ strncat (lineBuf, " ", sizeof (lineBuf) - strlen (lineBuf) - 1); + } + for (j = 1 + i - ((i + 1) % 16); j < i; ++j) + { +@@ -986,7 +986,7 @@ HexDump (int debugLevel, const unsigned + { + strcpy (itemBuf, "."); + } +- strncat (lineBuf, itemBuf, sizeof (lineBuf)); ++ strncat (lineBuf, itemBuf, sizeof (lineBuf) - strlen (lineBuf) - 1); + } + DBG (debugLevel, "%s\n", lineBuf); + } diff --git a/fix-buffer-overflow.patch b/fix-buffer-overflow.patch deleted file mode 100644 index ccb5a54..0000000 --- a/fix-buffer-overflow.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- backend/niash.c.orig 2006-02-04 12:34:28.000000000 +0100 -+++ backend/niash.c 2007-02-21 15:38:12.000000000 +0100 -@@ -89,7 +89,9 @@ typedef enum - optLamp, - - optCalibrate, -- optGamma /* analog gamma = single number */ -+ optGamma, /* analog gamma = single number */ -+/* have optEndOfList only to define arrays with sufficient size */ -+ optEndOfList - } EOptionIndex; - - -@@ -105,8 +107,8 @@ typedef union - - typedef struct - { -- SANE_Option_Descriptor aOptions[optLast]; -- TOptionValue aValues[optLast]; -+ SANE_Option_Descriptor aOptions[optEndOfList]; -+ TOptionValue aValues[optEndOfList]; - - TScanParams ScanParams; - THWParams HWParams; diff --git a/fix-mustek_pp_ccd300.c.patch b/fix-mustek_pp_ccd300.c.patch deleted file mode 100644 index ad09e61..0000000 --- a/fix-mustek_pp_ccd300.c.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- backend/mustek_pp_ccd300.c.orig 2003-12-01 12:52:19.000000000 +0100 -+++ backend/mustek_pp_ccd300.c 2009-07-29 16:29:54.000000000 +0200 -@@ -940,10 +940,10 @@ get_color_line_101x (Mustek_pp_Handle * - wait_bank_change (dev, priv->bank_count, 1); - reset_bank_count (dev); - if (priv->ccd_line >= (priv->line_step >> SANE_FIXED_SCALE_SHIFT)) -- priv->redline = ++priv->redline % priv->green_offs; -+ priv->redline = (priv->redline + 1) % priv->green_offs; - if (priv->ccd_line >= - priv->blue_offs + (priv->line_step >> SANE_FIXED_SCALE_SHIFT)) -- priv->blueline = ++priv->blueline % priv->blue_offs; -+ priv->blueline = (priv->blueline + 1) % priv->blue_offs; - continue; - } - -@@ -979,7 +979,7 @@ get_color_line_101x (Mustek_pp_Handle * - - } - -- priv->redline = ++priv->redline % priv->green_offs; -+ priv->redline = (priv->redline + 1) % priv->green_offs; - - if (priv->ccd_line >= priv->green_offs && gogreen) - { -@@ -1013,7 +1013,7 @@ get_color_line_101x (Mustek_pp_Handle * - - if (priv->ccd_line >= - priv->blue_offs + (priv->line_step >> SANE_FIXED_SCALE_SHIFT)) -- priv->blueline = ++priv->blueline % priv->blue_offs; -+ priv->blueline = (priv->blueline + 1) % priv->blue_offs; - - if (gogreen) - { diff --git a/install-umax_pp-tool.patch b/install-umax_pp-tool.patch deleted file mode 100644 index 3083104..0000000 --- a/install-umax_pp-tool.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- tools/Makefile.am.orig 2009-02-20 17:51:09.000000000 +0100 -+++ tools/Makefile.am 2009-06-05 15:08:45.000000000 +0200 -@@ -7,8 +7,8 @@ - AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_builddir)/include \ - -I$(top_srcdir)/include - --bin_PROGRAMS = sane-find-scanner gamma4scanimage --noinst_PROGRAMS = sane-desc umax_pp -+bin_PROGRAMS = sane-find-scanner gamma4scanimage umax_pp -+noinst_PROGRAMS = sane-desc - - if CROSS_COMPILING - HOTPLUG = diff --git a/re-add-SANE_CAP_ALWAYS_SETTABLE.patch b/re-add-SANE_CAP_ALWAYS_SETTABLE.patch deleted file mode 100644 index 868177d..0000000 --- a/re-add-SANE_CAP_ALWAYS_SETTABLE.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- include/sane/sane.h.orig 2009-06-12 10:19:19.000000000 +0200 -+++ include/sane/sane.h 2009-06-12 10:20:12.000000000 +0200 -@@ -115,6 +115,7 @@ SANE_Device; - #define SANE_CAP_AUTOMATIC (1 << 4) - #define SANE_CAP_INACTIVE (1 << 5) - #define SANE_CAP_ADVANCED (1 << 6) -+#define SANE_CAP_ALWAYS_SETTABLE (1 << 7) - - #define SANE_OPTION_IS_ACTIVE(cap) (((cap) & SANE_CAP_INACTIVE) == 0) - #define SANE_OPTION_IS_SETTABLE(cap) (((cap) & SANE_CAP_SOFT_SELECT) != 0) diff --git a/sane-backends-1.0.24.tar.gz b/sane-backends-1.0.24.tar.gz deleted file mode 100644 index 6ff6cb5..0000000 --- a/sane-backends-1.0.24.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:27c7085a54f1505d8b551e6f1e69d30e1ee57328b18429bb2225dabf4c45462d -size 5778749 diff --git a/sane-backends-1.0.25.tar.gz b/sane-backends-1.0.25.tar.gz new file mode 100644 index 0000000..7588d91 --- /dev/null +++ b/sane-backends-1.0.25.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a4d7ba8d62b2dea702ce76be85699940992daf3f44823ddc128812da33dc6e2c +size 5955016 diff --git a/sane-backends.changes b/sane-backends.changes index 446266e..f1934ae 100644 --- a/sane-backends.changes +++ b/sane-backends.changes @@ -1,3 +1,53 @@ +------------------------------------------------------------------- +Tue Oct 6 10:55:10 CEST 2015 - jsmeix@suse.de + +- Upgraded to sane-backends version 1.0.25: + Changes since 1.0.24: + * New backends: epsonds (Epson DS, PX and WF series), + pieusb (PIE and Reflecta film/slide scanners). + * Support for JPG and PNG output format in scanimage. + * Significant enhancements to avision, canon_dr, epjitsu, + fujitsu, genesys, kodakaio and pixma backends. + * Minor updates, bugfixes or scanners added in several backends. + * 300 new scanner models supported. + * Workaround for USB3 problems in Linux kernel. + * Added code for IR functionality. + * Documentation and translation updates. + * Bugfixes (threading, networking, udev rules). + A big thanks to Olaf Meeuwissen, for his efforts in bug triage, + patch wrangling and code cleanups. +- fix-buffer-overflow.patch, fix-mustek_pp_ccd300.c.patch, + install-umax_pp-tool.patch, MG5550-works.patch are obsolete + since sane-backends-1.0.24 because it is fixed in the source. +- re-add-SANE_CAP_ALWAYS_SETTABLE.patch should be longer needed + because there should be longer a fontend that references + SANE_CAP_ALWAYS_SETTABLE in its source code. +- Recreated adapt_epkowa.desc_for_yast2-scanner.patch + according to the comment in sane-backends.spec + so that it applies for sane-backends-1.0.25. +- Dropped avision.c.patch and avision.conf.patch + (cf. the entry below dated "Mon Sep 15 23:23:23 UTC 2013") + because it does no longer apply to sane-backends-1.0.25 sources. + Issues that are not specific for a particular Linux distribution + must be fixed directly at SANE upstream so that all Linux + distributions get it properly fixed and not via patches + at one particular Linux distribution where it falls apart + each time when SANE upstream changes that sources. +- Added BuildRequires for libpng-devel and libtiff-devel because + scanimage output format supports PNG and TIFF. +- dell1600n_net-fix-strncat.patch fixes the following build error: + Statement might be overflowing a buffer in strncat. + BAD: strncat(buffer,charptr,sizeof(buffer)) is wrong + GOOD: strncat(buffer,charptr,sizeof(buffer)-strlen(buffer)-1) + The upstream issue report is + https://alioth.debian.org/tracker/index.php?func=detail&aid=315198&group_id=30186&atid=410366 +- Disabled use of LaTeX to generate documentation because LaTeX + blows up the build system and "BuildRequires: texlive-latex" + causes various cycles and the sane.ps documentation + is not for users but for developers who could get + the "Programmer's Documentation" from SANE upstream + at http://www.sane-project.org/docs.html + ------------------------------------------------------------------- Wed Jan 14 12:41:18 UTC 2015 - johannes@lst.de diff --git a/sane-backends.spec b/sane-backends.spec index da0657f..ae16c90 100644 --- a/sane-backends.spec +++ b/sane-backends.spec @@ -1,7 +1,7 @@ # # spec file for package sane-backends # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,53 +24,35 @@ BuildRequires: libieee1284-devel BuildRequires: libieee1284 %endif BuildRequires: libjpeg-devel +BuildRequires: libpng-devel +BuildRequires: libtiff-devel BuildRequires: libtool BuildRequires: libusb-1_0-devel BuildRequires: libv4l-devel BuildRequires: net-snmp-devel BuildRequires: pkg-config -# texlive-latex is needed to make doc/sane.ps from doc/sane.tex -# but texlive-latex requires texlive which requires ghostscript-x11 -# but ghostscript-x11 is not needed for sane.tex -> sane.dvi -> sane.ps -# so that the needless package ghostscript-x11 blows up the build system -# and is explicitly excluded to be installed in the build system: -BuildRequires: texlive-latex -#!BuildIgnore: ghostscript-x11 Summary: SANE (Scanner Access Now Easy) Scanner Drivers License: GPL-2.0+ and SUSE-GPL-2.0+-with-sane-exception and SUSE-Public-Domain Group: Hardware/Scanner -Version: 1.0.24 +Version: 1.0.25 Release: 0 Url: http://www.sane-project.org/ # How to get Source0: -# wget --no-check-certificate https://alioth.debian.org/frs/download.php/file/3958/sane-backends-1.0.24.tar.gz +# wget --no-check-certificate https://alioth.debian.org/frs/download.php/file/4146/sane-backends-1.0.25.tar.gz # How to get the MD5 sum file: -# wget --no-check-certificate https://alioth.debian.org/frs/download.php/file/3956/sane-backends-1.0.24.tar.gz.md5 +# wget --no-check-certificate https://alioth.debian.org/frs/download.php/file/4144/sane-backends-1.0.25.tar.gz.md5 # How to check the MD5 sum: -# md5sum -c sane-backends-1.0.24.tar.gz.md5 -Source0: https://alioth.debian.org/frs/download.php/file/3958/sane-backends-%{version}.tar.gz +# md5sum -c sane-backends-1.0.25.tar.gz.md5 +Source0: https://alioth.debian.org/frs/download.php/file/4146/sane-backends-%{version}.tar.gz # Source100... is SUSE specific stuff: -# Source100 is the evil-hack init-script "sane-dev" to grant scanner access permissions. -# Source100 is no longer provided because sane-backends-1.0.19 has udev and HAL support. # Source101 is the xinetd file for the saned: Source101: sane-port # Source102 is the OpenSLP registration file for the saned: Source102: sane.reg -# Since openSUSE 10.3 "Source103: hpoj.desc" is dropped because the package hp-officeJet is dropped. -# 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. -# Since openSUSE 12.2 "Source105 epkowa.desc" is dropped because the package iscan-free is dropped. -# Instead adapt_epkowa.desc_for_yast2-scanner.patch adapts epkowa.desc for yast2-scanner. -# 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". -# Source107 are readymade udev rules for openSUSE 10.3 derived from sane-backends 1.0.18-cvs. -# Source107 is obsolete since sane-backends-1.0.19 because it has udev and HAL support. -# Source108 is a script which outputs a HAL fdi file. -# Source108 is obsolete since sane-backends-1.0.19 because it has udev and HAL support. -# We create our hpaio.desc file directly from the models.dat file of HPLIP: -Source109: create_hpaio.desc_from_models.dat -Source110: models.dat +# Source110 creates our hpaio.desc file directly from the models.dat file of HPLIP: +Source110: create_hpaio.desc_from_models.dat +# Source111 is the models.dat file of HPLIP: +Source111: models.dat # Was initially just dumped in as Source1 to "package baselibs.conf" # (see the matching explanatory entry in the RPM changelog): Source190: baselibs.conf @@ -85,95 +67,17 @@ Source200: create_scanner_database # to extract the needed info from which create_sane-backends-autoconfig.rules # generates the 56-sane-backends-autoconfig.rules file: Source201: create_sane-backends-autoconfig.rules -# Patch1 does locale rename: no -> nb: -# Patch1 is obsolete since sane-backends-1.0.19 because it uses 'nb'. -# Patch2 fix-buffer-overflow.patch fixes too small arrays in backend/niash.c: -Patch2: fix-buffer-overflow.patch -# Patch3 replaces fixed HZ compile-time value by sysconf(_SC_CLK_TCK) runtime value: -# Patch3 is obsolete since sane-backends-1.0.19 because it is fixed in the source. -# Patch4 disables hw_ink_remain which causes a buffer overflow in fujitsu.c: -# Patch4 is obsolete since sane-backends-1.0.19 because it is fixed in the source. -# Patch5 fixes uninitialized variables in avision.c: -# Patch5 is obsolete since sane-backends-1.0.20 because it is fixed in the source. -# Patch6 fixes an ambiguous post/pre increment in canon-sane.c: -# Patch6 is obsolete since sane-backends-1.0.19 because it is fixed in the source. -# Patch7 lets sanei_scsi_find_devices continue on to look at subsequent devices -# if the attach callback returns anything other than SANE_STATUS_GOOD: -# Patch7 is obsolete since sane-backends-1.0.20 because it is fixed in the source. -# Patch8 re-add-SANE_CAP_ALWAYS_SETTABLE.patch re-adds SANE_CAP_ALWAYS_SETTABLE to sane.h -# which was erroneously removed in sane-backends-1.0.20 so that sane-frontends and xsane -# can no longer build, see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=527675 -# SANE_CAP_ALWAYS_SETTABLE is still missing in sane-backends-1.0.21 -Patch8: re-add-SANE_CAP_ALWAYS_SETTABLE.patch -# Patch9 fix-hp3900_config.c.patch fixes a possible for loop overflow in hp3900_config.c -# see https://bugzilla.novell.com/show_bug.cgi?id=517281 -# and https://alioth.debian.org/tracker/index.php?func=detail&aid=311856&group_id=30186&atid=410366 -# which is obsolete since sane-backends-1.0.21 because it is fixed in the source. -# Patch10 fix-mustek_pp_ccd300.c.patch fixes undefined 'foo = ++foo modulo bar' operations -# in mustek_pp_ccd300.c see https://bugzilla.novell.com/show_bug.cgi?id=498435 -# and https://alioth.debian.org/tracker/index.php?func=detail&aid=311857&group_id=30186&atid=410366 -# where the upstream maintainer did not understand what is wrong and closed it as "Wont Fix" -# so that we have to keep this patch: -Patch10: fix-mustek_pp_ccd300.c.patch -# Patch11 sane-desc_closedir.patch adds missing call to closedir to sane-desc.c -# see https://bugzilla.novell.com/show_bug.cgi?id=530313 -# and https://alioth.debian.org/tracker/index.php?func=detail&aid=311880&group_id=30186&atid=410366 -# which is obsolete since sane-backends-1.0.21 because it is fixed in the source. -# Patch12 fix-lexmark_low-memory-leak.patch adds a missing call to free in backend/lexmark_low.c -# in the sanei_lexmark_low_find_start_line function -# see https://bugzilla.novell.com/show_bug.cgi?id=542341 -# and https://alioth.debian.org/tracker/index.php?func=detail&aid=311990&group_id=30186&atid=410366 -# which is obsolete since sane-backends-1.0.21 because it is fixed in the source. -# Patch13 fix-hp3900_sane-string-option-sizes.diff fixes option sizes in backend/hp3900_sane.c -# because otherwise the frontend (e.g. xsane) may crash -# see https://bugzilla.novell.com/show_bug.cgi?id=535752 -# and https://alioth.debian.org/tracker/index.php?func=detail&aid=311991&group_id=30186&atid=410366 -# which is obsolete since sane-backends-1.0.21 because it is fixed in the source. -# Patch14 is an upstream patch which adds two files required to build translations -# which are missing in the upstream sane-backends-1.0.21 source tar ball. -# URL for Patch14: https://alioth.debian.org/frs/download.php/3261/sane-backends-1.0.21-i18n.patch -# Patch14 is obsolete since sane-backends-1.0.22 because it is fixed in the source. -# Patch15 fix-genesys-create_range-type.patch lets in genesys.c the create_range function -# be of type 'SANE_Range *' to fix 'assignment makes pointer from integer' bugs -# wherever the create_range function is called -# see https://alioth.debian.org/tracker/index.php?func=detail&aid=312492&group_id=30186&atid=410366 -# which is obsolete since sane-backends-1.0.22 because it is fixed in the source. -# Patch16 fix-xerox_mfp-color-mode.patch adds SANE_VALUE_SCAN_MODE_HALFTONE in xerox_mfp.c -# to fix a regression in sane-backends-1.0.21 where the xerox_mfp works only in grayscale mode -# see https://bugzilla.novell.com/show_bug.cgi?id=658017 -# which is obsolete since sane-backends-1.0.22 because it is fixed in the source. +# Patch1 dell1600n_net-fix-strncat.patch fixes the following build error: +# Statement might be overflowing a buffer in strncat. Common mistake: +# BAD: strncat(buffer,charptr,sizeof(buffer)) is wrong, it takes the left over size as 3rd argument +# GOOD: strncat(buffer,charptr,sizeof(buffer)-strlen(buffer)-1): +# see https://alioth.debian.org/tracker/index.php?func=detail&aid=315198&group_id=30186&atid=410366 +Patch1: dell1600n_net-fix-strncat.patch # Patch100... is SUSE specific stuff: -# Patch100 canon-backend-autoprobing.patch lets the "canon" backend do scanner auto-recognition -# which is obsolete since sane-backends-1.0.22 because it is fixed in the source. -# Patch102 builds libsane-* modules as libtool modules: -# SANE backends (i.e. driver modules) are regular shared libraries. -# Nothing is linked directly with a /usr/lib/sane/libsane-.so module. -# In particular scanning frontends (like scanimage, xscanimage, xsane, kooka) -# are linked with libsane.so.1 which is the dll meta-backend which dlopen()s the -# driver modules according to which drivers are activated in /etc/sane.d/dll.conf. -# One could "cp /usr/lib/sane/libsane-.so /usr/lib/libsane.so" -# and scanning would also work (but now one can use only this single driver). -# The libtool script used in sane-backends is slightly modified to support that. -# Patch102 was dropped because there is no reason to build them as libtool modules -# and it would make our package incompatible with the rest of the SANE world. -# Patch103 install-umax_pp-tool.patch installs tools/umax_pp as /usr/bin/umax_pp which is built -# but not installed but it is needed to recover from a failed scan -# with scanners which use the umax_pp backend, see http://bugs.debian.org/496833 -Patch103: install-umax_pp-tool.patch -# Patch104 no-descriptions-external-hpoj.patch removes descriptions-external/hpoj.desc from doc/Makefile.am +# Patch101 no-descriptions-external-hpoj.patch removes descriptions-external/hpoj.desc from doc/Makefile.am # because it is intentionally removed from the sources in the prep section: -Patch104: no-descriptions-external-hpoj.patch -# Patch105 sane-backends-1.0.20-xerox_mfp.diff backports post 1.0.20 xerox_mfp changes -# and is therefore removed since sane-backends-1.0.21 which contains those changes. -# Patch106 sane-backends-1.0.21-SCX4500W.patch adds usb id for SCX4500W. -# Patch106 is obsolete since sane-backends-1.0.24 because it is fixed in the source. -# Patch107 sane-backends-1.0.22-xerox_mfp-fix-usb-devices.patch fixes usb device support in xerox_mfp (bnc#745245) -# is obsolete since sane-backends-1.0.23 because it is fixed in the source. -# Patch108 fix-no-return-in-nonvoid-function.patch fixes a "control reaches end of non-void function" gcc warning -# which lets build fail with "no-return-in-nonvoid-function" error in kodakaio.c - the upstream bug report is -# https://alioth.debian.org/tracker/index.php?func=detail&aid=313858&group_id=30186&atid=410366 -# Patch108 is obsolete since sane-backends-1.0.24 because it is fixed in the source. -# Patch109 adapt_epkowa.desc_for_yast2-scanner.patch adapts epkowa.desc for yast2-scanner +Patch101: no-descriptions-external-hpoj.patch +# Patch102 adapt_epkowa.desc_for_yast2-scanner.patch adapts epkowa.desc for yast2-scanner # (see https://bugzilla.novell.com/show_bug.cgi?id=788756#c14). # It adds "requires DFSG non-free Image Scan software from Avasys" to all comments # (or adds such a comment if there is not yet a comment) so that yast2-scanner @@ -183,15 +87,7 @@ Patch104: no-descriptions-external-hpoj.patch # and https://bugzilla.novell.com/show_bug.cgi?id=746038). # Furthermore it removes "unsupported" models from epkowa.desc because # otherwise there would be confusing model entries shown in yast2-scanner: -Patch109: adapt_epkowa.desc_for_yast2-scanner.patch -# Patch 110 and 111 implement scanjet 8200 ADF workaround - bnc#840443 -# https://alioth.debian.org/tracker/index.php?func=detail&aid=314108&group_id=30186&atid=410366 -Patch110: avision.conf.patch -Patch111: avision.c.patch - -# unchanged git checkin http://anonscm.debian.org/cgit/sane/sane-backends.git/commit/?id=54358f27e1d6cf8b537866d8034919fcbebea1f1 -# remove for upstream version 25 -Patch112: MG5550-works.patch +Patch102: adapt_epkowa.desc_for_yast2-scanner.patch # Install into this non-root directory (required when norootforbuild is used): BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -266,28 +162,19 @@ package or remove it when it is already installed. %prep %setup -q -# Apply upstream patches first of all: -# Then apply non-upstream patches: -# Patch2 fix-buffer-overflow.patch fixes too small arrays in backend/niash.c: -%patch2 -# Patch8 re-add-SANE_CAP_ALWAYS_SETTABLE.patch re-adds SANE_CAP_ALWAYS_SETTABLE to sane.h which was erroneously removed: -%patch8 -# Patch10 fix-mustek_pp_ccd300.c.patch fixes undefined 'foo = ++foo modulo bar' operations in mustek_pp_ccd300.c: -%patch10 +# Patch1 dell1600n_net-fix-strncat.patch fixes the following build error: +# Statement might be overflowing a buffer in strncat. Common mistake: +# BAD: strncat(buffer,charptr,sizeof(buffer)) is wrong, it takes the left over size as 3rd argument +# GOOD: strncat(buffer,charptr,sizeof(buffer)-strlen(buffer)-1) +# see https://alioth.debian.org/tracker/index.php?func=detail&aid=315198&group_id=30186&atid=410366 +%patch1 # Patch100... is SUSE specific stuff: -# Patch103 install-umax_pp-tool.patch installs tools/umax_pp as /usr/bin/umax_pp: -%patch103 -# Patch104 no-descriptions-external-hpoj.patch removes descriptions-external/hpoj.desc from doc/Makefile.am +# Patch101 no-descriptions-external-hpoj.patch removes descriptions-external/hpoj.desc from doc/Makefile.am # because it is intentionally removed from the sources in the prep section: -%patch104 -# Patch109 adapt_epkowa.desc_for_yast2-scanner.patch adapts epkowa.desc for yast2-scanner +%patch101 +# Patch102 adapt_epkowa.desc_for_yast2-scanner.patch adapts epkowa.desc for yast2-scanner # see https://bugzilla.novell.com/show_bug.cgi?id=788756#c14 -%patch109 -# Patch 110 and 111 implement scanjet 8200 ADF workaround - bnc#840443 -# https://alioth.debian.org/tracker/index.php?func=detail&aid=314108&group_id=30186&atid=410366 -%patch110 -%patch111 -%patch112 -p1 +%patch102 # Source100... is SUSE specific stuff: # Remove hpoj.desc completely to avoid confusion with its successor hpaio.desc # because since openSUSE 10.3 the package hp-officeJet (for hpoj.desc) is dropped. @@ -299,7 +186,7 @@ do sed -i -e '/^:mfg/s/Hewlett Packard/Hewlett-Packard/' $d done # Create our hpaio.desc descriptions-external file # (use it as bash input because sources may be installed without execute permissions): -bash %{SOURCE109} <%{SOURCE110} >doc/descriptions-external/hpaio.desc +bash %{SOURCE110} <%{SOURCE111} >doc/descriptions-external/hpaio.desc # Copy the create_scanner_database script from the sources directory to the build directory # to avoid that the original source becomes modified later in the install section # and ends up in the source RPM, see https://bugzilla.novell.com/show_bug.cgi?id=463464#c11 @@ -307,7 +194,7 @@ cp %{SOURCE200} create_scanner_database chmod u+x create_scanner_database %build -%{?suse_update_config:%{suse_update_config -f}} +%{?suse_update_config:%{suse_update_config -f}} # 'autoreconf -fi' failed for sane-backends-1.0.19 with the message: # "aclocal: acinclude.m4:606: file m4/libtool.m4 does not exist". # The m4 dir from CVS was not included in the 1.0.18 tar, so it was @@ -325,6 +212,10 @@ export LDFLAGS="-L/%_lib $LDFLAGS" # Enable libusb-1.0 support which is available since sane-backends 1.0.20 # and libusb-1_0 is available at least since openSUSE 11.1. # Disable locking because /var/lock/sane/ would be a world-writable directory. +# Disable use of LaTeX to generate documentation because LaTeX blows up the build system +# and "BuildRequires: texlive-latex" causes various cycles and the sane.ps documentation +# is not for users but for developers who could get the "Programmer's Documentation" +# from SANE upstream at http://www.sane-project.org/docs.html ./configure --prefix=/usr \ --exec-prefix=/usr \ --sysconfdir=%{_sysconfdir} \ @@ -336,7 +227,8 @@ export LDFLAGS="-L/%_lib $LDFLAGS" --with-docdir=%{_defaultdocdir}/sane-backends \ --enable-pthread \ --enable-libusb_1_0 \ - --disable-locking + --disable-locking \ + --disable-latex # Enable locking for backends where "99" is the group of the lockfile path (LOCKPATH_GROUP) # because "99" is the group of the user who runs the build when norootforbuild is used # and set localstatedir to have the lock files in /var/lock/sane (see backend/Makefile.in).