Merge branch 'release/experimental/1.0.27-1%experimental4'experimental/1.0.27-1%experimental4

3 files changed, 230 insertions, 0 deletions

diff --git a/debian/patches/0100-source_spelling.patch b/debian/patches/0100-source_spelling.patch
index 8796e35..0985e99 100644
--- a/debian/patches/0100-source_spelling.patch
+++ b/debian/patches/0100-source_spelling.patch
@@ -47,3 +47,108 @@ Index: trunk/doc/sane-pixma.man
  .PP
  Setting timeouts should only be required in exceptional cases.
  .PP
+@@ -288,7 +288,7 @@ common subnet for scanning.
+ .PP
+ Scanner detection is slightly more complicated. The pixma backend sends
+ a broadcast on all direct connected subnets it can find (provided your OS 
+-allows for enumeration of all netowrk interfaces). The broadcast is sent FROM 
++allows for enumeration of all network interfaces). The broadcast is sent FROM 
+ port 8612 TO port 8610 or 8612 on the broadcast address of each interface.
+ The outgoing packets will be allowed by the rule described above.
+ .PP
+Index: trunk/doc/sane-canon_dr.man
+===================================================================
+--- trunk.orig/doc/sane-canon_dr.man
++++ trunk/doc/sane-canon_dr.man
+@@ -105,7 +105,7 @@ Scanners can be specified in the configu
+ .PP
+ "scsi CANON DR"
+ .RS
+-Requests backend to search all scsi busses in the system for a device 
++Requests backend to search all scsi buses in the system for a device 
+ which reports itself to be a scanner made by 'CANON', with a model name
+ starting with 'DR'. 
+ .RE
+@@ -119,7 +119,7 @@ specify one. Probably should not be used
+ .PP
+ "usb 0x04a9 0x1603" (or other vendor/product ids)
+ .RS
+-Requests backend to search all usb busses in the system for a device 
++Requests backend to search all usb buses in the system for a device 
+ which uses that vendor and product id. The device will then be queried
+ to determine if it is a Canon scanner.
+ .RE
+Index: trunk/doc/sane-cardscan.man
+===================================================================
+--- trunk.orig/doc/sane-cardscan.man
++++ trunk/doc/sane-cardscan.man
+@@ -37,7 +37,7 @@ Scanners can be specified in the configu
+ .PP
+ "usb 0x04c5 0x1042" (or other vendor/product ids)
+ .RS
+-Requests backend to search all usb busses in the system for a device 
++Requests backend to search all usb buses in the system for a device 
+ which uses that vendor and product id. The device will then be queried
+ to determine if it is a cardscan scanner.
+ .RE
+Index: trunk/doc/sane-epjitsu.man
+===================================================================
+--- trunk.orig/doc/sane-epjitsu.man
++++ trunk/doc/sane-epjitsu.man
+@@ -42,7 +42,7 @@ Scanners can be specified in the configu
+ .PP
+ "usb 0x04c5 0x10c7" (or other vendor/product ids)
+ .RS
+-Requests backend to search all usb busses in the system for a device which uses that vendor and product id. The device will then be queried to determine if it is a supported scanner.
++Requests backend to search all usb buses in the system for a device which uses that vendor and product id. The device will then be queried to determine if it is a supported scanner.
+ .RE
+ .PP
+ "usb /dev/usb/scanner0" (or other device file)
+Index: trunk/doc/sane-fujitsu.man
+===================================================================
+--- trunk.orig/doc/sane-fujitsu.man
++++ trunk/doc/sane-fujitsu.man
+@@ -109,7 +109,7 @@ Scanners can be specified in the configu
+ .PP
+ "scsi FUJITSU"
+ .RS
+-Requests backend to search all scsi busses in the system for a device 
++Requests backend to search all scsi buses in the system for a device 
+ which reports itself to be a scanner made by 'FUJITSU'. 
+ .RE
+ .PP
+@@ -122,7 +122,7 @@ specify one. Probably should not be used
+ .PP
+ "usb 0x04c5 0x1042" (or other vendor/product ids)
+ .RS
+-Requests backend to search all usb busses in the system for a device 
++Requests backend to search all usb buses in the system for a device 
+ which uses that vendor and product id. The device will then be queried
+ to determine if it is a Fujitsu scanner.
+ .RE
+Index: trunk/doc/saned.man
+===================================================================
+--- trunk.orig/doc/saned.man
++++ trunk/doc/saned.man
+@@ -220,7 +220,7 @@ to the systemd journal. The systemd supp
+ requires compilation with the systemd-devel package
+ installed on the system. this is the preferred option.
+ 
+-Saned can be used wih systemd without the systemd integration 
++Saned can be used with systemd without the systemd integration 
+ compiled in, but then logging of debug information is not supported. 
+ 
+ The systemd configuration is different for the 2 options, so
+Index: trunk/doc/sane-kodak.man
+===================================================================
+--- trunk.orig/doc/sane-kodak.man
++++ trunk/doc/sane-kodak.man
+@@ -77,7 +77,7 @@ Scanners can be specified in the configu
+ .PP
+ "scsi KODAK"
+ .RS
+-Requests backend to search all scsi busses in the system for a device 
++Requests backend to search all scsi buses in the system for a device 
+ which reports itself to be a scanner made by 'KODAK'. 
+ .RE
+ .PP
diff --git a/debian/patches/0715-20-sane.hwdb_multi-arch.patch b/debian/patches/0715-20-sane.hwdb_multi-arch.patch
new file mode 100644
index 0000000..350c911
--- /dev/null
+++ b/debian/patches/0715-20-sane.hwdb_multi-arch.patch
@@ -0,0 +1,123 @@
+Description: Make 20-sane.hwdb Multi-Arch ready
+Author: Jörg Frings-Fürst <debian@jff.email>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=880391
+Forwarded: not-needed
+Last-Update: 2018-04-02
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: trunk/tools/sane-desc.c
+===================================================================
+--- trunk.orig/tools/sane-desc.c
++++ trunk/tools/sane-desc.c
+@@ -3326,10 +3326,10 @@ print_usermap_header (void)
+ 
+   printf
+     ("# This file was automatically created based on description files (*.desc)\n"
+-    "# by sane-desc %s from %s on %s"
++    "# by sane-desc %s from %s\n"
+     "#\n"
+     ,
+-    SANE_DESC_VERSION, PACKAGE_STRING, asctime (localtime (&current_time)));
++    SANE_DESC_VERSION, PACKAGE_STRING);
+ 
+   printf
+      ("# The entries below are used to detect a USB device and change owner\n"
+@@ -3398,8 +3398,8 @@ print_db_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"
+      "# The entries below are used to detect a USB device when it's plugged in\n"
+@@ -3656,8 +3656,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"
+@@ -3766,8 +3766,8 @@ print_hwdb_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/testsuite/tools/data/db.ref
+===================================================================
+--- trunk.orig/testsuite/tools/data/db.ref
++++ trunk/testsuite/tools/data/db.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.24git
+ #
+ # The entries below are used to detect a USB device when it's plugged in
+ # and then run a script to change the ownership and
+Index: trunk/testsuite/tools/data/hwdb.ref
+===================================================================
+--- trunk.orig/testsuite/tools/data/hwdb.ref
++++ trunk/testsuite/tools/data/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.25git on Tue Dec  3 15:24:46 2013
++# by sane-desc 3.5 from sane-backends 1.0.25git
+ #
+ # hwdb file for supported USB 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.24git
+ #
+ # 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.24git
+ #
+ # udev rules file for supported USB and SCSI devices
+ #
+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.24git
+ #
+ # udev rules file for supported USB and SCSI devices
+ #
+Index: trunk/testsuite/tools/data/usermap.ref
+===================================================================
+--- trunk.orig/testsuite/tools/data/usermap.ref
++++ trunk/testsuite/tools/data/usermap.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.24git
+ #
+ # The entries below are used to detect a USB device and change owner
+ # and permissions on the "device node" used by libusb.
diff --git a/debian/patches/series b/debian/patches/series
index 02949a2..8b454dc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -22,3 +22,5 @@
 0145-avahi.patch
 0100-source_spelling.patch
 0150-genesys-Fix-use-of-uninitialized-variable.patch
+#0130-usb-timeout.patch
+0715-20-sane.hwdb_multi-arch.patch