Merge branch 'release/experimental/1.0.29-1_experimental1'experimental/1.0.29-1_experimental1

1 files changed, 53 insertions, 137 deletions

diff --git a/debian/patches/0100-source_spelling.patch b/debian/patches/0100-source_spelling.patch
index 1d26086..baca168 100644
--- a/debian/patches/0100-source_spelling.patch
+++ b/debian/patches/0100-source_spelling.patch
@@ -1,96 +1,8 @@
 Description: Correct source typos
 Author: Jörg Frings-Fürst <debian@jff-webhosting.net>
-Last-Update: 2018-05-19
+Last-Update: 2019-04-28
 ----
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: trunk/backend/pixma_bjnp.c
-===================================================================
---- trunk.orig/backend/pixma_bjnp.c
-+++ trunk/backend/pixma_bjnp.c
-@@ -1829,7 +1829,7 @@ static void add_scanner(SANE_Int *dev_no
- 
-            attach_bjnp (uri, makemodel,
-                         serial, pixma_devices);
--           PDBG (bjnp_dbg (LOG_NOTICE, "add_scanner: New scanner added: %s, serial %s, mac addres: %s.\n",
-+           PDBG (bjnp_dbg (LOG_NOTICE, "add_scanner: New scanner added: %s, serial %s, mac address: %s.\n",
- 	                 uri, serial, device[*dev_no].mac_address));
-           }
-         break;
-Index: trunk/doc/sane-pixma.man
-===================================================================
---- trunk.orig/doc/sane-pixma.man
-+++ trunk/doc/sane-pixma.man
-@@ -232,7 +232,7 @@ interfaces (i.e. it does not support the
- to add your scanner here as well.
- .RS
- .PP
--.I Scanners shall be listed in the configuraton file as follows:
-+.I Scanners shall be listed in the configuration file as follows:
- .PP
- .RS
- .I <method>://<host>[:port][/timeout=<value>]
-@@ -253,7 +253,7 @@ bjnp-timeout parameter. The value is in
- .PP
- Define scanners each on a new line.
- .PP
--More globally applicable tinmeouts can be set using the bjnp-timeout parameter as folllows:
-+More globally applicable tinmeouts can be set using the bjnp-timeout parameter as follows:
- .PP
- .RS
- .I bjnp-timeout=<value>
-@@ -263,7 +263,7 @@ A timeout defined using bjnp-timeout wil
- in the file. If required the bjnp-timeout setting 
- can be defined multiple times, where each settng will apply only to the scanners that
- follow the setting. The last setting is used for the auto discovered scanners.
--If not explicitely set,  the default 1000ms setting will apply. 
-+If not explicitly set,  the default 1000ms setting will apply.
- .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
@@ -104,54 +16,6 @@ Index: trunk/doc/sane-epjitsu.man
  .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
 Index: trunk/backend/apple.c
 ===================================================================
 --- trunk.orig/backend/apple.c
@@ -165,3 +29,55 @@ Index: trunk/backend/apple.c
    s->opt[OPT_VOLT_REF].type = SANE_TYPE_BOOL;
    if (s->hw->ScannerModel!=COLORONESCANNER)
      s->opt[OPT_VOLT_REF].cap |= SANE_CAP_INACTIVE;
+Index: trunk/tools/umax_pp.c
+===================================================================
+--- trunk.orig/tools/umax_pp.c
++++ trunk/tools/umax_pp.c
+@@ -374,10 +374,10 @@ main (int argc, char **argv)
+       if (sanei_umax_pp_initPort (port, name) != 1)
+ 	{
+ 	  if (port)
+-	    fprintf (stderr, "failed to gain direct acces to port 0x%X!\n",
++	    fprintf (stderr, "failed to gain direct access to port 0x%X!\n",
+ 		     port);
+ 	  else
+-	    fprintf (stderr, "failed to gain acces to device %s!\n", name);
++	    fprintf (stderr, "failed to gain access to device %s!\n", name);
+ 	  return 0;
+ 	}
+     }
+Index: trunk/doc/saned.man
+===================================================================
+--- trunk.orig/doc/saned.man
++++ trunk/doc/saned.man
+@@ -254,7 +254,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-pixma.man
+===================================================================
+--- trunk.orig/doc/sane-pixma.man
++++ trunk/doc/sane-pixma.man
+@@ -307,7 +307,7 @@ This will cause all further statements i
+ .IP -
+ A line that contains
+ .B auto_detection=no
+-will cause auto-detection to be skipped. Explicitely defined network scanners will still be probed.
++will cause auto-detection to be skipped. Explicitly defined network scanners will still be probed.
+ .SH USB SUPPORT
+ USB scanners will be auto-detected and require no configuration.
+ .SH NETWORKING SUPPORT
+@@ -337,7 +337,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