Rename & reorder patches

29 files changed, 79 insertions, 1345 deletions

diff --git a/debian/patches/libsane_deps.patch b/debian/patches/0005-libsane_deps.patch
index 4a38952..4a38952 100644
--- a/debian/patches/libsane_deps.patch
+++ b/debian/patches/0005-libsane_deps.patch
diff --git a/debian/patches/unneeded_doc.patch b/debian/patches/0010-unneeded_doc.patch
index e3c346a..e3c346a 100644
--- a/debian/patches/unneeded_doc.patch
+++ b/debian/patches/0010-unneeded_doc.patch
diff --git a/debian/patches/frontend_libs.patch b/debian/patches/0015-frontend_libs.patch
index 31411bf..31411bf 100644
--- a/debian/patches/frontend_libs.patch
+++ b/debian/patches/0015-frontend_libs.patch
diff --git a/debian/patches/nousbtest.patch b/debian/patches/0020-nousbtest.patch
index bf7deec..bf7deec 100644
--- a/debian/patches/nousbtest.patch
+++ b/debian/patches/0020-nousbtest.patch
diff --git a/debian/patches/multiarch_manpages_libdir.patch b/debian/patches/0025-multiarch_manpages_libdir.patch
index 142d501..142d501 100644
--- a/debian/patches/multiarch_manpages_libdir.patch
+++ b/debian/patches/0025-multiarch_manpages_libdir.patch
diff --git a/debian/patches/ppc64el.patch b/debian/patches/0030-ppc64el.patch
index d04a535..d04a535 100644
--- a/debian/patches/ppc64el.patch
+++ b/debian/patches/0030-ppc64el.patch
diff --git a/debian/patches/trim-libraries-in-sane-backends.pc.in.patch b/debian/patches/0035-trim-libraries-in-sane-backends.pc.in.patch
index 7452b33..7452b33 100644
--- a/debian/patches/trim-libraries-in-sane-backends.pc.in.patch
+++ b/debian/patches/0035-trim-libraries-in-sane-backends.pc.in.patch
diff --git a/debian/patches/0100-source_spelling.patch b/debian/patches/0100-source_spelling.patch
new file mode 100644
index 0000000..a3725e6
--- /dev/null
+++ b/debian/patches/0100-source_spelling.patch
@@ -0,0 +1,18 @@
+Description: Correct source typos
+Author: Jörg Frings-Fürst <debian@jff-webhosting.net>
+Last-Update: 2015-10-13
+----
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: trunk/backend/hp-scl.c
+===================================================================
+--- trunk.orig/backend/hp-scl.c
++++ trunk/backend/hp-scl.c
+@@ -2083,7 +2083,7 @@ hp_scl_strerror (int errnum)
+       case 1024: return "ADF Paper Jam";
+       case 1025: return "Home Position Missing";
+       case 1026: return "Paper Not Loaded";
+-      default: return "??Unkown Error??";
++      default: return "??Unknown Error??";
+       }
+ }
+ 
diff --git a/debian/patches/0100-usb3-corrections.patch b/debian/patches/0100-usb3-corrections.patch
deleted file mode 100644
index eb2d5a5..0000000
--- a/debian/patches/0100-usb3-corrections.patch
+++ /dev/null
@@ -1,168 +0,0 @@
-Description: work around USB3/xhci problems in Linux.
- Backport from upstream. 
-Author: m. allan noah <kitno455 at gmail dot com>
-Origin: upstream,http://anonscm.debian.org/cgit/sane/sane-backends.git/commit/?id=014b45d920f1fb630e1a31bb01f1da02ea2a6a87
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=738592
-Forwarded: not-needed
-Last-Update: 2014-12-26
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: trunk/sanei/sanei_usb.c
-===================================================================
---- trunk.orig/sanei/sanei_usb.c
-+++ trunk/sanei/sanei_usb.c
-@@ -154,6 +154,7 @@ typedef struct
-   SANE_Int control_in_ep;
-   SANE_Int control_out_ep;
-   SANE_Int interface_nr;
-+  SANE_Int alt_setting;
-   SANE_Int missing;
- #ifdef HAVE_LIBUSB
-   usb_dev_handle *libusb_handle;
-@@ -635,6 +636,7 @@ static void usbcall_scan_devices(void)
- 	  device.product = pDevDesc->idProduct;
- 	  device.method = sanei_usb_method_usbcalls;
- 	  device.interface_nr = interface;
-+	  device.alt_setting = 0;
- 	  DBG (4, "%s: found usbcalls device (0x%04x/0x%04x) as device number %s\n", __func__,
- 	       pDevDesc->idVendor, pDevDesc->idProduct,device.devname);
- 	  store_device(device);
-@@ -821,7 +823,7 @@ static void libusb_scan_devices(void)
- 		     "scanner (%d/%d)\n", __func__, dev->descriptor.idVendor,
- 		     dev->descriptor.idProduct, interface,
- 		     dev->descriptor.bDeviceClass,
--		     dev->config[0].interface[interface].altsetting != 0
-+		     dev->config[0].interface[interface].num_altsetting != 0
-                        ? dev->config[0].interface[interface].altsetting[0].
- 		       bInterfaceClass : -1);
- 	    }
-@@ -845,6 +847,7 @@ static void libusb_scan_devices(void)
- 	  device.product = dev->descriptor.idProduct;
- 	  device.method = sanei_usb_method_libusb;
- 	  device.interface_nr = interface;
-+	  device.alt_setting = 0;
- 	  DBG (4,
- 	       "%s: found libusb device (0x%04x/0x%04x) interface "
-                "%d  at %s\n", __func__,
-@@ -991,7 +994,7 @@ static void libusb_scan_devices(void)
- 		 "%s: device 0x%04x/0x%04x, interface %d "
- 		 "doesn't look like a scanner (%d/%d)\n", __func__,
- 		 vid, pid, interface, desc.bDeviceClass,
--		 (config0->interface[interface].altsetting != 0)
-+		 (config0->interface[interface].num_altsetting != 0)
- 		 ? config0->interface[interface].altsetting[0].bInterfaceClass : -1);
- 	}
- 
-@@ -1018,6 +1021,7 @@ static void libusb_scan_devices(void)
-       device.product = pid;
-       device.method = sanei_usb_method_libusb;
-       device.interface_nr = interface;
-+      device.alt_setting = 0;
-       DBG (4,
- 	   "%s: found libusb-1.0 device (0x%04x/0x%04x) interface "
- 	   "%d at %s\n", __func__,
-@@ -2128,22 +2132,24 @@ sanei_usb_close (SANE_Int dn)
-   else
- #ifdef HAVE_LIBUSB
-     {
--#if 0
--      /* Should only be done in case of a stall */
--      usb_clear_halt (devices[dn].libusb_handle, devices[dn].bulk_in_ep);
--      usb_clear_halt (devices[dn].libusb_handle, devices[dn].bulk_out_ep);
--      usb_clear_halt (devices[dn].libusb_handle, devices[dn].iso_in_ep);
--      /* be careful, we don't know if we are in DATA0 stage now */
--      usb_resetep (devices[dn].libusb_handle, devices[dn].bulk_in_ep);
--      usb_resetep (devices[dn].libusb_handle, devices[dn].bulk_out_ep);
--      usb_resetep (devices[dn].libusb_handle, devices[dn].iso_in_ep);
--#endif /* 0 */
-+      /* This call seems to be required by Linux xhci driver
-+       * even though it should be a no-op. Without it, the
-+       * host or driver does not reset it's data toggle bit.
-+       * We intentionally ignore the return val */
-+      sanei_usb_set_altinterface (dn, devices[dn].alt_setting);
-+
-       usb_release_interface (devices[dn].libusb_handle,
- 			     devices[dn].interface_nr);
-       usb_close (devices[dn].libusb_handle);
-     }
- #elif defined(HAVE_LIBUSB_1_0)
-     {
-+      /* This call seems to be required by Linux xhci driver
-+       * even though it should be a no-op. Without it, the
-+       * host or driver does not reset it's data toggle bit.
-+       * We intentionally ignore the return val */
-+      sanei_usb_set_altinterface (dn, devices[dn].alt_setting);
-+
-       libusb_release_interface (devices[dn].lu_handle,
- 				devices[dn].interface_nr);
-       libusb_close (devices[dn].lu_handle);
-@@ -2168,7 +2174,6 @@ sanei_usb_set_timeout (SANE_Int timeout)
- SANE_Status
- sanei_usb_clear_halt (SANE_Int dn)
- {
--#ifdef HAVE_LIBUSB
-   int ret;
- 
-   if (dn >= device_number || dn < 0)
-@@ -2177,6 +2182,14 @@ sanei_usb_clear_halt (SANE_Int dn)
-       return SANE_STATUS_INVAL;
-     }
- 
-+#ifdef HAVE_LIBUSB
-+
-+  /* This call seems to be required by Linux xhci driver
-+   * even though it should be a no-op. Without it, the
-+   * host or driver does not send the clear to the device.
-+   * We intentionally ignore the return val */
-+  sanei_usb_set_altinterface (dn, devices[dn].alt_setting);
-+
-   ret = usb_clear_halt (devices[dn].libusb_handle, devices[dn].bulk_in_ep);
-   if (ret){
-     DBG (1, "sanei_usb_clear_halt: BULK_IN ret=%d\n", ret);
-@@ -2189,18 +2202,13 @@ sanei_usb_clear_halt (SANE_Int dn)
-     return SANE_STATUS_INVAL;
-   }
- 
--  /* be careful, we don't know if we are in DATA0 stage now
--  ret = usb_resetep (devices[dn].libusb_handle, devices[dn].bulk_in_ep);
--  ret = usb_resetep (devices[dn].libusb_handle, devices[dn].bulk_out_ep);
--  */
- #elif defined(HAVE_LIBUSB_1_0)
--  int ret;
- 
--  if (dn >= device_number || dn < 0)
--    {
--      DBG (1, "sanei_usb_clear_halt: dn >= device number || dn < 0\n");
--      return SANE_STATUS_INVAL;
--    }
-+  /* This call seems to be required by Linux xhci driver
-+   * even though it should be a no-op. Without it, the
-+   * host or driver does not send the clear to the device.
-+   * We intentionally ignore the return val */
-+  sanei_usb_set_altinterface (dn, devices[dn].alt_setting);
- 
-   ret = libusb_clear_halt (devices[dn].lu_handle, devices[dn].bulk_in_ep);
-   if (ret){
-@@ -3038,6 +3046,8 @@ sanei_usb_set_altinterface (SANE_Int dn,
- 
-   DBG (5, "sanei_usb_set_altinterface: alternate = %d\n", alternate);
- 
-+  devices[dn].alt_setting = alternate;
-+
-   if (devices[dn].method == sanei_usb_method_scanner_driver)
-     {
- #if defined(__linux__)
-Index: trunk/ChangeLog
-===================================================================
---- trunk.orig/ChangeLog
-+++ trunk/ChangeLog
-@@ -1,3 +1,9 @@
-+2014-12-16 m. allan noah <kitno455 at gmail dot com>
-+	* sanei/sanei_usb.c: add calls to sanei_usb_set_altinterface in
-+	sanei_usb_close and sanei_usb_clear_halt- hopefully work around
-+	USB3/xhci problems in Linux.
-+
-+
- ******  Release of sane-backends 1.0.24. End of code freeze ******
- 
- 2013-09-30 m. allan noah <kitno455 at gmail dot com>
diff --git a/debian/patches/0105-artec_missing_home_environment.patch b/debian/patches/0105-artec_missing_home_environment.patch
deleted file mode 100644
index 6602164..0000000
--- a/debian/patches/0105-artec_missing_home_environment.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Description: Test if  environment variable "HOME" exist
-Author: Jörg Frings-Fürst <debian@jff-webhosting.net>
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=786452
-Forwarded: https://alioth.debian.org/tracker/index.php?func=detail&aid=315071&group_id=30186&atid=410366
-Last-Update: 2015-05-22
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: trunk/backend/artec_eplus48u.c
-===================================================================
---- trunk.orig/backend/artec_eplus48u.c
-+++ trunk/backend/artec_eplus48u.c
-@@ -3580,6 +3580,14 @@ load_calibration_data (Artec48U_Scanner
- 
-   s->calibrated = SANE_FALSE;
-   path[0] = 0;
-+
-+  /* return SANE_STATUS_INVAL if HOME environment variable is not set */
-+  if (getenv ("HOME") == NULL)
-+  {
-+    XDBG ((1, "Environment variable HOME not set\n"));
-+    return SANE_STATUS_INVAL;
-+  }
-+
-   if (strlen (getenv ("HOME")) < (PATH_MAX - 1))
-     strcat (path, getenv ("HOME"));
-   else
-@@ -3690,6 +3698,14 @@ save_calibration_data (Artec48U_Scanner
-   mode_t mode = S_IRUSR | S_IWUSR;
- 
-   path[0] = 0;
-+
-+  /* return SANE_STATUS_INVAL if HOME environment variable is not set */
-+  if (getenv ("HOME") == NULL)
-+  {
-+    XDBG ((1, "Environment variable HOME not set\n"));
-+    return SANE_STATUS_INVAL;
-+  }
-+
-   if (strlen (getenv ("HOME")) < (PATH_MAX - 1))
-     strcat (path, getenv ("HOME"));
-   else
diff --git a/debian/patches/hp3900.patch b/debian/patches/0105-hp3900.patch
index 637a51e..637a51e 100644
--- a/debian/patches/hp3900.patch
+++ b/debian/patches/0105-hp3900.patch
diff --git a/debian/patches/dll_backend_conf.patch b/debian/patches/0110-dll_backend_conf.patch
index 193d75b..193d75b 100644
--- a/debian/patches/dll_backend_conf.patch
+++ b/debian/patches/0110-dll_backend_conf.patch
diff --git a/debian/patches/license_typo.patch b/debian/patches/0115-license_typo.patch
index 6aadc0a..6aadc0a 100644
--- a/debian/patches/license_typo.patch
+++ b/debian/patches/0115-license_typo.patch
diff --git a/debian/patches/typo.patch b/debian/patches/0120-typo.patch
index 365952b..365952b 100644
--- a/debian/patches/typo.patch
+++ b/debian/patches/0120-typo.patch
diff --git a/debian/patches/0500-systemd_configure.patch b/debian/patches/0500-systemd_configure.patch
deleted file mode 100644
index 27121e6..0000000
--- a/debian/patches/0500-systemd_configure.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-Description: Change test for systemd >= 209
-Author: Jörg Frings-Fürst <debian@jff-webhosting.net>
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=769196
-Forwarded: https://alioth.debian.org/tracker/index.php?func=detail&aid=314906&group_id=30186&atid=410366
-Last-Update: 2014-12-11
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: trunk/configure.in
-===================================================================
---- trunk.orig/configure.in
-+++ trunk/configure.in
-@@ -344,17 +344,40 @@ else
- 	with_cups="no"
- fi
- 
-+dnl
- dnl added by llagendijk 12/7/2012 to detect systemd for saned
--$as_echo_n "Checking for systemd..."
--if test -e /usr/include/systemd/sd-daemon.h ; then
--    AC_DEFINE(HAVE_SYSTEMD, 1, [Is /usr/include/systemd/sd-daemon.h available?])
--    with_systemd="yes"
--    SYSTEMD_LIBS=" -lsystemd-daemon"
--    AC_SUBST(SYSTEMD_LIBS)
--    $as_echo "yes"
-+dnl changed by jff 2014/12/11 for detect systemd >=209
-+dnl
-+$as_echo "Begin checking for systemd"
-+test_systemd=no
-+PKG_CHECK_MODULES([libsystemd],
-+    [libsystemd >= 209],
-+    [test_systemd=yes],
-+    [PKG_CHECK_MODULES([libsystemd],
-+        [libsystemd-daemon],
-+	[test_systemd=yes],
-+	[]
-+	)
-+    ]
-+)
-+if test x$test_systemd = xyes; then
-+    AC_CHECK_HEADERS(systemd/sd-daemon.h,
-+        [
-+	    AC_DEFINE(HAVE_SYSTEMD, 1, [Is /usr/include/systemd/sd-daemon.h available?])
-+            with_systemd="yes"
-+	    SYSTEMD_LIBS=" "${libsystemd_LIBS}
-+	    AC_SUBST(SYSTEMD_LIBS)
-+	    $as_echo "Checking for systemd...yes"
-+	],
-+	[
-+	    AC_MSG_ERROR([systemd development headers not found.])
-+	    with_systemd="no"
-+	    $as_echo "Checking for systemd...no"
-+	]
-+    )
- else
-     with_systemd="no"
--    $as_echo "no"
-+    $as_echo "Checking for systemd...no"
- fi
- 
- dnl ***********
diff --git a/debian/patches/001-scanimage_manpage.patch b/debian/patches/0600-scanimage_manpage.patch
index dc70271..dc70271 100644
--- a/debian/patches/001-scanimage_manpage.patch
+++ b/debian/patches/0600-scanimage_manpage.patch
diff --git a/debian/patches/man_typo.patch b/debian/patches/0605-man_typo.patch
index 92b0fa9..92b0fa9 100644
--- a/debian/patches/man_typo.patch
+++ b/debian/patches/0605-man_typo.patch
diff --git a/debian/patches/0005-mk_reproducible_results.patch b/debian/patches/0700-mk_reproducible_results.patch
index a1a6182..defc409 100644
--- a/debian/patches/0005-mk_reproducible_results.patch
+++ b/debian/patches/0700-mk_reproducible_results.patch
@@ -20,6 +20,17 @@ Index: trunk/tools/sane-desc.c
    printf ("</font>\n");
    printf ("</body> </html>\n");
  }
+@@ -3656,8 +3658,8 @@ print_udevhwdb_header (void)
+ {
+   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 (&current_time)));
++	  "# by sane-desc %s from %s\n",
++	  SANE_DESC_VERSION, PACKAGE_STRING );
+ 
+   printf
+     ("#\n"
 Index: trunk/Makefile.in
 ===================================================================
 --- trunk.orig/Makefile.in
@@ -90,3 +101,36 @@ Index: trunk/testsuite/tools/data/html-mfgs.ref
 +This page was last updated by sane-desc 3.5 from sane-backends 1.0.25
  </font>
  </body> </html>
+Index: trunk/testsuite/tools/data/udev.ref
+===================================================================
+--- trunk.orig/testsuite/tools/data/udev.ref
++++ trunk/testsuite/tools/data/udev.ref
+@@ -1,5 +1,5 @@
+ # This file was automatically created based on description files (*.desc)
+-# by sane-desc 3.5 from sane-backends 1.0.24git on Wed Jul 31 07:52:48 2013
++# by sane-desc 3.5 from sane-backends 1.0.25
+ #
+ # udev rules file for supported USB and SCSI devices
+ #
+Index: trunk/testsuite/tools/data/udev+acl.ref
+===================================================================
+--- trunk.orig/testsuite/tools/data/udev+acl.ref
++++ trunk/testsuite/tools/data/udev+acl.ref
+@@ -1,5 +1,5 @@
+ # This file was automatically created based on description files (*.desc)
+-# by sane-desc 3.5 from sane-backends 1.0.24git on Wed Jul 31 07:52:49 2013
++# by sane-desc 3.5 from sane-backends 1.0.25
+ #
+ # udev rules file for supported USB and SCSI devices
+ #
+Index: trunk/testsuite/tools/data/udev+hwdb.ref
+===================================================================
+--- trunk.orig/testsuite/tools/data/udev+hwdb.ref
++++ trunk/testsuite/tools/data/udev+hwdb.ref
+@@ -1,5 +1,5 @@
+ # This file was automatically created based on description files (*.desc)
+-# by sane-desc 3.5 from sane-backends 1.0.24git on Thu Aug  1 18:50:15 2013
++# by sane-desc 3.5 from sane-backends 1.0.25
+ #
+ # udev rules file for supported USB and SCSI devices
+ #
diff --git a/debian/patches/kfreebsd.patch b/debian/patches/0705-kfreebsd.patch
index e058877..e058877 100644
--- a/debian/patches/kfreebsd.patch
+++ b/debian/patches/0705-kfreebsd.patch
diff --git a/debian/patches/sane-desc.c_debian_mods.patch b/debian/patches/0710-sane-desc.c_debian_mods.patch
index b80afc3..b982f45 100644
--- a/debian/patches/sane-desc.c_debian_mods.patch
+++ b/debian/patches/0710-sane-desc.c_debian_mods.patch
@@ -859,19 +859,6 @@ Index: trunk/testsuite/tools/data/html-backends-split.ref
  <b>Description:</b> Network access to saned servers<br>
  <b>Comment:</b> Can be used to access any scanner supported by SANE over the net. Supports IPv4 and IPv6.<br>
  </p>
-Index: trunk/testsuite/tools/Makefile.in
-===================================================================
---- trunk.orig/testsuite/tools/Makefile.in
-+++ trunk/testsuite/tools/Makefile.in
-@@ -503,7 +503,7 @@ check.local:
- 	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: trunk/testsuite/tools/data/html-mfgs.ref
 ===================================================================
 --- trunk.orig/testsuite/tools/data/html-mfgs.ref
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
deleted file mode 100644
index d6d5009..0000000
--- a/debian/patches/fix-FTBFS-format-not-a-string-literal-error.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Markus Koschany <apo@gambaru.de>
-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/hp5370c.patch b/debian/patches/hp5370c.patch
deleted file mode 100644
index 88713fa..0000000
--- a/debian/patches/hp5370c.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: improved recognizability
-Author: Jörg Frings-Fürst <debian@jff-webhosting.net>
-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/sane-backends/+bug/1080787
-Forwarded: http://lists.alioth.debian.org/pipermail/sane-devel/2014-October/032778.html
-Last-Update: 2014-10-26
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: trunk/backend/avision.c
-===================================================================
---- trunk.orig/backend/avision.c
-+++ trunk/backend/avision.c
-@@ -620,7 +620,7 @@ static Avision_HWEntry Avision_Device_Li
-     { "HP",      "ScanJet 5370C",
-       0x03f0, 0x0701,
-       "Hewlett-Packard", "ScanJet 5370C",
--      AV_MULTI_CALIB_CMD | AV_INT_STATUS, AV_FIRMWARE },
-+      AV_MULTI_CALIB_CMD | AV_INT_STATUS, 0 },
-     /* comment="1 pass, 2400 dpi - some FW revisions have x-axis image scaling problems over 1200 dpi" */
-     /* status="good" */
-     
diff --git a/debian/patches/kodakaio.patch b/debian/patches/kodakaio.patch
deleted file mode 100644
index f413a00..0000000
--- a/debian/patches/kodakaio.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-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 <quandry@ntlworld.com>
-
---- 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/man-page-spelling.patch b/debian/patches/man-page-spelling.patch
deleted file mode 100644
index 39c506c..0000000
--- a/debian/patches/man-page-spelling.patch
+++ /dev/null
@@ -1,218 +0,0 @@
-Description:
- Correction of some spelling/grammatical errors and miscellany in man pages.
-Author: Mark Buda <hermit@acm.org>
-
---- 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
deleted file mode 100644
index 703a408..0000000
--- a/debian/patches/multiarch_dll_search_path.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-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 <jblache@debian.org>
-
---- 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/out_of_bounds.patch b/debian/patches/out_of_bounds.patch
deleted file mode 100644
index 43aeaf6..0000000
--- a/debian/patches/out_of_bounds.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-Description: prevent out-of-bounds
-Author: Jörg Frings-Fürst <debian@jff-webhosting.net>
-Forwarded: http://lists.alioth.debian.org/pipermail/sane-devel/2014-October
-Last-Update: 2014-10-26
----
-Index: trunk/backend/genesys_devices.c
-===================================================================
---- trunk.orig/backend/genesys_devices.c
-+++ trunk/backend/genesys_devices.c
-@@ -3362,7 +3362,7 @@ static Genesys_Model canon_formula101_mo
-   100
- };
- 
--
-+/* put the size on MAX_SCANNERS in genesys_low.h */
- static Genesys_USB_Device_Entry genesys_usb_device_list[] = {
-   /* GL646 devices */
-   {0x03f0, 0x0901, &hp2300c_model},
-Index: trunk/backend/genesys_low.h
-===================================================================
---- trunk.orig/backend/genesys_low.h
-+++ trunk/backend/genesys_low.h
-@@ -309,8 +309,9 @@ typedef enum Genesys_Color_Order
- }
- Genesys_Color_Order;
- 
--
--#define MAX_SCANNERS 50
-+/* To prevent out-of-bounds errors MAX_SCANNERS must be the size of genesys_usb_device_list */
-+/* found on genesys_devices.c                                                               */
-+#define MAX_SCANNERS 40
- #define MAX_RESOLUTIONS 13
- #define MAX_DPI 4
- 
-Index: trunk/backend/umax1220u-common.c
-===================================================================
---- trunk.orig/backend/umax1220u-common.c
-+++ trunk/backend/umax1220u-common.c
-@@ -972,7 +972,8 @@ move_2100U (UMAX_Handle * scan, int dist
-   unsigned char ope2[3] = {
-     0x00, 0xff, 0xff
-   };
--  unsigned char buf[512];
-+  /* To prevent out-of-bounds in functions (PAD|CKK)_ARRAY set the size from 512 to 522 */
-+  unsigned char buf[512 + PAD];
- 
- 
-   SANE_Status res;
-Index: trunk/backend/hs2p.h
-===================================================================
---- trunk.orig/backend/hs2p.h
-+++ trunk/backend/hs2p.h
-@@ -264,7 +264,8 @@ typedef struct HS2P_Scanner
-   Option_Value val[NUM_OPTIONS];
-   SANE_Parameters params;	/* SANE image parameters */
-   /* additional values that don't fit into Option_Value representation */
--  SANE_Word gamma_table[GAMMA_LENGTH];	/* Custom Gray Gamma Table */
-+  /* To prevnted out-of-bounds add + 2                                 */
-+  SANE_Word gamma_table[GAMMA_LENGTH + 2];	/* Custom Gray Gamma Table */
- 
-   /* state information - not options */
- 
-Index: trunk/backend/niash.c
-===================================================================
---- trunk.orig/backend/niash.c
-+++ trunk/backend/niash.c
-@@ -64,6 +64,7 @@
- 
- 
- /* options enumerator */
-+/* on changes please check the typedef struct TScanner */
- typedef enum
- {
-   optCount = 0,
-@@ -105,8 +106,8 @@ typedef union
- 
- typedef struct
- {
--  SANE_Option_Descriptor aOptions[optLast];
--  TOptionValue aValues[optLast];
-+  SANE_Option_Descriptor aOptions[optGamma + 1];
-+  TOptionValue aValues[optGamma + 1];
- 
-   TScanParams ScanParams;
-   THWParams HWParams;
diff --git a/debian/patches/saned.man.patch b/debian/patches/saned.man.patch
deleted file mode 100644
index c701fdf..0000000
--- a/debian/patches/saned.man.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description:
- Minor bug fix to man page.
-Author: Mark Buda <hermit@acm.org>
-
---- 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
index 025f34f..5b8e242 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,27 +1,17 @@
-#0105-artec_missing_home_environment.patch
-0005-mk_reproducible_results.patch
-hp3900.patch
-typo.patch
-license_typo.patch
-man_typo.patch
-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
-#hp5370c.patch
-#out_of_bounds.patch
-#0500-systemd_configure.patch
-#0100-usb3-corrections.patch
-001-scanimage_manpage.patch
+0005-libsane_deps.patch
+0010-unneeded_doc.patch
+0015-frontend_libs.patch
+0020-nousbtest.patch
+0025-multiarch_manpages_libdir.patch
+0030-ppc64el.patch
+0035-trim-libraries-in-sane-backends.pc.in.patch
+0100-source_spelling.patch
+0105-hp3900.patch
+0110-dll_backend_conf.patch
+0115-license_typo.patch
+0120-typo.patch
+0600-scanimage_manpage.patch
+0605-man_typo.patch
+0700-mk_reproducible_results.patch
+0705-kfreebsd.patch
+0710-sane-desc.c_debian_mods.patch
diff --git a/debian/patches/source-spelling.patch b/debian/patches/source-spelling.patch
deleted file mode 100644
index 2b1632c..0000000
--- a/debian/patches/source-spelling.patch
+++ /dev/null
@@ -1,565 +0,0 @@
-Description:
- Correction of some spelling/grammatical errors in source code.
-Author: Mark Buda <hermit@acm.org>
-
---- 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.");