From 6e9c41a892ed0e0da326e0278b3221ce3f5713b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Mon, 6 Oct 2014 14:00:40 +0200 Subject: Initial import of sane-backends version 1.0.24-1.2 --- debian/patches/dll_backend_conf.patch | 31 + ...x-FTBFS-format-not-a-string-literal-error.patch | 28 + debian/patches/frontend_libs.patch | 31 + debian/patches/kfreebsd.patch | 15 + debian/patches/kodakaio.patch | 63 + debian/patches/libsane_deps.patch | 27 + debian/patches/man-page-spelling.patch | 218 + debian/patches/multiarch_dll_search_path.patch | 42 + debian/patches/multiarch_manpages_libdir.patch | 16 + debian/patches/nousbtest.patch | 36 + debian/patches/ppc64el.patch | 70 + debian/patches/sane-desc.c_debian_mods.patch | 15673 +++++++++++++++++++ debian/patches/saned.man.patch | 15 + debian/patches/series | 16 + debian/patches/source-spelling.patch | 565 + .../trim-libraries-in-sane-backends.pc.in.patch | 24 + debian/patches/unneeded_doc.patch | 41 + 17 files changed, 16911 insertions(+) create mode 100644 debian/patches/dll_backend_conf.patch create mode 100644 debian/patches/fix-FTBFS-format-not-a-string-literal-error.patch create mode 100644 debian/patches/frontend_libs.patch create mode 100644 debian/patches/kfreebsd.patch create mode 100644 debian/patches/kodakaio.patch create mode 100644 debian/patches/libsane_deps.patch create mode 100644 debian/patches/man-page-spelling.patch create mode 100644 debian/patches/multiarch_dll_search_path.patch create mode 100644 debian/patches/multiarch_manpages_libdir.patch create mode 100644 debian/patches/nousbtest.patch create mode 100644 debian/patches/ppc64el.patch create mode 100644 debian/patches/sane-desc.c_debian_mods.patch create mode 100644 debian/patches/saned.man.patch create mode 100644 debian/patches/series create mode 100644 debian/patches/source-spelling.patch create mode 100644 debian/patches/trim-libraries-in-sane-backends.pc.in.patch create mode 100644 debian/patches/unneeded_doc.patch (limited to 'debian/patches') diff --git a/debian/patches/dll_backend_conf.patch b/debian/patches/dll_backend_conf.patch new file mode 100644 index 0000000..3b8583c --- /dev/null +++ b/debian/patches/dll_backend_conf.patch @@ -0,0 +1,31 @@ +Description: Add a header to dll.conf + Document dll.conf in a header, point to the dll.d directory for external + backends and document the net backend w/ pointers to the manpages. + . + Also remove the pint backend as it's not available on our platforms. +Author: Julien BLACHE + +--- a/backend/dll.conf.in ++++ b/backend/dll.conf.in +@@ -1,4 +1,12 @@ +-# enable the next line if you want to allow access through the network: ++# /etc/sane.d/dll.conf - Configuration file for the SANE dynamic backend loader ++# ++# Backends can also be enabled by configuration snippets under ++# /etc/sane.d/dll.d directory -- packages providing backends should drop ++# a config file similar to dll.conf in this directory, named after the package. ++# ++ ++# The next line enables the network backend; comment it out if you don't need ++# to use a remote SANE scanner over the network - see sane-net(5) and saned(8) + net + abaton + agfafocus +@@ -57,7 +65,6 @@ + niash + #p5 + pie +-pint + pixma + plustek + #plustek_pp diff --git a/debian/patches/fix-FTBFS-format-not-a-string-literal-error.patch b/debian/patches/fix-FTBFS-format-not-a-string-literal-error.patch new file mode 100644 index 0000000..d6d5009 --- /dev/null +++ b/debian/patches/fix-FTBFS-format-not-a-string-literal-error.patch @@ -0,0 +1,28 @@ +From: Markus Koschany +Date: Thu, 27 Jun 2013 12:12:40 +0200 +Subject: fix FTBFS format not a string literal error + +--- + frontend/scanimage.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/frontend/scanimage.c ++++ b/frontend/scanimage.c +@@ -1894,7 +1894,7 @@ + printf (start, int_arg); + break; + case 0: +- printf (start); ++ printf ("%s", start); + break; + } + *percent = cc; +@@ -1908,7 +1908,7 @@ + } + } + if (*start) +- printf (start); ++ printf ("%s", start); + } + } + if (i == 0 && ch != 'f') diff --git a/debian/patches/frontend_libs.patch b/debian/patches/frontend_libs.patch new file mode 100644 index 0000000..8c9c123 --- /dev/null +++ b/debian/patches/frontend_libs.patch @@ -0,0 +1,31 @@ +From: Markus Koschany +Date: Sun, 30 Jun 2013 15:20:24 +0200 +Subject: frontend_libs + +Only link frontends against the libraries they need +Reduce the dependencies on frontends by linking in only the required +libraries. +--- + frontend/Makefile.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/frontend/Makefile.in ++++ b/frontend/Makefile.in +@@ -238,7 +238,7 @@ + LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBOBJS = @LIBOBJS@ +-LIBS = @LIBS@ ++LIBS = + LIBTOOL = @LIBTOOL@ + LIBUSB_1_0_CFLAGS = @LIBUSB_1_0_CFLAGS@ + LIBUSB_1_0_LIBS = @LIBUSB_1_0_LIBS@ +@@ -361,7 +361,7 @@ + + saned_SOURCES = saned.c + saned_LDADD = ../backend/libsane.la ../sanei/libsanei.la ../lib/liblib.la \ +- ../lib/libfelib.la @SYSLOG_LIBS@ @SYSTEMD_LIBS@ ++ ../lib/libfelib.la @SYSLOG_LIBS@ @SYSTEMD_LIBS@ @AVAHI_LIBS@ + + test_SOURCES = test.c + test_LDADD = ../lib/liblib.la ../lib/libfelib.la ../backend/libsane.la diff --git a/debian/patches/kfreebsd.patch b/debian/patches/kfreebsd.patch new file mode 100644 index 0000000..e058877 --- /dev/null +++ b/debian/patches/kfreebsd.patch @@ -0,0 +1,15 @@ +description: Fix build failure on kfreebsd (closes: #680234) +author: Petr Salinger +--- a/backend/umax_pp_low.c ++++ b/backend/umax_pp_low.c +@@ -73,8 +73,10 @@ + #endif + + #ifdef HAVE_MACHINE_CPUFUNC_H ++#ifndef __GLIBC__ + #include + #endif ++#endif + + #ifdef HAVE_I386_SET_IOPERM + #include diff --git a/debian/patches/kodakaio.patch b/debian/patches/kodakaio.patch new file mode 100644 index 0000000..f413a00 --- /dev/null +++ b/debian/patches/kodakaio.patch @@ -0,0 +1,63 @@ +Description: Backport of bug fix for kodakaio driver + The kodakaio driver in 1.0.24 blows up due to a null pointer + dereference when scanning for devices if it doesn't find a + device. This is a backport of the fix from 1.0.25git. +Author: Paul Newall + +--- a/backend/kodakaio.c ++++ b/backend/kodakaio.c +@@ -2184,6 +2184,7 @@ + AvahiLookupResultFlags flags, + AVAHI_GCC_UNUSED void* userdata) { + ++ AvahiStringList *vid_pair_list = NULL, *pid_pair_list = NULL; + char *pidkey, *pidvalue; + char *vidkey, *vidvalue; + size_t valuesize; +@@ -2204,17 +2205,37 @@ + avahi_address_snprint(a, sizeof(a), address); + + /* Output short for Kodak ESP */ +- DBG(min(10,DBG_AUTO), "%s:%u %s ", a,port,host_name); +- avahi_string_list_get_pair(avahi_string_list_find(txt, "vid"), +- &vidkey, &vidvalue, &valuesize); +- DBG(min(10,DBG_AUTO), "%s=%s ", vidkey, vidvalue); +- avahi_string_list_get_pair(avahi_string_list_find(txt, "pid"), +- &pidkey, &pidvalue, &valuesize); +- DBG(min(10,DBG_AUTO), "%s=%s\n", pidkey, pidvalue); ++ DBG(min(10,DBG_AUTO), "%s:%u %s\n", a,port,host_name); + ++ vid_pair_list = avahi_string_list_find(txt, "vid"); ++ if(vid_pair_list != NULL) { ++ avahi_string_list_get_pair(vid_pair_list, &vidkey, &vidvalue, &valuesize); ++ DBG(min(10,DBG_AUTO), "%s=%s ", vidkey, vidvalue); ++ } ++ else DBG(min(10,DBG_AUTO), "failed to find key vid\n"); ++ ++ pid_pair_list = avahi_string_list_find(txt, "pid"); ++ if(pid_pair_list != NULL) { ++ avahi_string_list_get_pair(pid_pair_list, &pidkey, &pidvalue, &valuesize); ++ DBG(min(10,DBG_AUTO), "%s=%s\n", pidkey, pidvalue); ++ } ++ else DBG(min(10,DBG_AUTO), "failed to find key pid\n"); ++ ++ if(pid_pair_list != NULL && vid_pair_list != NULL) { + ProcessAvahiDevice(name, vidvalue, pidvalue, a); +- avahi_free(vidkey); avahi_free(vidvalue); +- avahi_free(pidkey); avahi_free(pidvalue); ++ } ++ else DBG(min(10,DBG_AUTO), "didn't call ProcessAvahiDevice\n"); ++ ++ if(vid_pair_list != NULL) { ++ avahi_free(vidkey); ++ avahi_free(vidvalue); ++ DBG(min(15,DBG_AUTO), "vidkey and vidvalue freed\n"); ++ } ++ if(pid_pair_list != NULL) { ++ avahi_free(pidkey); ++ avahi_free(pidvalue); ++ DBG(min(15,DBG_AUTO), "pidkey and pidvalue freed\n"); ++ } + } + } + diff --git a/debian/patches/libsane_deps.patch b/debian/patches/libsane_deps.patch new file mode 100644 index 0000000..478c9d2 --- /dev/null +++ b/debian/patches/libsane_deps.patch @@ -0,0 +1,27 @@ +From: Markus Koschany +Date: Sun, 30 Jun 2013 18:58:59 +0200 +Subject: libsane_deps + +Reduce libsane.so dependencies to the bare minimum. +Trim dependencies to keep only what's really required by libsane.so +(aka dll backend). +Original patch author: Julien BLACHE +--- + backend/Makefile.in | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +--- a/backend/Makefile.in ++++ b/backend/Makefile.in +@@ -2660,10 +2660,9 @@ + nodist_libsane_la_SOURCES = dll-s.c + libsane_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=dll + libsane_la_LDFLAGS = $(DIST_LIBS_LDFLAGS) +-libsane_la_LIBADD = $(COMMON_LIBS) @PRELOADABLE_BACKENDS_ENABLED@ libdll_preload.la sane_strstatus.lo ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo ../sanei/sanei_config2.lo ../sanei/sanei_usb.lo ../sanei/sanei_scsi.lo ../sanei/sanei_pv8630.lo ../sanei/sanei_pp.lo ../sanei/sanei_thread.lo ../sanei/sanei_lm983x.lo ../sanei/sanei_access.lo ../sanei/sanei_net.lo ../sanei/sanei_wire.lo ../sanei/sanei_codec_bin.lo ../sanei/sanei_pa4s2.lo ../sanei/sanei_ab306.lo ../sanei/sanei_pio.lo ../sanei/sanei_tcp.lo ../sanei/sanei_udp.lo ../sanei/sanei_magic.lo $(DL_LIBS) $(LIBV4L_LIBS) $(MATH_LIB) $(IEEE1284_LIBS) $(TIFF_LIBS) $(JPEG_LIBS) $(GPHOTO2_LIBS) $(SOCKET_LIBS) $(USB_LIBS) $(AVAHI_LIBS) $(SCSI_LIBS) $(PTHREAD_LIBS) $(RESMGR_LIBS) +- ++libsane_la_LIBADD = $(COMMON_LIBS) libdll.la sane_strstatus.lo ../sanei/sanei_init_debug.lo ../sanei/sanei_config.lo ../sanei/sanei_constrain_value.lo $(DL_LIBS) + # WARNING: Automake is getting this wrong so have to do it ourselves. +-libsane_la_DEPENDENCIES = $(COMMON_LIBS) @PRELOADABLE_BACKENDS_ENABLED@ libdll_preload.la sane_strstatus.lo ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo ../sanei/sanei_config2.lo ../sanei/sanei_usb.lo ../sanei/sanei_scsi.lo ../sanei/sanei_pv8630.lo ../sanei/sanei_pp.lo ../sanei/sanei_thread.lo ../sanei/sanei_lm983x.lo ../sanei/sanei_access.lo ../sanei/sanei_net.lo ../sanei/sanei_wire.lo ../sanei/sanei_codec_bin.lo ../sanei/sanei_pa4s2.lo ../sanei/sanei_ab306.lo ../sanei/sanei_pio.lo ../sanei/sanei_tcp.lo ../sanei/sanei_udp.lo ../sanei/sanei_magic.lo @SANEI_SANEI_JPEG_LO@ ++libsane_la_DEPENDENCIES = libdll.la sane_strstatus.lo ../sanei/sanei_init_debug.lo ../sanei/sanei_config.lo + all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am + diff --git a/debian/patches/man-page-spelling.patch b/debian/patches/man-page-spelling.patch new file mode 100644 index 0000000..39c506c --- /dev/null +++ b/debian/patches/man-page-spelling.patch @@ -0,0 +1,218 @@ +Description: + Correction of some spelling/grammatical errors and miscellany in man pages. +Author: Mark Buda + +--- a/doc/sane-cardscan.man ++++ b/doc/sane-cardscan.man +@@ -53,7 +53,7 @@ + .PP + "lines_per_block 16" (or other number from 1 to 32) + .RS +-Controls the number of lines of image data which will be aquired in each pass. ++Controls the number of lines of image data which will be acquired in each pass. + Older scanners will require this number set lower, often 1. + .RE + .PP +--- a/doc/sane-coolscan.man ++++ b/doc/sane-coolscan.man +@@ -39,7 +39,7 @@ + + Some SCSI-adapters and low-level SCSI drivers do not work correctly with this backend and the + Coolscan scanners. These systems hang when the autofocus command is send to the Scanner. +-To see a list of which card/driver combinations work or dont work have a look at: ++To see a list of which card/driver combinations work or don't work have a look at: + http://andreas.rick.free.fr/sane/autofocus.html. + + +--- a/doc/sane-epson.man ++++ b/doc/sane-epson.man +@@ -91,7 +91,7 @@ + + The + .I \-\-dropout +-switch selects the so called dropout color. Vald options are None, ++switch selects the so called dropout color. Valid options are None, + Red, Green and Blue. The default is None. The dropout color is used for + monochrome scanning and selects the color that is not scanned. This can + be used to e.g. scan an original with a colored background. +@@ -269,7 +269,7 @@ + Only a value of 2 is supported. + .TP + .B SANE_EPSON_CMD_LVL +-This allows to override the function or command level that the backend ++This allows one to override the function or command level that the backend + uses to communicate with the scanner. The function level a scanner + supports is determined during the initialization of the device. If + the backend does not recognize the function level reported by the +--- a/doc/sane-epson2.man ++++ b/doc/sane-epson2.man +@@ -137,7 +137,7 @@ + + The + .I \-\-dropout +-switch selects the so called dropout color. Vald options are None, ++switch selects the so called dropout color. Valid options are None, + Red, Green and Blue. The default is None. The dropout color is used for + monochrome scanning and selects the color that is not scanned. This can + be used to e.g. scan an original with a colored background. +@@ -323,7 +323,7 @@ + Smaller levels reduce verbosity. + .TP + .B SANE_EPSON2_CMD_LVL +-This allows to override the function or command level that the backend ++This allows one to override the function or command level that the backend + uses to communicate with the scanner. The function level a scanner + supports is determined during the initialization of the device. If + the backend does not recognize the function level reported by the +--- a/doc/sane-genesys.man ++++ b/doc/sane-genesys.man +@@ -48,7 +48,7 @@ + .SH "CALIBRATION" + To give correct image quality, sheet fed scanners need to be calibrated using the + calibration sheet sold with the scanner. To do calibration, you must insert this target +-in the feeder then start calibration either by passing the --calibrate option to scanimage ++in the feeder then start calibration either by passing the \-\-calibrate option to scanimage + or by clicking on the available 'calibrate' button in the 'advanced options' in a graphical + frontend. The result of the calibration is stored in a file in the home directory of the user doing it. + If you plug the scanner in another machine or use it with another account, calibration +@@ -69,13 +69,13 @@ + + .B \-\-brightness value + .RS +- -100..100 (in steps of 1). Set the brightness enhancement. 0 for no enhancement, negative ++ \-100..100 (in steps of 1). Set the brightness enhancement. 0 for no enhancement, negative + values to decrease brigthness, and positive values to increase it. + .RE + + .B \-\-contrast value + .RS +- -100..100 (in steps of 1). Set the contrast enhancement. 0 for no enhancement, negative ++ \-100..100 (in steps of 1). Set the contrast enhancement. 0 for no enhancement, negative + values to decrease contrast, and positive values to increase it. + .RE + +@@ -295,7 +295,7 @@ + Powersaving isn't implemented for gl646 based scanner. Dynamic (emulated from gray data and with dithering) isn't enabled for gl646 scanners. Hardware lineart is limited up to 600 dpi for gl847 based scanners, due to the way image sensors are built. + .br + .TP +-This backend will be much slower if not using libusb-1.0. So be sure that sane-backends is built with the --enable-libusb_1_0 option. ++This backend will be much slower if not using libusb\-1.0. So be sure that sane\-backends is built with the \-\-enable-libusb_1_0 option. + .br + + .SH "BUGS" +--- a/doc/sane-gt68xx.man ++++ b/doc/sane-gt68xx.man +@@ -117,7 +117,7 @@ + .PP + The + .B afe +-option allows to set custom offset and gain values for the Analog FrontEnd of ++option allows one to set custom offset and gain values for the Analog FrontEnd of + the scanner. This option can be either used to select the AFE values if + automatic coarse calibration is disabled, or to make automatic coarse + calibration faster. For the latter usage, enable debug level 3 (see below), +--- a/doc/sane-pixma.man ++++ b/doc/sane-pixma.man +@@ -136,7 +136,7 @@ + \#.B experimental + options for button handling, i.e. the options might change in the future. + .br +-The button status can be polled i.e. with 'scanimage -A'. ++The button status can be polled i.e. with 'scanimage \-A'. + .br + Button scan is disabled on MAC OS X due to darwin libusb not handling + timeouts in usb interrupt reads. +--- a/doc/sane-scsi.man ++++ b/doc/sane-scsi.man +@@ -28,7 +28,7 @@ + for HP scanners, etc.). + .PP + For some operating systems (e.g. Linux and OS/2), there is an alternate way of +-specifying scanner devices. This alternate way allows to identify scanners by ++specifying scanner devices. This alternate way allows one to identify scanners by + the SCSI vendor and model string and/or by the SCSI device address (consisting + of bus number, channel number, id, and logical unit number). The syntax for + specifying a scanner in this way is: +--- a/doc/sane-test.man ++++ b/doc/sane-test.man +@@ -40,7 +40,7 @@ + .B hand\-scanner + results in the test-backend behaving like a hand-scanner. Hand-scanners do + not know the image height a priori. Instead, they return a height of \-1. +-Setting this option allows to test whether a frontend can handle this ++Setting this option allows one to test whether a frontend can handle this + correctly. This option also enables a fixed width of 11 cm. + .PP + Setting option +@@ -68,7 +68,7 @@ + .SH SPECIAL OPTIONS + Option + .B test\-picture +-allows to set the image that's returned to the frontend. While "Solid white" ++allows one to set the image that's returned to the frontend. While "Solid white" + and "Solid black" are quite obvious, the other options need some more + explanation. Color patterns are used to determine if all modes and their + colors are represented correctly by the frontend. The grid should look like the +@@ -76,10 +76,10 @@ + found at: http://www.meier\-geinitz.de/sane/test\-backend/test\-pictures.html. + .PP + If option +-.B invert\-endianess ++.B invert\-endianness + is set, the upper and lower bytes of image data in 16 bit modes are exchanged. + This option can be used to test the 16 bit modes of frontends, e.g. if the +-frontend uses the correct endianess. ++frontend uses the correct endianness. + .PP + If option + .B read\-limit +--- a/doc/sane.man ++++ b/doc/sane.man +@@ -429,7 +429,7 @@ + .TP + .B plustek + The SANE plustek backend supports USB flatbed scanners that use the National +-Semiconductor LM983[1/2/3]-chipset aka Merlin. Scanners using this LM983x chips ++Semiconductor LM983[1/2/3] chipset aka Merlin. Scanners using this LM983x chips + include some models from Plustek, KYE/Genius, Hewlett-Packard, Mustek, Umax, + Epson, and Canon. See + .BR sane\-plustek (5) +--- a/doc/sane-kodakaio.man ++++ b/doc/sane-kodakaio.man +@@ -1,4 +1,4 @@ +-.TH sane\-kodakaio 2.4 "17 Jun 2012" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy" ++.TH sane\-kodakaio 5 "17 Jun 2012" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy" + .IX sane\-kodakaio + + .SH NAME +--- a/doc/sane-umax_pp.man ++++ b/doc/sane-umax_pp.man +@@ -58,7 +58,7 @@ + run the backend through the network interface (See saned(8) and sane\-net(5)). + A more relaxed solution (security wise) is to add suid bit to the frontend + (See chmod(1)). +-The backend drop root priviledges as soon as it can, right after gaining direct ++The backend drop root privileges as soon as it can, right after gaining direct + access to IO ports, which lessen risks when being root. + + .SH "DEVICE NAMES" +@@ -100,7 +100,7 @@ + OS/2 + .PP + .RE +-\fBNOTE:\fR in all cases, you must have sufficient priviledges ++\fBNOTE:\fR in all cases, you must have sufficient privileges + to get access to the chosen device or address. Depending on the + security settings, devices may not be available for all users. + You have to change permissions on the dev/ppi* or /dev/parport* devices. +--- a/doc/sane-usb.man ++++ b/doc/sane-usb.man +@@ -90,7 +90,7 @@ + and the individual backend manpages. + .PP + Most backends can detect USB scanners automatically using "usb" configuration +-file lines. This method allows to identify scanners by the USB vendor and ++file lines. This method allows one to identify scanners by the USB vendor and + product numbers. The syntax for specifying a scanner this way is: + .PP + .RS diff --git a/debian/patches/multiarch_dll_search_path.patch b/debian/patches/multiarch_dll_search_path.patch new file mode 100644 index 0000000..703a408 --- /dev/null +++ b/debian/patches/multiarch_dll_search_path.patch @@ -0,0 +1,42 @@ +Description: Keep /usr/lib/sane as a fallback for SANE backends + Make /usr/lib/arch_triplet/sane the default location for SANE backends, + but keep /usr/lib/sane as a fallback for now. +Author: Julien BLACHE + +--- a/backend/dll.c ++++ b/backend/dll.c +@@ -430,7 +430,7 @@ + + if (path) + { +- src_len = strlen (path) + strlen (STRINGIFY (LIBDIR)) + 1 + 1; ++ src_len = strlen (path) + strlen (DEB_DLL_LIBDIR) + 1 + 1; + src = malloc (src_len); + if (!src) + { +@@ -438,12 +438,11 @@ + return SANE_STATUS_NO_MEM; + } + orig_src = src; +- snprintf (src, src_len, "%s:%s", path, STRINGIFY (LIBDIR)); ++ snprintf (src, src_len, "%s:%s", path, DEB_DLL_LIBDIR); + } + else + { +- src = STRINGIFY (LIBDIR); +- src = strdup (src); ++ src = strdup (DEB_DLL_LIBDIR); + if (!src) + { + DBG (1, "load: strdup failed: %s\n", strerror (errno)); +--- a/backend/Makefile.in ++++ b/backend/Makefile.in +@@ -1868,7 +1868,7 @@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include -DLIBDIR="$(libdir)/sane" ++AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include -DLIBDIR="$(libdir)/sane" -DDEB_DLL_LIBDIR="\"$(libdir)/sane:$(prefix)/lib/sane\"" + AM_LDFLAGS = @STRICT_LDFLAGS@ + # The -rpath option is added because we are creating _LTLIBRARIES based + # on configure substitution. This causes automake to not know the diff --git a/debian/patches/multiarch_manpages_libdir.patch b/debian/patches/multiarch_manpages_libdir.patch new file mode 100644 index 0000000..cd40126 --- /dev/null +++ b/debian/patches/multiarch_manpages_libdir.patch @@ -0,0 +1,16 @@ +Description: Use a generic multiarch path in man pages + Backend location in the man pages is substituted from LIBDIR; use + a generic /usr/lib/arch_triplet/sane path instead. +Author: Julien BLACHE + +--- a/doc/Makefile.in ++++ b/doc/Makefile.in +@@ -901,7 +901,7 @@ + @sed -e 's|@DATADIR@|$(datadir)|g' \ + -e 's|@CONFIGDIR@|$(configdir)|g' \ + -e 's|@DOCDIR@|$(docdir)|g' \ +- -e 's|@LIBDIR@|$(libdir)/sane|g' \ ++ -e 's|@LIBDIR@|/usr/lib/arch_triplet/sane|g' \ + -e 's|@BINDIR@|$(bindir)|g' \ + -e 's|@SBINDIR@|$(sbindir)|g' \ + -e 's|@PACKAGEVERSION@|$(package_version)|g' $^ >$@ diff --git a/debian/patches/nousbtest.patch b/debian/patches/nousbtest.patch new file mode 100644 index 0000000..bf7deec --- /dev/null +++ b/debian/patches/nousbtest.patch @@ -0,0 +1,36 @@ +Description: + Don't build the USB tests because they will fail on the autobuilders. +Author: Mark Buda + +--- a/testsuite/sanei/Makefile.am ++++ b/testsuite/sanei/Makefile.am +@@ -15,7 +15,7 @@ + PTHREAD_LIBS = @PTHREAD_LIBS@ + TEST_LDADD = ../../sanei/libsanei.la ../../lib/liblib.la ../../lib/libfelib.la $(MATH_LIB) $(USB_LIBS) $(PTHREAD_LIBS) + +-check_PROGRAMS = sanei_usb_test test_wire sanei_check_test sanei_config_test sanei_constrain_test ++check_PROGRAMS = test_wire sanei_check_test sanei_config_test sanei_constrain_test + TESTS = $(check_PROGRAMS) + + AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include +@@ -30,9 +30,6 @@ + sanei_check_test_SOURCES = sanei_check_test.c + sanei_check_test_LDADD = $(TEST_LDADD) + +-sanei_usb_test_SOURCES = sanei_usb_test.c +-sanei_usb_test_LDADD = $(TEST_LDADD) +- + test_wire_SOURCES = test_wire.c + test_wire_LDADD = $(TEST_LDADD) + +--- a/testsuite/sanei/Makefile.in ++++ b/testsuite/sanei/Makefile.in +@@ -77,7 +77,7 @@ + POST_UNINSTALL = : + build_triplet = @build@ + host_triplet = @host@ +-check_PROGRAMS = sanei_usb_test$(EXEEXT) test_wire$(EXEEXT) \ ++check_PROGRAMS = test_wire$(EXEEXT) \ + sanei_check_test$(EXEEXT) sanei_config_test$(EXEEXT) \ + sanei_constrain_test$(EXEEXT) + subdir = testsuite/sanei diff --git a/debian/patches/ppc64el.patch b/debian/patches/ppc64el.patch new file mode 100644 index 0000000..e14ad9d --- /dev/null +++ b/debian/patches/ppc64el.patch @@ -0,0 +1,70 @@ +--- a/configure ++++ b/configure +@@ -12929,7 +12929,7 @@ + rm -rf conftest* + ;; + +-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ ++x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ + s390*-*linux*|s390*-*tpf*|sparc*-*linux*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext +@@ -12947,7 +12947,10 @@ + x86_64-*linux*) + LD="${LD-ld} -m elf_i386" + ;; +- ppc64-*linux*|powerpc64-*linux*) ++ powerpc64le-*) ++ LD="${LD-ld} -m elf32lppclinux" ++ ;; ++ powerpc64-*) + LD="${LD-ld} -m elf32ppclinux" + ;; + s390x-*linux*) +@@ -12966,7 +12969,10 @@ + x86_64-*linux*) + LD="${LD-ld} -m elf_x86_64" + ;; +- ppc*-*linux*|powerpc*-*linux*) ++ powerpcle-*) ++ LD="${LD-ld} -m elf64lppc" ++ ;; ++ powerpc-*) + LD="${LD-ld} -m elf64ppc" + ;; + s390*-*linux*|s390*-*tpf*) +--- a/m4/libtool.m4 ++++ b/m4/libtool.m4 +@@ -1312,7 +1312,7 @@ + rm -rf conftest* + ;; + +-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ ++x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ + s390*-*linux*|s390*-*tpf*|sparc*-*linux*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext +@@ -1326,7 +1326,10 @@ + x86_64-*linux*) + LD="${LD-ld} -m elf_i386" + ;; +- ppc64-*linux*|powerpc64-*linux*) ++ powerpc64le-*) ++ LD="${LD-ld} -m elf32lppclinux" ++ ;; ++ powerpc64-*) + LD="${LD-ld} -m elf32ppclinux" + ;; + s390x-*linux*) +@@ -1345,7 +1348,10 @@ + x86_64-*linux*) + LD="${LD-ld} -m elf_x86_64" + ;; +- ppc*-*linux*|powerpc*-*linux*) ++ powerpcle-*) ++ LD="${LD-ld} -m elf64lppc" ++ ;; ++ powerpc-*) + LD="${LD-ld} -m elf64ppc" + ;; + s390*-*linux*|s390*-*tpf*) diff --git a/debian/patches/sane-desc.c_debian_mods.patch b/debian/patches/sane-desc.c_debian_mods.patch new file mode 100644 index 0000000..27520ce --- /dev/null +++ b/debian/patches/sane-desc.c_debian_mods.patch @@ -0,0 +1,15673 @@ +Description: Tweak sane-desc to suit our needs + Do not link to HTML manpages, we do not have them installed. Also, + do not use sane.png, as it's not distributed in the source tarball. + Do not output a timestamp as part of the udev rules file header, as + this breaks multiarch. +Author: Julien BLACHE + +Index: sane-backends-1.0.24/tools/sane-desc.c +=================================================================== +--- sane-backends-1.0.24.orig/tools/sane-desc.c 2013-08-25 17:23:27.000000000 -0400 ++++ sane-backends-1.0.24/tools/sane-desc.c 2013-10-05 16:10:52.703408806 -0400 +@@ -47,7 +47,7 @@ + + #define SANE_DESC_VERSION "3.5" + +-#define MAN_PAGE_LINK "http://www.sane-project.org/man/%s.5.html" ++#define MAN_PAGE_LINK "/usr/share/doc/libsane/html/%s.5.html" + #define COLOR_MINIMAL "\"#B00000\"" + #define COLOR_BASIC "\"#FF9000\"" + #define COLOR_GOOD "\"#90B000\"" +@@ -2523,8 +2523,8 @@ + printf ("
\n"); + } + if (be->manpage) +- printf ("Manual page: %s
\n", be->manpage, be->manpage); ++ printf ("Manual page:" ++ "%s
\n", be->manpage); + + if (be->comment) + printf ("Comment: %s
\n", be->comment); +@@ -2758,9 +2758,9 @@ + + printf ("\n"); + if (model_record->be->manpage) +- printf ("%s\n", +- model_record->be->manpage, model_record->be->manpage); ++ printf ("" ++ "%s\n", ++ model_record->be->manpage); + else + printf ("?\n"); + +@@ -2785,8 +2785,8 @@ + printf + ("\n" + "\n" +- "
\n" +- "\"SANE\"\n"); ++ "
\n"); ++ /* "\"SANE\"\n"); */ + printf ("

%s

\n", title); + printf ("
\n" "
\n"); + printf ("%s\n", intro); +@@ -3463,8 +3463,8 @@ + { + time_t current_time = time (0); + printf ("# This file was automatically created based on description files (*.desc)\n" +- "# by sane-desc %s from %s on %s", +- SANE_DESC_VERSION, PACKAGE_STRING, asctime (localtime (¤t_time))); ++ "# by sane-desc %s from %s\n", ++ SANE_DESC_VERSION, PACKAGE_STRING); + + printf + ("#\n" +Index: sane-backends-1.0.24/testsuite/tools/data/html-backends-split.ref +=================================================================== +--- sane-backends-1.0.24.orig/testsuite/tools/data/html-backends-split.ref 2013-08-25 17:23:27.000000000 -0400 ++++ sane-backends-1.0.24/testsuite/tools/data/html-backends-split.ref 2013-10-05 16:11:28.143407759 -0400 +@@ -5,7 +5,6 @@ + + +
+-SANE +

SANE: Backends (Drivers)

+
+
+@@ -165,7 +164,7 @@ + (unmaintained) + +

+-Manual page: sane-abaton
++Manual page:sane-abaton
+

+ + +@@ -197,7 +196,7 @@ + (unmaintained) + +

+-Manual page: sane-agfafocus
++Manual page:sane-agfafocus
+

+
+ +@@ -259,7 +258,7 @@ + (unmaintained) + +

+-Manual page: sane-apple
++Manual page:sane-apple
+

+
+ +@@ -300,7 +299,7 @@ +

+ Link(s): + http://www4.infi.net/~cpinkham/sane/sane-artec-doc.html
+-Manual page: sane-artec
++Manual page:sane-artec
+

+
+ +@@ -378,7 +377,7 @@ + (unmaintained) + +

+-Manual page: sane-artec_eplus48u
++Manual page:sane-artec_eplus48u
+

+
+ +@@ -494,7 +493,7 @@ +

+ Link(s): + http://as6edriver.sourceforge.net/
+-Manual page: sane-as6e
++Manual page:sane-as6e
+

+
+ +@@ -539,7 +538,7 @@ +

+ Link(s): + http://skull.piratehaven.org/~mike/sane/avision.html
+-Manual page: sane-avision
++Manual page:sane-avision
+

+
+ +@@ -1619,7 +1618,7 @@ +

+ Link(s): + http://www.martoneconsulting.com/sane-bh.html
+-Manual page: sane-bh
++Manual page:sane-bh
+ Comment: Supports Copiscan II scanners with Remote SCSI Controller (RSC) interface
+

+
+@@ -1682,7 +1681,7 @@ +

+ Link(s): + http://www.rzg.mpg.de/~mpd/sane/
+-Manual page: sane-canon
++Manual page:sane-canon
+

+
+ +@@ -1760,7 +1759,7 @@ +

+ Link(s): + http://canon-fb630u.sourceforge.net/
+-Manual page: sane-canon630u
++Manual page:sane-canon630u
+

+
+ +@@ -1794,7 +1793,7 @@ +

+ Link(s): + http://www.thebility.com/canon/
+-Manual page: sane-canon_dr
++Manual page:sane-canon_dr
+ Comment: Backend updated for SANE release 1.0.23, see sane-canon_dr manpage
+

+
+@@ -2095,7 +2094,7 @@ +

+ Link(s): + http://canon-fb330p.sourceforge.net
+-Manual page: sane-canon_pp
++Manual page:sane-canon_pp
+

+
+ +@@ -2178,7 +2177,7 @@ +

+ Link(s): + http://www.thebility.com/cardscan/
+-Manual page: sane-cardscan
++Manual page:sane-cardscan
+ Comment: Backend updated for SANE release 1.0.21, see sane-cardscan manpage
+

+
+@@ -2213,7 +2212,7 @@ +

+ Link(s): + http://andreas.rick.free.fr/sane/
+-Manual page: sane-coolscan
++Manual page:sane-coolscan
+

+
+ +@@ -2261,7 +2260,7 @@ +

+ Link(s): + http://coolscan2.sourceforge.net/
+-Manual page: sane-coolscan2
++Manual page:sane-coolscan2
+

+
+ +@@ -2335,7 +2334,7 @@ + (1.0.0) + +

+-Manual page: sane-coolscan3
++Manual page:sane-coolscan3
+

+
+ +@@ -2448,7 +2447,7 @@ +

+ Link(s): + http://www.thebility.com/epjitsu/
+-Manual page: sane-epjitsu
++Manual page:sane-epjitsu
+ Comment: Backend updated for SANE release 1.0.21, see sane-epjitsu manpage
+

+
+@@ -2504,7 +2503,7 @@ +

+ Link(s): + http://www.khk.net/sane
+-Manual page: sane-epson
++Manual page:sane-epson
+

+
+ +@@ -2984,7 +2983,7 @@ + (1.0.124) + +

+-Manual page: sane-epson2
++Manual page:sane-epson2
+

+
+ +@@ -5398,7 +5397,7 @@ +

+ Link(s): + http://www.thebility.com/fujitsu/
+-Manual page: sane-fujitsu
++Manual page:sane-fujitsu
+ Comment: Backend updated for SANE release 1.0.23, see sane-fujitsu manpage
+

+
+@@ -5923,7 +5922,7 @@ +

+ Link(s): + http://www.meier-geinitz.de/sane/genesys-backend/
+-Manual page: sane-genesys
++Manual page:sane-genesys
+ Comment: Only the USB scanners mentioned below are currently supported.
+

+
+@@ -6242,7 +6241,7 @@ +

+ Link(s): + http://www.meier-geinitz.de/sane/gt68xx-backend/
+-Manual page: sane-gt68xx
++Manual page:sane-gt68xx
+ Comment: Only the USB scanners mentioned below are supported. For other Mustek BearPaws, look at the Plustek and the MA-1509 backend.
+

+
+@@ -6774,7 +6773,7 @@ +

+ Link(s): + http://www.kirchgessner.net/
+-Manual page: sane-hp
++Manual page:sane-hp
+

+
+ +@@ -6927,7 +6926,7 @@ +

+ Link(s): + http://projects.troy.rollo.name/rt-scanners/
+-Manual page: sane-hp3500
++Manual page:sane-hp3500
+ Comment: HP3500 series scanners.
+

+
+@@ -6969,7 +6968,7 @@ +

+ Link(s): + http://sourceforge.net/projects/hp3900-series/
+-Manual page: sane-hp3900
++Manual page:sane-hp3900
+ Comment: Still Beta
+

+
+@@ -7057,7 +7056,7 @@ +

+ Link(s): + http://hp4200-backend.sourceforge.net
+-Manual page: sane-hp4200
++Manual page:sane-hp4200
+

+
+ +@@ -7098,7 +7097,7 @@ +

+ Link(s): + http://sourceforge.net/projects/hp5400backend
+-Manual page: sane-hp5400
++Manual page:sane-hp5400
+ Comment: HP5400 and HP5470 scanners. Prototype backend available
+

+
+@@ -7138,7 +7137,7 @@ + (1.0.5) + +

+-Manual page: sane-hp5590
++Manual page:sane-hp5590
+

+
+ +@@ -7198,7 +7197,7 @@ + (0) + +

+-Manual page: sane-hpljm1005
++Manual page:sane-hpljm1005
+

+
+ +@@ -7239,7 +7238,7 @@ +

+ Link(s): + http://hpsj5s.sourceforge.net/
+-Manual page: sane-hpsj5s
++Manual page:sane-hpsj5s
+

+
+ +@@ -7266,7 +7265,7 @@ +

+ Link(s): + http://www.acjlaw.net:8080/~jeremy/Ricoh/
+-Manual page: sane-hs2p
++Manual page:sane-hs2p
+ Comment: This backend has been tested with the IS450DE (Duplex/Endorser). All major functions necessary for scanning are supported. This backend should work with all Ricoh scanners in the IS450 family as well as the IS420 series, but the IS420 has not yet been tested. Features provided by the optional Image Processing Unit (IPU) are not yet integrated into the backend, as my scanner lacks the IPU.
+

+
+@@ -7315,7 +7314,7 @@ +

+ Link(s): + http://www.meier-geinitz.de/sane/ibm-backend/
+-Manual page: sane-ibm
++Manual page:sane-ibm
+ Comment: This backend has had only limited testing. It needs more work especially for the Ricoh scanners. Patches are welcome.
+

+
+@@ -7366,7 +7365,7 @@ +

+ Link(s): + http://www.thebility.com/kodak/
+-Manual page: sane-kodak
++Manual page:sane-kodak
+ Comment: New backend for SANE release 1.0.21, see sane-kodak manpage
+

+
+@@ -7618,7 +7617,7 @@ +

+ Link(s): + http://sourceforge.net/projects/cupsdriverkodak/
+-Manual page: sane-kodakaio
++Manual page:sane-kodakaio
+ Comment: Backend for Kodak AiO ESP and Hero printers. Also possibly Advent AWL10
+

+
+@@ -7821,7 +7820,7 @@ + (unmaintained) + +

+-Manual page: sane-kvs20xx
++Manual page:sane-kvs20xx
+ Comment: New backend for SANE release 1.0.22, see sane-kvs20xx manpage
+

+
+@@ -7882,7 +7881,7 @@ + (unmaintained) + +

+-Manual page: sane-kvs40xx
++Manual page:sane-kvs40xx
+ Comment: New backend for SANE release 1.0.23, see sane-kvs40xx manpage
+

+
+@@ -7922,7 +7921,7 @@ + (unmaintained) + +

+-Manual page: sane-kvs1025
++Manual page:sane-kvs1025
+ Comment: New backend for SANE release 1.0.21, see sane-kvs1025 manpage
+

+
+@@ -7964,7 +7963,7 @@ +

+ Link(s): + http://www.zago.net/sane/#leo
+-Manual page: sane-leo
++Manual page:sane-leo
+

+
+ +@@ -8009,7 +8008,7 @@ +

+ Link(s): + http://stef.dev.free.fr/sane/lexmark
+-Manual page: sane-lexmark
++Manual page:sane-lexmark
+ Comment: This backend supports lexmark x1100 series scanners.
+

+
+@@ -8109,7 +8108,7 @@ +

+ Link(s): + http://www.meier-geinitz.de/sane/ma1509-backend/
+-Manual page: sane-ma1509
++Manual page:sane-ma1509
+

+
+ +@@ -8145,7 +8144,7 @@ +

+ Link(s): + http://wiki.kainhofer.com/hardware/magicolor_scan
+-Manual page: sane-magicolor
++Manual page:sane-magicolor
+

+
+ +@@ -8186,7 +8185,7 @@ +

+ Link(s): + http://www.zago.net/sane
+-Manual page: sane-matsushita
++Manual page:sane-matsushita
+

+
+ +@@ -8283,7 +8282,7 @@ +

+ Link(s): + http://www.mir.com/mtek/
+-Manual page: sane-microtek
++Manual page:sane-microtek
+

+
+ +@@ -8463,7 +8462,7 @@ +

+ Link(s): + http://karstenfestag.gmxhome.de/linux.html
+-Manual page: sane-microtek2
++Manual page:sane-microtek2
+

+
+ +@@ -8713,7 +8712,7 @@ +

+ Link(s): + http://www.meier-geinitz.de/sane/mustek-backend/
+-Manual page: sane-mustek
++Manual page:sane-mustek
+ Comment: Most Mustek SCSI scanners are supported by this backend. For USB scanners, look at the mustek_usb backend.
+

+
+@@ -8962,7 +8961,7 @@ +

+ Link(s): + http://penguin-breeder.org/sane/mustek_pp/
+-Manual page: sane-mustek_pp
++Manual page:sane-mustek_pp
+ Comment: Supports CIS and CCD type parallel port scanners from Mustek.
+

+
+@@ -9160,7 +9159,7 @@ +

+ Link(s): + http://www.meier-geinitz.de/sane/mustek_usb-backend/
+-Manual page: sane-mustek_usb
++Manual page:sane-mustek_usb
+ Comment: Only the USB scanners mentioned below are supported. For BearPaws, look at the Plustek, MA-1509, and gt68xx backends.
+

+
+@@ -9218,7 +9217,7 @@ +

+ Link(s): + http://www.meier-geinitz.de/sane/mustek_usb2-backend/
+-Manual page: sane-mustek_usb2
++Manual page:sane-mustek_usb2
+ Comment: Only BearPaw 2448TA Pro is supported at the moment
+

+
+@@ -9246,7 +9245,7 @@ +

+ Link(s): + http://www5a.biglobe.ne.jp/~saetaka/
+-Manual page: sane-nec
++Manual page:sane-nec
+

+
+ +@@ -9273,7 +9272,7 @@ +

+ Link(s): + http://sourceforge.net/projects/hp3300backend
+-Manual page: sane-niash
++Manual page:sane-niash
+

+
+ +@@ -9339,7 +9338,7 @@ +

+ Link(s): + http://www.sane-project.org/
+-Manual page: sane-p5
++Manual page:sane-p5
+ Comment: New backend for SANE release 1.0.21, see sane-p5 manpage
+

+
+@@ -9367,7 +9366,7 @@ +

+ Link(s): + http://www.munton.demon.co.uk/sane
+-Manual page: sane-pie
++Manual page:sane-pie
+

+
+ +@@ -9510,7 +9509,7 @@ +

+ Link(s): + http://home.arcor.de/wittawat/pixma/, http://mp610.blogspot.com/
+-Manual page: sane-pixma
++Manual page:sane-pixma
+

+
+ +@@ -10496,7 +10495,7 @@ +

+ Link(s): + http://www.gjaeger.de/scanner/plustek/
+-Manual page: sane-plustek
++Manual page:sane-plustek
+

+
+ +@@ -10818,7 +10817,7 @@ +

+ Link(s): + http://www.gjaeger.de/scanner/plustek_pp/
+-Manual page: sane-plustek_pp
++Manual page:sane-plustek_pp
+

+
+ +@@ -11026,7 +11025,7 @@ + (unmaintained) + +

+-Manual page: sane-ricoh
++Manual page:sane-ricoh
+

+
+ +@@ -11060,7 +11059,7 @@ +

+ Link(s): + http://stef.dev.free.fr/sane/rts8891/index.html
+-Manual page: sane-rts8891
++Manual page:sane-rts8891
+ Comment: This backend supports Realtek RTS8891 ASIC bases scanners.
+

+
+@@ -11109,7 +11108,7 @@ + (unmaintained) + +

+-Manual page: sane-s9036
++Manual page:sane-s9036
+

+
+ +@@ -11136,7 +11135,7 @@ +

+ Link(s): + http://www.zago.net/sane/
+-Manual page: sane-sceptre
++Manual page:sane-sceptre
+

+
+ +@@ -11172,7 +11171,7 @@ +

+ Link(s): + http://www.satzbau-gmbh.de/staff/abel/sane-sharp.html
+-Manual page: sane-sharp
++Manual page:sane-sharp
+

+
+ +@@ -11234,7 +11233,7 @@ +

+ Link(s): + http://sm3600.sourceforge.net/
+-Manual page: sane-sm3600
++Manual page:sane-sm3600
+

+
+ +@@ -11296,7 +11295,7 @@ +

+ Link(s): + http://www.ziplabel.com/sm3840/
+-Manual page: sane-sm3840
++Manual page:sane-sm3840
+ Comment: This reverse-engineered backend supports the USB ScanMaker 3840 model
+

+
+@@ -11331,7 +11330,7 @@ +

+ Link(s): + http://snapscan.sourceforge.net/
+-Manual page: sane-snapscan
++Manual page:sane-snapscan
+ Comment: Supported bit depths: 24 bit (color), 48 bit (color, Epson) 8 bit (gray)
+

+
+@@ -11757,7 +11756,7 @@ + (unmaintained) + +

+-Manual page: sane-sp15c
++Manual page:sane-sp15c
+

+
+ +@@ -11791,7 +11790,7 @@ +

+ Link(s): + http://www.informatik.uni-oldenburg.de/~ingo/sane/
+-Manual page: sane-st400
++Manual page:sane-st400
+

+
+ +@@ -11823,7 +11822,7 @@ + (unmaintained) + +

+-Manual page: sane-tamarack
++Manual page:sane-tamarack
+

+
+ +@@ -11864,7 +11863,7 @@ +

+ Link(s): + http://www.zago.net/sane/#teco
+-Manual page: sane-teco1
++Manual page:sane-teco1
+

+
+ +@@ -12021,7 +12020,7 @@ +

+ Link(s): + http://gkall.hobby.nl/teco2.html
+-Manual page: sane-teco2
++Manual page:sane-teco2
+

+
+ +@@ -12122,7 +12121,7 @@ +

+ Link(s): + http://www.zago.net/sane/#teco3
+-Manual page: sane-teco3
++Manual page:sane-teco3
+

+
+ +@@ -12190,7 +12189,7 @@ +

+ Link(s): + http://www.gjaeger.de/scanner/u12/
+-Manual page: sane-u12
++Manual page:sane-u12
+

+
+ +@@ -12256,7 +12255,7 @@ +

+ Link(s): + http://www.rauch-domain.de/sane-umax/index.html
+-Manual page: sane-umax
++Manual page:sane-umax
+

+
+ +@@ -12749,7 +12748,7 @@ +

+ Link(s): + http://sourceforge.net/projects/umax1220u-sane
+-Manual page: sane-umax1220u
++Manual page:sane-umax1220u
+

+
+ +@@ -12797,7 +12796,7 @@ +

+ Link(s): + http://umax1220p.sourceforge.net/
+-Manual page: sane-umax_pp
++Manual page:sane-umax_pp
+

+
+ +@@ -15632,7 +15631,7 @@ + (1.0-13) + +

+-Manual page: sane-xerox_mfp
++Manual page:sane-xerox_mfp
+

+
+ +@@ -16131,7 +16130,7 @@ +

+ Link(s): + mailto:peter@fales-lorenz.net
+-Manual page: sane-dc25
++Manual page:sane-dc25
+

+
+ +@@ -16165,7 +16164,7 @@ +

+ Link(s): + mailto:peter@fales-lorenz.net
+-Manual page: sane-dc210
++Manual page:sane-dc210
+

+
+ +@@ -16192,7 +16191,7 @@ +

+ Link(s): + mailto:peter@fales-lorenz.net
+-Manual page: sane-dc240
++Manual page:sane-dc240
+

+
+ +@@ -16217,7 +16216,7 @@ + (unmaintained) + +

+-Manual page: sane-dmc
++Manual page:sane-dmc
+

+
+ +@@ -16247,7 +16246,7 @@ + (unmaintained) + +

+-Manual page: sane-qcam
++Manual page:sane-qcam
+

+
+ +@@ -16281,7 +16280,7 @@ +

+ Link(s): + http://gkall.hobby.nl/stv680-aiptek.html
+-Manual page: sane-stv680
++Manual page:sane-stv680
+ Comment: This vidcam backend is for the stv0680 chipset, See the website for more info.
+

+
+@@ -16379,7 +16378,7 @@ +

+ Link(s): + mailto:peter@fales-lorenz.net
+-Manual page: sane-gphoto2
++Manual page:sane-gphoto2
+ Description: Multiple cameras supported by the gphoto2 libraries
+ Comment: The long-term plan is to support all the cameras supported by the gphoto2 libraries (currently over 140 models). However, at this stage, only a handful of cameras are definitely known to work with SANE. Other cameras will probably work if the native file format is EXIF or JPEG. Testers welcome!
+

+@@ -16387,7 +16386,7 @@ + (unmaintained) + +

+-Manual page: sane-pint
++Manual page:sane-pint
+ Description: Scanners with the machine-independent PINT interface
+ Comment: Haven't been tested for a long time. Handle with care.
+

+@@ -16397,7 +16396,7 @@ +

+ Link(s): + mailto:henning@meier-geinitz.de
+-Manual page: sane-pnm
++Manual page:sane-pnm
+ Description: Reads PNM files
+ Comment: Used for debugging frontends. Obsolete, use test backend instead.
+

+@@ -16407,7 +16406,7 @@ +

+ Link(s): + http://www.meier-geinitz.de/sane/test-backend/
+-Manual page: sane-test
++Manual page:sane-test
+ Description: Frontend-tester
+ Comment: Backend for testing frontends. Also serves as example for SANE backend options.
+

+@@ -16417,7 +16416,7 @@ +

+ Link(s): + mailto:henning@meier-geinitz.de
+-Manual page: sane-v4l
++Manual page:sane-v4l
+ Description: Interface to Video For Linux API
+ Comment: Supports video cameras and other devices accessed by the v4l kernel API, e.g. bttv devices. Quite a lot of known bugs.
+

+@@ -16431,7 +16430,7 @@ +

+ Link(s): + mailto:henning@meier-geinitz.de
+-Manual page: sane-dll
++Manual page:sane-dll
+ Description: Dynamic loading of shared-library backends.
+

+

Backend: net +@@ -16440,7 +16439,7 @@ +

+ Link(s): + http://www.penguin-breeder.org/?page=sane-net
+-Manual page: sane-net
++Manual page:sane-net
+ Description: Network access to saned servers
+ Comment: Can be used to access any scanner supported by SANE over the net. Supports IPv4 and IPv6.
+

+Index: sane-backends-1.0.24/testsuite/tools/Makefile.in +=================================================================== +--- sane-backends-1.0.24.orig/testsuite/tools/Makefile.in 2013-10-05 16:41:07.991355170 -0400 ++++ sane-backends-1.0.24/testsuite/tools/Makefile.in 2013-10-05 16:47:36.395343694 -0400 +@@ -503,7 +503,7 @@ + do \ + echo "PASS: sane-desc -m $$mode -s $(srcdir)/data"; \ + $(SANEDESC) -m $$mode -s $(srcdir)/data >$$mode.res ;\ +- if ! diff --ignore-matching-lines="..:..:.. 20[0-9][0-9]" $(srcdir)/data/$$mode.ref $$mode.res ; \ ++ if ! diff --ignore-matching-lines="by sane-desc .* from sane-backends\|..:..:.. 20[0-9][0-9]" $(srcdir)/data/$$mode.ref $$mode.res ; \ + then \ + echo "**** File generated for $$mode mode is different from reference" ;\ + exit 1 ;\ +Index: sane-backends-1.0.24/testsuite/tools/data/html-mfgs.ref +=================================================================== +--- sane-backends-1.0.24.orig/testsuite/tools/data/html-mfgs.ref 2013-08-25 17:23:27.000000000 -0400 ++++ sane-backends-1.0.24/testsuite/tools/data/html-mfgs.ref 2013-10-05 17:15:20.619294522 -0400 +@@ -5,7 +5,6 @@ + + +
+-SANE +

SANE: Supported Devices

+
+
+@@ -225,7 +224,7 @@ +

+- ++ + + + +@@ -235,7 +234,7 @@ + +- ++ + +
+ abaton
(unmaintained) + 		sane-abatonsane-abaton
Scan 300/SSCSI + abaton
(unmaintained) + 		sane-abatonsane-abaton
+

Manufacturer: Acer Peripherals

+@@ -264,7 +263,7 @@ + leo +
(1.0-10) + +-sane-leo ++sane-leo + + +

Manufacturer: Actown

+@@ -289,7 +288,7 @@ + teco1 +
(1.0-10) + +-sane-teco1 ++sane-teco1 + + +

Manufacturer: Adlib

+@@ -314,7 +313,7 @@ + pie +
(1.0) + +-sane-pie ++sane-pie + + JetScan636PRO + SCSI +@@ -325,7 +324,7 @@ + pie +
(1.0) + +-sane-pie ++sane-pie + + +

Manufacturer: Advent

+@@ -352,7 +351,7 @@ + kodakaio +
(2.4.6) + +-sane-kodakaio ++sane-kodakaio + + +

Manufacturer: AGFA

+@@ -379,7 +378,7 @@ + SnapScan +
(1.4) + +-sane-snapscan ++sane-snapscan + + Arcus II + SCSI +@@ -390,7 +389,7 @@ + microtek +
(0.13.1) + +-sane-microtek ++sane-microtek + + DuoScan + SCSI +@@ -401,7 +400,7 @@ + microtek +
(0.13.1) + +-sane-microtek ++sane-microtek + + DuoScan f40 + USB IEEE-1394 +@@ -444,7 +443,7 @@ + + agfafocus
(unmaintained) + +-sane-agfafocus ++sane-agfafocus + + Focus Color Plus + SCSI +@@ -454,7 +453,7 @@ + + agfafocus
(unmaintained) + +-sane-agfafocus ++sane-agfafocus + + Focus GS Scanner + SCSI +@@ -464,7 +463,7 @@ + + agfafocus
(unmaintained) + +-sane-agfafocus ++sane-agfafocus + + Focus II + SCSI +@@ -474,7 +473,7 @@ + + agfafocus
(unmaintained) + +-sane-agfafocus ++sane-agfafocus + + Focus Lineart Scanner + SCSI +@@ -484,7 +483,7 @@ + + agfafocus
(unmaintained) + +-sane-agfafocus ++sane-agfafocus + + SnapScan + SCSI +@@ -495,7 +494,7 @@ + SnapScan +
(1.4) + +-sane-snapscan ++sane-snapscan + + SnapScan 300 + SCSI +@@ -506,7 +505,7 @@ + SnapScan +
(1.4) + +-sane-snapscan ++sane-snapscan + + SnapScan 310 + SCSI +@@ -517,7 +516,7 @@ + SnapScan +
(1.4) + +-sane-snapscan ++sane-snapscan + + SnapScan 310P + Parport +@@ -539,7 +538,7 @@ + SnapScan +
(1.4) + +-sane-snapscan ++sane-snapscan + + SnapScan 1200P + Parport +@@ -572,7 +571,7 @@ + SnapScan +
(1.4) + +-sane-snapscan ++sane-snapscan + + SnapScan 1212U_2 + USB +@@ -583,7 +582,7 @@ + SnapScan +
(1.4) + +-sane-snapscan ++sane-snapscan + + SnapScan 1236s + SCSI +@@ -594,7 +593,7 @@ + SnapScan +
(1.4) + +-sane-snapscan ++sane-snapscan + + SnapScan 1236u + USB +@@ -605,7 +604,7 @@ + SnapScan +
(1.4) + +-sane-snapscan ++sane-snapscan + + SnapScan e10 + USB +@@ -616,7 +615,7 @@ + SnapScan +
(1.4) + +-sane-snapscan ++sane-snapscan + + SnapScan e20 + USB +@@ -627,7 +626,7 @@ + SnapScan +
(1.4) + +-sane-snapscan ++sane-snapscan + + SnapScan e25 + USB +@@ -638,7 +637,7 @@ + SnapScan +
(1.4) + +-sane-snapscan ++sane-snapscan + + SnapScan e26 + USB +@@ -649,7 +648,7 @@ + SnapScan +
(1.4) + +-sane-snapscan ++sane-snapscan + + SnapScan e40 + USB +@@ -660,7 +659,7 @@ + SnapScan +
(1.4) + +-sane-snapscan ++sane-snapscan + + SnapScan e42 + USB +@@ -671,7 +670,7 @@ + SnapScan +
(1.4) + +-sane-snapscan ++sane-snapscan + + SnapScan e50 + USB +@@ -682,7 +681,7 @@ + SnapScan +
(1.4) + +-sane-snapscan ++sane-snapscan + + SnapScan e52 + USB +@@ -693,7 +692,7 @@ + SnapScan +
(1.4) + +-sane-snapscan ++sane-snapscan + + SnapScan e60 + USB +@@ -704,7 +703,7 @@ + SnapScan +
(1.4) + +-sane-snapscan ++sane-snapscan + + SnapScan EZ + Parport +@@ -726,7 +725,7 @@ + niash +
(0.3) + +-sane-niash ++sane-niash + + StudioScan + SCSI +@@ -737,7 +736,7 @@ + microtek +
(0.13.1) + +-sane-microtek ++sane-microtek + + StudioScan II + SCSI +@@ -748,7 +747,7 @@ + microtek +
(0.13.1) + +-sane-microtek ++sane-microtek + + StudioScan IIsi + SCSI +@@ -759,7 +758,7 @@ + microtek +
(0.13.1) + +-sane-microtek ++sane-microtek + + Studiostar + SCSI +@@ -770,7 +769,7 @@ + microtek +
(0.13.1) + +-sane-microtek ++sane-microtek + + +

Manufacturer: Ambir

+@@ -795,7 +794,7 @@ + plustek +
(0.52) + +-sane-plustek ++sane-plustek + + +

Manufacturer: Apple

+@@ -821,7 +820,7 @@ + + apple
(unmaintained) + +-sane-apple ++sane-apple + + Color OneScanner + SCSI +@@ -831,7 +830,7 @@ + + apple
(unmaintained) + +-sane-apple ++sane-apple + + Color OneScanner 600/27 + SCSI +@@ -842,7 +841,7 @@ + canon +
(1.12) + +-sane-canon ++sane-canon + + OneScanner + SCSI +@@ -852,7 +851,7 @@ + + apple
(unmaintained) + +-sane-apple ++sane-apple + + +

Manufacturer: Aries

+@@ -877,7 +876,7 @@ + plustek_pp +
(0.43) + +-sane-plustek_pp ++sane-plustek_pp + + +

Manufacturer: Artec/Ultima

+@@ -915,7 +914,7 @@ + artec +
(unmaintained) + +-sane-artec ++sane-artec + + A6000C PLUS + SCSI +@@ -926,7 +925,7 @@ + artec +
(unmaintained) + +-sane-artec ++sane-artec + + AM12e+ + Parport +@@ -948,7 +947,7 @@ + artec +
(unmaintained) + +-sane-artec ++sane-artec + + AS6E + Parport +@@ -959,7 +958,7 @@ + as6e +
(0.5) + +-sane-as6e ++sane-as6e + + AT3 + SCSI +@@ -970,7 +969,7 @@ + artec +
(unmaintained) + +-sane-artec ++sane-artec + + AT6 + SCSI +@@ -981,7 +980,7 @@ + artec +
(unmaintained) + +-sane-artec ++sane-artec + + AT12 + SCSI +@@ -992,7 +991,7 @@ + artec +
(unmaintained) + +-sane-artec ++sane-artec + + E+ 48U + USB +@@ -1002,7 +1001,7 @@ + + artec_eplus48u
(unmaintained) + +-sane-artec_eplus48u ++sane-artec_eplus48u + + E+ Pro + USB +@@ -1012,7 +1011,7 @@ + + artec_eplus48u
(unmaintained) + +-sane-artec_eplus48u ++sane-artec_eplus48u + + Ultima 2000 + USB +@@ -1023,7 +1022,7 @@ + gt68xx +
(1.0-84) + +-sane-gt68xx ++sane-gt68xx + + Ultima 2000 (0x4001) + USB +@@ -1045,7 +1044,7 @@ + gt68xx +
(1.0-84) + +-sane-gt68xx ++sane-gt68xx + + +

Manufacturer: Avigramm

+@@ -1097,7 +1096,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + @V5100 + USB +@@ -1108,7 +1107,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + AM3000 Series + USB +@@ -1119,7 +1118,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + AV100CS + SCSI +@@ -1130,7 +1129,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + AV100IIICS + SCSI +@@ -1141,7 +1140,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + AV100S + SCSI +@@ -1152,7 +1151,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + AV120 + USB +@@ -1163,7 +1162,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + AV121 + USB +@@ -1174,7 +1173,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + AV122 + USB +@@ -1185,7 +1184,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + AV122 C2 + USB +@@ -1196,7 +1195,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + AV210 + USB +@@ -1207,7 +1206,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + AV210 + USB +@@ -1218,7 +1217,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + AV210C2 + USB +@@ -1229,7 +1228,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + AV210C2-G + USB +@@ -1240,7 +1239,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + AV210D2+ + USB +@@ -1251,7 +1250,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + AV220 + USB +@@ -1262,7 +1261,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + AV220+ + USB +@@ -1273,7 +1272,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + AV220-G + USB +@@ -1284,7 +1283,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + AV220C2 + USB +@@ -1295,7 +1294,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + AV220C2-B + USB +@@ -1306,7 +1305,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + AV220C2-G + USB +@@ -1317,7 +1316,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + AV220D2 + USB +@@ -1328,7 +1327,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + AV240SC + SCSI +@@ -1339,7 +1338,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + AV260CS + SCSI +@@ -1350,7 +1349,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + AV360CS + SCSI +@@ -1361,7 +1360,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + AV363CS + SCSI +@@ -1372,7 +1371,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + AV420CS + SCSI +@@ -1383,7 +1382,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + AV600U + USB +@@ -1394,7 +1393,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + AV600U Plus + USB +@@ -1405,7 +1404,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + AV610 + USB +@@ -1416,7 +1415,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + AV610C2 + USB +@@ -1427,7 +1426,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + AV620CS + SCSI +@@ -1438,7 +1437,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + AV620CS Plus + SCSI +@@ -1449,7 +1448,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + AV630CS + SCSI +@@ -1460,7 +1459,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + AV630CSL + SCSI +@@ -1471,7 +1470,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + AV660S + SCSI +@@ -1482,7 +1481,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + AV680S + SCSI +@@ -1493,7 +1492,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + AV690U + SCSI +@@ -1504,7 +1503,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + AV800S + SCSI +@@ -1515,7 +1514,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + AV810C + SCSI +@@ -1526,7 +1525,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + AV820 + SCSI +@@ -1537,7 +1536,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + AV820C + SCSI +@@ -1548,7 +1547,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + AV820C Plus + SCSI +@@ -1559,7 +1558,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + AV830C + SCSI +@@ -1570,7 +1569,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + AV830C Plus + SCSI +@@ -1581,7 +1580,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + AV880 + SCSI +@@ -1592,7 +1591,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + AV880C + SCSI +@@ -1603,7 +1602,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + AV3200C + SCSI +@@ -1614,7 +1613,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + AV3200SU + USB +@@ -1625,7 +1624,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + AV3730SU + USB +@@ -1636,7 +1635,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + AV3750SU + USB +@@ -1647,7 +1646,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + AV3800C + SCSI +@@ -1658,7 +1657,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + AV3850SU + USB +@@ -1669,7 +1668,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + AV6120 + SCSI +@@ -1680,7 +1679,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + AV6240 + SCSI +@@ -1691,7 +1690,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + AV8000S + SCSI +@@ -1702,7 +1701,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + AV8050U + USB +@@ -1713,7 +1712,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + AV8300 + USB +@@ -1724,7 +1723,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + AV8350 + USB +@@ -1735,7 +1734,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + AVA3 + SCSI +@@ -1746,7 +1745,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + DS310F + Parport +@@ -1768,7 +1767,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + FB2080E + USB +@@ -1779,7 +1778,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + FB6000E + SCSI +@@ -1790,7 +1789,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + FB6080E + USB +@@ -1801,7 +1800,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + IT8300 + USB +@@ -1812,7 +1811,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + iVina 1600 + USB +@@ -1872,7 +1871,7 @@ + bh +
(1.0-4) + +-sane-bh ++sane-bh + + COPISCAN II 2137(A) + SCSI +@@ -1883,7 +1882,7 @@ + bh +
(1.0-4) + +-sane-bh ++sane-bh + + COPISCAN II 2138A + SCSI +@@ -1894,7 +1893,7 @@ + bh +
(1.0-4) + +-sane-bh ++sane-bh + + COPISCAN II 3238 + SCSI +@@ -1905,7 +1904,7 @@ + bh +
(1.0-4) + +-sane-bh ++sane-bh + + COPISCAN II 3338(A) + SCSI +@@ -1916,7 +1915,7 @@ + bh +
(1.0-4) + +-sane-bh ++sane-bh + + COPISCAN II 6338 + SCSI +@@ -1927,7 +1926,7 @@ + bh +
(1.0-4) + +-sane-bh ++sane-bh + + +

Manufacturer: Bell+Howell

+@@ -1952,7 +1951,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + +

Manufacturer: BenQ

+@@ -1979,7 +1978,7 @@ + hp3900 +
(0.12) + +-sane-hp3900 ++sane-hp3900 + + +

Manufacturer: Benq (Acer)

+@@ -2007,7 +2006,7 @@ + SnapScan +
(1.4) + +-sane-snapscan ++sane-snapscan + + 310P + Parport +@@ -2029,7 +2028,7 @@ + SnapScan +
(1.4) + +-sane-snapscan ++sane-snapscan + + 310U + USB +@@ -2040,7 +2039,7 @@ + SnapScan +
(1.4) + +-sane-snapscan ++sane-snapscan + + 320P + Parport +@@ -2062,7 +2061,7 @@ + SnapScan +
(1.4) + +-sane-snapscan ++sane-snapscan + + 340P + Parport +@@ -2084,7 +2083,7 @@ + SnapScan +
(1.4) + +-sane-snapscan ++sane-snapscan + + 610P + Parport +@@ -2106,7 +2105,7 @@ + SnapScan +
(1.4) + +-sane-snapscan ++sane-snapscan + + 610PT + Parport +@@ -2128,7 +2127,7 @@ + SnapScan +
(1.4) + +-sane-snapscan ++sane-snapscan + + 620P + Parport +@@ -2161,7 +2160,7 @@ + SnapScan +
(1.4) + +-sane-snapscan ++sane-snapscan + + 620U + USB +@@ -2172,7 +2171,7 @@ + SnapScan +
(1.4) + +-sane-snapscan ++sane-snapscan + + 620UT + USB +@@ -2183,7 +2182,7 @@ + SnapScan +
(1.4) + +-sane-snapscan ++sane-snapscan + + 640BT + USB +@@ -2194,7 +2193,7 @@ + SnapScan +
(1.4) + +-sane-snapscan ++sane-snapscan + + 640bu + USB +@@ -2205,7 +2204,7 @@ + SnapScan +
(1.4) + +-sane-snapscan ++sane-snapscan + + 640P + Parport +@@ -2227,7 +2226,7 @@ + SnapScan +
(1.4) + +-sane-snapscan ++sane-snapscan + + 1240 + USB +@@ -2238,7 +2237,7 @@ + SnapScan +
(1.4) + +-sane-snapscan ++sane-snapscan + + 3300 + USB +@@ -2249,7 +2248,7 @@ + SnapScan +
(1.4) + +-sane-snapscan ++sane-snapscan + + 3300 + USB +@@ -2260,7 +2259,7 @@ + SnapScan +
(1.4) + +-sane-snapscan ++sane-snapscan + + 4300 + USB +@@ -2271,7 +2270,7 @@ + SnapScan +
(1.4) + +-sane-snapscan ++sane-snapscan + + 4300 + USB +@@ -2282,7 +2281,7 @@ + SnapScan +
(1.4) + +-sane-snapscan ++sane-snapscan + + 5000 + USB +@@ -2293,7 +2292,7 @@ + SnapScan +
(1.4) + +-sane-snapscan ++sane-snapscan + + 5000E + USB +@@ -2304,7 +2303,7 @@ + SnapScan +
(1.4) + +-sane-snapscan ++sane-snapscan + + 5000U + USB +@@ -2315,7 +2314,7 @@ + SnapScan +
(1.4) + +-sane-snapscan ++sane-snapscan + + 5150 + USB +@@ -2326,7 +2325,7 @@ + SnapScan +
(1.4) + +-sane-snapscan ++sane-snapscan + + 5250 + USB +@@ -2337,7 +2336,7 @@ + SnapScan +
(1.4) + +-sane-snapscan ++sane-snapscan + + 5300 + USB +@@ -2348,7 +2347,7 @@ + SnapScan +
(1.4) + +-sane-snapscan ++sane-snapscan + + 5450 + USB +@@ -2403,7 +2402,7 @@ + SnapScan +
(1.4) + +-sane-snapscan ++sane-snapscan + + +

Manufacturer: BlackWidow

+@@ -2430,7 +2429,7 @@ + artec +
(unmaintained) + +-sane-artec ++sane-artec + + +

Manufacturer: Boeder

+@@ -2466,7 +2465,7 @@ + gt68xx +
(1.0-84) + +-sane-gt68xx ++sane-gt68xx + + +

Manufacturer: BrightScan

+@@ -2491,7 +2490,7 @@ + plustek_pp +
(0.43) + +-sane-plustek_pp ++sane-plustek_pp + + +

Manufacturer: Brother

+@@ -2627,7 +2626,7 @@ + genesys +
(1.0-63) + +-sane-genesys ++sane-genesys + + CanoScan 300 + SCSI +@@ -2638,7 +2637,7 @@ + canon +
(1.12) + +-sane-canon ++sane-canon + + CanoScan 600 + SCSI +@@ -2649,7 +2648,7 @@ + canon +
(1.12) + +-sane-canon ++sane-canon + + CanoScan 620S + SCSI +@@ -2660,7 +2659,7 @@ + canon +
(1.12) + +-sane-canon ++sane-canon + + CanoScan 700F + USB +@@ -2671,7 +2670,7 @@ + genesys +
(1.0-63) + +-sane-genesys ++sane-genesys + + CanoScan 1200S + SCSI +@@ -2682,7 +2681,7 @@ + canon +
(1.12) + +-sane-canon ++sane-canon + + CanoScan 2700F + SCSI +@@ -2693,7 +2692,7 @@ + canon +
(1.12) + +-sane-canon ++sane-canon + + CanoScan 2710S + SCSI +@@ -2704,7 +2703,7 @@ + canon +
(1.12) + +-sane-canon ++sane-canon + + CanoScan 3000 + USB +@@ -2770,7 +2769,7 @@ + genesys +
(1.0-63) + +-sane-genesys ++sane-genesys + + CanoScan 5000F + USB +@@ -2803,7 +2802,7 @@ + genesys +
(1.0-63) + +-sane-genesys ++sane-genesys + + CanoScan 8000F + USB +@@ -2847,7 +2846,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + CanoScan 9000F + USB +@@ -2858,7 +2857,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + CanoScan 9000F Mark II + USB +@@ -2869,7 +2868,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + CanoScan 9900F + USB +@@ -2924,7 +2923,7 @@ + plustek +
(0.52) + +-sane-plustek ++sane-plustek + + CanoScan D1230U + USB +@@ -2968,7 +2967,7 @@ + canon_pp +
(0.33) + +-sane-canon_pp ++sane-canon_pp + + CanoScan FB320P + Parport (ECP) +@@ -2979,7 +2978,7 @@ + canon_pp +
(0.33) + +-sane-canon_pp ++sane-canon_pp + + CanoScan FB320U + USB +@@ -3001,7 +3000,7 @@ + canon_pp +
(0.33) + +-sane-canon_pp ++sane-canon_pp + + CanoScan FB610P + Parport (ECP) +@@ -3012,7 +3011,7 @@ + canon_pp +
(0.33) + +-sane-canon_pp ++sane-canon_pp + + CanoScan FB620P + Parport (ECP) +@@ -3023,7 +3022,7 @@ + canon_pp +
(0.33) + +-sane-canon_pp ++sane-canon_pp + + CanoScan FB620U + USB +@@ -3045,7 +3044,7 @@ + canon_pp +
(0.33) + +-sane-canon_pp ++sane-canon_pp + + CanoScan fb630u + USB +@@ -3056,7 +3055,7 @@ + canon630u +
(0.1) + +-sane-canon630u ++sane-canon630u + + CanoScan fb636u + USB +@@ -3067,7 +3066,7 @@ + canon630u +
(0.1) + +-sane-canon630u ++sane-canon630u + + CanoScan FB1210U + USB +@@ -3089,7 +3088,7 @@ + genesys +
(1.0-63) + +-sane-genesys ++sane-genesys + + CanoScan LiDE 40 + USB +@@ -3100,7 +3099,7 @@ + genesys +
(1.0-63) + +-sane-genesys ++sane-genesys + + CanoScan LiDE 50 + USB +@@ -3111,7 +3110,7 @@ + genesys +
(1.0-63) + +-sane-genesys ++sane-genesys + + CanoScan LiDE 60 + USB +@@ -3122,7 +3121,7 @@ + genesys +
(1.0-63) + +-sane-genesys ++sane-genesys + + CanoScan LiDE 70 + USB +@@ -3166,7 +3165,7 @@ + genesys +
(1.0-63) + +-sane-genesys ++sane-genesys + + CanoScan LiDE 110 + USB +@@ -3177,7 +3176,7 @@ + genesys +
(1.0-63) + +-sane-genesys ++sane-genesys + + CanoScan LiDE 200 + USB +@@ -3188,7 +3187,7 @@ + genesys +
(1.0-63) + +-sane-genesys ++sane-genesys + + CanoScan LiDE 210 + USB +@@ -3199,7 +3198,7 @@ + genesys +
(1.0-63) + +-sane-genesys ++sane-genesys + + CanoScan LiDE 500F + USB +@@ -3243,7 +3242,7 @@ + plustek +
(0.52) + +-sane-plustek ++sane-plustek + + CanoScan N340P + Parport (ECP) +@@ -3254,7 +3253,7 @@ + canon_pp +
(0.33) + +-sane-canon_pp ++sane-canon_pp + + CanoScan N640P + Parport (ECP) +@@ -3265,7 +3264,7 @@ + canon_pp +
(0.33) + +-sane-canon_pp ++sane-canon_pp + + CanoScan N640P ex + Parport (ECP) +@@ -3276,7 +3275,7 @@ + canon_pp +
(0.33) + +-sane-canon_pp ++sane-canon_pp + + CanoScan N650U/N656U + USB +@@ -3287,7 +3286,7 @@ + plustek +
(0.52) + +-sane-plustek ++sane-plustek + + CanoScan N670U/N676U/LiDE20 + USB +@@ -3298,7 +3297,7 @@ + plustek +
(0.52) + +-sane-plustek ++sane-plustek + + CanoScan N1220U + USB +@@ -3309,7 +3308,7 @@ + plustek +
(0.52) + +-sane-plustek ++sane-plustek + + CanoScan N1240U/LiDE30 + USB +@@ -3320,7 +3319,7 @@ + plustek +
(0.52) + +-sane-plustek ++sane-plustek + + CR-25 + USB +@@ -3331,7 +3330,7 @@ + canon_dr +
(38) + +-sane-canon_dr ++sane-canon_dr + + CR-55 + USB +@@ -3342,7 +3341,7 @@ + canon_dr +
(38) + +-sane-canon_dr ++sane-canon_dr + + CR-135i + USB SCSI +@@ -3353,7 +3352,7 @@ + canon_dr +
(38) + +-sane-canon_dr ++sane-canon_dr + + CR-180 + USB SCSI +@@ -3364,7 +3363,7 @@ + canon_dr +
(38) + +-sane-canon_dr ++sane-canon_dr + + CR-180II + USB SCSI +@@ -3375,7 +3374,7 @@ + canon_dr +
(38) + +-sane-canon_dr ++sane-canon_dr + + CR-190i + USB SCSI +@@ -3386,7 +3385,7 @@ + canon_dr +
(38) + +-sane-canon_dr ++sane-canon_dr + + DR-1210C + USB +@@ -3397,7 +3396,7 @@ + canon_dr +
(38) + +-sane-canon_dr ++sane-canon_dr + + DR-1210C + USB +@@ -3408,7 +3407,7 @@ + canon_dr +
(38) + +-sane-canon_dr ++sane-canon_dr + + DR-2010C + USB +@@ -3419,7 +3418,7 @@ + canon_dr +
(38) + +-sane-canon_dr ++sane-canon_dr + + DR-2010M + USB +@@ -3430,7 +3429,7 @@ + canon_dr +
(38) + +-sane-canon_dr ++sane-canon_dr + + DR-2020U + USB +@@ -3452,7 +3451,7 @@ + canon_dr +
(38) + +-sane-canon_dr ++sane-canon_dr + + DR-2050SP + USB +@@ -3463,7 +3462,7 @@ + canon_dr +
(38) + +-sane-canon_dr ++sane-canon_dr + + DR-2080C + USB SCSI +@@ -3474,7 +3473,7 @@ + canon_dr +
(38) + +-sane-canon_dr ++sane-canon_dr + + DR-2510C + USB +@@ -3485,7 +3484,7 @@ + canon_dr +
(38) + +-sane-canon_dr ++sane-canon_dr + + DR-2510M + USB +@@ -3496,7 +3495,7 @@ + canon_dr +
(38) + +-sane-canon_dr ++sane-canon_dr + + DR-2580C + USB SCSI +@@ -3507,7 +3506,7 @@ + canon_dr +
(38) + +-sane-canon_dr ++sane-canon_dr + + DR-3010C + USB +@@ -3518,7 +3517,7 @@ + canon_dr +
(38) + +-sane-canon_dr ++sane-canon_dr + + DR-3020C + SCSI +@@ -3529,7 +3528,7 @@ + canon_dr +
(38) + +-sane-canon_dr ++sane-canon_dr + + DR-3060 + SCSI +@@ -3540,7 +3539,7 @@ + canon_dr +
(38) + +-sane-canon_dr ++sane-canon_dr + + DR-3080C + SCSI +@@ -3551,7 +3550,7 @@ + canon_dr +
(38) + +-sane-canon_dr ++sane-canon_dr + + DR-3080CII + USB SCSI +@@ -3562,7 +3561,7 @@ + canon_dr +
(38) + +-sane-canon_dr ++sane-canon_dr + + DR-4010C + USB +@@ -3573,7 +3572,7 @@ + canon_dr +
(38) + +-sane-canon_dr ++sane-canon_dr + + DR-4580U + USB +@@ -3584,7 +3583,7 @@ + canon_dr +
(38) + +-sane-canon_dr ++sane-canon_dr + + DR-5010C + USB +@@ -3595,7 +3594,7 @@ + canon_dr +
(38) + +-sane-canon_dr ++sane-canon_dr + + DR-5020 + SCSI +@@ -3606,7 +3605,7 @@ + canon_dr +
(38) + +-sane-canon_dr ++sane-canon_dr + + DR-5060F + SCSI +@@ -3617,7 +3616,7 @@ + canon_dr +
(38) + +-sane-canon_dr ++sane-canon_dr + + DR-5080C + SCSI +@@ -3628,7 +3627,7 @@ + canon_dr +
(38) + +-sane-canon_dr ++sane-canon_dr + + DR-6010C + USB SCSI +@@ -3639,7 +3638,7 @@ + canon_dr +
(38) + +-sane-canon_dr ++sane-canon_dr + + DR-6030C + USB SCSI +@@ -3650,7 +3649,7 @@ + canon_dr +
(38) + +-sane-canon_dr ++sane-canon_dr + + DR-6050C + USB SCSI +@@ -3661,7 +3660,7 @@ + canon_dr +
(38) + +-sane-canon_dr ++sane-canon_dr + + DR-6080 + USB SCSI +@@ -3672,7 +3671,7 @@ + canon_dr +
(38) + +-sane-canon_dr ++sane-canon_dr + + DR-7080C + USB SCSI +@@ -3683,7 +3682,7 @@ + canon_dr +
(38) + +-sane-canon_dr ++sane-canon_dr + + DR-7090C + USB SCSI +@@ -3694,7 +3693,7 @@ + canon_dr +
(38) + +-sane-canon_dr ++sane-canon_dr + + DR-7550C + USB SCSI +@@ -3705,7 +3704,7 @@ + canon_dr +
(38) + +-sane-canon_dr ++sane-canon_dr + + DR-7580 + USB SCSI +@@ -3716,7 +3715,7 @@ + canon_dr +
(38) + +-sane-canon_dr ++sane-canon_dr + + DR-9050C + USB SCSI +@@ -3727,7 +3726,7 @@ + canon_dr +
(38) + +-sane-canon_dr ++sane-canon_dr + + DR-9080C + USB SCSI +@@ -3738,7 +3737,7 @@ + canon_dr +
(38) + +-sane-canon_dr ++sane-canon_dr + + DR-X10C + USB SCSI +@@ -3749,7 +3748,7 @@ + canon_dr +
(38) + +-sane-canon_dr ++sane-canon_dr + + DR3020 + SCSI +@@ -3760,7 +3759,7 @@ + canon_dr +
(38) + +-sane-canon_dr ++sane-canon_dr + + DR4080U + USB +@@ -3771,7 +3770,7 @@ + canon_dr +
(38) + +-sane-canon_dr ++sane-canon_dr + + FS4000 + USB SCSI +@@ -3793,7 +3792,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + I-SENSYS MF4320d + USB +@@ -3804,7 +3803,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + I-SENSYS MF4330d + USB +@@ -3815,7 +3814,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + i-SENSYS MF4550d + USB +@@ -3826,7 +3825,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + i-SENSYS MF5880dn + USB +@@ -3837,7 +3836,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + i-SENSYS MF6680dn + USB +@@ -3848,7 +3847,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + imageCLASS D420 + USB +@@ -3859,7 +3858,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + imageCLASS D480 + USB +@@ -3870,7 +3869,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + imageCLASS MF3110 + USB +@@ -3881,7 +3880,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + imageCLASS MF3240 + USB +@@ -3892,7 +3891,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + imageCLASS MF4010 + USB +@@ -3903,7 +3902,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + imageCLASS MF4018 + USB +@@ -3914,7 +3913,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + imageCLASS MF4120 + USB +@@ -3925,7 +3924,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + imageCLASS MF4122 + USB +@@ -3936,7 +3935,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + imageCLASS MF4140 + USB +@@ -3947,7 +3946,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + imageCLASS MF4150 + USB +@@ -3958,7 +3957,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + imageCLASS MF4270 + USB +@@ -3969,7 +3968,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + imageCLASS MF4350d + USB +@@ -3980,7 +3979,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + imageCLASS MF4370dn + USB +@@ -3991,7 +3990,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + imageCLASS MF4380dn + USB +@@ -4002,7 +4001,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + imageCLASS MF4410 + USB +@@ -4013,7 +4012,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + imageCLASS MF4430 + USB +@@ -4024,7 +4023,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + imageCLASS MF4660 + USB +@@ -4035,7 +4034,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + imageCLASS MF4690 + USB +@@ -4046,7 +4045,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + imageCLASS MF5630 + USB +@@ -4057,7 +4056,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + imageCLASS MF5730 + USB +@@ -4068,7 +4067,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + imageCLASS MF5750 + USB +@@ -4079,7 +4078,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + imageCLASS MF5770 + USB +@@ -4090,7 +4089,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + imageCLASS MF6500 series + USB +@@ -4101,7 +4100,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + imageCLASS MF6550 + USB +@@ -4112,7 +4111,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + imageCLASS MF8030 + USB +@@ -4123,7 +4122,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + imageCLASS MF8170c + USB +@@ -4134,7 +4133,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + imageRUNNER 1020/1024/1025 + USB +@@ -4145,7 +4144,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + ImageRunner iR1018 + USB +@@ -4233,7 +4232,7 @@ + canon +
(1.12) + +-sane-canon ++sane-canon + + laserBase MF5650 + USB +@@ -4244,7 +4243,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA E500 + USB +@@ -4255,7 +4254,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA E510 + USB +@@ -4266,7 +4265,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA E600 + USB +@@ -4277,7 +4276,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA E610 + USB +@@ -4288,7 +4287,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA MG2100 Series + USB +@@ -4299,7 +4298,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA MG2200 Series + USB +@@ -4310,7 +4309,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA MG3100 Series + USB WLAN +@@ -4321,7 +4320,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA MG3200 Series + USB +@@ -4332,7 +4331,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA MG4100 Series + USB +@@ -4343,7 +4342,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA MG4200 Series + USB +@@ -4354,7 +4353,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA MG5100 Series + USB +@@ -4365,7 +4364,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA MG5200 Series + USB +@@ -4376,7 +4375,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA MG5300 Series + USB +@@ -4387,7 +4386,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA MG5400 Series + USB +@@ -4398,7 +4397,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA MG6100 Series + USB +@@ -4409,7 +4408,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA MG6200 Series + USB +@@ -4420,7 +4419,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA MG6300 Series + USB Ethernet +@@ -4431,7 +4430,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA MG8100 Series + USB +@@ -4442,7 +4441,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA MG8200 Series + USB Ethernet +@@ -4453,7 +4452,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA MP110 + USB +@@ -4486,7 +4485,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA MP150 + USB +@@ -4497,7 +4496,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA MP160 + USB +@@ -4508,7 +4507,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA MP170 + USB +@@ -4519,7 +4518,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA MP180 + USB +@@ -4530,7 +4529,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA MP190 + USB +@@ -4541,7 +4540,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA MP210 + USB +@@ -4552,7 +4551,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA MP220 + USB +@@ -4563,7 +4562,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA MP230 + USB +@@ -4574,7 +4573,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA MP240 + USB +@@ -4585,7 +4584,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA MP250 + USB +@@ -4596,7 +4595,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA MP260 + USB +@@ -4607,7 +4606,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA MP270 + USB +@@ -4618,7 +4617,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA MP280 + USB +@@ -4629,7 +4628,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA MP360 + USB +@@ -4640,7 +4639,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA MP370 + USB +@@ -4651,7 +4650,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA MP375R + USB +@@ -4662,7 +4661,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA MP390 + USB +@@ -4673,7 +4672,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA MP450 + USB +@@ -4684,7 +4683,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA MP460 + USB +@@ -4695,7 +4694,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA MP470 + USB +@@ -4706,7 +4705,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA MP480 + USB +@@ -4717,7 +4716,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA MP490 + USB +@@ -4728,7 +4727,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA MP493 + USB +@@ -4739,7 +4738,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA MP495 + USB +@@ -4750,7 +4749,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA MP500 + USB +@@ -4761,7 +4760,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA MP510 + USB +@@ -4772,7 +4771,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA MP520 + USB +@@ -4783,7 +4782,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA MP530 + USB +@@ -4794,7 +4793,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA MP540 + USB +@@ -4805,7 +4804,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA MP550 + USB +@@ -4816,7 +4815,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA MP560 + USB +@@ -4827,7 +4826,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA MP600 + USB +@@ -4838,7 +4837,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA MP600R + USB Ethernet +@@ -4849,7 +4848,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA MP610 + USB +@@ -4860,7 +4859,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA MP620 + USB Ethernet +@@ -4871,7 +4870,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA MP630 + USB +@@ -4882,7 +4881,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA MP640 + USB Ethernet +@@ -4893,7 +4892,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA MP700 + USB +@@ -4904,7 +4903,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA MP710 + USB +@@ -4915,7 +4914,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA MP730 + USB +@@ -4926,7 +4925,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA MP740 + USB +@@ -4937,7 +4936,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA MP750 + USB +@@ -4948,7 +4947,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA MP760 + USB +@@ -4959,7 +4958,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA MP770 + USB +@@ -4970,7 +4969,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA MP780 + USB +@@ -4981,7 +4980,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA MP790 + USB +@@ -4992,7 +4991,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA MP800 + USB +@@ -5003,7 +5002,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA MP800R + USB +@@ -5014,7 +5013,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA MP810 + USB +@@ -5025,7 +5024,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA MP830 + USB +@@ -5036,7 +5035,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA MP960 + USB +@@ -5047,7 +5046,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA MP970 + USB Ethernet +@@ -5058,7 +5057,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA MP980 + USB Ethernet +@@ -5069,7 +5068,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA MP990 + USB Ethernet +@@ -5080,7 +5079,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA MX300 + USB +@@ -5091,7 +5090,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA MX310 + USB +@@ -5102,7 +5101,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA MX320 + USB +@@ -5113,7 +5112,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA MX330 + USB +@@ -5124,7 +5123,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA MX340 + USB +@@ -5135,7 +5134,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA MX350 + USB Ethernet +@@ -5146,7 +5145,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA MX360 + USB +@@ -5157,7 +5156,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA MX370 Series + USB +@@ -5168,7 +5167,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA MX390 Series + USB +@@ -5179,7 +5178,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA MX410 + USB Ethernet +@@ -5190,7 +5189,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA MX420 + USB Ethernet +@@ -5201,7 +5200,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA MX430 Series + USB Ethernet +@@ -5212,7 +5211,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA MX450 Series + USB +@@ -5223,7 +5222,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA MX510 Series + USB Ethernet +@@ -5234,7 +5233,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA MX520 Series + USB +@@ -5245,7 +5244,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA MX700 + USB Ethernet +@@ -5256,7 +5255,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA MX710 Series + USB Ethernet +@@ -5267,7 +5266,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA MX720 Series + USB +@@ -5278,7 +5277,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA MX850 + USB Ethernet +@@ -5289,7 +5288,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA MX860 + USB Ethernet +@@ -5300,7 +5299,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA MX870 + USB Ethernet +@@ -5311,7 +5310,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA MX880 Series + USB Ethernet +@@ -5322,7 +5321,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA MX882 + USB Ethernet +@@ -5333,7 +5332,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA MX885 + USB Ethernet +@@ -5344,7 +5343,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA MX890 Series + USB Ethernet +@@ -5355,7 +5354,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA MX920 Series + USB +@@ -5366,7 +5365,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + PIXMA MX7600 + USB Ethernet +@@ -5377,7 +5376,7 @@ + pixma +
(0.17.3) + +-sane-pixma ++sane-pixma + + +

Manufacturer: Chinon

+@@ -5429,7 +5428,7 @@ + plustek +
(0.52) + +-sane-plustek ++sane-plustek + + S200 + USB +@@ -5492,7 +5491,7 @@ + cardscan +
(2) + +-sane-cardscan ++sane-cardscan + + 800c + USB +@@ -5503,7 +5502,7 @@ + cardscan +
(2) + +-sane-cardscan ++sane-cardscan + + Cardscan 500 + USB +@@ -5550,7 +5549,7 @@ + mustek_pp +
(13) + +-sane-mustek_pp ++sane-mustek_pp + + +

Manufacturer: DCT

+@@ -5578,7 +5577,7 @@ + genesys +
(1.0-63) + +-sane-genesys ++sane-genesys + + +

Manufacturer: Dell

+@@ -5625,7 +5624,7 @@ + lexmark +
(1.0-0) + +-sane-lexmark ++sane-lexmark + + A940 + USB +@@ -5657,7 +5656,7 @@ + + xerox_mfp
(1.0-13) + +-sane-xerox_mfp ++sane-xerox_mfp + + +

Manufacturer: Devcom

+@@ -5684,7 +5683,7 @@ + pie +
(1.0) + +-sane-pie ++sane-pie + + 9636PRO + SCSI +@@ -5695,7 +5694,7 @@ + pie +
(1.0) + +-sane-pie ++sane-pie + + 9636S + SCSI +@@ -5706,7 +5705,7 @@ + pie +
(1.0) + +-sane-pie ++sane-pie + + +

Manufacturer: Dextra

+@@ -5731,7 +5730,7 @@ + teco1 +
(1.0-10) + +-sane-teco1 ++sane-teco1 + + DF-1200T+ + SCSI +@@ -5742,7 +5741,7 @@ + teco1 +
(1.0-10) + +-sane-teco1 ++sane-teco1 + + DF-4830T + SCSI +@@ -5753,7 +5752,7 @@ + teco1 +
(1.0-10) + +-sane-teco1 ++sane-teco1 + + DF-9624 + SCSI +@@ -5764,7 +5763,7 @@ + teco1 +
(1.0-10) + +-sane-teco1 ++sane-teco1 + + +

Manufacturer: Dexxa

+@@ -5791,7 +5790,7 @@ + as6e +
(0.5) + +-sane-as6e ++sane-as6e + + +

Manufacturer: E-Lux

+@@ -5842,7 +5841,7 @@ + umax +
(1.0-41) + +-sane-umax ++sane-umax + + +

Manufacturer: EDT (Electronic Document Technology)

+@@ -5932,7 +5931,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Actionscanner II + SCSI Parport +@@ -5943,7 +5942,7 @@ + epson +
(unmaintained) + +-sane-epson ++sane-epson + + AcuLaser CX11 + USB +@@ -5953,7 +5952,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + AcuLaser CX11 + USB +@@ -5964,7 +5963,7 @@ + epson +
(unmaintained) + +-sane-epson ++sane-epson + + AcuLaser CX11NF + USB Network +@@ -5974,7 +5973,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + AcuLaser CX11NF + USB +@@ -5985,7 +5984,7 @@ + epson +
(unmaintained) + +-sane-epson ++sane-epson + + AcuLaser CX21 + USB +@@ -5995,7 +5994,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Artisan 700 + USB Network +@@ -6005,7 +6004,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Artisan 710 Series + USB +@@ -6015,7 +6014,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Artisan 800 + USB +@@ -6025,7 +6024,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Artisan 810 Series + USB +@@ -6035,7 +6034,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + CC-500L + USB +@@ -6045,7 +6044,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + CC-550L + USB +@@ -6055,7 +6054,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + CC-570L + USB +@@ -6065,7 +6064,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + CC-600PX + USB +@@ -6075,7 +6074,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + CC-700 + USB +@@ -6085,7 +6084,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + CX-3200 + USB +@@ -6096,7 +6095,7 @@ + epson +
(unmaintained) + +-sane-epson ++sane-epson + + CX-3600 + USB +@@ -6107,7 +6106,7 @@ + epson +
(unmaintained) + +-sane-epson ++sane-epson + + CX-3650 + USB +@@ -6118,7 +6117,7 @@ + epson +
(unmaintained) + +-sane-epson ++sane-epson + + CX-3700 + USB +@@ -6129,7 +6128,7 @@ + epson +
(unmaintained) + +-sane-epson ++sane-epson + + CX-3800 + USB +@@ -6140,7 +6139,7 @@ + epson +
(unmaintained) + +-sane-epson ++sane-epson + + CX-4200 + USB +@@ -6151,7 +6150,7 @@ + epson +
(unmaintained) + +-sane-epson ++sane-epson + + CX-4600 + USB +@@ -6162,7 +6161,7 @@ + epson +
(unmaintained) + +-sane-epson ++sane-epson + + CX-4800 + USB +@@ -6173,7 +6172,7 @@ + epson +
(unmaintained) + +-sane-epson ++sane-epson + + CX-5000 + USB +@@ -6184,7 +6183,7 @@ + epson +
(unmaintained) + +-sane-epson ++sane-epson + + CX-5200 + USB +@@ -6195,7 +6194,7 @@ + epson +
(unmaintained) + +-sane-epson ++sane-epson + + CX-5400 + USB +@@ -6206,7 +6205,7 @@ + epson +
(unmaintained) + +-sane-epson ++sane-epson + + CX-5400 + USB +@@ -6217,7 +6216,7 @@ + epson +
(unmaintained) + +-sane-epson ++sane-epson + + CX-6300 + USB +@@ -6228,7 +6227,7 @@ + epson +
(unmaintained) + +-sane-epson ++sane-epson + + CX-6400 + USB +@@ -6239,7 +6238,7 @@ + epson +
(unmaintained) + +-sane-epson ++sane-epson + + CX-6500 + USB +@@ -6250,7 +6249,7 @@ + epson +
(unmaintained) + +-sane-epson ++sane-epson + + CX-6600 + USB +@@ -6261,7 +6260,7 @@ + epson +
(unmaintained) + +-sane-epson ++sane-epson + + DX-3800 + USB +@@ -6272,7 +6271,7 @@ + epson +
(unmaintained) + +-sane-epson ++sane-epson + + DX-3850 + USB +@@ -6283,7 +6282,7 @@ + epson +
(unmaintained) + +-sane-epson ++sane-epson + + DX-4050 + USB +@@ -6294,7 +6293,7 @@ + epson +
(unmaintained) + +-sane-epson ++sane-epson + + DX-5000 + USB +@@ -6305,7 +6304,7 @@ + epson +
(unmaintained) + +-sane-epson ++sane-epson + + DX-5050 + USB +@@ -6316,7 +6315,7 @@ + epson +
(unmaintained) + +-sane-epson ++sane-epson + + DX-6000 + USB +@@ -6327,7 +6326,7 @@ + epson +
(unmaintained) + +-sane-epson ++sane-epson + + DX-7400 + USB +@@ -6338,7 +6337,7 @@ + epson +
(unmaintained) + +-sane-epson ++sane-epson + + EP-702A + USB +@@ -6348,7 +6347,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + EP-801A + USB Network +@@ -6358,7 +6357,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + EP-802A + USB +@@ -6368,7 +6367,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + EP-901A + USB +@@ -6378,7 +6377,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + EP-901F + USB +@@ -6388,7 +6387,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + EP-902A + USB +@@ -6398,7 +6397,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + ES-300C + SCSI parallel +@@ -6408,7 +6407,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + ES-300C + SCSI Parport +@@ -6419,7 +6418,7 @@ + epson +
(unmaintained) + +-sane-epson ++sane-epson + + ES-300GS + SCSI +@@ -6429,7 +6428,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + ES-300GS + SCSI +@@ -6440,7 +6439,7 @@ + epson +
(unmaintained) + +-sane-epson ++sane-epson + + ES-600C + parallel +@@ -6450,7 +6449,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + ES-600C + Parport +@@ -6461,7 +6460,7 @@ + epson +
(unmaintained) + +-sane-epson ++sane-epson + + ES-800C + SCSI +@@ -6471,7 +6470,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + ES-1000C + ? +@@ -6481,7 +6480,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + ES-1200C + parallel +@@ -6491,7 +6490,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + ES-1200C + Parport +@@ -6502,7 +6501,7 @@ + epson +
(unmaintained) + +-sane-epson ++sane-epson + + ES-2000 + SCSI USB +@@ -6512,7 +6511,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + ES-2200 + SCSI USB +@@ -6522,7 +6521,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + ES-6000 + SCSI +@@ -6532,7 +6531,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + ES-6000H + SCSI +@@ -6542,7 +6541,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + ES-6000HS + SCSI +@@ -6552,7 +6551,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + ES-7000H + SCSI USB +@@ -6562,7 +6561,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + ES-8000 + SCSI +@@ -6572,7 +6571,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + ES-8500 + SCSI USB +@@ -6582,7 +6581,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + ES-8500 + SCSI +@@ -6593,7 +6592,7 @@ + epson +
(unmaintained) + +-sane-epson ++sane-epson + + ES-9000H + SCSI +@@ -6603,7 +6602,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + ES-10000G + USB +@@ -6613,7 +6612,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + ES-D400 + USB +@@ -6623,7 +6622,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + ES-H300 + USB +@@ -6633,7 +6632,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + ES-H7200 + USB Ethernet +@@ -6643,7 +6642,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Expression 636 + SCSI +@@ -6653,7 +6652,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Expression 636 + SCSI +@@ -6664,7 +6663,7 @@ + epson +
(unmaintained) + +-sane-epson ++sane-epson + + Expression 800 + SCSI +@@ -6674,7 +6673,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Expression 800 + SCSI +@@ -6685,7 +6684,7 @@ + epson +
(unmaintained) + +-sane-epson ++sane-epson + + Expression 836XL + SCSI +@@ -6695,7 +6694,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Expression 1600 + SCSI USB +@@ -6705,7 +6704,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Expression 1600 + SCSI USB IEEE-1394 +@@ -6716,7 +6715,7 @@ + epson +
(unmaintained) + +-sane-epson ++sane-epson + + Expression 1640XL + SCSI USB +@@ -6726,7 +6725,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Expression 1680 + SCSI USB +@@ -6736,7 +6735,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Expression 1680 + SCSI USB IEEE-1394 +@@ -6747,7 +6746,7 @@ + epson +
(unmaintained) + +-sane-epson ++sane-epson + + Expression 1680 Pro + SCSI USB +@@ -6757,7 +6756,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Expression 1680XL Pro + SCSI USB +@@ -6767,7 +6766,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Expression 10000XL + USB +@@ -6777,7 +6776,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Expression 10000XL Graphic Arts + USB IEEE1394 +@@ -6787,7 +6786,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Expression 10000XL Photo + USB IEEE1394 +@@ -6797,7 +6796,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + F-3200 + USB IEEE1394 +@@ -6807,7 +6806,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + F-3200 Photo + USB IEEE1394 +@@ -6817,7 +6816,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + FilmScan 200 + SCSI +@@ -6827,7 +6826,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + GT-1500 + USB +@@ -6837,7 +6836,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + GT-2200 + USB +@@ -6858,7 +6857,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + GT-2500 + USB +@@ -6868,7 +6867,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + GT-4000 + ? +@@ -6878,7 +6877,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + GT-5000 + parallel SCSI +@@ -6888,7 +6887,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + GT-5000 + SCSI Parport +@@ -6899,7 +6898,7 @@ + epson +
(unmaintained) + +-sane-epson ++sane-epson + + GT-5400 + parallel +@@ -6909,7 +6908,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + GT-5500 + SCSI +@@ -6919,7 +6918,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + GT-5500 + SCSI +@@ -6930,7 +6929,7 @@ + epson +
(unmaintained) + +-sane-epson ++sane-epson + + GT-6000 + SCSI Parport +@@ -6940,7 +6939,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + GT-6000 + SCSI Parport +@@ -6951,7 +6950,7 @@ + epson +
(unmaintained) + +-sane-epson ++sane-epson + + GT-6500 + parallel +@@ -6961,7 +6960,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + GT-6500 + Parport +@@ -6972,7 +6971,7 @@ + epson +
(unmaintained) + +-sane-epson ++sane-epson + + GT-6600U + USB +@@ -6982,7 +6981,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + GT-6700U + USB +@@ -6992,7 +6991,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + GT-7000 + SCSI +@@ -7003,7 +7002,7 @@ + epson +
(unmaintained) + +-sane-epson ++sane-epson + + GT-7000S + SCSI +@@ -7013,7 +7012,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + GT-7000U + USB +@@ -7023,7 +7022,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + GT-7200U + USB +@@ -7033,7 +7032,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + GT-7300U + USB +@@ -7043,7 +7042,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + GT-7400U + USB +@@ -7053,7 +7052,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + GT-7600S + SCSI +@@ -7063,7 +7062,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + GT-7600U + USB +@@ -7073,7 +7072,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + GT-7600UF + USB +@@ -7083,7 +7082,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + GT-7700U + USB +@@ -7093,7 +7092,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + GT-8000 + SCSI +@@ -7103,7 +7102,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + GT-8000 + SCSI +@@ -7114,7 +7113,7 @@ + epson +
(unmaintained) + +-sane-epson ++sane-epson + + GT-8200U + USB +@@ -7124,7 +7123,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + GT-8200UF + USB +@@ -7134,7 +7133,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + GT-8300UF + USB +@@ -7144,7 +7143,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + GT-8400UF + USB +@@ -7154,7 +7153,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + GT-8500 + ? +@@ -7164,7 +7163,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + GT-8700 + SCSI USB +@@ -7174,7 +7173,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + GT-8700F + SCSI USB +@@ -7184,7 +7183,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + GT-9000 + parallel +@@ -7194,7 +7193,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + GT-9300UF + USB +@@ -7204,7 +7203,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + GT-9400UF + USB +@@ -7214,7 +7213,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + GT-9500 + SCSI +@@ -7224,7 +7223,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + GT-9600 + SCSI +@@ -7234,7 +7233,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + GT-9700F + USB +@@ -7244,7 +7243,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + GT-9800F + USB +@@ -7254,7 +7253,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + GT-10000 + SCSI +@@ -7264,7 +7263,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + GT-10000+ + SCSI +@@ -7274,7 +7273,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + GT-12000 + SCSI +@@ -7284,7 +7283,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + GT-15000 + SCSI USB +@@ -7294,7 +7293,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + GT-20000 + USB Ethernet +@@ -7304,7 +7303,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + GT-30000 + SCSI +@@ -7314,7 +7313,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + GT-D1000 + USB +@@ -7324,7 +7323,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + GT-F500 + USB +@@ -7334,7 +7333,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + GT-F520 + USB +@@ -7344,7 +7343,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + GT-F550 + USB +@@ -7354,7 +7353,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + GT-F570 + USB +@@ -7364,7 +7363,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + GT-F600 + USB +@@ -7374,7 +7373,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + GT-F650 + USB +@@ -7384,7 +7383,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + GT-F670 + USB +@@ -7394,7 +7393,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + GT-F700 + USB +@@ -7404,7 +7403,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + GT-F720 + USB +@@ -7414,7 +7413,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + GT-S50 + USB +@@ -7424,7 +7423,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + GT-S80 + USB +@@ -7434,7 +7433,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + GT-S600 + USB +@@ -7444,7 +7443,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + GT-S620 + USB +@@ -7454,7 +7453,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + GT-X700 + USB +@@ -7464,7 +7463,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + GT-X750 + USB +@@ -7474,7 +7473,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + GT-X770 + USB +@@ -7484,7 +7483,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + GT-X800 + USB +@@ -7494,7 +7493,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + GT-X820 + USB +@@ -7504,7 +7503,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + GT-X900 + USB +@@ -7514,7 +7513,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + GT-X970 + USB +@@ -7524,7 +7523,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + LP-7900CS + ? +@@ -7534,7 +7533,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + LP-9000CCH + ? +@@ -7544,7 +7543,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + LP-9000CCS + ? +@@ -7554,7 +7553,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + LP-9000CFH + ? +@@ -7564,7 +7563,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + LP-9500CCS + ? +@@ -7574,7 +7573,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + LP-9500CFH + ? +@@ -7584,7 +7583,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + LP-9500CH2 + ? +@@ -7594,7 +7593,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + LP-9800CCH + ? +@@ -7604,7 +7603,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + LP-9800CCS + ? +@@ -7614,7 +7613,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + LP-9800CFH + ? +@@ -7624,7 +7623,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + LP-A500 + USB Network +@@ -7634,7 +7633,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + LP-M5000 + USB +@@ -7644,7 +7643,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + LP-M5500 + USB +@@ -7654,7 +7653,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + LP-M5500F + USB +@@ -7664,7 +7663,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + LP-M5600 + USB +@@ -7674,7 +7673,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + LP-M6000 + USB +@@ -7684,7 +7683,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + ME 200 + USB +@@ -7694,7 +7693,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + ME 300 + USB +@@ -7704,7 +7703,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + ME OFFICE 510 + USB +@@ -7714,7 +7713,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + ME Office 600F + USB +@@ -7724,7 +7723,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + ME OFFICE 650FN Series + USB +@@ -7734,7 +7733,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + ME Office 700FW + USB +@@ -7744,7 +7743,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Perfection 600 + SCSI +@@ -7755,7 +7754,7 @@ + umax +
(1.0-41) + +-sane-umax ++sane-umax + + Perfection 610 + USB +@@ -7765,7 +7764,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Perfection 610 + USB +@@ -7776,7 +7775,7 @@ + epson +
(unmaintained) + +-sane-epson ++sane-epson + + Perfection 636 + SCSI +@@ -7787,7 +7786,7 @@ + epson +
(unmaintained) + +-sane-epson ++sane-epson + + Perfection 636S + SCSI +@@ -7797,7 +7796,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Perfection 636S + SCSI +@@ -7808,7 +7807,7 @@ + epson +
(unmaintained) + +-sane-epson ++sane-epson + + Perfection 636U + USB +@@ -7818,7 +7817,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Perfection 636U + USB +@@ -7829,7 +7828,7 @@ + epson +
(unmaintained) + +-sane-epson ++sane-epson + + Perfection 640 + USB +@@ -7840,7 +7839,7 @@ + epson +
(unmaintained) + +-sane-epson ++sane-epson + + Perfection 640U + USB +@@ -7850,7 +7849,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Perfection 660 + USB +@@ -7861,7 +7860,7 @@ + SnapScan +
(1.4) + +-sane-snapscan ++sane-snapscan + + Perfection 1200Photo + USB +@@ -7872,7 +7871,7 @@ + epson +
(unmaintained) + +-sane-epson ++sane-epson + + Perfection 1200S + SCSI +@@ -7882,7 +7881,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Perfection 1200S + SCSI +@@ -7893,7 +7892,7 @@ + epson +
(unmaintained) + +-sane-epson ++sane-epson + + Perfection 1200U + USB +@@ -7903,7 +7902,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Perfection 1200U + USB +@@ -7914,7 +7913,7 @@ + epson +
(unmaintained) + +-sane-epson ++sane-epson + + Perfection 1200U PHOTO + USB +@@ -7924,7 +7923,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Perfection 1240 + SCSI USB +@@ -7935,7 +7934,7 @@ + epson +
(unmaintained) + +-sane-epson ++sane-epson + + Perfection 1240U + USB +@@ -7945,7 +7944,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Perfection 1250 + USB +@@ -7956,7 +7955,7 @@ + plustek +
(0.52) + +-sane-plustek ++sane-plustek + + Perfection 1250 PHOTO + USB +@@ -7966,7 +7965,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Perfection 1250Photo + USB +@@ -7977,7 +7976,7 @@ + plustek +
(0.52) + +-sane-plustek ++sane-plustek + + Perfection 1260 + USB +@@ -7988,7 +7987,7 @@ + plustek +
(0.52) + +-sane-plustek ++sane-plustek + + Perfection 1260 PHOTO + USB +@@ -7998,7 +7997,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Perfection 1260Photo + USB +@@ -8009,7 +8008,7 @@ + plustek +
(0.52) + +-sane-plustek ++sane-plustek + + Perfection 1270 + USB +@@ -8020,7 +8019,7 @@ + SnapScan +
(1.4) + +-sane-snapscan ++sane-snapscan + + Perfection 1600 + SCSI +@@ -8030,7 +8029,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Perfection 1640 + SCSI USB +@@ -8041,7 +8040,7 @@ + epson +
(unmaintained) + +-sane-epson ++sane-epson + + Perfection 1640SU + SCSI USB +@@ -8051,7 +8050,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Perfection 1640SU PHOTO + SCSI USB +@@ -8061,7 +8060,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Perfection 1650 + USB +@@ -8071,7 +8070,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Perfection 1650 + USB +@@ -8082,7 +8081,7 @@ + epson +
(unmaintained) + +-sane-epson ++sane-epson + + Perfection 1650 PHOTO + USB +@@ -8092,7 +8091,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Perfection 1660 + USB +@@ -8103,7 +8102,7 @@ + epson +
(unmaintained) + +-sane-epson ++sane-epson + + Perfection 1660 PHOTO + USB +@@ -8113,7 +8112,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Perfection 1670 + USB +@@ -8124,7 +8123,7 @@ + SnapScan +
(1.4) + +-sane-snapscan ++sane-snapscan + + Perfection 1670 PHOTO + USB +@@ -8134,7 +8133,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Perfection 2400 + USB +@@ -8145,7 +8144,7 @@ + epson +
(unmaintained) + +-sane-epson ++sane-epson + + Perfection 2400 PHOTO + USB +@@ -8155,7 +8154,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Perfection 2450 + USB IEEE-1394 +@@ -8166,7 +8165,7 @@ + epson +
(unmaintained) + +-sane-epson ++sane-epson + + Perfection 2450 PHOTO + USB IEEE-1394 +@@ -8176,7 +8175,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Perfection 2480 + USB +@@ -8187,7 +8186,7 @@ + SnapScan +
(1.4) + +-sane-snapscan ++sane-snapscan + + Perfection 2480 PHOTO + USB +@@ -8197,7 +8196,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Perfection 2580 + USB +@@ -8208,7 +8207,7 @@ + SnapScan +
(1.4) + +-sane-snapscan ++sane-snapscan + + Perfection 2580 PHOTO + USB +@@ -8218,7 +8217,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Perfection 3170 PHOTO + USB +@@ -8228,7 +8227,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Perfection 3200 + USB IEEE-1394 +@@ -8239,7 +8238,7 @@ + epson +
(unmaintained) + +-sane-epson ++sane-epson + + Perfection 3200 PHOTO + USB IEEE-1394 +@@ -8249,7 +8248,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Perfection 3490 + USB +@@ -8260,7 +8259,7 @@ + SnapScan +
(1.4) + +-sane-snapscan ++sane-snapscan + + Perfection 3490 PHOTO + USB +@@ -8270,7 +8269,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Perfection 3590 + USB +@@ -8281,7 +8280,7 @@ + SnapScan +
(1.4) + +-sane-snapscan ++sane-snapscan + + Perfection 3590 PHOTO + USB +@@ -8291,7 +8290,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Perfection 4180 PHOTO + USB +@@ -8301,7 +8300,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Perfection 4490 PHOTO + USB +@@ -8311,7 +8310,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Perfection 4870 + USB +@@ -8322,7 +8321,7 @@ + epson +
(unmaintained) + +-sane-epson ++sane-epson + + Perfection 4870 PHOTO + USB +@@ -8332,7 +8331,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Perfection 4990 + USB +@@ -8343,7 +8342,7 @@ + epson +
(unmaintained) + +-sane-epson ++sane-epson + + Perfection 4990 PHOTO + USB +@@ -8353,7 +8352,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Perfection 4990 Pro + USB IEEE1394 +@@ -8363,7 +8362,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Perfection V10 + USB +@@ -8373,7 +8372,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Perfection V30 + USB +@@ -8383,7 +8382,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Perfection V100 Photo + USB +@@ -8393,7 +8392,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Perfection V200 Photo + USB +@@ -8403,7 +8402,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Perfection V300 Photo + USB +@@ -8413,7 +8412,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Perfection V350 Photo + USB +@@ -8423,7 +8422,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Perfection V500 Photo + USB +@@ -8433,7 +8432,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Perfection V600 Photo + USB +@@ -8443,7 +8442,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Perfection V700 Photo + USB +@@ -8453,7 +8452,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Perfection V750 Photo + USB +@@ -8463,7 +8462,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + PM-A700 + USB +@@ -8473,7 +8472,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + PM-A750 + USB +@@ -8483,7 +8482,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + PM-A820 + USB +@@ -8493,7 +8492,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + PM-A840 + USB +@@ -8503,7 +8502,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + PM-A840S + USB +@@ -8513,7 +8512,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + PM-A850 + USB +@@ -8523,7 +8522,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + PM-A870 + USB +@@ -8533,7 +8532,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + PM-A890 + USB +@@ -8543,7 +8542,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + PM-A900 + USB +@@ -8553,7 +8552,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + PM-A920 + USB +@@ -8563,7 +8562,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + PM-A940 + USB +@@ -8573,7 +8572,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + PM-A950 + USB +@@ -8583,7 +8582,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + PM-A970 + USB +@@ -8593,7 +8592,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + PM-T960 + USB +@@ -8603,7 +8602,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + PM-T990 + USB +@@ -8613,7 +8612,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + PX-401A + USB +@@ -8623,7 +8622,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + PX-402A + USB +@@ -8633,7 +8632,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + PX-501A + USB +@@ -8643,7 +8642,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + PX-502A + USB +@@ -8653,7 +8652,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + PX-601F + USB +@@ -8663,7 +8662,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + PX-A550 + USB +@@ -8673,7 +8672,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + PX-A620 + USB +@@ -8683,7 +8682,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + PX-A640 + USB +@@ -8693,7 +8692,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + PX-A650 + USB +@@ -8703,7 +8702,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + PX-A720 + USB +@@ -8713,7 +8712,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + PX-A740 + USB +@@ -8723,7 +8722,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + PX-FA700 + USB +@@ -8733,7 +8732,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + RX-425 + USB +@@ -8744,7 +8743,7 @@ + epson +
(unmaintained) + +-sane-epson ++sane-epson + + RX-500 + USB +@@ -8755,7 +8754,7 @@ + epson +
(unmaintained) + +-sane-epson ++sane-epson + + RX-600 + USB +@@ -8766,7 +8765,7 @@ + epson +
(unmaintained) + +-sane-epson ++sane-epson + + RX-620 + USB +@@ -8777,7 +8776,7 @@ + epson +
(unmaintained) + +-sane-epson ++sane-epson + + RX-700 + USB +@@ -8788,7 +8787,7 @@ + epson +
(unmaintained) + +-sane-epson ++sane-epson + + Stylus CX-1500 + USB +@@ -8799,7 +8798,7 @@ + SnapScan +
(1.4) + +-sane-snapscan ++sane-snapscan + + Stylus CX-5800 + USB +@@ -8820,7 +8819,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus CX2800 + USB +@@ -8830,7 +8829,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus CX2900 + USB +@@ -8840,7 +8839,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus CX3100 + USB +@@ -8850,7 +8849,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus CX3200 + USB +@@ -8860,7 +8859,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus CX3500 + USB +@@ -8870,7 +8869,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus CX3600 + USB +@@ -8880,7 +8879,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus CX3650 + USB +@@ -8890,7 +8889,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus CX3700 + USB +@@ -8900,7 +8899,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus CX3800 + USB +@@ -8910,7 +8909,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus CX3810 + USB +@@ -8920,7 +8919,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus CX3900 + USB +@@ -8930,7 +8929,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus CX4100 + USB +@@ -8940,7 +8939,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus CX4200 + USB +@@ -8950,7 +8949,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus CX4300 + USB +@@ -8960,7 +8959,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus CX4400 + USB +@@ -8970,7 +8969,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus CX4500 + USB +@@ -8980,7 +8979,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus CX4600 + USB +@@ -8990,7 +8989,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus CX4700 + USB +@@ -9000,7 +8999,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus CX4800 + USB +@@ -9010,7 +9009,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus CX4900 + USB +@@ -9020,7 +9019,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus CX5000 + USB +@@ -9030,7 +9029,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus CX5100 + USB +@@ -9040,7 +9039,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus CX5200 + USB +@@ -9050,7 +9049,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus CX5300 + USB +@@ -9060,7 +9059,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus CX5400 + USB +@@ -9070,7 +9069,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus CX5500 + USB +@@ -9080,7 +9079,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus CX5600 + USB +@@ -9090,7 +9089,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus CX5700F + USB +@@ -9100,7 +9099,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus CX5800F + USB +@@ -9110,7 +9109,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus CX5900 + USB +@@ -9120,7 +9119,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus CX6000 + USB +@@ -9130,7 +9129,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus CX6300 + USB +@@ -9140,7 +9139,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus CX6400 + USB +@@ -9150,7 +9149,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus CX6500 + USB +@@ -9160,7 +9159,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus CX6600 + USB +@@ -9170,7 +9169,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus CX6900F + USB +@@ -9180,7 +9179,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus CX7000F + USB +@@ -9190,7 +9189,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus CX7300 + USB +@@ -9200,7 +9199,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus CX7400 + USB +@@ -9210,7 +9209,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus CX7700 + USB +@@ -9220,7 +9219,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus CX7800 + USB +@@ -9230,7 +9229,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus CX8300 + USB +@@ -9240,7 +9239,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus CX8400 + USB +@@ -9250,7 +9249,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus CX9300F + USB +@@ -9260,7 +9259,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus CX9400Fax + USB +@@ -9270,7 +9269,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus DX3800 + USB +@@ -9280,7 +9279,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus DX3850 + USB +@@ -9290,7 +9289,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus DX4000 + USB +@@ -9300,7 +9299,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus DX4200 + USB +@@ -9310,7 +9309,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus DX4400 + USB +@@ -9320,7 +9319,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus DX4450 + USB +@@ -9341,7 +9340,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus DX4850 + USB +@@ -9351,7 +9350,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus DX5000 + USB +@@ -9361,7 +9360,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus DX6000 + USB +@@ -9371,7 +9370,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus DX7000F + USB +@@ -9381,7 +9380,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus DX7400 + USB +@@ -9391,7 +9390,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus DX8400 + USB +@@ -9401,7 +9400,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus DX9400F + USB +@@ -9411,7 +9410,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus NX100 + USB +@@ -9421,7 +9420,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus NX110 Series + USB +@@ -9431,7 +9430,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus NX200 + USB +@@ -9441,7 +9440,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus NX210 Series + USB +@@ -9451,7 +9450,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus NX300 + USB +@@ -9461,7 +9460,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus NX400 + USB +@@ -9471,7 +9470,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus NX410 Series + USB +@@ -9481,7 +9480,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus NX510 Series + USB +@@ -9491,7 +9490,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus Office BX300F + USB +@@ -9501,7 +9500,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus Office BX310FN Series + USB +@@ -9511,7 +9510,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus Office BX600FW + USB +@@ -9521,7 +9520,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus Office BX610FW Series + USB +@@ -9531,7 +9530,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus Office TX300F + USB +@@ -9541,7 +9540,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus Office TX510FN Series + USB +@@ -9551,7 +9550,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus Office TX600FW + USB +@@ -9561,7 +9560,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus Office TX610FW Series + USB +@@ -9571,7 +9570,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus Photo PX650 Series + USB +@@ -9581,7 +9580,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus Photo PX700W + USB Network +@@ -9591,7 +9590,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus Photo PX710W Series + USB +@@ -9601,7 +9600,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus Photo PX800FW + USB +@@ -9611,7 +9610,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus Photo PX810FW Series + USB +@@ -9621,7 +9620,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus Photo RX420 + USB +@@ -9631,7 +9630,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus Photo RX425 + USB +@@ -9641,7 +9640,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus Photo RX430 + USB +@@ -9651,7 +9650,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus Photo RX500 + USB +@@ -9661,7 +9660,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus Photo RX510 + USB +@@ -9671,7 +9670,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus Photo RX520 + USB +@@ -9681,7 +9680,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus Photo RX530 + USB +@@ -9691,7 +9690,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus Photo RX560 + USB +@@ -9701,7 +9700,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus Photo RX580 + USB +@@ -9711,7 +9710,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus Photo RX585 + USB +@@ -9721,7 +9720,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus Photo RX590 + USB +@@ -9731,7 +9730,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus Photo RX595 + USB +@@ -9741,7 +9740,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus Photo RX600 + USB +@@ -9751,7 +9750,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus Photo RX610 + USB +@@ -9761,7 +9760,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus Photo RX620 + USB +@@ -9771,7 +9770,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus Photo RX630 + USB +@@ -9781,7 +9780,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus Photo RX640 + USB +@@ -9791,7 +9790,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus Photo RX650 + USB +@@ -9801,7 +9800,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus Photo RX680 + USB +@@ -9811,7 +9810,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus Photo RX685 + USB +@@ -9821,7 +9820,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus Photo RX690 + USB +@@ -9831,7 +9830,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus Photo RX700 + USB +@@ -9841,7 +9840,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus Photo TX650 Series + USB +@@ -9851,7 +9850,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus Photo TX700W + USB +@@ -9861,7 +9860,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus Photo TX710W Series + USB +@@ -9871,7 +9870,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus Photo TX800FW + USB +@@ -9881,7 +9880,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus Scan 2000 + USB +@@ -9891,7 +9890,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus Scan 2500 + USB +@@ -9901,7 +9900,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus SX100 + USB +@@ -9911,7 +9910,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus SX110 Series + USB +@@ -9921,7 +9920,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus SX125 + USB +@@ -9931,7 +9930,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus SX200 + USB +@@ -9941,7 +9940,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus SX205 + USB +@@ -9951,7 +9950,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus SX210 Series + USB +@@ -9961,7 +9960,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus SX400 + USB +@@ -9971,7 +9970,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus SX405 + USB +@@ -9981,7 +9980,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus SX410 Series + USB +@@ -9991,7 +9990,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus SX510W Series + USB +@@ -10001,7 +10000,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus SX600FW + USB +@@ -10011,7 +10010,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus SX610FW Series + USB +@@ -10021,7 +10020,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus TX100 + USB +@@ -10031,7 +10030,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus TX110 Series + USB +@@ -10041,7 +10040,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus TX200 + USB +@@ -10051,7 +10050,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus TX203 + USB +@@ -10061,7 +10060,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus TX209 + USB +@@ -10071,7 +10070,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus TX210 Series + USB +@@ -10081,7 +10080,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus TX400 + USB +@@ -10091,7 +10090,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus TX410 Series + USB +@@ -10101,7 +10100,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + Stylus TX550W Series + USB +@@ -10111,7 +10110,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + StylusScan 2000 + USB +@@ -10133,7 +10132,7 @@ + epson +
(unmaintained) + +-sane-epson ++sane-epson + + V750 + USB IEEE-1394 +@@ -10144,7 +10143,7 @@ + epson +
(unmaintained) + +-sane-epson ++sane-epson + + WorkForce 310 Series + USB +@@ -10154,7 +10153,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + WorkForce 500 + USB +@@ -10164,7 +10163,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + WorkForce 600 + USB +@@ -10174,7 +10173,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + WorkForce 610 Series + USB +@@ -10184,7 +10183,7 @@ + + epson2
(1.0.124) + +-sane-epson2 ++sane-epson2 + + +

Manufacturer: Escom

+@@ -10209,7 +10208,7 @@ + umax +
(1.0-41) + +-sane-umax ++sane-umax + + +

Manufacturer: Escort

+@@ -10234,7 +10233,7 @@ + umax +
(1.0-41) + +-sane-umax ++sane-umax + + +

Manufacturer: Fujitsu

+@@ -10261,7 +10260,7 @@ + gt68xx +
(1.0-84) + +-sane-gt68xx ++sane-gt68xx + + fi-60F + USB +@@ -10272,7 +10271,7 @@ + epjitsu +
(20) + +-sane-epjitsu ++sane-epjitsu + + fi-4010CU + USB +@@ -10283,7 +10282,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + fi-4110EOX/2/3 + USB +@@ -10294,7 +10293,7 @@ + ma1509 +
(1.0-3) + +-sane-ma1509 ++sane-ma1509 + + fi-4120C + SCSI USB +@@ -10305,7 +10304,7 @@ + fujitsu +
(117) + +-sane-fujitsu ++sane-fujitsu + + fi-4120C2 + SCSI USB +@@ -10316,7 +10315,7 @@ + fujitsu +
(117) + +-sane-fujitsu ++sane-fujitsu + + fi-4220C + SCSI USB +@@ -10327,7 +10326,7 @@ + fujitsu +
(117) + +-sane-fujitsu ++sane-fujitsu + + fi-4220C2 + SCSI USB +@@ -10338,7 +10337,7 @@ + fujitsu +
(117) + +-sane-fujitsu ++sane-fujitsu + + fi-4340C + SCSI USB +@@ -10349,7 +10348,7 @@ + fujitsu +
(117) + +-sane-fujitsu ++sane-fujitsu + + fi-4530C + SCSI USB +@@ -10360,7 +10359,7 @@ + fujitsu +
(117) + +-sane-fujitsu ++sane-fujitsu + + fi-4640S + SCSI +@@ -10371,7 +10370,7 @@ + fujitsu +
(117) + +-sane-fujitsu ++sane-fujitsu + + fi-4750C + SCSI +@@ -10382,7 +10381,7 @@ + fujitsu +
(117) + +-sane-fujitsu ++sane-fujitsu + + fi-4750L + SCSI +@@ -10393,7 +10392,7 @@ + fujitsu +
(117) + +-sane-fujitsu ++sane-fujitsu + + fi-4860C + SCSI +@@ -10404,7 +10403,7 @@ + fujitsu +
(117) + +-sane-fujitsu ++sane-fujitsu + + fi-4860C2 + SCSI +@@ -10415,7 +10414,7 @@ + fujitsu +
(117) + +-sane-fujitsu ++sane-fujitsu + + fi-4990C + SCSI +@@ -10426,7 +10425,7 @@ + fujitsu +
(117) + +-sane-fujitsu ++sane-fujitsu + + fi-5000N + Ethernet +@@ -10437,7 +10436,7 @@ + fujitsu +
(117) + +-sane-fujitsu ++sane-fujitsu + + fi-5015C + USB +@@ -10448,7 +10447,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + fi-5110C + USB +@@ -10459,7 +10458,7 @@ + fujitsu +
(117) + +-sane-fujitsu ++sane-fujitsu + + fi-5110EOX/2 + USB +@@ -10470,7 +10469,7 @@ + fujitsu +
(117) + +-sane-fujitsu ++sane-fujitsu + + fi-5110EOX3 + USB +@@ -10481,7 +10480,7 @@ + fujitsu +
(117) + +-sane-fujitsu ++sane-fujitsu + + fi-5110EOXM + USB +@@ -10492,7 +10491,7 @@ + fujitsu +
(117) + +-sane-fujitsu ++sane-fujitsu + + fi-5120C + SCSI USB +@@ -10503,7 +10502,7 @@ + fujitsu +
(117) + +-sane-fujitsu ++sane-fujitsu + + fi-5220C + SCSI USB +@@ -10514,7 +10513,7 @@ + fujitsu +
(117) + +-sane-fujitsu ++sane-fujitsu + + fi-5530C + SCSI USB +@@ -10525,7 +10524,7 @@ + fujitsu +
(117) + +-sane-fujitsu ++sane-fujitsu + + fi-5530C2 + SCSI USB +@@ -10536,7 +10535,7 @@ + fujitsu +
(117) + +-sane-fujitsu ++sane-fujitsu + + fi-5650C + SCSI USB +@@ -10547,7 +10546,7 @@ + fujitsu +
(117) + +-sane-fujitsu ++sane-fujitsu + + fi-5750C + SCSI USB +@@ -10558,7 +10557,7 @@ + fujitsu +
(117) + +-sane-fujitsu ++sane-fujitsu + + fi-5900C + SCSI USB +@@ -10569,7 +10568,7 @@ + fujitsu +
(117) + +-sane-fujitsu ++sane-fujitsu + + fi-5950 + SCSI USB +@@ -10580,7 +10579,7 @@ + fujitsu +
(117) + +-sane-fujitsu ++sane-fujitsu + + fi-6000NS + Ethernet +@@ -10591,7 +10590,7 @@ + fujitsu +
(117) + +-sane-fujitsu ++sane-fujitsu + + fi-6110 + USB +@@ -10602,7 +10601,7 @@ + fujitsu +
(117) + +-sane-fujitsu ++sane-fujitsu + + fi-6130 + USB +@@ -10613,7 +10612,7 @@ + fujitsu +
(117) + +-sane-fujitsu ++sane-fujitsu + + fi-6130Z + USB +@@ -10624,7 +10623,7 @@ + fujitsu +
(117) + +-sane-fujitsu ++sane-fujitsu + + fi-6140 + SCSI USB +@@ -10635,7 +10634,7 @@ + fujitsu +
(117) + +-sane-fujitsu ++sane-fujitsu + + fi-6140Z + SCSI USB +@@ -10646,7 +10645,7 @@ + fujitsu +
(117) + +-sane-fujitsu ++sane-fujitsu + + fi-6230 + USB +@@ -10657,7 +10656,7 @@ + fujitsu +
(117) + +-sane-fujitsu ++sane-fujitsu + + fi-6230Z + USB +@@ -10668,7 +10667,7 @@ + fujitsu +
(117) + +-sane-fujitsu ++sane-fujitsu + + fi-6240 + SCSI USB +@@ -10679,7 +10678,7 @@ + fujitsu +
(117) + +-sane-fujitsu ++sane-fujitsu + + fi-6240Z + SCSI USB +@@ -10690,7 +10689,7 @@ + fujitsu +
(117) + +-sane-fujitsu ++sane-fujitsu + + fi-6670 + SCSI USB +@@ -10701,7 +10700,7 @@ + fujitsu +
(117) + +-sane-fujitsu ++sane-fujitsu + + fi-6670A + SCSI USB +@@ -10712,7 +10711,7 @@ + fujitsu +
(117) + +-sane-fujitsu ++sane-fujitsu + + fi-6750S + USB +@@ -10723,7 +10722,7 @@ + fujitsu +
(117) + +-sane-fujitsu ++sane-fujitsu + + fi-6770 + SCSI USB +@@ -10734,7 +10733,7 @@ + fujitsu +
(117) + +-sane-fujitsu ++sane-fujitsu + + fi-6770A + SCSI USB +@@ -10745,7 +10744,7 @@ + fujitsu +
(117) + +-sane-fujitsu ++sane-fujitsu + + fi-6800 + SCSI USB +@@ -10756,7 +10755,7 @@ + fujitsu +
(117) + +-sane-fujitsu ++sane-fujitsu + + fi-6800-CGA + SCSI USB +@@ -10767,7 +10766,7 @@ + fujitsu +
(117) + +-sane-fujitsu ++sane-fujitsu + + M3091DC + SCSI +@@ -10778,7 +10777,7 @@ + fujitsu +
(117) + +-sane-fujitsu ++sane-fujitsu + + M3092DC + SCSI +@@ -10789,7 +10788,7 @@ + fujitsu +
(117) + +-sane-fujitsu ++sane-fujitsu + + M3093DE + RS232C/Video +@@ -10800,7 +10799,7 @@ + fujitsu +
(117) + +-sane-fujitsu ++sane-fujitsu + + M3093DG + SCSI +@@ -10811,7 +10810,7 @@ + fujitsu +
(117) + +-sane-fujitsu ++sane-fujitsu + + M3093E + RS232C/Video +@@ -10822,7 +10821,7 @@ + fujitsu +
(117) + +-sane-fujitsu ++sane-fujitsu + + M3093EX + RS232C/Video +@@ -10833,7 +10832,7 @@ + fujitsu +
(117) + +-sane-fujitsu ++sane-fujitsu + + M3093GX + SCSI +@@ -10844,7 +10843,7 @@ + fujitsu +
(117) + +-sane-fujitsu ++sane-fujitsu + + M3096EX + RS232C/Video +@@ -10855,7 +10854,7 @@ + fujitsu +
(117) + +-sane-fujitsu ++sane-fujitsu + + M3096GX + SCSI +@@ -10866,7 +10865,7 @@ + fujitsu +
(117) + +-sane-fujitsu ++sane-fujitsu + + M3097DE + RS232C/Video +@@ -10877,7 +10876,7 @@ + fujitsu +
(117) + +-sane-fujitsu ++sane-fujitsu + + M3097DG + SCSI +@@ -10888,7 +10887,7 @@ + fujitsu +
(117) + +-sane-fujitsu ++sane-fujitsu + + M3097E+ + RS232C/Video +@@ -10899,7 +10898,7 @@ + fujitsu +
(117) + +-sane-fujitsu ++sane-fujitsu + + M3097G+ + SCSI +@@ -10910,7 +10909,7 @@ + fujitsu +
(117) + +-sane-fujitsu ++sane-fujitsu + + M3099A + RS232C/Video +@@ -10921,7 +10920,7 @@ + fujitsu +
(117) + +-sane-fujitsu ++sane-fujitsu + + M3099EH + RS232C/Video +@@ -10932,7 +10931,7 @@ + fujitsu +
(117) + +-sane-fujitsu ++sane-fujitsu + + M3099EX + RS232C/Video +@@ -10943,7 +10942,7 @@ + fujitsu +
(117) + +-sane-fujitsu ++sane-fujitsu + + M3099G + SCSI +@@ -10954,7 +10953,7 @@ + fujitsu +
(117) + +-sane-fujitsu ++sane-fujitsu + + M3099GH + SCSI +@@ -10965,7 +10964,7 @@ + fujitsu +
(117) + +-sane-fujitsu ++sane-fujitsu + + M3099GX + SCSI +@@ -10976,7 +10975,7 @@ + fujitsu +
(117) + +-sane-fujitsu ++sane-fujitsu + + M4097D + SCSI +@@ -10987,7 +10986,7 @@ + fujitsu +
(117) + +-sane-fujitsu ++sane-fujitsu + + M4099D + SCSI +@@ -10998,7 +10997,7 @@ + fujitsu +
(117) + +-sane-fujitsu ++sane-fujitsu + + ScanPartner + SCSI +@@ -11009,7 +11008,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + ScanPartner 10 + SCSI +@@ -11020,7 +11019,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + ScanPartner 10C + SCSI +@@ -11031,7 +11030,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + ScanPartner 15C + SCSI +@@ -11041,7 +11040,7 @@ + + sp15c
(unmaintained) + +-sane-sp15c ++sane-sp15c + + ScanPartner 300C + SCSI +@@ -11052,7 +11051,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + ScanPartner 600C + SCSI +@@ -11062,7 +11061,7 @@ + + sp15c
(unmaintained) + +-sane-sp15c ++sane-sp15c + + ScanPartner 620C + SCSI +@@ -11073,7 +11072,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + ScanPartner Jr + SCSI +@@ -11084,7 +11083,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + ScanSnap fi-6010N + Ethernet +@@ -11095,7 +11094,7 @@ + fujitsu +
(117) + +-sane-fujitsu ++sane-fujitsu + + ScanSnap iX500 + USB WiFi +@@ -11106,7 +11105,7 @@ + fujitsu +
(117) + +-sane-fujitsu ++sane-fujitsu + + ScanSnap N1800 + Ethernet +@@ -11117,7 +11116,7 @@ + fujitsu +
(117) + +-sane-fujitsu ++sane-fujitsu + + ScanSnap S300 + USB +@@ -11128,7 +11127,7 @@ + epjitsu +
(20) + +-sane-epjitsu ++sane-epjitsu + + ScanSnap S300M + USB +@@ -11139,7 +11138,7 @@ + epjitsu +
(20) + +-sane-epjitsu ++sane-epjitsu + + ScanSnap S500 + USB +@@ -11150,7 +11149,7 @@ + fujitsu +
(117) + +-sane-fujitsu ++sane-fujitsu + + ScanSnap S500M + USB +@@ -11161,7 +11160,7 @@ + fujitsu +
(117) + +-sane-fujitsu ++sane-fujitsu + + ScanSnap S510 + USB +@@ -11172,7 +11171,7 @@ + fujitsu +
(117) + +-sane-fujitsu ++sane-fujitsu + + ScanSnap S510M + USB +@@ -11183,7 +11182,7 @@ + fujitsu +
(117) + +-sane-fujitsu ++sane-fujitsu + + ScanSnap S1100 + USB +@@ -11194,7 +11193,7 @@ + epjitsu +
(20) + +-sane-epjitsu ++sane-epjitsu + + ScanSnap S1300 + USB +@@ -11205,7 +11204,7 @@ + epjitsu +
(20) + +-sane-epjitsu ++sane-epjitsu + + ScanSnap S1500 + USB +@@ -11216,7 +11215,7 @@ + fujitsu +
(117) + +-sane-fujitsu ++sane-fujitsu + + ScanSnap S1500M + USB +@@ -11227,7 +11226,7 @@ + fujitsu +
(117) + +-sane-fujitsu ++sane-fujitsu + + ScanStation + SCSI +@@ -11238,7 +11237,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + +

Manufacturer: Gallery

+@@ -11263,7 +11262,7 @@ + mustek_pp +
(13) + +-sane-mustek_pp ++sane-mustek_pp + + +

Manufacturer: Genius

+@@ -11301,7 +11300,7 @@ + u12 +
(0.02) + +-sane-u12 ++sane-u12 + + Colorpage HR6 V2 + USB +@@ -11312,7 +11311,7 @@ + plustek +
(0.52) + +-sane-plustek ++sane-plustek + + Colorpage HR6 V2 + USB +@@ -11323,7 +11322,7 @@ + plustek +
(0.52) + +-sane-plustek ++sane-plustek + + Colorpage HR6A + USB +@@ -11334,7 +11333,7 @@ + plustek +
(0.52) + +-sane-plustek ++sane-plustek + + Colorpage HR6X + USB +@@ -11345,7 +11344,7 @@ + plustek +
(0.52) + +-sane-plustek ++sane-plustek + + Colorpage HR6X EPP + Parport (SPP, EPP) +@@ -11356,7 +11355,7 @@ + plustek_pp +
(0.43) + +-sane-plustek_pp ++sane-plustek_pp + + ColorPage HR6X Slim + USB +@@ -11378,7 +11377,7 @@ + plustek +
(0.52) + +-sane-plustek ++sane-plustek + + Colorpage HR7LE + USB +@@ -11389,7 +11388,7 @@ + plustek +
(0.52) + +-sane-plustek ++sane-plustek + + ColorPage HR7X + USB +@@ -11433,7 +11432,7 @@ + gt68xx +
(1.0-84) + +-sane-gt68xx ++sane-gt68xx + + ColorPage Slim 1200 + USB +@@ -11444,7 +11443,7 @@ + gt68xx +
(1.0-84) + +-sane-gt68xx ++sane-gt68xx + + Colorpage Vivid 1200 X + USB +@@ -11455,7 +11454,7 @@ + gt68xx +
(1.0-84) + +-sane-gt68xx ++sane-gt68xx + + Colorpage Vivid 1200 XE + USB +@@ -11466,7 +11465,7 @@ + gt68xx +
(1.0-84) + +-sane-gt68xx ++sane-gt68xx + + ColorPage Vivid III USB + USB +@@ -11477,7 +11476,7 @@ + u12 +
(0.02) + +-sane-u12 ++sane-u12 + + Colorpage Vivid III V2 + Parport (SPP, EPP) +@@ -11488,7 +11487,7 @@ + plustek_pp +
(0.43) + +-sane-plustek_pp ++sane-plustek_pp + + Colorpage Vivid Pro II Film + Parport (SPP, EPP) +@@ -11499,7 +11498,7 @@ + plustek_pp +
(0.43) + +-sane-plustek_pp ++sane-plustek_pp + + Colorpage Vivid3 V2 + USB +@@ -11510,7 +11509,7 @@ + gt68xx +
(1.0-84) + +-sane-gt68xx ++sane-gt68xx + + Colorpage Vivid3x + USB +@@ -11521,7 +11520,7 @@ + gt68xx +
(1.0-84) + +-sane-gt68xx ++sane-gt68xx + + Colorpage Vivid3xe + USB +@@ -11532,7 +11531,7 @@ + gt68xx +
(1.0-84) + +-sane-gt68xx ++sane-gt68xx + + Colorpage Vivid4 + USB +@@ -11543,7 +11542,7 @@ + gt68xx +
(1.0-84) + +-sane-gt68xx ++sane-gt68xx + + Colorpage Vivid4x + USB +@@ -11554,7 +11553,7 @@ + gt68xx +
(1.0-84) + +-sane-gt68xx ++sane-gt68xx + + Colorpage Vivid4xe + USB +@@ -11565,7 +11564,7 @@ + gt68xx +
(1.0-84) + +-sane-gt68xx ++sane-gt68xx + + ColorPage-EP + Parport +@@ -11576,7 +11575,7 @@ + microtek2 +
(unmaintained) + +-sane-microtek2 ++sane-microtek2 + + ColorPage-HR5 (Pro) + SCSI +@@ -11587,7 +11586,7 @@ + umax +
(1.0-41) + +-sane-umax ++sane-umax + + ColorPage-Life Pro + Parport (EPP/ECP) +@@ -11598,7 +11597,7 @@ + umax_pp +
(1) + +-sane-umax_pp ++sane-umax_pp + + ColorPage-Slim 1200 USB2 + USB +@@ -11620,7 +11619,7 @@ + microtek +
(0.13.1) + +-sane-microtek ++sane-microtek + + FS-1130 Colorpage Scanner + SCSI +@@ -11631,7 +11630,7 @@ + leo +
(1.0-10) + +-sane-leo ++sane-leo + + +

Manufacturer: Googlegear

+@@ -11656,7 +11655,7 @@ + gt68xx +
(1.0-84) + +-sane-gt68xx ++sane-gt68xx + + +

Manufacturer: Guillemot

+@@ -11719,7 +11718,7 @@ + SnapScan +
(1.4) + +-sane-snapscan ++sane-snapscan + + Maxi Scan A4 Deluxe (SCSI) + SCSI +@@ -11730,7 +11729,7 @@ + SnapScan +
(1.4) + +-sane-snapscan ++sane-snapscan + + Maxi Scan A4 USB 640U + USB +@@ -11741,7 +11740,7 @@ + SnapScan +
(1.4) + +-sane-snapscan ++sane-snapscan + + Scan@home Touch 1248 (USB) + USB +@@ -11752,7 +11751,7 @@ + SnapScan +
(1.4) + +-sane-snapscan ++sane-snapscan + + +

Manufacturer: Hercules

+@@ -11803,7 +11802,7 @@ + + hpljm1005
(0) + +-sane-hpljm1005 ++sane-hpljm1005 + + LaserJet M1120 MFP + USB +@@ -11813,7 +11812,7 @@ + + hpljm1005
(0) + +-sane-hpljm1005 ++sane-hpljm1005 + + LaserJet M1120n MFP + USB +@@ -11823,7 +11822,7 @@ + + hpljm1005
(0) + +-sane-hpljm1005 ++sane-hpljm1005 + + Photo Scanner 1000 + USB +@@ -11878,7 +11877,7 @@ + hp +
(1.06) + +-sane-hp ++sane-hp + + Photosmart S20 (C5101A) + USB +@@ -11911,7 +11910,7 @@ + hp +
(1.06) + +-sane-hp ++sane-hp + + ScanJet 3p + SCSI +@@ -11922,7 +11921,7 @@ + hp +
(1.06) + +-sane-hp ++sane-hp + + ScanJet 4c + SCSI +@@ -11933,7 +11932,7 @@ + hp +
(1.06) + +-sane-hp ++sane-hp + + ScanJet 4p + SCSI +@@ -11944,7 +11943,7 @@ + hp +
(1.06) + +-sane-hp ++sane-hp + + ScanJet 5p + SCSI +@@ -11955,7 +11954,7 @@ + hp +
(1.06) + +-sane-hp ++sane-hp + + ScanJet 5s + Parport (EPP) +@@ -11966,7 +11965,7 @@ + hpsj5s +
(0.03) + +-sane-hpsj5s ++sane-hpsj5s + + ScanJet 2100C + USB +@@ -11977,7 +11976,7 @@ + plustek +
(0.52) + +-sane-plustek ++sane-plustek + + ScanJet 2200C + USB +@@ -11988,7 +11987,7 @@ + plustek +
(0.52) + +-sane-plustek ++sane-plustek + + ScanJet 2300C + USB +@@ -11999,7 +11998,7 @@ + genesys +
(1.0-63) + +-sane-genesys ++sane-genesys + + ScanJet 2400C + USB +@@ -12010,7 +12009,7 @@ + genesys +
(1.0-63) + +-sane-genesys ++sane-genesys + + Scanjet 3200C + Parport (EPP/ECP) +@@ -12021,7 +12020,7 @@ + umax_pp +
(1) + +-sane-umax_pp ++sane-umax_pp + + ScanJet 3300c + USB +@@ -12032,7 +12031,7 @@ + niash +
(0.3) + +-sane-niash ++sane-niash + + ScanJet 3400c + USB +@@ -12043,7 +12042,7 @@ + niash +
(0.3) + +-sane-niash ++sane-niash + + ScanJet 3500C + USB +@@ -12054,7 +12053,7 @@ + hp3500 +
(1.1) + +-sane-hp3500 ++sane-hp3500 + + ScanJet 3530C + USB +@@ -12065,7 +12064,7 @@ + hp3500 +
(1.1) + +-sane-hp3500 ++sane-hp3500 + + ScanJet 3570C + USB +@@ -12076,7 +12075,7 @@ + hp3500 +
(1.1) + +-sane-hp3500 ++sane-hp3500 + + ScanJet 3670C + USB +@@ -12087,7 +12086,7 @@ + genesys +
(1.0-63) + +-sane-genesys ++sane-genesys + + ScanJet 3690C + USB +@@ -12098,7 +12097,7 @@ + genesys +
(1.0-63) + +-sane-genesys ++sane-genesys + + ScanJet 3770 + USB +@@ -12120,7 +12119,7 @@ + hp3900 +
(0.12) + +-sane-hp3900 ++sane-hp3900 + + ScanJet 3970c + USB +@@ -12131,7 +12130,7 @@ + hp3900 +
(0.12) + +-sane-hp3900 ++sane-hp3900 + + ScanJet 4070 Photosmart + USB +@@ -12142,7 +12141,7 @@ + hp3900 +
(0.12) + +-sane-hp3900 ++sane-hp3900 + + ScanJet 4100C + USB +@@ -12153,7 +12152,7 @@ + hp +
(1.06) + +-sane-hp ++sane-hp + + ScanJet 4200C + USB +@@ -12164,7 +12163,7 @@ + hp4200 +
(1.0-2) + +-sane-hp4200 ++sane-hp4200 + + ScanJet 4200Cse + USB +@@ -12175,7 +12174,7 @@ + hp4200 +
(1.0-2) + +-sane-hp4200 ++sane-hp4200 + + ScanJet 4200Cxi + USB +@@ -12186,7 +12185,7 @@ + hp4200 +
(1.0-2) + +-sane-hp4200 ++sane-hp4200 + + ScanJet 4300c + USB +@@ -12197,7 +12196,7 @@ + niash +
(0.3) + +-sane-niash ++sane-niash + + ScanJet 4300c/Silitek + USB +@@ -12208,7 +12207,7 @@ + niash +
(0.3) + +-sane-niash ++sane-niash + + ScanJet 4370 + USB +@@ -12219,7 +12218,7 @@ + hp3900 +
(0.12) + +-sane-hp3900 ++sane-hp3900 + + scanjet 4400c + USB +@@ -12230,7 +12229,7 @@ + rts8891 +
(1.0-0) + +-sane-rts8891 ++sane-rts8891 + + scanjet 4470c + USB +@@ -12241,7 +12240,7 @@ + rts8891 +
(1.0-0) + +-sane-rts8891 ++sane-rts8891 + + ScanJet 4500C + USB +@@ -12251,7 +12250,7 @@ + + hp5590
(1.0.5) + +-sane-hp5590 ++sane-hp5590 + + ScanJet 4570C + USB +@@ -12261,7 +12260,7 @@ + + hp5590
(1.0.5) + +-sane-hp5590 ++sane-hp5590 + + ScanJet 4600 + USB +@@ -12294,7 +12293,7 @@ + genesys +
(1.0-63) + +-sane-genesys ++sane-genesys + + ScanJet 4890C + USB +@@ -12316,7 +12315,7 @@ + hp +
(1.06) + +-sane-hp ++sane-hp + + ScanJet 5200C + Parport USB +@@ -12327,7 +12326,7 @@ + hp +
(1.06) + +-sane-hp ++sane-hp + + ScanJet 5300C + USB +@@ -12338,7 +12337,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + ScanJet 5370C + USB +@@ -12349,7 +12348,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + ScanJet 5400c + USB +@@ -12360,7 +12359,7 @@ + hp5400 +
(1.0-2) + +-sane-hp5400 ++sane-hp5400 + + ScanJet 5470c + USB +@@ -12371,7 +12370,7 @@ + hp5400 +
(1.0-2) + +-sane-hp5400 ++sane-hp5400 + + ScanJet 5490c + USB +@@ -12382,7 +12381,7 @@ + hp5400 +
(1.0-2) + +-sane-hp5400 ++sane-hp5400 + + ScanJet 5500C + USB +@@ -12392,7 +12391,7 @@ + + hp5590
(1.0.5) + +-sane-hp5590 ++sane-hp5590 + + ScanJet 5530C Photosmart + USB +@@ -12413,7 +12412,7 @@ + + hp5590
(1.0.5) + +-sane-hp5590 ++sane-hp5590 + + ScanJet 5590 + USB +@@ -12423,7 +12422,7 @@ + + hp5590
(1.0.5) + +-sane-hp5590 ++sane-hp5590 + + ScanJet 6100C + SCSI +@@ -12434,7 +12433,7 @@ + hp +
(1.06) + +-sane-hp ++sane-hp + + ScanJet 6200C + SCSI USB +@@ -12445,7 +12444,7 @@ + hp +
(1.06) + +-sane-hp ++sane-hp + + ScanJet 6250C + SCSI USB +@@ -12456,7 +12455,7 @@ + hp +
(1.06) + +-sane-hp ++sane-hp + + ScanJet 6300C + SCSI USB +@@ -12467,7 +12466,7 @@ + hp +
(1.06) + +-sane-hp ++sane-hp + + ScanJet 6350C + SCSI USB +@@ -12478,7 +12477,7 @@ + hp +
(1.06) + +-sane-hp ++sane-hp + + ScanJet 6390C + SCSI USB +@@ -12489,7 +12488,7 @@ + hp +
(1.06) + +-sane-hp ++sane-hp + + ScanJet 7400c + USB +@@ -12500,7 +12499,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + ScanJet 7450c + USB +@@ -12511,7 +12510,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + ScanJet 7490c + USB +@@ -12522,7 +12521,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + ScanJet 7650 + USB +@@ -12532,7 +12531,7 @@ + + hp5590
(1.0.5) + +-sane-hp5590 ++sane-hp5590 + + ScanJet 8200 + USB +@@ -12543,7 +12542,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + ScanJet 8250 + USB +@@ -12554,7 +12553,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + ScanJet 8270 + USB +@@ -12565,7 +12564,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + ScanJet 8290 + USB +@@ -12576,7 +12575,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + ScanJet 8300 + USB +@@ -12587,7 +12586,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + ScanJet 8350 + USB +@@ -12598,7 +12597,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + ScanJet 8390 + USB +@@ -12609,7 +12608,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + ScanJet G2410 + USB +@@ -12620,7 +12619,7 @@ + genesys +
(1.0-63) + +-sane-genesys ++sane-genesys + + ScanJet G2710 + USB +@@ -12631,7 +12630,7 @@ + hp3900 +
(0.12) + +-sane-hp3900 ++sane-hp3900 + + ScanJet G3010 + USB +@@ -12642,7 +12641,7 @@ + hp3900 +
(0.12) + +-sane-hp3900 ++sane-hp3900 + + ScanJet G3110 + USB +@@ -12653,7 +12652,7 @@ + hp3900 +
(0.12) + +-sane-hp3900 ++sane-hp3900 + + ScanJet G4000 + USB +@@ -12675,7 +12674,7 @@ + genesys +
(1.0-63) + +-sane-genesys ++sane-genesys + + ScanJet G4050 + USB +@@ -12686,7 +12685,7 @@ + genesys +
(1.0-63) + +-sane-genesys ++sane-genesys + + ScanJet IIc + SCSI +@@ -12697,7 +12696,7 @@ + hp +
(1.06) + +-sane-hp ++sane-hp + + ScanJet IIcx + SCSI +@@ -12708,7 +12707,7 @@ + hp +
(1.06) + +-sane-hp ++sane-hp + + ScanJet IIp + SCSI +@@ -12719,7 +12718,7 @@ + hp +
(1.06) + +-sane-hp ++sane-hp + + ScanJet N6310 + USB +@@ -12730,7 +12729,7 @@ + genesys +
(1.0-63) + +-sane-genesys ++sane-genesys + + ScanJet Plus + Propietary +@@ -12741,7 +12740,7 @@ + hp +
(1.06) + +-sane-hp ++sane-hp + + +

Manufacturer: IBM

+@@ -12768,7 +12767,7 @@ + ibm +
(1.0-4) + +-sane-ibm ++sane-ibm + + ADF Color Scanner + Proprietary +@@ -12880,7 +12879,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + +

Manufacturer: Kodak

+@@ -12907,7 +12906,7 @@ + kodak +
(7) + +-sane-kodak ++sane-kodak + + Color Scanner 4500 + SCSI +@@ -12918,7 +12917,7 @@ + kodak +
(7) + +-sane-kodak ++sane-kodak + + ESP 5 + USB +@@ -12929,7 +12928,7 @@ + kodakaio +
(2.4.6) + +-sane-kodakaio ++sane-kodakaio + + ESP 7 + USB +@@ -12940,7 +12939,7 @@ + kodakaio +
(2.4.6) + +-sane-kodakaio ++sane-kodakaio + + ESP 9 + USB +@@ -12951,7 +12950,7 @@ + kodakaio +
(2.4.6) + +-sane-kodakaio ++sane-kodakaio + + ESP 2150 + USB +@@ -12962,7 +12961,7 @@ + kodakaio +
(2.4.6) + +-sane-kodakaio ++sane-kodakaio + + ESP 2170 + USB +@@ -12973,7 +12972,7 @@ + kodakaio +
(2.4.6) + +-sane-kodakaio ++sane-kodakaio + + ESP 3200 + USB +@@ -12984,7 +12983,7 @@ + kodakaio +
(2.4.6) + +-sane-kodakaio ++sane-kodakaio + + ESP 3300 + USB +@@ -12995,7 +12994,7 @@ + kodakaio +
(2.4.6) + +-sane-kodakaio ++sane-kodakaio + + ESP 4100 + USB +@@ -13006,7 +13005,7 @@ + kodakaio +
(2.4.6) + +-sane-kodakaio ++sane-kodakaio + + ESP 5000 + USB +@@ -13017,7 +13016,7 @@ + kodakaio +
(2.4.6) + +-sane-kodakaio ++sane-kodakaio + + ESP 5100 + USB +@@ -13028,7 +13027,7 @@ + kodakaio +
(2.4.6) + +-sane-kodakaio ++sane-kodakaio + + ESP 5200 + USB Ethernet +@@ -13039,7 +13038,7 @@ + kodakaio +
(2.4.6) + +-sane-kodakaio ++sane-kodakaio + + ESP 5300 + USB +@@ -13050,7 +13049,7 @@ + kodakaio +
(2.4.6) + +-sane-kodakaio ++sane-kodakaio + + ESP 5500 + USB +@@ -13061,7 +13060,7 @@ + kodakaio +
(2.4.6) + +-sane-kodakaio ++sane-kodakaio + + ESP 6100 + USB +@@ -13072,7 +13071,7 @@ + kodakaio +
(2.4.6) + +-sane-kodakaio ++sane-kodakaio + + ESP 7200 + USB +@@ -13083,7 +13082,7 @@ + kodakaio +
(2.4.6) + +-sane-kodakaio ++sane-kodakaio + + ESP 9200 + USB +@@ -13094,7 +13093,7 @@ + kodakaio +
(2.4.6) + +-sane-kodakaio ++sane-kodakaio + + ESP C110 + USB +@@ -13105,7 +13104,7 @@ + kodakaio +
(2.4.6) + +-sane-kodakaio ++sane-kodakaio + + ESP C115 + USB +@@ -13116,7 +13115,7 @@ + kodakaio +
(2.4.6) + +-sane-kodakaio ++sane-kodakaio + + ESP C310 + USB +@@ -13127,7 +13126,7 @@ + kodakaio +
(2.4.6) + +-sane-kodakaio ++sane-kodakaio + + ESP C315 + USB +@@ -13138,7 +13137,7 @@ + kodakaio +
(2.4.6) + +-sane-kodakaio ++sane-kodakaio + + Hero 3.1 + USB +@@ -13149,7 +13148,7 @@ + kodakaio +
(2.4.6) + +-sane-kodakaio ++sane-kodakaio + + Hero 5.1 + USB +@@ -13160,7 +13159,7 @@ + kodakaio +
(2.4.6) + +-sane-kodakaio ++sane-kodakaio + + Hero 7.1 + USB +@@ -13171,7 +13170,7 @@ + kodakaio +
(2.4.6) + +-sane-kodakaio ++sane-kodakaio + + Hero 9.1 + USB Ethernet +@@ -13182,7 +13181,7 @@ + kodakaio +
(2.4.6) + +-sane-kodakaio ++sane-kodakaio + + Hero Office 6.1 + USB +@@ -13193,7 +13192,7 @@ + kodakaio +
(2.4.6) + +-sane-kodakaio ++sane-kodakaio + + i30 + USB +@@ -13204,7 +13203,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + i40 + USB +@@ -13215,7 +13214,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + i50 + USB +@@ -13226,7 +13225,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + i55 + USB +@@ -13237,7 +13236,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + i60 + USB +@@ -13248,7 +13247,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + i65 + USB +@@ -13259,7 +13258,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + i80 + USB +@@ -13270,7 +13269,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + i150 Scanner + IEEE-1394 +@@ -13281,7 +13280,7 @@ + kodak +
(7) + +-sane-kodak ++sane-kodak + + i160 Scanner + IEEE-1394 +@@ -13292,7 +13291,7 @@ + kodak +
(7) + +-sane-kodak ++sane-kodak + + i250 Scanner + IEEE-1394 +@@ -13303,7 +13302,7 @@ + kodak +
(7) + +-sane-kodak ++sane-kodak + + i260 Scanner + IEEE-1394 +@@ -13314,7 +13313,7 @@ + kodak +
(7) + +-sane-kodak ++sane-kodak + + i280 Scanner + IEEE-1394 +@@ -13325,7 +13324,7 @@ + kodak +
(7) + +-sane-kodak ++sane-kodak + + i610 Scanner + IEEE-1394 +@@ -13336,7 +13335,7 @@ + kodak +
(7) + +-sane-kodak ++sane-kodak + + i620 Scanner + IEEE-1394 +@@ -13347,7 +13346,7 @@ + kodak +
(7) + +-sane-kodak ++sane-kodak + + i640 Scanner + IEEE-1394 +@@ -13358,7 +13357,7 @@ + kodak +
(7) + +-sane-kodak ++sane-kodak + + i660 Scanner + IEEE-1394 +@@ -13369,7 +13368,7 @@ + kodak +
(7) + +-sane-kodak ++sane-kodak + + i730 Scanner + IEEE-1394 +@@ -13380,7 +13379,7 @@ + kodak +
(7) + +-sane-kodak ++sane-kodak + + i750 Scanner + IEEE-1394 +@@ -13391,7 +13390,7 @@ + kodak +
(7) + +-sane-kodak ++sane-kodak + + i780 Scanner + IEEE-1394 +@@ -13402,7 +13401,7 @@ + kodak +
(7) + +-sane-kodak ++sane-kodak + + i810 Scanner + SCSI +@@ -13413,7 +13412,7 @@ + kodak +
(7) + +-sane-kodak ++sane-kodak + + i820 Scanner + SCSI +@@ -13424,7 +13423,7 @@ + kodak +
(7) + +-sane-kodak ++sane-kodak + + i830 Scanner + SCSI +@@ -13435,7 +13434,7 @@ + kodak +
(7) + +-sane-kodak ++sane-kodak + + i840 Scanner + SCSI +@@ -13446,7 +13445,7 @@ + kodak +
(7) + +-sane-kodak ++sane-kodak + + i1840 Scanner + IEEE-1394 +@@ -13457,7 +13456,7 @@ + kodak +
(7) + +-sane-kodak ++sane-kodak + + i1860 Scanner + IEEE-1394 +@@ -13468,7 +13467,7 @@ + kodak +
(7) + +-sane-kodak ++sane-kodak + + s1740 + SCSI +@@ -13479,7 +13478,7 @@ + kodak +
(7) + +-sane-kodak ++sane-kodak + + Scanner 900 + SCSI +@@ -13490,7 +13489,7 @@ + kodak +
(7) + +-sane-kodak ++sane-kodak + + Scanner 923 + SCSI +@@ -13501,7 +13500,7 @@ + kodak +
(7) + +-sane-kodak ++sane-kodak + + Scanner 1500 + SCSI +@@ -13512,7 +13511,7 @@ + kodak +
(7) + +-sane-kodak ++sane-kodak + + Scanner 2500 + SCSI +@@ -13523,7 +13522,7 @@ + kodak +
(7) + +-sane-kodak ++sane-kodak + + Scanner 3500 + SCSI +@@ -13534,7 +13533,7 @@ + kodak +
(7) + +-sane-kodak ++sane-kodak + + Scanner 3510 + SCSI +@@ -13545,7 +13544,7 @@ + kodak +
(7) + +-sane-kodak ++sane-kodak + + Scanner 3520 + SCSI +@@ -13556,7 +13555,7 @@ + kodak +
(7) + +-sane-kodak ++sane-kodak + + Scanner 5500 + SCSI +@@ -13567,7 +13566,7 @@ + kodak +
(7) + +-sane-kodak ++sane-kodak + + Scanner 7500 + SCSI +@@ -13578,7 +13577,7 @@ + kodak +
(7) + +-sane-kodak ++sane-kodak + + Scanner 7520 + SCSI +@@ -13589,7 +13588,7 @@ + kodak +
(7) + +-sane-kodak ++sane-kodak + + Scanner 9500 + SCSI +@@ -13600,7 +13599,7 @@ + kodak +
(7) + +-sane-kodak ++sane-kodak + + Scanner 9520 + SCSI +@@ -13611,7 +13610,7 @@ + kodak +
(7) + +-sane-kodak ++sane-kodak + + Snapshot Photo Scanner 1 + Parport +@@ -13649,7 +13648,7 @@ + sceptre +
(1.0-10) + +-sane-sceptre ++sane-sceptre + + +

Manufacturer: KONICA MINOLTA

+@@ -13676,7 +13675,7 @@ + magicolor +
(1.0.0) + +-sane-magicolor ++sane-magicolor + + DiMage 1611 + USB Network +@@ -13687,7 +13686,7 @@ + magicolor +
(1.0.0) + +-sane-magicolor ++sane-magicolor + + DiMAGE Scan Elite 5400 + USB IEEE-1394 +@@ -13753,7 +13752,7 @@ + magicolor +
(1.0.0) + +-sane-magicolor ++sane-magicolor + + magicolor 2480MF + USB Network +@@ -13789,7 +13788,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + +

Manufacturer: LEO

+@@ -13814,7 +13813,7 @@ + leo +
(1.0-10) + +-sane-leo ++sane-leo + + +

Manufacturer: Lexmark

+@@ -13863,7 +13862,7 @@ + lexmark +
(1.0-0) + +-sane-lexmark ++sane-lexmark + + X70 + USB +@@ -13874,7 +13873,7 @@ + gt68xx +
(1.0-84) + +-sane-gt68xx ++sane-gt68xx + + X73 + USB +@@ -13885,7 +13884,7 @@ + gt68xx +
(1.0-84) + +-sane-gt68xx ++sane-gt68xx + + X74 + USB +@@ -13896,7 +13895,7 @@ + lexmark +
(1.0-0) + +-sane-lexmark ++sane-lexmark + + X75 + USB +@@ -13940,7 +13939,7 @@ + lexmark +
(1.0-0) + +-sane-lexmark ++sane-lexmark + + X1130 + USB +@@ -13951,7 +13950,7 @@ + lexmark +
(1.0-0) + +-sane-lexmark ++sane-lexmark + + X1140 + USB +@@ -13962,7 +13961,7 @@ + lexmark +
(1.0-0) + +-sane-lexmark ++sane-lexmark + + X1150 + USB +@@ -13973,7 +13972,7 @@ + lexmark +
(1.0-0) + +-sane-lexmark ++sane-lexmark + + X1170 + USB +@@ -13984,7 +13983,7 @@ + lexmark +
(1.0-0) + +-sane-lexmark ++sane-lexmark + + X1180 + USB +@@ -13995,7 +13994,7 @@ + lexmark +
(1.0-0) + +-sane-lexmark ++sane-lexmark + + X1185 + USB +@@ -14006,7 +14005,7 @@ + lexmark +
(1.0-0) + +-sane-lexmark ++sane-lexmark + + X1195 + USB +@@ -14017,7 +14016,7 @@ + lexmark +
(1.0-0) + +-sane-lexmark ++sane-lexmark + + X2330 + USB +@@ -14143,7 +14142,7 @@ + umax +
(1.0-41) + +-sane-umax ++sane-umax + + Jade + SCSI +@@ -14154,7 +14153,7 @@ + umax +
(1.0-41) + +-sane-umax ++sane-umax + + Jade2 + SCSI +@@ -14165,7 +14164,7 @@ + umax +
(1.0-41) + +-sane-umax ++sane-umax + + Linoscan 1400 + SCSI +@@ -14176,7 +14175,7 @@ + umax +
(1.0-41) + +-sane-umax ++sane-umax + + Opal + SCSI +@@ -14187,7 +14186,7 @@ + umax +
(1.0-41) + +-sane-umax ++sane-umax + + Opal Ultra + SCSI +@@ -14198,7 +14197,7 @@ + umax +
(1.0-41) + +-sane-umax ++sane-umax + + Opal2 + SCSI +@@ -14209,7 +14208,7 @@ + umax +
(1.0-41) + +-sane-umax ++sane-umax + + Saphir + SCSI +@@ -14220,7 +14219,7 @@ + umax +
(1.0-41) + +-sane-umax ++sane-umax + + Saphir HiRes + SCSI +@@ -14231,7 +14230,7 @@ + umax +
(1.0-41) + +-sane-umax ++sane-umax + + Saphir Ultra + SCSI +@@ -14242,7 +14241,7 @@ + umax +
(1.0-41) + +-sane-umax ++sane-umax + + Saphir Ultra II + SCSI +@@ -14253,7 +14252,7 @@ + umax +
(1.0-41) + +-sane-umax ++sane-umax + + Saphir2 + SCSI +@@ -14264,7 +14263,7 @@ + umax +
(1.0-41) + +-sane-umax ++sane-umax + + Saphir3 + SCSI +@@ -14275,7 +14274,7 @@ + umax +
(1.0-41) + +-sane-umax ++sane-umax + + +

Manufacturer: Logitech

+@@ -14339,7 +14338,7 @@ + gt68xx +
(1.0-84) + +-sane-gt68xx ++sane-gt68xx + + MD 4394 + USB +@@ -14350,7 +14349,7 @@ + gt68xx +
(1.0-84) + +-sane-gt68xx ++sane-gt68xx + + MD 6190 + USB +@@ -14383,7 +14382,7 @@ + gt68xx +
(1.0-84) + +-sane-gt68xx ++sane-gt68xx + + MD 9806 + Parport (EPP) +@@ -14394,7 +14393,7 @@ + mustek_pp +
(13) + +-sane-mustek_pp ++sane-mustek_pp + + MD 9848 + Parport (EPP) +@@ -14405,7 +14404,7 @@ + mustek_pp +
(13) + +-sane-mustek_pp ++sane-mustek_pp + + MD 40420 + USB +@@ -14504,7 +14503,7 @@ + mustek_pp +
(13) + +-sane-mustek_pp ++sane-mustek_pp + + MD/LT 985x + Parport (EPP) +@@ -14515,7 +14514,7 @@ + mustek_pp +
(13) + +-sane-mustek_pp ++sane-mustek_pp + + MD/LT 9375 + USB +@@ -14526,7 +14525,7 @@ + gt68xx +
(1.0-84) + +-sane-gt68xx ++sane-gt68xx + + MD/LT 9385 + USB +@@ -14537,7 +14536,7 @@ + gt68xx +
(1.0-84) + +-sane-gt68xx ++sane-gt68xx + + MD/LT 9890 + Parport (EPP) +@@ -14548,7 +14547,7 @@ + mustek_pp +
(13) + +-sane-mustek_pp ++sane-mustek_pp + + MD4394 + USB +@@ -14558,7 +14557,7 @@ + + artec_eplus48u
(unmaintained) + +-sane-artec_eplus48u ++sane-artec_eplus48u + + MD5345 + USB +@@ -14569,7 +14568,7 @@ + genesys +
(1.0-63) + +-sane-genesys ++sane-genesys + + MD6228 + USB +@@ -14580,7 +14579,7 @@ + genesys +
(1.0-63) + +-sane-genesys ++sane-genesys + + MD6471 + USB +@@ -14591,7 +14590,7 @@ + genesys +
(1.0-63) + +-sane-genesys ++sane-genesys + + MD9693 + USB +@@ -14601,7 +14600,7 @@ + + artec_eplus48u
(unmaintained) + +-sane-artec_eplus48u ++sane-artec_eplus48u + + MD9705 + USB +@@ -14611,7 +14610,7 @@ + + artec_eplus48u
(unmaintained) + +-sane-artec_eplus48u ++sane-artec_eplus48u + + +

Manufacturer: Memorex

+@@ -14670,7 +14669,7 @@ + + artec_eplus48u
(unmaintained) + +-sane-artec_eplus48u ++sane-artec_eplus48u + + SCF 9612P + Parport +@@ -14706,7 +14705,7 @@ + mustek_pp +
(13) + +-sane-mustek_pp ++sane-mustek_pp + + +

Manufacturer: Microstar

+@@ -14732,7 +14731,7 @@ + + artec_eplus48u
(unmaintained) + +-sane-artec_eplus48u ++sane-artec_eplus48u + + +

Manufacturer: Microtek

+@@ -14804,7 +14803,7 @@ + microtek +
(0.13.1) + +-sane-microtek ++sane-microtek + + FilmScan 35 + USB +@@ -14826,7 +14825,7 @@ + microtek2 +
(unmaintained) + +-sane-microtek2 ++sane-microtek2 + + Phantom 636 + SCSI +@@ -14837,7 +14836,7 @@ + microtek2 +
(unmaintained) + +-sane-microtek2 ++sane-microtek2 + + Phantom 636CX + Parport +@@ -14848,7 +14847,7 @@ + microtek2 +
(unmaintained) + +-sane-microtek2 ++sane-microtek2 + + ScanMaker 5 + SCSI +@@ -14870,7 +14869,7 @@ + microtek +
(0.13.1) + +-sane-microtek ++sane-microtek + + Scanmaker 35t+ + SCSI +@@ -14881,7 +14880,7 @@ + microtek +
(0.13.1) + +-sane-microtek ++sane-microtek + + Scanmaker 45t + SCSI +@@ -14892,7 +14891,7 @@ + microtek +
(0.13.1) + +-sane-microtek ++sane-microtek + + ScanMaker 330 + SCSI +@@ -14903,7 +14902,7 @@ + microtek2 +
(unmaintained) + +-sane-microtek2 ++sane-microtek2 + + ScanMaker 336 CX + SCSI +@@ -14925,7 +14924,7 @@ + microtek +
(0.13.1) + +-sane-microtek ++sane-microtek + + Scanmaker 600Z(S) + SCSI +@@ -14936,7 +14935,7 @@ + microtek +
(0.13.1) + +-sane-microtek ++sane-microtek + + ScanMaker 630 + SCSI +@@ -14947,7 +14946,7 @@ + microtek2 +
(unmaintained) + +-sane-microtek2 ++sane-microtek2 + + ScanMaker 636 + SCSI +@@ -14958,7 +14957,7 @@ + microtek2 +
(unmaintained) + +-sane-microtek2 ++sane-microtek2 + + Scanmaker 1850S + SCSI +@@ -14980,7 +14979,7 @@ + sm3600 +
(0.1) + +-sane-sm3600 ++sane-sm3600 + + ScanMaker 3600 + USB +@@ -14991,7 +14990,7 @@ + sm3600 +
(0.1) + +-sane-sm3600 ++sane-sm3600 + + ScanMaker 3600 + USB +@@ -15002,7 +15001,7 @@ + sm3600 +
(0.1) + +-sane-sm3600 ++sane-sm3600 + + ScanMaker 3630 + USB +@@ -15024,7 +15023,7 @@ + sm3600 +
(0.1) + +-sane-sm3600 ++sane-sm3600 + + ScanMaker 3700 + USB +@@ -15035,7 +15034,7 @@ + sm3600 +
(0.1) + +-sane-sm3600 ++sane-sm3600 + + ScanMaker 3750 + USB +@@ -15046,7 +15045,7 @@ + sm3600 +
(0.1) + +-sane-sm3600 ++sane-sm3600 + + ScanMaker 3800 + USB +@@ -15079,7 +15078,7 @@ + sm3840 +
(1.1) + +-sane-sm3840 ++sane-sm3840 + + ScanMaker 3860 + USB +@@ -15134,7 +15133,7 @@ + sm3840 +
(1.1) + +-sane-sm3840 ++sane-sm3840 + + ScanMaker 4850 + USB +@@ -15266,7 +15265,7 @@ + microtek2 +
(unmaintained) + +-sane-microtek2 ++sane-microtek2 + + ScanMaker 6700 + USB IEEE-1394 +@@ -15310,7 +15309,7 @@ + microtek2 +
(unmaintained) + +-sane-microtek2 ++sane-microtek2 + + ScanMaker 9800XL + USB SCSI +@@ -15332,7 +15331,7 @@ + microtek2 +
(unmaintained) + +-sane-microtek2 ++sane-microtek2 + + Scanmaker E2 + SCSI +@@ -15343,7 +15342,7 @@ + microtek +
(0.13.1) + +-sane-microtek ++sane-microtek + + Scanmaker E3 + SCSI +@@ -15354,7 +15353,7 @@ + microtek +
(0.13.1) + +-sane-microtek ++sane-microtek + + ScanMaker E3plus + SCSI +@@ -15365,7 +15364,7 @@ + microtek2 +
(unmaintained) + +-sane-microtek2 ++sane-microtek2 + + ScanMaker E3plus + Parport +@@ -15376,7 +15375,7 @@ + microtek2 +
(unmaintained) + +-sane-microtek2 ++sane-microtek2 + + Scanmaker E6 + SCSI +@@ -15387,7 +15386,7 @@ + microtek +
(0.13.1) + +-sane-microtek ++sane-microtek + + ScanMaker i320 + USB +@@ -15409,7 +15408,7 @@ + microtek +
(0.13.1) + +-sane-microtek ++sane-microtek + + Scanmaker IIG + SCSI +@@ -15420,7 +15419,7 @@ + microtek +
(0.13.1) + +-sane-microtek ++sane-microtek + + Scanmaker IIHR + SCSI +@@ -15431,7 +15430,7 @@ + microtek +
(0.13.1) + +-sane-microtek ++sane-microtek + + Scanmaker III + SCSI +@@ -15442,7 +15441,7 @@ + microtek +
(0.13.1) + +-sane-microtek ++sane-microtek + + Scanmaker IISP + SCSI +@@ -15453,7 +15452,7 @@ + microtek +
(0.13.1) + +-sane-microtek ++sane-microtek + + ScanMaker S400 + USB +@@ -15486,7 +15485,7 @@ + microtek2 +
(unmaintained) + +-sane-microtek2 ++sane-microtek2 + + ScanMaker V6USL + USB +@@ -15497,7 +15496,7 @@ + microtek2 +
(unmaintained) + +-sane-microtek2 ++sane-microtek2 + + ScanMaker V6USL + USB +@@ -15508,7 +15507,7 @@ + microtek2 +
(unmaintained) + +-sane-microtek2 ++sane-microtek2 + + ScanMaker V6USL + SCSI +@@ -15519,7 +15518,7 @@ + microtek2 +
(unmaintained) + +-sane-microtek2 ++sane-microtek2 + + ScanMaker V300 + Parport +@@ -15530,7 +15529,7 @@ + microtek2 +
(unmaintained) + +-sane-microtek2 ++sane-microtek2 + + ScanMaker V300 + SCSI +@@ -15541,7 +15540,7 @@ + microtek2 +
(unmaintained) + +-sane-microtek2 ++sane-microtek2 + + ScanMaker V310 + Parport +@@ -15552,7 +15551,7 @@ + microtek2 +
(unmaintained) + +-sane-microtek2 ++sane-microtek2 + + ScanMaker V310 + SCSI +@@ -15563,7 +15562,7 @@ + microtek2 +
(unmaintained) + +-sane-microtek2 ++sane-microtek2 + + ScanMaker V600 + Parport +@@ -15574,7 +15573,7 @@ + microtek2 +
(unmaintained) + +-sane-microtek2 ++sane-microtek2 + + ScanMaker V600 + SCSI +@@ -15585,7 +15584,7 @@ + microtek2 +
(unmaintained) + +-sane-microtek2 ++sane-microtek2 + + ScanMaker X6 + SCSI +@@ -15596,7 +15595,7 @@ + microtek2 +
(unmaintained) + +-sane-microtek2 ++sane-microtek2 + + ScanMaker X6EL + SCSI +@@ -15607,7 +15606,7 @@ + microtek2 +
(unmaintained) + +-sane-microtek2 ++sane-microtek2 + + ScanMaker X6USB + USB +@@ -15618,7 +15617,7 @@ + microtek2 +
(unmaintained) + +-sane-microtek2 ++sane-microtek2 + + ScanMaker X12USL + SCSI +@@ -15629,7 +15628,7 @@ + microtek2 +
(unmaintained) + +-sane-microtek2 ++sane-microtek2 + + ScanPort 3000 + USB +@@ -15651,7 +15650,7 @@ + microtek2 +
(unmaintained) + +-sane-microtek2 ++sane-microtek2 + + SlimScan C6 + USB +@@ -15662,7 +15661,7 @@ + microtek2 +
(unmaintained) + +-sane-microtek2 ++sane-microtek2 + + +

Manufacturer: Minolta

+@@ -15689,7 +15688,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + Dimage Scan Dual II + USB +@@ -15700,7 +15699,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + Dimage Scan Dual III + USB +@@ -15711,7 +15710,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + Dimage Scan Elite 5400 + USB +@@ -15722,7 +15721,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + Elite II + USB +@@ -15733,7 +15732,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + Scan Multi Pro + SCSI +@@ -15744,7 +15743,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + +

Manufacturer: Minolta-QMS

+@@ -15769,7 +15768,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + SC-215 + USB +@@ -15780,7 +15779,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + +

Manufacturer: Mitsubishi

+@@ -15807,7 +15806,7 @@ + SnapScan +
(1.4) + +-sane-snapscan ++sane-snapscan + + Diamondview 650U + USB +@@ -15818,7 +15817,7 @@ + SnapScan +
(1.4) + +-sane-snapscan ++sane-snapscan + + MCA-ADFC + SCSI +@@ -15829,7 +15828,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + S600C + SCSI +@@ -15840,7 +15839,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + S1200C + SCSI +@@ -15851,7 +15850,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + SS600 + SCSI +@@ -15862,7 +15861,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + +

Manufacturer: Mustek

+@@ -15889,7 +15888,7 @@ + mustek_pp +
(13) + +-sane-mustek_pp ++sane-mustek_pp + + 600 III EP Plus + Parport (EPP) +@@ -15900,7 +15899,7 @@ + mustek_pp +
(13) + +-sane-mustek_pp ++sane-mustek_pp + + 1200 III EP + Parport +@@ -15933,7 +15932,7 @@ + plustek +
(0.52) + +-sane-plustek ++sane-plustek + + BearPaw 1200 + USB +@@ -15944,7 +15943,7 @@ + plustek +
(0.52) + +-sane-plustek ++sane-plustek + + BearPaw 1200 CS + USB +@@ -15955,7 +15954,7 @@ + gt68xx +
(1.0-84) + +-sane-gt68xx ++sane-gt68xx + + BearPaw 1200 CU + USB +@@ -15966,7 +15965,7 @@ + gt68xx +
(1.0-84) + +-sane-gt68xx ++sane-gt68xx + + BearPaw 1200 CU Plus + USB +@@ -15977,7 +15976,7 @@ + gt68xx +
(1.0-84) + +-sane-gt68xx ++sane-gt68xx + + BearPaw 1200 CU Plus + USB +@@ -15988,7 +15987,7 @@ + gt68xx +
(1.0-84) + +-sane-gt68xx ++sane-gt68xx + + BearPaw 1200 F + USB +@@ -15999,7 +15998,7 @@ + ma1509 +
(1.0-3) + +-sane-ma1509 ++sane-ma1509 + + BearPaw 1200 TA + USB +@@ -16010,7 +16009,7 @@ + gt68xx +
(1.0-84) + +-sane-gt68xx ++sane-gt68xx + + BearPaw 1248 CU + USB +@@ -16021,7 +16020,7 @@ + gt68xx +
(1.0-84) + +-sane-gt68xx ++sane-gt68xx + + BearPaw 2400 + USB +@@ -16032,7 +16031,7 @@ + plustek +
(0.52) + +-sane-plustek ++sane-plustek + + BearPaw 2400 CS + USB +@@ -16043,7 +16042,7 @@ + gt68xx +
(1.0-84) + +-sane-gt68xx ++sane-gt68xx + + BearPaw 2400 CS Plus + USB +@@ -16054,7 +16053,7 @@ + gt68xx +
(1.0-84) + +-sane-gt68xx ++sane-gt68xx + + BearPaw 2400 CU + USB +@@ -16065,7 +16064,7 @@ + gt68xx +
(1.0-84) + +-sane-gt68xx ++sane-gt68xx + + BearPaw 2400 CU Plus + USB +@@ -16076,7 +16075,7 @@ + gt68xx +
(1.0-84) + +-sane-gt68xx ++sane-gt68xx + + BearPaw 2400 TA + USB +@@ -16087,7 +16086,7 @@ + gt68xx +
(1.0-84) + +-sane-gt68xx ++sane-gt68xx + + BearPaw 2400 TA Plus + USB +@@ -16098,7 +16097,7 @@ + gt68xx +
(1.0-84) + +-sane-gt68xx ++sane-gt68xx + + BearPaw 2400 TA Pro + USB +@@ -16120,7 +16119,7 @@ + gt68xx +
(1.0-84) + +-sane-gt68xx ++sane-gt68xx + + BearPaw 2448 CU Pro + USB +@@ -16142,7 +16141,7 @@ + gt68xx +
(1.0-84) + +-sane-gt68xx ++sane-gt68xx + + BearPaw 2448TA Pro + USB +@@ -16153,7 +16152,7 @@ + mustek_usb2 +
(1.0-10) + +-sane-mustek_usb2 ++sane-mustek_usb2 + + BearPaw 4800 TA Pro + USB +@@ -16197,7 +16196,7 @@ + mustek +
(1.0-138) + +-sane-mustek ++sane-mustek + + Paragon 600 II ED + Parport +@@ -16208,7 +16207,7 @@ + mustek +
(1.0-138) + +-sane-mustek ++sane-mustek + + Paragon 600 II EP + Parport +@@ -16219,7 +16218,7 @@ + mustek +
(1.0-138) + +-sane-mustek ++sane-mustek + + Paragon 600 II N + Proprietary +@@ -16230,7 +16229,7 @@ + mustek +
(1.0-138) + +-sane-mustek ++sane-mustek + + Paragon 800 II EP + Parport +@@ -16252,7 +16251,7 @@ + mustek +
(1.0-138) + +-sane-mustek ++sane-mustek + + Paragon 1200 A3 Pro + SCSI +@@ -16263,7 +16262,7 @@ + mustek +
(1.0-138) + +-sane-mustek ++sane-mustek + + Paragon 1200 III SP + SCSI +@@ -16274,7 +16273,7 @@ + mustek +
(1.0-138) + +-sane-mustek ++sane-mustek + + Paragon 1200 LS + SCSI +@@ -16285,7 +16284,7 @@ + mustek +
(1.0-138) + +-sane-mustek ++sane-mustek + + Paragon 1200 SP Pro + SCSI +@@ -16296,7 +16295,7 @@ + mustek +
(1.0-138) + +-sane-mustek ++sane-mustek + + Paragon MFC-600S + SCSI +@@ -16307,7 +16306,7 @@ + mustek +
(1.0-138) + +-sane-mustek ++sane-mustek + + Paragon MFC-800S + SCSI +@@ -16318,7 +16317,7 @@ + mustek +
(1.0-138) + +-sane-mustek ++sane-mustek + + Paragon MFS-1200SP + SCSI +@@ -16329,7 +16328,7 @@ + mustek +
(1.0-138) + +-sane-mustek ++sane-mustek + + Paragon MFS-6000CX + SCSI +@@ -16340,7 +16339,7 @@ + mustek +
(1.0-138) + +-sane-mustek ++sane-mustek + + Paragon MFS-6000SP + SCSI +@@ -16351,7 +16350,7 @@ + mustek +
(1.0-138) + +-sane-mustek ++sane-mustek + + Paragon MFS-8000SP + SCSI +@@ -16362,7 +16361,7 @@ + mustek +
(1.0-138) + +-sane-mustek ++sane-mustek + + Paragon MFS-12000CX + SCSI +@@ -16373,7 +16372,7 @@ + mustek +
(1.0-138) + +-sane-mustek ++sane-mustek + + Paragon MFS-12000SP + SCSI +@@ -16384,7 +16383,7 @@ + mustek +
(1.0-138) + +-sane-mustek ++sane-mustek + + Plug-n-Scan 2400 M + USB +@@ -16395,7 +16394,7 @@ + gt68xx +
(1.0-84) + +-sane-gt68xx ++sane-gt68xx + + Plug-n-Scan 2400 MT + USB +@@ -16406,7 +16405,7 @@ + gt68xx +
(1.0-84) + +-sane-gt68xx ++sane-gt68xx + + ScanExpress 600 CP + Parport (EPP) +@@ -16417,7 +16416,7 @@ + mustek_pp +
(13) + +-sane-mustek_pp ++sane-mustek_pp + + ScanExpress 600 CU + USB +@@ -16428,7 +16427,7 @@ + mustek_usb +
(1.0-18) + +-sane-mustek_usb ++sane-mustek_usb + + ScanExpress 600 SEP + Parport (EPP) +@@ -16439,7 +16438,7 @@ + mustek_pp +
(13) + +-sane-mustek_pp ++sane-mustek_pp + + ScanExpress 600 USB + USB +@@ -16461,7 +16460,7 @@ + mustek_pp +
(13) + +-sane-mustek_pp ++sane-mustek_pp + + ScanExpress 1200 CP+ + Parport (EPP) +@@ -16472,7 +16471,7 @@ + mustek_pp +
(13) + +-sane-mustek_pp ++sane-mustek_pp + + ScanExpress 1200 CU + USB +@@ -16483,7 +16482,7 @@ + mustek_usb +
(1.0-18) + +-sane-mustek_usb ++sane-mustek_usb + + ScanExpress 1200 CU Plus + USB +@@ -16494,7 +16493,7 @@ + mustek_usb +
(1.0-18) + +-sane-mustek_usb ++sane-mustek_usb + + ScanExpress 1200 FS + SCSI +@@ -16505,7 +16504,7 @@ + mustek +
(1.0-138) + +-sane-mustek ++sane-mustek + + ScanExpress 1200 UB + USB +@@ -16516,7 +16515,7 @@ + mustek_usb +
(1.0-18) + +-sane-mustek_usb ++sane-mustek_usb + + ScanExpress 1200 UB Plus + USB +@@ -16527,7 +16526,7 @@ + gt68xx +
(1.0-84) + +-sane-gt68xx ++sane-gt68xx + + ScanExpress 1200 USB + USB +@@ -16560,7 +16559,7 @@ + gt68xx +
(1.0-84) + +-sane-gt68xx ++sane-gt68xx + + ScanExpress 2400 USB + USB +@@ -16571,7 +16570,7 @@ + gt68xx +
(1.0-84) + +-sane-gt68xx ++sane-gt68xx + + ScanExpress 6000 P + Parport (EPP) +@@ -16582,7 +16581,7 @@ + mustek_pp +
(13) + +-sane-mustek_pp ++sane-mustek_pp + + ScanExpress 6000SP + SCSI +@@ -16593,7 +16592,7 @@ + mustek +
(1.0-138) + +-sane-mustek ++sane-mustek + + ScanExpress 12000 P + Parport +@@ -16615,7 +16614,7 @@ + mustek +
(1.0-138) + +-sane-mustek ++sane-mustek + + ScanExpress 12000SP Plus + SCSI +@@ -16626,7 +16625,7 @@ + mustek +
(1.0-138) + +-sane-mustek ++sane-mustek + + ScanExpress A3 EP + Parport +@@ -16648,7 +16647,7 @@ + mustek +
(1.0-138) + +-sane-mustek ++sane-mustek + + ScanExpress A3 USB + USB +@@ -16659,7 +16658,7 @@ + gt68xx +
(1.0-84) + +-sane-gt68xx ++sane-gt68xx + + ScanExpress CardSmart + USB +@@ -16681,7 +16680,7 @@ + mustek_pp +
(13) + +-sane-mustek_pp ++sane-mustek_pp + + ScanMagic 600 II SP + SCSI +@@ -16692,7 +16691,7 @@ + mustek +
(1.0-138) + +-sane-mustek ++sane-mustek + + ScanMagic 1200 UB Plus + USB +@@ -16703,7 +16702,7 @@ + gt68xx +
(1.0-84) + +-sane-gt68xx ++sane-gt68xx + + ScanMagic 4800 P + Parport (EPP) +@@ -16714,7 +16713,7 @@ + mustek_pp +
(13) + +-sane-mustek_pp ++sane-mustek_pp + + ScanMagic 4830S + SCSI +@@ -16725,7 +16724,7 @@ + teco2 +
(1.0-9) + +-sane-teco2 ++sane-teco2 + + ScanMagic 9636P + Parport +@@ -16747,7 +16746,7 @@ + mustek +
(1.0-138) + +-sane-mustek ++sane-mustek + + ScanMagic 9636S Plus + SCSI +@@ -16758,7 +16757,7 @@ + mustek +
(1.0-138) + +-sane-mustek ++sane-mustek + + TwainScan II SP + SCSI +@@ -16769,7 +16768,7 @@ + mustek +
(1.0-138) + +-sane-mustek ++sane-mustek + + +

Manufacturer: NeatReceipts

+@@ -16794,7 +16793,7 @@ + gt68xx +
(1.0-84) + +-sane-gt68xx ++sane-gt68xx + + Scanalizer Professional 2.5 + USB +@@ -16805,7 +16804,7 @@ + gt68xx +
(1.0-84) + +-sane-gt68xx ++sane-gt68xx + + +

Manufacturer: NEC

+@@ -16832,7 +16831,7 @@ + nec +
(0.12) + +-sane-nec ++sane-nec + + Petiscan + USB +@@ -16868,7 +16867,7 @@ + mustek_pp +
(13) + +-sane-mustek_pp ++sane-mustek_pp + + +

Manufacturer: Nikon

+@@ -16895,7 +16894,7 @@ + umax +
(1.0-41) + +-sane-umax ++sane-umax + + AX-210 + SCSI +@@ -16906,7 +16905,7 @@ + umax +
(1.0-41) + +-sane-umax ++sane-umax + + Coolscan III + SCSI +@@ -16916,7 +16915,7 @@ + + coolscan3
(1.0.0) + +-sane-coolscan3 ++sane-coolscan3 + + Coolscan V ED + USB +@@ -16926,7 +16925,7 @@ + + coolscan3
(1.0.0) + +-sane-coolscan3 ++sane-coolscan3 + + Coolscan V ED + USB +@@ -16937,7 +16936,7 @@ + coolscan2 +
(0.1.8) + +-sane-coolscan2 ++sane-coolscan2 + + Coolspan IV + USB +@@ -16947,7 +16946,7 @@ + + coolscan3
(1.0.0) + +-sane-coolscan3 ++sane-coolscan3 + + LS 30 + SCSI +@@ -16957,7 +16956,7 @@ + + coolscan3
(1.0.0) + +-sane-coolscan3 ++sane-coolscan3 + + LS 30 + SCSI +@@ -16968,7 +16967,7 @@ + coolscan2 +
(0.1.8) + +-sane-coolscan2 ++sane-coolscan2 + + LS 40 ED + USB +@@ -16978,7 +16977,7 @@ + + coolscan3
(1.0.0) + +-sane-coolscan3 ++sane-coolscan3 + + LS 40 ED + USB +@@ -16989,7 +16988,7 @@ + coolscan2 +
(0.1.8) + +-sane-coolscan2 ++sane-coolscan2 + + LS 50 ED + USB +@@ -16999,7 +16998,7 @@ + + coolscan3
(1.0.0) + +-sane-coolscan3 ++sane-coolscan3 + + LS 50 ED + USB +@@ -17010,7 +17009,7 @@ + coolscan2 +
(0.1.8) + +-sane-coolscan2 ++sane-coolscan2 + + LS 2000 + SCSI +@@ -17020,7 +17019,7 @@ + + coolscan3
(1.0.0) + +-sane-coolscan3 ++sane-coolscan3 + + LS 2000 + SCSI +@@ -17031,7 +17030,7 @@ + coolscan2 +
(0.1.8) + +-sane-coolscan2 ++sane-coolscan2 + + LS 4000 ED + IEEE-1394 +@@ -17041,7 +17040,7 @@ + + coolscan3
(1.0.0) + +-sane-coolscan3 ++sane-coolscan3 + + LS 4000 ED + IEEE-1394 +@@ -17052,7 +17051,7 @@ + coolscan2 +
(0.1.8) + +-sane-coolscan2 ++sane-coolscan2 + + LS 8000 ED + IEEE-1394 +@@ -17062,7 +17061,7 @@ + + coolscan3
(1.0.0) + +-sane-coolscan3 ++sane-coolscan3 + + LS 8000 ED + IEEE-1394 +@@ -17073,7 +17072,7 @@ + coolscan2 +
(0.1.8) + +-sane-coolscan2 ++sane-coolscan2 + + LS-20 + SCSI +@@ -17084,7 +17083,7 @@ + coolscan +
(0.4.3) + +-sane-coolscan ++sane-coolscan + + LS-30 + SCSI +@@ -17095,7 +17094,7 @@ + coolscan +
(0.4.3) + +-sane-coolscan ++sane-coolscan + + LS-1000 + SCSI +@@ -17106,7 +17105,7 @@ + coolscan +
(0.4.3) + +-sane-coolscan ++sane-coolscan + + LS-2000 + SCSI +@@ -17117,7 +17116,7 @@ + coolscan +
(0.4.3) + +-sane-coolscan ++sane-coolscan + + LS-9000 ED + IEEE-1394 +@@ -17138,7 +17137,7 @@ + + coolscan3
(1.0.0) + +-sane-coolscan3 ++sane-coolscan3 + + Super Coolscan LS-5000 ED + USB +@@ -17149,7 +17148,7 @@ + coolscan2 +
(0.1.8) + +-sane-coolscan2 ++sane-coolscan2 + + +

Manufacturer: Nortek

+@@ -17174,7 +17173,7 @@ + gt68xx +
(1.0-84) + +-sane-gt68xx ++sane-gt68xx + + +

Manufacturer: OKI

+@@ -17199,7 +17198,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + +

Manufacturer: Olivetti

+@@ -17394,7 +17393,7 @@ + gt68xx +
(1.0-84) + +-sane-gt68xx ++sane-gt68xx + + Diamond 1200 Plus + USB +@@ -17405,7 +17404,7 @@ + gt68xx +
(1.0-84) + +-sane-gt68xx ++sane-gt68xx + + Diamond 1200 Plus + USB +@@ -17416,7 +17415,7 @@ + gt68xx +
(1.0-84) + +-sane-gt68xx ++sane-gt68xx + + Diamond 2450 + USB +@@ -17427,7 +17426,7 @@ + gt68xx +
(1.0-84) + +-sane-gt68xx ++sane-gt68xx + + +

Manufacturer: Panasonic

+@@ -17453,7 +17452,7 @@ + + kvs1025
(unmaintained) + +-sane-kvs1025 ++sane-kvs1025 + + KV-S1025C + USB +@@ -17463,7 +17462,7 @@ + + kvs1025
(unmaintained) + +-sane-kvs1025 ++sane-kvs1025 + + KV-S1045C + USB +@@ -17473,7 +17472,7 @@ + + kvs1025
(unmaintained) + +-sane-kvs1025 ++sane-kvs1025 + + KV-S2025C + SCSI +@@ -17484,7 +17483,7 @@ + matsushita +
(1.0-7) + +-sane-matsushita ++sane-matsushita + + KV-S2026C + USB SCSI +@@ -17494,7 +17493,7 @@ + + kvs20xx
(unmaintained) + +-sane-kvs20xx ++sane-kvs20xx + + KV-S2028C + USB +@@ -17504,7 +17503,7 @@ + + kvs20xx
(unmaintained) + +-sane-kvs20xx ++sane-kvs20xx + + KV-S2045C + SCSI +@@ -17515,7 +17514,7 @@ + matsushita +
(1.0-7) + +-sane-matsushita ++sane-matsushita + + KV-S2046C + USB SCSI +@@ -17525,7 +17524,7 @@ + + kvs20xx
(unmaintained) + +-sane-kvs20xx ++sane-kvs20xx + + KV-S2048C + USB +@@ -17535,7 +17534,7 @@ + + kvs20xx
(unmaintained) + +-sane-kvs20xx ++sane-kvs20xx + + KV-S2055L + SCSI +@@ -17568,7 +17567,7 @@ + matsushita +
(1.0-7) + +-sane-matsushita ++sane-matsushita + + KV-S2065W + SCSI +@@ -17633,7 +17632,7 @@ + + kvs40xx
(unmaintained) + +-sane-kvs40xx ++sane-kvs40xx + + KV-S4085C + USB +@@ -17643,7 +17642,7 @@ + + kvs40xx
(unmaintained) + +-sane-kvs40xx ++sane-kvs40xx + + KV-S6040W + SCSI +@@ -17708,7 +17707,7 @@ + + kvs40xx
(unmaintained) + +-sane-kvs40xx ++sane-kvs40xx + + KV-SS25 + SCSI +@@ -17719,7 +17718,7 @@ + matsushita +
(1.0-7) + +-sane-matsushita ++sane-matsushita + + KV-SS25D + SCSI +@@ -17730,7 +17729,7 @@ + matsushita +
(1.0-7) + +-sane-matsushita ++sane-matsushita + + KV-SS50 + SCSI +@@ -17741,7 +17740,7 @@ + matsushita +
(1.0-7) + +-sane-matsushita ++sane-matsushita + + KV-SS50EX + SCSI +@@ -17752,7 +17751,7 @@ + matsushita +
(1.0-7) + +-sane-matsushita ++sane-matsushita + + KV-SS55 + SCSI +@@ -17763,7 +17762,7 @@ + matsushita +
(1.0-7) + +-sane-matsushita ++sane-matsushita + + KV-SS55EX + SCSI +@@ -17774,7 +17773,7 @@ + matsushita +
(1.0-7) + +-sane-matsushita ++sane-matsushita + + KV-SS080 + USB +@@ -17785,7 +17784,7 @@ + genesys +
(1.0-63) + +-sane-genesys ++sane-genesys + + KV-SS850 + SCSI +@@ -17796,7 +17795,7 @@ + matsushita +
(1.0-7) + +-sane-matsushita ++sane-matsushita + + KV-SS855 + SCSI +@@ -17807,7 +17806,7 @@ + matsushita +
(1.0-7) + +-sane-matsushita ++sane-matsushita + + KV-SS905C + SCSI +@@ -17845,7 +17844,7 @@ + genesys +
(1.0-63) + +-sane-genesys ++sane-genesys + + DSmobile 600 + USB +@@ -17856,7 +17855,7 @@ + genesys +
(1.0-63) + +-sane-genesys ++sane-genesys + + DSmobile USB + USB +@@ -17950,7 +17949,7 @@ + pie +
(1.0) + +-sane-pie ++sane-pie + + ScanAce 636S + SCSI +@@ -17961,7 +17960,7 @@ + pie +
(1.0) + +-sane-pie ++sane-pie + + ScanAce 1230S + SCSI +@@ -17972,7 +17971,7 @@ + pie +
(1.0) + +-sane-pie ++sane-pie + + ScanAce 1236S + SCSI +@@ -17983,7 +17982,7 @@ + pie +
(1.0) + +-sane-pie ++sane-pie + + ScanAce II + SCSI +@@ -17994,7 +17993,7 @@ + pie +
(1.0) + +-sane-pie ++sane-pie + + ScanAce II Plus + SCSI +@@ -18005,7 +18004,7 @@ + pie +
(1.0) + +-sane-pie ++sane-pie + + ScanAce III + SCSI +@@ -18016,7 +18015,7 @@ + pie +
(1.0) + +-sane-pie ++sane-pie + + ScanAce III Plus + SCSI +@@ -18027,7 +18026,7 @@ + pie +
(1.0) + +-sane-pie ++sane-pie + + ScanAce Plus + SCSI +@@ -18038,7 +18037,7 @@ + pie +
(1.0) + +-sane-pie ++sane-pie + + ScanAce ScanMedia + SCSI +@@ -18049,7 +18048,7 @@ + pie +
(1.0) + +-sane-pie ++sane-pie + + ScanAce ScanMedia II + SCSI +@@ -18060,7 +18059,7 @@ + pie +
(1.0) + +-sane-pie ++sane-pie + + ScanAce V + SCSI +@@ -18071,7 +18070,7 @@ + pie +
(1.0) + +-sane-pie ++sane-pie + + +

Manufacturer: PIOTECH

+@@ -18098,7 +18097,7 @@ + teco3 +
(1.0-1) + +-sane-teco3 ++sane-teco3 + + +

Manufacturer: PLANon

+@@ -18174,7 +18173,7 @@ + gt68xx +
(1.0-84) + +-sane-gt68xx ++sane-gt68xx + + OptiCard 600+ + USB +@@ -18196,7 +18195,7 @@ + genesys +
(1.0-63) + +-sane-genesys ++sane-genesys + + OpticFilm 7200 + USB +@@ -18229,7 +18228,7 @@ + plustek_pp +
(0.43) + +-sane-plustek_pp ++sane-plustek_pp + + OpticPro 1212U + USB +@@ -18240,7 +18239,7 @@ + u12 +
(0.02) + +-sane-u12 ++sane-u12 + + OpticPro 1236P + Parport (SPP, EPP) +@@ -18251,7 +18250,7 @@ + plustek_pp +
(0.43) + +-sane-plustek_pp ++sane-plustek_pp + + OpticPro 1248U + USB +@@ -18262,7 +18261,7 @@ + gt68xx +
(1.0-84) + +-sane-gt68xx ++sane-gt68xx + + OpticPro 1248U + USB +@@ -18273,7 +18272,7 @@ + gt68xx +
(1.0-84) + +-sane-gt68xx ++sane-gt68xx + + OpticPro 2400SP + SCSI +@@ -18284,7 +18283,7 @@ + teco3 +
(1.0-1) + +-sane-teco3 ++sane-teco3 + + OpticPro 4800P + Parport (SPP, EPP) +@@ -18295,7 +18294,7 @@ + plustek_pp +
(0.43) + +-sane-plustek_pp ++sane-plustek_pp + + OpticPro 4830P + Parport (SPP, EPP) +@@ -18306,7 +18305,7 @@ + plustek_pp +
(0.43) + +-sane-plustek_pp ++sane-plustek_pp + + OpticPro 4831P + Parport (SPP, EPP) +@@ -18317,7 +18316,7 @@ + plustek_pp +
(0.43) + +-sane-plustek_pp ++sane-plustek_pp + + OpticPro 9600P + Parport (SPP, EPP) +@@ -18328,7 +18327,7 @@ + plustek_pp +
(0.43) + +-sane-plustek_pp ++sane-plustek_pp + + OpticPro 9630P + Parport (SPP, EPP) +@@ -18339,7 +18338,7 @@ + plustek_pp +
(0.43) + +-sane-plustek_pp ++sane-plustek_pp + + OpticPro 9630PL + Parport (SPP, EPP) +@@ -18350,7 +18349,7 @@ + plustek_pp +
(0.43) + +-sane-plustek_pp ++sane-plustek_pp + + OpticPro 9636P + Parport (SPP, EPP) +@@ -18361,7 +18360,7 @@ + plustek_pp +
(0.43) + +-sane-plustek_pp ++sane-plustek_pp + + OpticPro 9636P+/Turbo + Parport (SPP, EPP) +@@ -18372,7 +18371,7 @@ + plustek_pp +
(0.43) + +-sane-plustek_pp ++sane-plustek_pp + + OpticPro 9636T + Parport (SPP, EPP) +@@ -18383,7 +18382,7 @@ + plustek_pp +
(0.43) + +-sane-plustek_pp ++sane-plustek_pp + + OpticPro 12000P/96000P + Parport (SPP, EPP) +@@ -18394,7 +18393,7 @@ + plustek_pp +
(0.43) + +-sane-plustek_pp ++sane-plustek_pp + + OpticPro 12000T + Parport (SPP, EPP) +@@ -18405,7 +18404,7 @@ + plustek_pp +
(0.43) + +-sane-plustek_pp ++sane-plustek_pp + + OpticPro 19200S + SCSI +@@ -18416,7 +18415,7 @@ + artec +
(unmaintained) + +-sane-artec ++sane-artec + + OpticPro A3U + USB +@@ -18438,7 +18437,7 @@ + plustek_pp +
(0.43) + +-sane-plustek_pp ++sane-plustek_pp + + OpticPro P8 + Parport +@@ -18449,7 +18448,7 @@ + plustek_pp +
(0.43) + +-sane-plustek_pp ++sane-plustek_pp + + OpticPro P12 + Parport (SPP, EPP) +@@ -18460,7 +18459,7 @@ + plustek_pp +
(0.43) + +-sane-plustek_pp ++sane-plustek_pp + + OpticPro PT12 + Parport (SPP, EPP) +@@ -18471,7 +18470,7 @@ + plustek_pp +
(0.43) + +-sane-plustek_pp ++sane-plustek_pp + + OpticPro S6 + USB +@@ -18504,7 +18503,7 @@ + gt68xx +
(1.0-84) + +-sane-gt68xx ++sane-gt68xx + + OpticPro S24 + USB +@@ -18526,7 +18525,7 @@ + gt68xx +
(1.0-84) + +-sane-gt68xx ++sane-gt68xx + + OpticPro S28 + USB +@@ -18559,7 +18558,7 @@ + gt68xx +
(1.0-84) + +-sane-gt68xx ++sane-gt68xx + + OpticPro ST16 + USB +@@ -18647,7 +18646,7 @@ + u12 +
(0.02) + +-sane-u12 ++sane-u12 + + OpticPro U12 + USB +@@ -18658,7 +18657,7 @@ + plustek +
(0.52) + +-sane-plustek ++sane-plustek + + OpticPro U16B + USB +@@ -18669,7 +18668,7 @@ + gt68xx +
(1.0-84) + +-sane-gt68xx ++sane-gt68xx + + OpticPro U16B+ + USB +@@ -18680,7 +18679,7 @@ + gt68xx +
(1.0-84) + +-sane-gt68xx ++sane-gt68xx + + OpticPro U24 + USB +@@ -18691,7 +18690,7 @@ + plustek +
(0.52) + +-sane-plustek ++sane-plustek + + OpticPro U24 + USB +@@ -18702,7 +18701,7 @@ + plustek +
(0.52) + +-sane-plustek ++sane-plustek + + OpticPro UA18 + USB +@@ -18724,7 +18723,7 @@ + u12 +
(0.02) + +-sane-u12 ++sane-u12 + + OpticPro UT12 + USB +@@ -18735,7 +18734,7 @@ + plustek +
(0.52) + +-sane-plustek ++sane-plustek + + OpticPro UT12 + USB +@@ -18746,7 +18745,7 @@ + plustek +
(0.52) + +-sane-plustek ++sane-plustek + + OpticPro UT16 + USB +@@ -18757,7 +18756,7 @@ + plustek +
(0.52) + +-sane-plustek ++sane-plustek + + OpticPro UT16B + USB +@@ -18768,7 +18767,7 @@ + gt68xx +
(1.0-84) + +-sane-gt68xx ++sane-gt68xx + + OpticPro UT24 + USB +@@ -18779,7 +18778,7 @@ + plustek +
(0.52) + +-sane-plustek ++sane-plustek + + OpticSlim 500 + USB +@@ -18801,7 +18800,7 @@ + gt68xx +
(1.0-84) + +-sane-gt68xx ++sane-gt68xx + + OpticSlim 2400 + USB +@@ -18812,7 +18811,7 @@ + gt68xx +
(1.0-84) + +-sane-gt68xx ++sane-gt68xx + + OpticSlim 2400 plus + USB +@@ -18823,7 +18822,7 @@ + gt68xx +
(1.0-84) + +-sane-gt68xx ++sane-gt68xx + + OpticSlim 2420 + USB +@@ -18856,7 +18855,7 @@ + gt68xx +
(1.0-84) + +-sane-gt68xx ++sane-gt68xx + + OpticWorks 2000 + Parport +@@ -19015,7 +19014,7 @@ + plustek +
(0.52) + +-sane-plustek ++sane-plustek + + Q-Scan USB201 (A6 portable scanner) + USB +@@ -19026,7 +19025,7 @@ + plustek +
(0.52) + +-sane-plustek ++sane-plustek + + +

Manufacturer: Primax

+@@ -19086,7 +19085,7 @@ + plustek_pp +
(0.43) + +-sane-plustek_pp ++sane-plustek_pp + + Colorado Direct 600 + Parport +@@ -19130,7 +19129,7 @@ + plustek_pp +
(0.43) + +-sane-plustek_pp ++sane-plustek_pp + + Compact 4800 Direct-30 + Parport (SPP, EPP) +@@ -19141,7 +19140,7 @@ + plustek_pp +
(0.43) + +-sane-plustek_pp ++sane-plustek_pp + + Compact 4800 SCSI + SCSI +@@ -19152,7 +19151,7 @@ + mustek +
(1.0-138) + +-sane-mustek ++sane-mustek + + Compact 9600 Direct-30 + Parport (SPP, EPP) +@@ -19163,7 +19162,7 @@ + plustek_pp +
(0.43) + +-sane-plustek_pp ++sane-plustek_pp + + G2-300 + USB +@@ -19251,7 +19250,7 @@ + teco2 +
(1.0-9) + +-sane-teco2 ++sane-teco2 + + OneTouch 5300 + Parport +@@ -19284,7 +19283,7 @@ + p5 +
(1) + +-sane-p5 ++sane-p5 + + Primascan Colorado 2600u + USB +@@ -19306,7 +19305,7 @@ + teco2 +
(1.0-9) + +-sane-teco2 ++sane-teco2 + + Profi 19200 + SCSI +@@ -19317,7 +19316,7 @@ + teco2 +
(1.0-9) + +-sane-teco2 ++sane-teco2 + + ReadyScan 636i + USB +@@ -19489,7 +19488,7 @@ + teco2 +
(1.0-9) + +-sane-teco2 ++sane-teco2 + + APOLLO Express 6 + SCSI +@@ -19500,7 +19499,7 @@ + teco2 +
(1.0-9) + +-sane-teco2 ++sane-teco2 + + AVEC 2400 + SCSI +@@ -19511,7 +19510,7 @@ + teco1 +
(1.0-10) + +-sane-teco1 ++sane-teco1 + + AVEC 2412 + SCSI +@@ -19522,7 +19521,7 @@ + teco1 +
(1.0-10) + +-sane-teco1 ++sane-teco1 + + AVEC 4800 + SCSI +@@ -19533,7 +19532,7 @@ + teco1 +
(1.0-10) + +-sane-teco1 ++sane-teco1 + + AVEC 4816 + SCSI +@@ -19544,7 +19543,7 @@ + teco1 +
(1.0-10) + +-sane-teco1 ++sane-teco1 + + AVEC II E3 + Parport +@@ -19566,7 +19565,7 @@ + teco2 +
(1.0-9) + +-sane-teco2 ++sane-teco2 + + AVEC Super 3 + SCSI +@@ -19577,7 +19576,7 @@ + teco2 +
(1.0-9) + +-sane-teco2 ++sane-teco2 + + Eclipse 1200U + USB +@@ -19610,7 +19609,7 @@ + teco3 +
(1.0-1) + +-sane-teco3 ++sane-teco3 + + RELI 2400 + SCSI +@@ -19621,7 +19620,7 @@ + teco1 +
(1.0-10) + +-sane-teco1 ++sane-teco1 + + RELI 2412 + SCSI +@@ -19632,7 +19631,7 @@ + teco1 +
(1.0-10) + +-sane-teco1 ++sane-teco1 + + RELI 4816 + SCSI +@@ -19643,7 +19642,7 @@ + teco1 +
(1.0-10) + +-sane-teco1 ++sane-teco1 + + RELI 4830 + SCSI +@@ -19654,7 +19653,7 @@ + teco1 +
(1.0-10) + +-sane-teco1 ++sane-teco1 + + RELI 9600 + SCSI +@@ -19665,7 +19664,7 @@ + teco1 +
(1.0-10) + +-sane-teco1 ++sane-teco1 + + RELI 9612 + SCSI +@@ -19676,7 +19675,7 @@ + teco1 +
(1.0-10) + +-sane-teco1 ++sane-teco1 + + RELI 9624 + SCSI +@@ -19687,7 +19686,7 @@ + teco1 +
(1.0-10) + +-sane-teco1 ++sane-teco1 + + RELI 9630 + SCSI +@@ -19698,7 +19697,7 @@ + teco1 +
(1.0-10) + +-sane-teco1 ++sane-teco1 + + RELI DS6 + SCSI +@@ -19709,7 +19708,7 @@ + teco1 +
(1.0-10) + +-sane-teco1 ++sane-teco1 + + RELI DS15 + SCSI +@@ -19720,7 +19719,7 @@ + teco1 +
(1.0-10) + +-sane-teco1 ++sane-teco1 + + SCORPIO Pro + SCSI +@@ -19731,7 +19730,7 @@ + teco2 +
(1.0-9) + +-sane-teco2 ++sane-teco2 + + SCORPIO Pro-S + SCSI +@@ -19742,7 +19741,7 @@ + teco2 +
(1.0-9) + +-sane-teco2 ++sane-teco2 + + SCORPIO Super 3 + SCSI +@@ -19753,7 +19752,7 @@ + teco2 +
(1.0-9) + +-sane-teco2 ++sane-teco2 + + Scorpio Ultra 3 + USB +@@ -19789,7 +19788,7 @@ + gt68xx +
(1.0-84) + +-sane-gt68xx ++sane-gt68xx + + RevScan Orange R48Ti + USB +@@ -19800,7 +19799,7 @@ + u12 +
(0.02) + +-sane-u12 ++sane-u12 + + +

Manufacturer: Ricoh

+@@ -19827,7 +19826,7 @@ + ibm +
(1.0-4) + +-sane-ibm ++sane-ibm + + IS-410 + SCSI +@@ -19838,7 +19837,7 @@ + hs2p +
(1.00) + +-sane-hs2p ++sane-hs2p + + IS-420 + SCSI +@@ -19849,7 +19848,7 @@ + ibm +
(1.0-4) + +-sane-ibm ++sane-ibm + + IS-430 + SCSI +@@ -19860,7 +19859,7 @@ + ibm +
(1.0-4) + +-sane-ibm ++sane-ibm + + IS-430 + SCSI +@@ -19871,7 +19870,7 @@ + hs2p +
(1.00) + +-sane-hs2p ++sane-hs2p + + IS450 + SCSI +@@ -19882,7 +19881,7 @@ + hs2p +
(1.00) + +-sane-hs2p ++sane-hs2p + + Ricoh IS50 + SCSI +@@ -19892,7 +19891,7 @@ + + ricoh
(unmaintained) + +-sane-ricoh ++sane-ricoh + + Ricoh IS60 + SCSI +@@ -19902,7 +19901,7 @@ + + ricoh
(unmaintained) + +-sane-ricoh ++sane-ricoh + + +

Manufacturer: Samsung

+@@ -19928,7 +19927,7 @@ + + xerox_mfp
(1.0-13) + +-sane-xerox_mfp ++sane-xerox_mfp + + CLX-2160 + USB +@@ -19938,7 +19937,7 @@ + + xerox_mfp
(1.0-13) + +-sane-xerox_mfp ++sane-xerox_mfp + + CLX-3160 + USB +@@ -19948,7 +19947,7 @@ + + xerox_mfp
(1.0-13) + +-sane-xerox_mfp ++sane-xerox_mfp + + CLX-3170fn (CLX-3170 Series) + USB +@@ -19958,7 +19957,7 @@ + + xerox_mfp
(1.0-13) + +-sane-xerox_mfp ++sane-xerox_mfp + + CLX-3175FW + USB +@@ -19968,7 +19967,7 @@ + + xerox_mfp
(1.0-13) + +-sane-xerox_mfp ++sane-xerox_mfp + + CLX-3185 + USB +@@ -19978,7 +19977,7 @@ + + xerox_mfp
(1.0-13) + +-sane-xerox_mfp ++sane-xerox_mfp + + CLX-3300 Series + USB +@@ -19988,7 +19987,7 @@ + + xerox_mfp
(1.0-13) + +-sane-xerox_mfp ++sane-xerox_mfp + + CLX-4190 + USB +@@ -19998,7 +19997,7 @@ + + xerox_mfp
(1.0-13) + +-sane-xerox_mfp ++sane-xerox_mfp + + CLX-6200 + USB +@@ -20008,7 +20007,7 @@ + + xerox_mfp
(1.0-13) + +-sane-xerox_mfp ++sane-xerox_mfp + + CLX-6220 + USB +@@ -20018,7 +20017,7 @@ + + xerox_mfp
(1.0-13) + +-sane-xerox_mfp ++sane-xerox_mfp + + CLX-6240 + USB +@@ -20028,7 +20027,7 @@ + + xerox_mfp
(1.0-13) + +-sane-xerox_mfp ++sane-xerox_mfp + + CLX-6250 + USB +@@ -20038,7 +20037,7 @@ + + xerox_mfp
(1.0-13) + +-sane-xerox_mfp ++sane-xerox_mfp + + CLX-6260 + USB +@@ -20048,7 +20047,7 @@ + + xerox_mfp
(1.0-13) + +-sane-xerox_mfp ++sane-xerox_mfp + + CLX-8380 + USB +@@ -20058,7 +20057,7 @@ + + xerox_mfp
(1.0-13) + +-sane-xerox_mfp ++sane-xerox_mfp + + CLX-8385 + USB +@@ -20068,7 +20067,7 @@ + + xerox_mfp
(1.0-13) + +-sane-xerox_mfp ++sane-xerox_mfp + + CLX-8385X + USB +@@ -20078,7 +20077,7 @@ + + xerox_mfp
(1.0-13) + +-sane-xerox_mfp ++sane-xerox_mfp + + CLX-8540 + USB +@@ -20088,7 +20087,7 @@ + + xerox_mfp
(1.0-13) + +-sane-xerox_mfp ++sane-xerox_mfp + + M267x 287x Series + USB +@@ -20098,7 +20097,7 @@ + + xerox_mfp
(1.0-13) + +-sane-xerox_mfp ++sane-xerox_mfp + + M337x 387x 407x Series + USB +@@ -20108,7 +20107,7 @@ + + xerox_mfp
(1.0-13) + +-sane-xerox_mfp ++sane-xerox_mfp + + MFP-65x + USB +@@ -20118,7 +20117,7 @@ + + xerox_mfp
(1.0-13) + +-sane-xerox_mfp ++sane-xerox_mfp + + MFP-560 + USB +@@ -20128,7 +20127,7 @@ + + xerox_mfp
(1.0-13) + +-sane-xerox_mfp ++sane-xerox_mfp + + MFP-750 + USB +@@ -20138,7 +20137,7 @@ + + xerox_mfp
(1.0-13) + +-sane-xerox_mfp ++sane-xerox_mfp + + SCX-4x16 + USB +@@ -20148,7 +20147,7 @@ + + xerox_mfp
(1.0-13) + +-sane-xerox_mfp ++sane-xerox_mfp + + SCX-4x20 + USB +@@ -20158,7 +20157,7 @@ + + xerox_mfp
(1.0-13) + +-sane-xerox_mfp ++sane-xerox_mfp + + SCX-4x21 + USB +@@ -20168,7 +20167,7 @@ + + xerox_mfp
(1.0-13) + +-sane-xerox_mfp ++sane-xerox_mfp + + SCX-4x26 + USB +@@ -20178,7 +20177,7 @@ + + xerox_mfp
(1.0-13) + +-sane-xerox_mfp ++sane-xerox_mfp + + SCX-5x30 + USB +@@ -20188,7 +20187,7 @@ + + xerox_mfp
(1.0-13) + +-sane-xerox_mfp ++sane-xerox_mfp + + SCX-6x20 + USB +@@ -20198,7 +20197,7 @@ + + xerox_mfp
(1.0-13) + +-sane-xerox_mfp ++sane-xerox_mfp + + SCX-6x22 + USB +@@ -20208,7 +20207,7 @@ + + xerox_mfp
(1.0-13) + +-sane-xerox_mfp ++sane-xerox_mfp + + SCX-6x45 + USB +@@ -20218,7 +20217,7 @@ + + xerox_mfp
(1.0-13) + +-sane-xerox_mfp ++sane-xerox_mfp + + SCX-6x55 + USB +@@ -20228,7 +20227,7 @@ + + xerox_mfp
(1.0-13) + +-sane-xerox_mfp ++sane-xerox_mfp + + SCX-6x55X + USB +@@ -20238,7 +20237,7 @@ + + xerox_mfp
(1.0-13) + +-sane-xerox_mfp ++sane-xerox_mfp + + SCX-470x + USB +@@ -20248,7 +20247,7 @@ + + xerox_mfp
(1.0-13) + +-sane-xerox_mfp ++sane-xerox_mfp + + SCX-681x + USB +@@ -20258,7 +20257,7 @@ + + xerox_mfp
(1.0-13) + +-sane-xerox_mfp ++sane-xerox_mfp + + SCX-3205W (SCX-3200 Series) + USB Ethernet +@@ -20268,7 +20267,7 @@ + + xerox_mfp
(1.0-13) + +-sane-xerox_mfp ++sane-xerox_mfp + + SCX-3400 + USB +@@ -20278,7 +20277,7 @@ + + xerox_mfp
(1.0-13) + +-sane-xerox_mfp ++sane-xerox_mfp + + SCX-3405W + Ethernet +@@ -20288,7 +20287,7 @@ + + xerox_mfp
(1.0-13) + +-sane-xerox_mfp ++sane-xerox_mfp + + SCX-4100 + USB +@@ -20298,7 +20297,7 @@ + + xerox_mfp
(1.0-13) + +-sane-xerox_mfp ++sane-xerox_mfp + + SCX-4200 + USB +@@ -20308,7 +20307,7 @@ + + xerox_mfp
(1.0-13) + +-sane-xerox_mfp ++sane-xerox_mfp + + SCX-4300 + USB +@@ -20318,7 +20317,7 @@ + + xerox_mfp
(1.0-13) + +-sane-xerox_mfp ++sane-xerox_mfp + + SCX-4500 + USB +@@ -20328,7 +20327,7 @@ + + xerox_mfp
(1.0-13) + +-sane-xerox_mfp ++sane-xerox_mfp + + SCX-4500W + USB Ethernet +@@ -20338,7 +20337,7 @@ + + xerox_mfp
(1.0-13) + +-sane-xerox_mfp ++sane-xerox_mfp + + SCX-4600 + USB +@@ -20348,7 +20347,7 @@ + + xerox_mfp
(1.0-13) + +-sane-xerox_mfp ++sane-xerox_mfp + + SCX-4623 + USB +@@ -20358,7 +20357,7 @@ + + xerox_mfp
(1.0-13) + +-sane-xerox_mfp ++sane-xerox_mfp + + SCX-4623FW + USB +@@ -20368,7 +20367,7 @@ + + xerox_mfp
(1.0-13) + +-sane-xerox_mfp ++sane-xerox_mfp + + SCX-4650 4x21S Series + USB +@@ -20378,7 +20377,7 @@ + + xerox_mfp
(1.0-13) + +-sane-xerox_mfp ++sane-xerox_mfp + + SCX-4725FN + USB +@@ -20399,7 +20398,7 @@ + + xerox_mfp
(1.0-13) + +-sane-xerox_mfp ++sane-xerox_mfp + + SCX-4824 (SCX-4x24 Series) + USB +@@ -20409,7 +20408,7 @@ + + xerox_mfp
(1.0-13) + +-sane-xerox_mfp ++sane-xerox_mfp + + SCX-4825FN (SCX-4x25 Series) + USB +@@ -20419,7 +20418,7 @@ + + xerox_mfp
(1.0-13) + +-sane-xerox_mfp ++sane-xerox_mfp + + SCX-4828FN (SCX-4x28 Series) + USB +@@ -20429,7 +20428,7 @@ + + xerox_mfp
(1.0-13) + +-sane-xerox_mfp ++sane-xerox_mfp + + SCX-4833FD + USB +@@ -20439,7 +20438,7 @@ + + xerox_mfp
(1.0-13) + +-sane-xerox_mfp ++sane-xerox_mfp + + SCX-4835FD + Ethernet +@@ -20449,7 +20448,7 @@ + + xerox_mfp
(1.0-13) + +-sane-xerox_mfp ++sane-xerox_mfp + + SCX-5635 + USB +@@ -20459,7 +20458,7 @@ + + xerox_mfp
(1.0-13) + +-sane-xerox_mfp ++sane-xerox_mfp + + SCX-5835_5935 + USB +@@ -20469,7 +20468,7 @@ + + xerox_mfp
(1.0-13) + +-sane-xerox_mfp ++sane-xerox_mfp + + SCX-5835_5935X + USB +@@ -20479,7 +20478,7 @@ + + xerox_mfp
(1.0-13) + +-sane-xerox_mfp ++sane-xerox_mfp + + SCX-6545 + USB +@@ -20489,7 +20488,7 @@ + + xerox_mfp
(1.0-13) + +-sane-xerox_mfp ++sane-xerox_mfp + + SCX-6545X + USB +@@ -20499,7 +20498,7 @@ + + xerox_mfp
(1.0-13) + +-sane-xerox_mfp ++sane-xerox_mfp + + SCX4725 + USB +@@ -20509,7 +20508,7 @@ + + xerox_mfp
(1.0-13) + +-sane-xerox_mfp ++sane-xerox_mfp + + SCX4725-FN + USB +@@ -20519,7 +20518,7 @@ + + xerox_mfp
(1.0-13) + +-sane-xerox_mfp ++sane-xerox_mfp + + SF-760 + USB +@@ -20529,7 +20528,7 @@ + + xerox_mfp
(1.0-13) + +-sane-xerox_mfp ++sane-xerox_mfp + + +

Manufacturer: Scanport

+@@ -20556,7 +20555,7 @@ + microtek2 +
(unmaintained) + +-sane-microtek2 ++sane-microtek2 + + SQ2030 + Parport +@@ -20567,7 +20566,7 @@ + microtek2 +
(unmaintained) + +-sane-microtek2 ++sane-microtek2 + + SQ4836 + SCSI +@@ -20578,7 +20577,7 @@ + microtek2 +
(unmaintained) + +-sane-microtek2 ++sane-microtek2 + + +

Manufacturer: Scanshell

+@@ -20630,7 +20629,7 @@ + sceptre +
(1.0-10) + +-sane-sceptre ++sane-sceptre + + +

Manufacturer: Sharp

+@@ -20657,7 +20656,7 @@ + sharp +
(0.32) + +-sane-sharp ++sane-sharp + + JX-320 + SCSI +@@ -20668,7 +20667,7 @@ + sharp +
(0.32) + +-sane-sharp ++sane-sharp + + JX-325 + SCSI +@@ -20679,7 +20678,7 @@ + sharp +
(0.32) + +-sane-sharp ++sane-sharp + + JX-330 + SCSI +@@ -20690,7 +20689,7 @@ + sharp +
(0.32) + +-sane-sharp ++sane-sharp + + JX-350 + SCSI +@@ -20701,7 +20700,7 @@ + sharp +
(0.32) + +-sane-sharp ++sane-sharp + + JX-610 + SCSI +@@ -20712,7 +20711,7 @@ + sharp +
(0.32) + +-sane-sharp ++sane-sharp + + +

Manufacturer: Sicos

+@@ -20763,7 +20762,7 @@ + + s9036
(unmaintained) + +-sane-s9036 ++sane-s9036 + + Cherry FingerTIP ID Board - Sensor + USB +@@ -20795,7 +20794,7 @@ + + agfafocus
(unmaintained) + +-sane-agfafocus ++sane-agfafocus + + ST400 + SCSI +@@ -20806,7 +20805,7 @@ + st400 +
(1.6) + +-sane-st400 ++sane-st400 + + ST800 + SCSI +@@ -20817,7 +20816,7 @@ + st400 +
(1.6) + +-sane-st400 ++sane-st400 + + +

Manufacturer: SmartDisk

+@@ -20917,7 +20916,7 @@ + genesys +
(1.0-63) + +-sane-genesys ++sane-genesys + + DocketPort 485 + USB +@@ -20928,7 +20927,7 @@ + genesys +
(1.0-63) + +-sane-genesys ++sane-genesys + + DocketPort 665 + USB +@@ -20939,7 +20938,7 @@ + genesys +
(1.0-63) + +-sane-genesys ++sane-genesys + + DocketPort 685/ Ambir DS685 + USB +@@ -20950,7 +20949,7 @@ + genesys +
(1.0-63) + +-sane-genesys ++sane-genesys + + TravelScan 460/464 + USB +@@ -20961,7 +20960,7 @@ + plustek +
(0.52) + +-sane-plustek ++sane-plustek + + TravelScan 662 + USB +@@ -20972,7 +20971,7 @@ + plustek +
(0.52) + +-sane-plustek ++sane-plustek + + TravelScan FS-531 + USB +@@ -21029,7 +21028,7 @@ + + tamarack
(unmaintained) + +-sane-tamarack ++sane-tamarack + + Artiscan 8000C + SCSI +@@ -21039,7 +21038,7 @@ + + tamarack
(unmaintained) + +-sane-tamarack ++sane-tamarack + + Artiscan 9600 + Parport +@@ -21071,7 +21070,7 @@ + + tamarack
(unmaintained) + +-sane-tamarack ++sane-tamarack + + +

Manufacturer: Targa

+@@ -21096,7 +21095,7 @@ + mustek_pp +
(13) + +-sane-mustek_pp ++sane-mustek_pp + + Funline TS12 EP + Parport (EPP) +@@ -21107,7 +21106,7 @@ + mustek_pp +
(13) + +-sane-mustek_pp ++sane-mustek_pp + + +

Manufacturer: TCE

+@@ -21225,7 +21224,7 @@ + umax +
(1.0-41) + +-sane-umax ++sane-umax + + +

Manufacturer: Trust

+@@ -21252,7 +21251,7 @@ + + artec_eplus48u
(unmaintained) + +-sane-artec_eplus48u ++sane-artec_eplus48u + + 240TH Easy Webscan Gold + USB +@@ -21263,7 +21262,7 @@ + gt68xx +
(1.0-84) + +-sane-gt68xx ++sane-gt68xx + + CombiScan 19200 + Parport USB +@@ -21285,7 +21284,7 @@ + mustek_usb +
(1.0-18) + +-sane-mustek_usb ++sane-mustek_usb + + Compact Scan USB 19200 + USB +@@ -21296,7 +21295,7 @@ + gt68xx +
(1.0-84) + +-sane-gt68xx ++sane-gt68xx + + Direct WebScan 19200 + USB +@@ -21307,7 +21306,7 @@ + gt68xx +
(1.0-84) + +-sane-gt68xx ++sane-gt68xx + + Easy Connect 9600+ + Parport (EPP) +@@ -21318,7 +21317,7 @@ + mustek_pp +
(13) + +-sane-mustek_pp ++sane-mustek_pp + + Easy Connect 19200+ + Parport (EPP) +@@ -21329,7 +21328,7 @@ + mustek_pp +
(13) + +-sane-mustek_pp ++sane-mustek_pp + + Easy Scan 9600 Plus + Parport +@@ -21340,7 +21339,7 @@ + as6e +
(0.5) + +-sane-as6e ++sane-as6e + + Easy Webscan 19200 + USB +@@ -21350,7 +21349,7 @@ + + artec_eplus48u
(unmaintained) + +-sane-artec_eplus48u ++sane-artec_eplus48u + + EasyScan 19200 + Parport +@@ -21372,7 +21371,7 @@ + gt68xx +
(1.0-84) + +-sane-gt68xx ++sane-gt68xx + + Imagery 1200 + SCSI +@@ -21383,7 +21382,7 @@ + mustek +
(1.0-138) + +-sane-mustek ++sane-mustek + + Imagery 1200 SP + SCSI +@@ -21394,7 +21393,7 @@ + mustek +
(1.0-138) + +-sane-mustek ++sane-mustek + + Imagery 2400 SP + SCSI +@@ -21405,7 +21404,7 @@ + teco3 +
(1.0-1) + +-sane-teco3 ++sane-teco3 + + Imagery 4800 SP + SCSI +@@ -21416,7 +21415,7 @@ + mustek +
(1.0-138) + +-sane-mustek ++sane-mustek + + Imagery 4800 SP+ + SCSI +@@ -21427,7 +21426,7 @@ + teco3 +
(1.0-1) + +-sane-teco3 ++sane-teco3 + + Imagery 9600 SP + SCSI +@@ -21438,7 +21437,7 @@ + teco3 +
(1.0-1) + +-sane-teco3 ++sane-teco3 + + Office Scan USB 19200 + USB +@@ -21449,7 +21448,7 @@ + niash +
(0.3) + +-sane-niash ++sane-niash + + SCSI Connect 19200 + SCSI +@@ -21460,7 +21459,7 @@ + mustek +
(1.0-138) + +-sane-mustek ++sane-mustek + + SCSI excellence series 19200 + SCSI +@@ -21471,7 +21470,7 @@ + mustek +
(1.0-138) + +-sane-mustek ++sane-mustek + + SCSI Scan 19200 -Excellence Series- + SCSI +@@ -21509,7 +21508,7 @@ + umax_pp +
(1) + +-sane-umax_pp ++sane-umax_pp + + Astra 600S + SCSI +@@ -21520,7 +21519,7 @@ + umax +
(1.0-41) + +-sane-umax ++sane-umax + + Astra 610P + Parport (SPP/ECP) +@@ -21531,7 +21530,7 @@ + umax_pp +
(1) + +-sane-umax_pp ++sane-umax_pp + + Astra 610S + SCSI +@@ -21542,7 +21541,7 @@ + umax +
(1.0-41) + +-sane-umax ++sane-umax + + Astra 1200S + SCSI +@@ -21553,7 +21552,7 @@ + umax +
(1.0-41) + +-sane-umax ++sane-umax + + Astra 1220P + Parport (EPP/ECP) +@@ -21564,7 +21563,7 @@ + umax_pp +
(1) + +-sane-umax_pp ++sane-umax_pp + + Astra 1220S + SCSI +@@ -21575,7 +21574,7 @@ + umax +
(1.0-41) + +-sane-umax ++sane-umax + + Astra 1220U + USB +@@ -21586,7 +21585,7 @@ + umax1220u +
(unmaintained) + +-sane-umax1220u ++sane-umax1220u + + Astra 1600P + Parport (EPP/ECP) +@@ -21597,7 +21596,7 @@ + umax_pp +
(1) + +-sane-umax_pp ++sane-umax_pp + + Astra 1600U + USB +@@ -21608,7 +21607,7 @@ + umax1220u +
(unmaintained) + +-sane-umax1220u ++sane-umax1220u + + Astra 2000P + Parport (EPP/ECP) +@@ -21619,7 +21618,7 @@ + umax_pp +
(1) + +-sane-umax_pp ++sane-umax_pp + + Astra 2000U + USB +@@ -21630,7 +21629,7 @@ + umax1220u +
(unmaintained) + +-sane-umax1220u ++sane-umax1220u + + Astra 2100S + SCSI +@@ -21641,7 +21640,7 @@ + umax +
(1.0-41) + +-sane-umax ++sane-umax + + Astra 2100U + USB +@@ -21652,7 +21651,7 @@ + umax1220u +
(unmaintained) + +-sane-umax1220u ++sane-umax1220u + + Astra 2200 (SU) + USB +@@ -21663,7 +21662,7 @@ + umax +
(1.0-41) + +-sane-umax ++sane-umax + + Astra 2200 (SU) + SCSI +@@ -21674,7 +21673,7 @@ + umax +
(1.0-41) + +-sane-umax ++sane-umax + + Astra 2400S + SCSI +@@ -21685,7 +21684,7 @@ + umax +
(1.0-41) + +-sane-umax ++sane-umax + + Astra 2500 + USB +@@ -21762,7 +21761,7 @@ + rts8891 +
(1.0-0) + +-sane-rts8891 ++sane-rts8891 + + Astra 4450 + USB +@@ -21773,7 +21772,7 @@ + rts8891 +
(1.0-0) + +-sane-rts8891 ++sane-rts8891 + + Astra 4500 + USB +@@ -21817,7 +21816,7 @@ + hp3900 +
(0.12) + +-sane-hp3900 ++sane-hp3900 + + Astra 6400 + IEEE-1394 +@@ -21828,7 +21827,7 @@ + umax +
(1.0-41) + +-sane-umax ++sane-umax + + Astra 6450 + IEEE-1394 +@@ -21839,7 +21838,7 @@ + umax +
(1.0-41) + +-sane-umax ++sane-umax + + Astra 6700 + USB +@@ -21861,7 +21860,7 @@ + umax +
(1.0-41) + +-sane-umax ++sane-umax + + Astra MX3 + SCSI +@@ -21872,7 +21871,7 @@ + umax +
(1.0-41) + +-sane-umax ++sane-umax + + AstraSlim + USB +@@ -21904,7 +21903,7 @@ + + artec_eplus48u
(unmaintained) + +-sane-artec_eplus48u ++sane-artec_eplus48u + + AstraSlim 6000 + USB +@@ -21925,7 +21924,7 @@ + + artec_eplus48u
(unmaintained) + +-sane-artec_eplus48u ++sane-artec_eplus48u + + Gemini D-16 + SCSI +@@ -21936,7 +21935,7 @@ + umax +
(1.0-41) + +-sane-umax ++sane-umax + + Mirage D-16L + SCSI +@@ -21947,7 +21946,7 @@ + umax +
(1.0-41) + +-sane-umax ++sane-umax + + Mirage II + SCSI +@@ -21958,7 +21957,7 @@ + umax +
(1.0-41) + +-sane-umax ++sane-umax + + Mirage IIse + SCSI +@@ -21969,7 +21968,7 @@ + umax +
(1.0-41) + +-sane-umax ++sane-umax + + Nete3470' + Parport +@@ -21991,7 +21990,7 @@ + umax +
(1.0-41) + +-sane-umax ++sane-umax + + PowerLook + SCSI +@@ -22002,7 +22001,7 @@ + umax +
(1.0-41) + +-sane-umax ++sane-umax + + Powerlook 180 + USB +@@ -22024,7 +22023,7 @@ + umax +
(1.0-41) + +-sane-umax ++sane-umax + + PowerLook 270plus + SCSI +@@ -22035,7 +22034,7 @@ + umax +
(1.0-41) + +-sane-umax ++sane-umax + + Powerlook 1000 USB + USB +@@ -22057,7 +22056,7 @@ + umax +
(1.0-41) + +-sane-umax ++sane-umax + + PowerLook 2000 + SCSI +@@ -22068,7 +22067,7 @@ + umax +
(1.0-41) + +-sane-umax ++sane-umax + + PowerLook 2100XL + SCSI +@@ -22079,7 +22078,7 @@ + umax +
(1.0-41) + +-sane-umax ++sane-umax + + PowerLook 3000 + SCSI +@@ -22090,7 +22089,7 @@ + umax +
(1.0-41) + +-sane-umax ++sane-umax + + PowerLook III + SCSI +@@ -22101,7 +22100,7 @@ + umax +
(1.0-41) + +-sane-umax ++sane-umax + + PSD + SCSI +@@ -22112,7 +22111,7 @@ + umax +
(1.0-41) + +-sane-umax ++sane-umax + + Supervista S-12 + SCSI +@@ -22123,7 +22122,7 @@ + umax +
(1.0-41) + +-sane-umax ++sane-umax + + UC 630 + SCSI +@@ -22134,7 +22133,7 @@ + umax +
(1.0-41) + +-sane-umax ++sane-umax + + UC 840 + SCSI +@@ -22145,7 +22144,7 @@ + umax +
(1.0-41) + +-sane-umax ++sane-umax + + UC 1200S + SCSI +@@ -22156,7 +22155,7 @@ + umax +
(1.0-41) + +-sane-umax ++sane-umax + + UC 1200SE + SCSI +@@ -22167,7 +22166,7 @@ + umax +
(1.0-41) + +-sane-umax ++sane-umax + + UC 1260 + SCSI +@@ -22178,7 +22177,7 @@ + umax +
(1.0-41) + +-sane-umax ++sane-umax + + UG 80 + SCSI +@@ -22189,7 +22188,7 @@ + umax +
(1.0-41) + +-sane-umax ++sane-umax + + UG 630 + SCSI +@@ -22200,7 +22199,7 @@ + umax +
(1.0-41) + +-sane-umax ++sane-umax + + UMAX 3400 + USB +@@ -22211,7 +22210,7 @@ + plustek +
(0.52) + +-sane-plustek ++sane-plustek + + UMAX 3400 + USB +@@ -22222,7 +22221,7 @@ + plustek +
(0.52) + +-sane-plustek ++sane-plustek + + UMAX 3450 + USB +@@ -22233,7 +22232,7 @@ + plustek +
(0.52) + +-sane-plustek ++sane-plustek + + UMAX 5400 + USB +@@ -22244,7 +22243,7 @@ + plustek +
(0.52) + +-sane-plustek ++sane-plustek + + UMAX Astranet ia101 + USB +@@ -22255,7 +22254,7 @@ + plustek +
(0.52) + +-sane-plustek ++sane-plustek + + UMAX S-6E + SCSI +@@ -22266,7 +22265,7 @@ + umax +
(1.0-41) + +-sane-umax ++sane-umax + + UMAX S-6EG + SCSI +@@ -22277,7 +22276,7 @@ + umax +
(1.0-41) + +-sane-umax ++sane-umax + + UMAX S-12 + SCSI +@@ -22288,7 +22287,7 @@ + umax +
(1.0-41) + +-sane-umax ++sane-umax + + UMAX S-12G + SCSI +@@ -22299,7 +22298,7 @@ + umax +
(1.0-41) + +-sane-umax ++sane-umax + + UMAX VT600 + SCSI +@@ -22310,7 +22309,7 @@ + umax +
(1.0-41) + +-sane-umax ++sane-umax + + Vista S6 + SCSI +@@ -22321,7 +22320,7 @@ + umax +
(1.0-41) + +-sane-umax ++sane-umax + + Vista S6E + SCSI +@@ -22332,7 +22331,7 @@ + umax +
(1.0-41) + +-sane-umax ++sane-umax + + Vista-S8 + SCSI +@@ -22343,7 +22342,7 @@ + umax +
(1.0-41) + +-sane-umax ++sane-umax + + Vista-T630 + SCSI +@@ -22354,7 +22353,7 @@ + umax +
(1.0-41) + +-sane-umax ++sane-umax + + +

Manufacturer: Vantas

+@@ -22439,7 +22438,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + 9420 + USB +@@ -22461,7 +22460,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + 9450 USB + USB +@@ -22483,7 +22482,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + 9550 + USB +@@ -22494,7 +22493,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + 9650 + USB +@@ -22505,7 +22504,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + 9650-G + USB +@@ -22516,7 +22515,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + 9750 + USB +@@ -22527,7 +22526,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + 9750-G + USB +@@ -22538,7 +22537,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + DocuImage 620S + SCSI +@@ -22670,7 +22669,7 @@ + gt68xx +
(1.0-84) + +-sane-gt68xx ++sane-gt68xx + + Onetouch 7700 + USB +@@ -22824,7 +22823,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + Patriot 470 + USB +@@ -22835,7 +22834,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + Patriot 680 + USB +@@ -22846,7 +22845,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + Patriot 780 + USB +@@ -22857,7 +22856,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + Roadwarrior + USB +@@ -22868,7 +22867,7 @@ + genesys +
(1.0-63) + +-sane-genesys ++sane-genesys + + Strobe Pro USB + USB +@@ -22890,7 +22889,7 @@ + plustek +
(0.52) + +-sane-plustek ++sane-plustek + + Strobe XP 100,r3 + USB +@@ -22901,7 +22900,7 @@ + genesys +
(1.0-63) + +-sane-genesys ++sane-genesys + + Strobe XP 200 + USB +@@ -22912,7 +22911,7 @@ + genesys +
(1.0-63) + +-sane-genesys ++sane-genesys + + Strobe XP 300 + USB +@@ -22923,7 +22922,7 @@ + genesys +
(1.0-63) + +-sane-genesys ++sane-genesys + + Strobe XP 450 + USB +@@ -22934,7 +22933,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + Strobe XP 450-G + USB +@@ -22945,7 +22944,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + Strobe XP 470 + USB +@@ -22956,7 +22955,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + Strobe XP 470-G + USB +@@ -22967,7 +22966,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + Visioneer OneTouch 7100 + USB +@@ -22978,7 +22977,7 @@ + genesys +
(1.0-63) + +-sane-genesys ++sane-genesys + + WorkCentre 470cx + Parport +@@ -23080,7 +23079,7 @@ + mustek_pp +
(13) + +-sane-mustek_pp ++sane-mustek_pp + + +

Manufacturer: Vobis

+@@ -23107,7 +23106,7 @@ + microtek2 +
(unmaintained) + +-sane-microtek2 ++sane-microtek2 + + Highscreen Realscan + SCSI +@@ -23118,7 +23117,7 @@ + microtek +
(0.13.1) + +-sane-microtek ++sane-microtek + + Highscreen Scanboostar Premium + SCSI +@@ -23129,7 +23128,7 @@ + umax +
(1.0-41) + +-sane-umax ++sane-umax + + +

Manufacturer: Vuego

+@@ -23160,7 +23159,7 @@ + genesys +
(1.0-63) + +-sane-genesys ++sane-genesys + + DocuMate150 + USB +@@ -23171,7 +23170,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + DocuMate152 + USB +@@ -23182,7 +23181,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + DocuMate162 + USB +@@ -23193,7 +23192,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + DocuMate232 + USB +@@ -23204,7 +23203,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + DocuMate250 + USB +@@ -23215,7 +23214,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + DocuMate250-G + USB +@@ -23226,7 +23225,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + DocuMate252 + USB +@@ -23237,7 +23236,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + DocuMate252-G + USB +@@ -23248,7 +23247,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + DocuMate262 + USB +@@ -23259,7 +23258,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + DocuMate262-G + USB +@@ -23270,7 +23269,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + DocuMate262i + USB +@@ -23281,7 +23280,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + DocuMate272 + USB +@@ -23292,7 +23291,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + DocuMate272-G + USB +@@ -23303,7 +23302,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + DocuMate510 + USB +@@ -23314,7 +23313,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + DocuMate510-G + USB +@@ -23325,7 +23324,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + DocuMate512 + USB +@@ -23336,7 +23335,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + DocuMate520 + USB +@@ -23347,7 +23346,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + DocuMate520-G + USB +@@ -23358,7 +23357,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + DocuMate632 + USB +@@ -23369,7 +23368,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + DocuMate752 + USB +@@ -23380,7 +23379,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + DocuMate752 + USB +@@ -23391,7 +23390,7 @@ + avision +
(Build: 296) + +-sane-avision ++sane-avision + + Phaser 3200MFP + USB +@@ -23401,7 +23400,7 @@ + + xerox_mfp
(1.0-13) + +-sane-xerox_mfp ++sane-xerox_mfp + + Phaser 6110MFP + USB +@@ -23411,7 +23410,7 @@ + + xerox_mfp
(1.0-13) + +-sane-xerox_mfp ++sane-xerox_mfp + + Travel Scanner 100 + USB +@@ -23422,7 +23421,7 @@ + genesys +
(1.0-63) + +-sane-genesys ++sane-genesys + + WorkCentre 3119 Series + USB +@@ -23432,7 +23431,7 @@ + + xerox_mfp
(1.0-13) + +-sane-xerox_mfp ++sane-xerox_mfp + + WorkCentre 3210 + USB +@@ -23442,7 +23441,7 @@ + + xerox_mfp
(1.0-13) + +-sane-xerox_mfp ++sane-xerox_mfp + + WorkCentre 3220 + USB +@@ -23452,7 +23451,7 @@ + + xerox_mfp
(1.0-13) + +-sane-xerox_mfp ++sane-xerox_mfp + + WorkCentre 4118 Series + USB +@@ -23462,7 +23461,7 @@ + + xerox_mfp
(1.0-13) + +-sane-xerox_mfp ++sane-xerox_mfp + + +

Manufacturer: Yakumo

+@@ -23488,7 +23487,7 @@ + + artec_eplus48u
(unmaintained) + +-sane-artec_eplus48u ++sane-artec_eplus48u + + +

Still Cameras

+@@ -23519,7 +23518,7 @@ + dc25 +
(1.2) + +-sane-dc25 ++sane-dc25 + + DC25 + Serial port +@@ -23530,7 +23529,7 @@ + dc25 +
(1.2) + +-sane-dc25 ++sane-dc25 + + DC210 + Serial port +@@ -23541,7 +23540,7 @@ + dc210 +
(0.0) + +-sane-dc210 ++sane-dc210 + + DC240 + Serial port +@@ -23552,7 +23551,7 @@ + dc240 +
(0.0) + +-sane-dc240 ++sane-dc240 + + +

Manufacturer: Polaroid

+@@ -23578,7 +23577,7 @@ + + dmc
(unmaintained) + +-sane-dmc ++sane-dmc + + +

Video Cameras

+@@ -23614,7 +23613,7 @@ + stv680 +
(1.0-1) + +-sane-stv680 ++sane-stv680 + + +

Manufacturer: Biolux

+@@ -23663,7 +23662,7 @@ + + qcam
(unmaintained) + +-sane-qcam ++sane-qcam + + Greyscale QuickCam + Parport +@@ -23673,7 +23672,7 @@ + + qcam
(unmaintained) + +-sane-qcam ++sane-qcam + + +

Manufacturer: Creative

+@@ -23700,7 +23699,7 @@ + stv680 +
(1.0-1) + +-sane-stv680 ++sane-stv680 + + +

Manufacturer: Digital Dream

+@@ -23727,7 +23726,7 @@ + stv680 +
(1.0-1) + +-sane-stv680 ++sane-stv680 + + +

Manufacturer: Grandtek Scopecam

+@@ -23779,7 +23778,7 @@ + stv680 +
(1.0-1) + +-sane-stv680 ++sane-stv680 + + +

APIs

+@@ -23795,7 +23794,7 @@ +

+ Link(s): + mailto:peter@fales-lorenz.net
+-Manual page: sane-gphoto2
++Manual page:sane-gphoto2
+ Description: Multiple cameras supported by the gphoto2 libraries
+ Comment: The long-term plan is to support all the cameras supported by the gphoto2 libraries (currently over 140 models). However, at this stage, only a handful of cameras are definitely known to work with SANE. Other cameras will probably work if the native file format is EXIF or JPEG. Testers welcome!
+

+@@ -23803,7 +23802,7 @@ + (unmaintained) + +

+-Manual page: sane-pint
++Manual page:sane-pint
+ Description: Scanners with the machine-independent PINT interface
+ Comment: Haven't been tested for a long time. Handle with care.
+

+@@ -23813,7 +23812,7 @@ +

+ Link(s): + mailto:henning@meier-geinitz.de
+-Manual page: sane-pnm
++Manual page:sane-pnm
+ Description: Reads PNM files
+ Comment: Used for debugging frontends. Obsolete, use test backend instead.
+

+@@ -23823,7 +23822,7 @@ +

+ Link(s): + http://www.meier-geinitz.de/sane/test-backend/
+-Manual page: sane-test
++Manual page:sane-test
+ Description: Frontend-tester
+ Comment: Backend for testing frontends. Also serves as example for SANE backend options.
+

+@@ -23833,7 +23832,7 @@ +

+ Link(s): + mailto:henning@meier-geinitz.de
+-Manual page: sane-v4l
++Manual page:sane-v4l
+ Description: Interface to Video For Linux API
+ Comment: Supports video cameras and other devices accessed by the v4l kernel API, e.g. bttv devices. Quite a lot of known bugs.
+

+@@ -23847,7 +23846,7 @@ +

+ Link(s): + mailto:henning@meier-geinitz.de
+-Manual page: sane-dll
++Manual page:sane-dll
+ Description: Dynamic loading of shared-library backends.
+

+

Backend: net +@@ -23856,7 +23855,7 @@ +

+ Link(s): + http://www.penguin-breeder.org/?page=sane-net
+-Manual page: sane-net
++Manual page:sane-net
+ Description: Network access to saned servers
+ Comment: Can be used to access any scanner supported by SANE over the net. Supports IPv4 and IPv6.
+

diff --git a/debian/patches/saned.man.patch b/debian/patches/saned.man.patch new file mode 100644 index 0000000..c701fdf --- /dev/null +++ b/debian/patches/saned.man.patch @@ -0,0 +1,15 @@ +Description: + Minor bug fix to man page. +Author: Mark Buda + +--- a/doc/saned.man ++++ b/doc/saned.man +@@ -164,7 +164,7 @@ + .PP + .RS + sane\-port stream tcp nowait saned.saned @SBINDIR@/saned saned +-.E ++.RE + .PP + However, if your system uses + .BR tcpd (8) diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..eadc963 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,16 @@ +dll_backend_conf.patch +multiarch_dll_search_path.patch +multiarch_manpages_libdir.patch +kfreebsd.patch +fix-FTBFS-format-not-a-string-literal-error.patch +frontend_libs.patch +libsane_deps.patch +trim-libraries-in-sane-backends.pc.in.patch +unneeded_doc.patch +sane-desc.c_debian_mods.patch +kodakaio.patch +saned.man.patch +nousbtest.patch +man-page-spelling.patch +source-spelling.patch +ppc64el.patch diff --git a/debian/patches/source-spelling.patch b/debian/patches/source-spelling.patch new file mode 100644 index 0000000..2b1632c --- /dev/null +++ b/debian/patches/source-spelling.patch @@ -0,0 +1,565 @@ +Description: + Correction of some spelling/grammatical errors in source code. +Author: Mark Buda + +--- a/backend/abaton.c ++++ b/backend/abaton.c +@@ -1455,7 +1455,7 @@ + if (s->AbortedByUser) + { + DBG (FLOW_CONTROL, "sane_cancel: Scan has not been initiated yet." +- "we probably recieved a signal while writing data.\n"); ++ "we probably received a signal while writing data.\n"); + s->AbortedByUser = SANE_FALSE; + } + else +--- a/backend/apple.c ++++ b/backend/apple.c +@@ -1596,7 +1596,7 @@ + s->opt[OPT_WAIT].title = "Wait"; + s->opt[OPT_WAIT].desc = "You may issue the scan command but the actual " + "scan will not start unless you press the button in the front of the " +- "scanner. It is usefull feature when you want to make a network scan (?) " ++ "scanner. It is a useful feature when you want to make a network scan (?) " + "In the mean time you may halt your computer waiting for the SCSI bus " + "to be free. If this happens just press the scanner button."; + s->opt[OPT_WAIT].type = SANE_TYPE_BOOL; +--- a/backend/artec.c ++++ b/backend/artec.c +@@ -607,7 +607,7 @@ + return SANE_STATUS_IO_ERROR; + } + default: +- DBG (2, "sense: Unkown Error Code Qualifier (%02x)\n", sense[0]); ++ DBG (2, "sense: Unknown Error Code Qualifier (%02x)\n", sense[0]); + return SANE_STATUS_IO_ERROR; + } + +--- a/backend/coolscan.c ++++ b/backend/coolscan.c +@@ -179,7 +179,7 @@ + + case 0x2: + if ((0x4 == asc) && (0x1 == ascq)) { +- DBG (10, "\t%d/%d/%d: Logical unit is in process of becomming ready\n", ++ DBG (10, "\t%d/%d/%d: Logical unit is in process of becoming ready\n", + sense, asc, ascq); + ret = SANE_STATUS_DEVICE_BUSY; + } +--- a/backend/hp3900_debug.c ++++ b/backend/hp3900_debug.c +@@ -597,7 +597,7 @@ + } + else + DBG (DBG_ERR, +- "- dbg_tiff_save: Enviroment HOME variable does not exist\n"); ++ "- dbg_tiff_save: Environment HOME variable does not exist\n"); + } + #else + /* silent gcc */ +--- a/backend/hp3900_sane.c ++++ b/backend/hp3900_sane.c +@@ -1405,7 +1405,7 @@ + pDesc->title = SANE_I18N ("Scanner model"); + pDesc->desc = + SANE_I18N +- ("Allows to test device behaviour with other supported models"); ++ ("Allows one to test device behaviour with other supported models"); + pDesc->type = SANE_TYPE_STRING; + pDesc->size = max_string_size (scanner->list_models); + pDesc->constraint_type = SANE_CONSTRAINT_STRING_LIST; +--- a/backend/mustek_pp_ccd300.c ++++ b/backend/mustek_pp_ccd300.c +@@ -1660,7 +1660,7 @@ + + if (caps & ~(CAP_NOTHING | CAP_INVERT | CAP_LAMP_OFF)) + { +- DBG (1, "ccd300_open: called with unknonw capabilities (%#02x)\n", ++ DBG (1, "ccd300_open: called with unknown capabilities (%#02x)\n", + caps); + return SANE_STATUS_INVAL; + } +@@ -1816,7 +1816,7 @@ + } + else + { +- DBG (1, "ccd300_config: unkown option ``%s''", optname); ++ DBG (1, "ccd300_config: unknown option ``%s''", optname); + return SANE_STATUS_INVAL; + } + +--- a/backend/pixma_bjnp.c ++++ b/backend/pixma_bjnp.c +@@ -553,7 +553,7 @@ + set_cmd (int devno, struct BJNP_command *cmd, char cmd_code, int payload_len) + { + /* +- * Set command buffer with command code, session_id and lenght of payload ++ * Set command buffer with command code, session_id and length of payload + * Returns: sequence number of command + */ + strncpy (cmd->BJNP_id, BJNP_STRING, sizeof (cmd->BJNP_id)); +@@ -732,7 +732,7 @@ + id->id[id_len] = '\0'; + strcpy (scanner_id, id->id); + +- PDBG (bjnp_dbg (LOG_INFO, "Scanner identity string = %s - lenght = %d\n", scanner_id, id_len)); ++ PDBG (bjnp_dbg (LOG_INFO, "Scanner identity string = %s - length = %d\n", scanner_id, id_len)); + + /* get make&model from IEEE1284 id */ + +--- a/backend/pnm.c ++++ b/backend/pnm.c +@@ -267,7 +267,7 @@ + SANE_I18N ("Hand-Scanner Simulation"), + SANE_I18N ("Simulate a hand-scanner. Hand-scanners often do not know the " + "image height a priori. Instead, they return a height of -1. " +- "Setting this option allows to test whether a frontend can " ++ "Setting this option allows one to test whether a frontend can " + "handle this correctly."), + SANE_TYPE_BOOL, + SANE_UNIT_NONE, +--- a/backend/umax.c ++++ b/backend/umax.c +@@ -1035,7 +1035,7 @@ + + if (asc == 0x00) + { +- DBG(DBG_sense, "-> button protocoll\n"); ++ DBG(DBG_sense, "-> button protocol\n"); + if (ascq & 1) + { + dev->button0_pressed = 1; +--- a/backend/umax_pp_low.c ++++ b/backend/umax_pp_low.c +@@ -10900,7 +10900,7 @@ + + /* scan time are high enough to forget about usec */ + elapsed = tf.tv_sec - td.tv_sec; +- DBG (8, "%ld bytes transfered in %f seconds ( %.2f Kb/s)\n", somme, ++ DBG (8, "%ld bytes transferred in %f seconds ( %.2f Kb/s)\n", somme, + elapsed, (somme / elapsed) / 1024.0); + #endif + +--- a/frontend/scanimage.c ++++ b/frontend/scanimage.c +@@ -250,7 +250,7 @@ + md5mode = 1; + len = (strstr (resource, "$MD5$") - resource); + if (query_user == 1) +- fprintf (stderr, "Authentification required for resource %*.*s. " ++ fprintf (stderr, "Authentication required for resource %*.*s. " + "Enter username: ", len, len, resource); + } + else +@@ -270,7 +270,7 @@ + + if (query_user == 1) + fprintf (stderr, +- "Authentification required for resource %s. Enter username: ", ++ "Authentication required for resource %s. Enter username: ", + resource); + } + +--- a/po/bg.po ++++ b/po/bg.po +@@ -4596,7 +4596,7 @@ + msgid "" + "Simulate a hand-scanner. Hand-scanners often do not know the image " + "height a priori. Instead, they return a height of -1. Setting this " +-"option allows to test whether a frontend can handle this correctly." ++"option allows one to test whether a frontend can handle this correctly." + msgstr "" + "Симулира ръчен скенер. Ръчните скенери често не знаят височината на " + "образа а приори. Вместо това, те връщат стойност от -1. Пускането на " +@@ -4938,7 +4938,7 @@ + msgid "" + "Simulate a hand-scanner. Hand-scanners do not know the image height a " + "priori. Instead, they return a height of -1. Setting this option " +-"allows to test whether a frontend can handle this correctly. This " ++"allows one to test whether a frontend can handle this correctly. This " + "option also enables a fixed width of 11 cm." + msgstr "" + "Симулира ръчен скенер. Ръчните скенери не знаят височината на " +--- a/po/cs.po ++++ b/po/cs.po +@@ -4584,7 +4584,7 @@ + msgid "" + "Simulate a hand-scanner. Hand-scanners often do not know the image " + "height a priori. Instead, they return a height of -1. Setting this " +-"option allows to test whether a frontend can handle this correctly." ++"option allows one to test whether a frontend can handle this correctly." + msgstr "" + "Simuluje ruční skener. Ruční skenery obvykle neznají výšku obrázku " + "předem. Proto vracejí výšku 1. Tato volba umožnuje otestovat, jestli se " +@@ -4925,7 +4925,7 @@ + msgid "" + "Simulate a hand-scanner. Hand-scanners do not know the image height a " + "priori. Instead, they return a height of -1. Setting this option " +-"allows to test whether a frontend can handle this correctly. This " ++"allows one to test whether a frontend can handle this correctly. This " + "option also enables a fixed width of 11 cm." + msgstr "" + "Simuluje ruční skener. Ruční skenery obvykle neznají výšku obrázku " +--- a/po/da.po ++++ b/po/da.po +@@ -4604,7 +4604,7 @@ + msgid "" + "Simulate a hand-scanner. Hand-scanners often do not know the image " + "height a priori. Instead, they return a height of -1. Setting this " +-"option allows to test whether a frontend can handle this correctly." ++"option allows one to test whether a frontend can handle this correctly." + msgstr "" + "Simulerer en håndskanner. Oftest kender en håndskanner ikke billedhøjden " + "i forvejen. I stedet for returnerer de en højde på -1. Sættes denne " +@@ -4944,7 +4944,7 @@ + msgid "" + "Simulate a hand-scanner. Hand-scanners do not know the image height a " + "priori. Instead, they return a height of -1. Setting this option " +-"allows to test whether a frontend can handle this correctly. This " ++"allows one to test whether a frontend can handle this correctly. This " + "option also enables a fixed width of 11 cm." + msgstr "" + "Simulerer en håndskanner. Håndskannere kender ikke forud billedhøjden. I " +--- a/po/de.po ++++ b/po/de.po +@@ -4758,7 +4758,7 @@ + msgid "" + "Simulate a hand-scanner. Hand-scanners often do not know the image " + "height a priori. Instead, they return a height of -1. Setting this " +-"option allows to test whether a frontend can handle this correctly." ++"option allows one to test whether a frontend can handle this correctly." + msgstr "" + "Simuliere einen Handscanner. Bei Handscannern steht meistens die " + "Bildhöhe nicht von vornherein fest. Stattdessen geben sie eine Höhe von " +@@ -5148,7 +5148,7 @@ + msgid "" + "Simulate a hand-scanner. Hand-scanners do not know the image height a " + "priori. Instead, they return a height of -1. Setting this option " +-"allows to test whether a frontend can handle this correctly. This " ++"allows one to test whether a frontend can handle this correctly. This " + "option also enables a fixed width of 11 cm." + msgstr "" + "Simuliere einen Handscanner. Bei Handscannern steht meistens die " +--- a/po/en_GB.po ++++ b/po/en_GB.po +@@ -4611,11 +4611,11 @@ + msgid "" + "Simulate a hand-scanner. Hand-scanners often do not know the image " + "height a priori. Instead, they return a height of -1. Setting this " +-"option allows to test whether a frontend can handle this correctly." ++"option allows one to test whether a frontend can handle this correctly." + msgstr "" + "Simulate a hand-scanner. Hand-scanners often do not know the image " + "height a priori. Instead, they return a height of -1. Setting this " +-"option allows to test whether a frontend can handle this correctly." ++"option allows one to test whether a frontend can handle this correctly." + + #: ../backend/pnm.c:283 + #, no-c-format +@@ -4952,12 +4952,12 @@ + msgid "" + "Simulate a hand-scanner. Hand-scanners do not know the image height a " + "priori. Instead, they return a height of -1. Setting this option " +-"allows to test whether a frontend can handle this correctly. This " ++"allows one to test whether a frontend can handle this correctly. This " + "option also enables a fixed width of 11 cm." + msgstr "" + "Simulate a hand-scanner. Hand-scanners do not know the image height a " + "priori. Instead, they return a height of -1. Setting this option " +-"allows to test whether a frontend can handle this correctly. This " ++"allows one to test whether a frontend can handle this correctly. This " + "option also enables a fixed width of 11 cm." + + #: ../backend/test.c:366 +--- a/po/eo.po ++++ b/po/eo.po +@@ -4635,7 +4635,7 @@ + msgid "" + "Simulate a hand-scanner. Hand-scanners often do not know the image " + "height a priori. Instead, they return a height of -1. Setting this " +-"option allows to test whether a frontend can handle this correctly." ++"option allows one to test whether a frontend can handle this correctly." + msgstr "" + "Ĝi simulas akiradon per mana skanilo. La manaj skaniloj ofte ne rekonas " + "la alton de la bildon apriore, do ili revenigas alton kun valoro -1. Per " +@@ -4977,7 +4977,7 @@ + msgid "" + "Simulate a hand-scanner. Hand-scanners do not know the image height a " + "priori. Instead, they return a height of -1. Setting this option " +-"allows to test whether a frontend can handle this correctly. This " ++"allows one to test whether a frontend can handle this correctly. This " + "option also enables a fixed width of 11 cm." + msgstr "" + "Ĝi simulas akiradon per mana skanilo. La manaj skaniloj ofte ne rekonas " +--- a/po/es.po ++++ b/po/es.po +@@ -4666,7 +4666,7 @@ + msgid "" + "Simulate a hand-scanner. Hand-scanners often do not know the image " + "height a priori. Instead, they return a height of -1. Setting this " +-"option allows to test whether a frontend can handle this correctly." ++"option allows one to test whether a frontend can handle this correctly." + msgstr "" + "Simula un escáner de mano. Los escáneres de mano a menudo no conocen a " + "priori la distancia a la imagen. En su lugar utiliza una altura de " +@@ -5011,7 +5011,7 @@ + msgid "" + "Simulate a hand-scanner. Hand-scanners do not know the image height a " + "priori. Instead, they return a height of -1. Setting this option " +-"allows to test whether a frontend can handle this correctly. This " ++"allows one to test whether a frontend can handle this correctly. This " + "option also enables a fixed width of 11 cm." + msgstr "" + "Simula un escáner de mano. Los escáneres de mano a menudo no conocen a " +--- a/po/fi.po ++++ b/po/fi.po +@@ -4586,7 +4586,7 @@ + msgid "" + "Simulate a hand-scanner. Hand-scanners often do not know the image " + "height a priori. Instead, they return a height of -1. Setting this " +-"option allows to test whether a frontend can handle this correctly." ++"option allows one to test whether a frontend can handle this correctly." + msgstr "" + "Simuloi käsiskanneria. Käsiskannerit eivät yleensä tiedä kuvan kokoa " + "etukäteen. Sen sijaan, ne palauttavat kuvan korkeudeksi -1. Tällä " +@@ -4926,7 +4926,7 @@ + msgid "" + "Simulate a hand-scanner. Hand-scanners do not know the image height a " + "priori. Instead, they return a height of -1. Setting this option " +-"allows to test whether a frontend can handle this correctly. This " ++"allows one to test whether a frontend can handle this correctly. This " + "option also enables a fixed width of 11 cm." + msgstr "" + "Simuloi käsikuvnalukijaa. Käsikuvanlukijat eivät tiedä kuvan korkeutta " +--- a/po/fr.po ++++ b/po/fr.po +@@ -4713,7 +4713,7 @@ + msgid "" + "Simulate a hand-scanner. Hand-scanners often do not know the image " + "height a priori. Instead, they return a height of -1. Setting this " +-"option allows to test whether a frontend can handle this correctly." ++"option allows one to test whether a frontend can handle this correctly." + msgstr "" + "Simule une numérisation avec un scanner à main. Les scanners à main ne " + "connaissent pas à priori la hauteur de l'image. A la place, ils " +@@ -5057,7 +5057,7 @@ + msgid "" + "Simulate a hand-scanner. Hand-scanners do not know the image height a " + "priori. Instead, they return a height of -1. Setting this option " +-"allows to test whether a frontend can handle this correctly. This " ++"allows one to test whether a frontend can handle this correctly. This " + "option also enables a fixed width of 11 cm." + msgstr "" + "Simule un scanner à main. Les scanners à main ne connaissent pas à " +--- a/po/gl.po ++++ b/po/gl.po +@@ -4668,7 +4668,7 @@ + msgid "" + "Simulate a hand-scanner. Hand-scanners often do not know the image " + "height a priori. Instead, they return a height of -1. Setting this " +-"option allows to test whether a frontend can handle this correctly." ++"option allows one to test whether a frontend can handle this correctly." + msgstr "" + "Semella un escáner de man. Os escáneres de man adoitan descoñecer a " + "priori a distancia á imaxe. Na súa vez utiliza unha altura de retorno " +@@ -5012,7 +5012,7 @@ + msgid "" + "Simulate a hand-scanner. Hand-scanners do not know the image height a " + "priori. Instead, they return a height of -1. Setting this option " +-"allows to test whether a frontend can handle this correctly. This " ++"allows one to test whether a frontend can handle this correctly. This " + "option also enables a fixed width of 11 cm." + msgstr "" + "Semella un escáner de man. Os escáneres de man adoitan descoñecer a " +--- a/po/it.po ++++ b/po/it.po +@@ -4661,7 +4661,7 @@ + msgid "" + "Simulate a hand-scanner. Hand-scanners often do not know the image " + "height a priori. Instead, they return a height of -1. Setting this " +-"option allows to test whether a frontend can handle this correctly." ++"option allows one to test whether a frontend can handle this correctly." + msgstr "" + "Simula l'acquisizione mediante uno scanner manuale; questi scanner " + "spesso non conoscono l'altezza dell'immagine a priori e restituiscono " +@@ -5007,7 +5007,7 @@ + msgid "" + "Simulate a hand-scanner. Hand-scanners do not know the image height a " + "priori. Instead, they return a height of -1. Setting this option " +-"allows to test whether a frontend can handle this correctly. This " ++"allows one to test whether a frontend can handle this correctly. This " + "option also enables a fixed width of 11 cm." + msgstr "" + "Simulazione di acquisizione mediante uno scanner manuale; questi scanner " +--- a/po/ja.po ++++ b/po/ja.po +@@ -4567,7 +4567,7 @@ + msgid "" + "Simulate a hand-scanner. Hand-scanners often do not know the image " + "height a priori. Instead, they return a height of -1. Setting this " +-"option allows to test whether a frontend can handle this correctly." ++"option allows one to test whether a frontend can handle this correctly." + msgstr "" + "ハンドスキャナーをシミュレートします。ハンドスキャナーは、たいていの場" + "合、イメージの高さが事前にはわかりません。その代わり、高さとしてー１を返" +@@ -4891,7 +4891,7 @@ + msgid "" + "Simulate a hand-scanner. Hand-scanners do not know the image height a " + "priori. Instead, they return a height of -1. Setting this option " +-"allows to test whether a frontend can handle this correctly. This " ++"allows one to test whether a frontend can handle this correctly. This " + "option also enables a fixed width of 11 cm." + msgstr "" + +--- a/po/nb.po ++++ b/po/nb.po +@@ -4534,7 +4534,7 @@ + msgid "" + "Simulate a hand-scanner. Hand-scanners often do not know the image " + "height a priori. Instead, they return a height of -1. Setting this " +-"option allows to test whether a frontend can handle this correctly." ++"option allows one to test whether a frontend can handle this correctly." + msgstr "" + + #: ../backend/pnm.c:283 +@@ -4846,7 +4846,7 @@ + msgid "" + "Simulate a hand-scanner. Hand-scanners do not know the image height a " + "priori. Instead, they return a height of -1. Setting this option " +-"allows to test whether a frontend can handle this correctly. This " ++"allows one to test whether a frontend can handle this correctly. This " + "option also enables a fixed width of 11 cm." + msgstr "" + +--- a/po/nl.po ++++ b/po/nl.po +@@ -4745,7 +4745,7 @@ + msgid "" + "Simulate a hand-scanner. Hand-scanners often do not know the image " + "height a priori. Instead, they return a height of -1. Setting this " +-"option allows to test whether a frontend can handle this correctly." ++"option allows one to test whether a frontend can handle this correctly." + msgstr "" + "Simuleer een handscanner. Bij handscanners staat meestal de beeldhoogte " + "van te voren niet vast. In plaats daarvan geven zij een hoogte van -1 " +@@ -5132,7 +5132,7 @@ + msgid "" + "Simulate a hand-scanner. Hand-scanners do not know the image height a " + "priori. Instead, they return a height of -1. Setting this option " +-"allows to test whether a frontend can handle this correctly. This " ++"allows one to test whether a frontend can handle this correctly. This " + "option also enables a fixed width of 11 cm." + msgstr "" + "Simuleer een handscanner. Bij handscanners staat tenminste de " +--- a/po/pl.po ++++ b/po/pl.po +@@ -4652,7 +4652,7 @@ + msgid "" + "Simulate a hand-scanner. Hand-scanners often do not know the image " + "height a priori. Instead, they return a height of -1. Setting this " +-"option allows to test whether a frontend can handle this correctly." ++"option allows one to test whether a frontend can handle this correctly." + msgstr "" + "Symuluje skaner ręczny. Skanery ręczne zwykle nie znają wysokości " + "obrazka. Zamiast tego zwracają wysokość -1. Ustawienie tej opcji pozwala " +@@ -4994,7 +4994,7 @@ + msgid "" + "Simulate a hand-scanner. Hand-scanners do not know the image height a " + "priori. Instead, they return a height of -1. Setting this option " +-"allows to test whether a frontend can handle this correctly. This " ++"allows one to test whether a frontend can handle this correctly. This " + "option also enables a fixed width of 11 cm." + msgstr "" + "Symuluje skaner ręczny. Skanery ręczne zwykle nie znają wysokości " +--- a/po/pt.po ++++ b/po/pt.po +@@ -3979,7 +3979,7 @@ + msgid "" + "Simulate a hand-scanner. Hand-scanners often do not know the image " + "height a priori. Instead, they return a height of -1. Setting this " +-"option allows to test whether a frontend can handle this correctly." ++"option allows one to test whether a frontend can handle this correctly." + msgstr "" + + #: ../backend/pnm.c:283 +@@ -4291,7 +4291,7 @@ + msgid "" + "Simulate a hand-scanner. Hand-scanners do not know the image height a " + "priori. Instead, they return a height of -1. Setting this option " +-"allows to test whether a frontend can handle this correctly. This " ++"allows one to test whether a frontend can handle this correctly. This " + "option also enables a fixed width of 11 cm." + msgstr "" + +--- a/po/ru.po ++++ b/po/ru.po +@@ -4661,7 +4661,7 @@ + msgid "" + "Simulate a hand-scanner. Hand-scanners often do not know the image " + "height a priori. Instead, they return a height of -1. Setting this " +-"option allows to test whether a frontend can handle this correctly." ++"option allows one to test whether a frontend can handle this correctly." + msgstr "" + "Имитирует ручной сканер. Ручные сканеры часто не имеют информации о " + "длине изображения. Вместо этого они возвращает длину -1. Установка этого " +@@ -4992,7 +4992,7 @@ + msgid "" + "Simulate a hand-scanner. Hand-scanners do not know the image height a " + "priori. Instead, they return a height of -1. Setting this option " +-"allows to test whether a frontend can handle this correctly. This " ++"allows one to test whether a frontend can handle this correctly. This " + "option also enables a fixed width of 11 cm." + msgstr "" + "Имитировать ручной сканер. Ручные сканеры никогда не знают о высоте " +--- a/po/sv.po ++++ b/po/sv.po +@@ -4701,7 +4701,7 @@ + msgid "" + "Simulate a hand-scanner. Hand-scanners often do not know the image " + "height a priori. Instead, they return a height of -1. Setting this " +-"option allows to test whether a frontend can handle this correctly." ++"option allows one to test whether a frontend can handle this correctly." + msgstr "" + "Simulera en handbildläsare. Handbildläsare vet oftast inte bildhöjden i " + "förväg. I stället returnerar de en höjd som är -1. Om denna inställning " +@@ -5043,7 +5043,7 @@ + msgid "" + "Simulate a hand-scanner. Hand-scanners do not know the image height a " + "priori. Instead, they return a height of -1. Setting this option " +-"allows to test whether a frontend can handle this correctly. This " ++"allows one to test whether a frontend can handle this correctly. This " + "option also enables a fixed width of 11 cm." + msgstr "" + "Simulera en handbildläsare. Handbildläsare vet oftast inte bildhöjden i " +--- a/po/uk.po ++++ b/po/uk.po +@@ -4775,7 +4775,7 @@ + msgid "" + "Simulate a hand-scanner. Hand-scanners often do not know the image " + "height a priori. Instead, they return a height of -1. Setting this " +-"option allows to test whether a frontend can handle this correctly." ++"option allows one to test whether a frontend can handle this correctly." + msgstr "" + "Імітує ручний сканер. Ручні сканери часто попередньо не отримують даних " + "щодо висоти зображення. Замість цього, вони повертають висоту рівну -1. " +@@ -5164,7 +5164,7 @@ + msgid "" + "Simulate a hand-scanner. Hand-scanners do not know the image height a " + "priori. Instead, they return a height of -1. Setting this option " +-"allows to test whether a frontend can handle this correctly. This " ++"allows one to test whether a frontend can handle this correctly. This " + "option also enables a fixed width of 11 cm." + msgstr "" + "Імітує ручний сканер. Ручні сканери попередньо не отримують даних щодо " +--- a/backend/test.c ++++ b/backend/test.c +@@ -348,7 +348,7 @@ + od->title = SANE_I18N ("Hand-scanner simulation"); + od->desc = SANE_I18N ("Simulate a hand-scanner. Hand-scanners do not " + "know the image height a priori. Instead, they " +- "return a height of -1. Setting this option allows " ++ "return a height of -1. Setting this option allows one " + "to test whether a frontend can handle this " + "correctly. This option also enables a fixed width " + "of 11 cm."); diff --git a/debian/patches/trim-libraries-in-sane-backends.pc.in.patch b/debian/patches/trim-libraries-in-sane-backends.pc.in.patch new file mode 100644 index 0000000..7452b33 --- /dev/null +++ b/debian/patches/trim-libraries-in-sane-backends.pc.in.patch @@ -0,0 +1,24 @@ +From: Markus Koschany +Date: Sun, 30 Jun 2013 19:13:54 +0200 +Subject: trim libraries in sane-backends.pc.in + +Update the original sane-config_and_pkg-config_fixes.patch from Julien BLACHE. +Patching RPATH related flags is no longer necessary. Still trim the libraries +in sane-backends.pc.in to the bare minimum for what is needed for libsane. +--- + tools/sane-backends.pc.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/tools/sane-backends.pc.in ++++ b/tools/sane-backends.pc.in +@@ -2,8 +2,8 @@ + exec_prefix=@exec_prefix@ + libdir=@libdir@ + includedir=@includedir@ +-ldflags=@LDFLAGS@ @GPHOTO2_LDFLAGS@ +-libs=@LIBS@ @DL_LIBS@ @LIBV4L_LIBS@ @MATH_LIB@ @TIFF_LIBS@ @JPEG_LIBS@ @GPHOTO2_LIBS@ @SOCKET_LIBS@ @AVAHI_LIBS@ @USB_LIBS@ @SCSI_LIBS@ @RESMGR_LIBS@ ++ldflags=@LDFLAGS@ ++libs=@LIBS@ + + Name: SANE Backends + Description: Backends for SANE, the universal scanner interface diff --git a/debian/patches/unneeded_doc.patch b/debian/patches/unneeded_doc.patch new file mode 100644 index 0000000..39f5fa5 --- /dev/null +++ b/debian/patches/unneeded_doc.patch @@ -0,0 +1,41 @@ +From: Markus Koschany +Date: Sun, 30 Jun 2013 19:29:40 +0200 +Subject: unneeded_doc + +Avoid generating some docs we don't want. +Do not generate some documentation we do not want; do not include +sane.png in the html documentation, as it is not distributed in the +source tarball. + +Original Author: Julien BLACHE +--- + Makefile.in | 6 +----- + doc/Makefile.in | 2 +- + 2 files changed, 2 insertions(+), 6 deletions(-) + +--- a/Makefile.in ++++ b/Makefile.in +@@ -398,11 +398,7 @@ + top_srcdir = @top_srcdir@ + SUBDIRS = include lib sanei backend frontend tools doc po testsuite + DIST_SUBDIRS = include lib sanei backend frontend tools doc po japi testsuite +-dist_doc_DATA = AUTHORS ChangeLog COPYING LICENSE NEWS PROBLEMS PROJECTS \ +- README README.aix README.beos README.darwin README.djpeg README.freebsd \ +- README.hp-ux README.linux README.netbsd README.openbsd README.os2 \ +- README.solaris README.unixware2 README.unixware7 README.windows \ +- README.zeta ++dist_doc_DATA = README AUTHORS NEWS PROBLEMS PROJECTS + + EXTRA_DIST = ChangeLog-1.0.0 ChangeLog-1.0.1 ChangeLog-1.0.2 \ + ChangeLog-1.0.3 ChangeLog-1.0.4 ChangeLog-1.0.5 ChangeLog-1.0.6 \ +--- a/doc/Makefile.in ++++ b/doc/Makefile.in +@@ -410,7 +410,7 @@ + MAN2HTML = nroff -c -man |\ + man2html -compress -topm 6 -botm 6 -nodepage -title $${page} \ + -cgiurl '$$title.$$section.html'|\ +- sed 's,,

,' ++ sed 's,,

,' + + beman5dir = $(mandir)/man5 + BEDOCS = canon/canon.changes canon/canon.install2700F.txt \ -- cgit v1.2.3