Refresh patches

4 files changed, 230 insertions, 2 deletions

diff --git a/debian/patches/0100-source_spelling.patch b/debian/patches/0100-source_spelling.patch
index cc8e6b6..916e502 100644
--- a/debian/patches/0100-source_spelling.patch
+++ b/debian/patches/0100-source_spelling.patch
@@ -63,7 +63,7 @@ Index: trunk/doc/sane-pixma.man
 ===================================================================
 --- trunk.orig/doc/sane-pixma.man
 +++ trunk/doc/sane-pixma.man
-@@ -308,7 +308,7 @@ common subnet for scanning.
+@@ -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
diff --git a/debian/patches/0100-source_spelling.patch~ b/debian/patches/0100-source_spelling.patch~
new file mode 100644
index 0000000..cc8e6b6
--- /dev/null
+++ b/debian/patches/0100-source_spelling.patch~
@@ -0,0 +1,74 @@
+Description: Correct source typos
+Author: Jörg Frings-Fürst <debian@jff-webhosting.net>
+Last-Update: 2019-04-28
+----
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+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/backend/apple.c
+===================================================================
+--- trunk.orig/backend/apple.c
++++ trunk/backend/apple.c
+@@ -1546,7 +1546,7 @@ init_options (Apple_Scanner * s)
+   /* Use volt_ref */
+   s->opt[OPT_VOLT_REF].name = "volt-ref";
+   s->opt[OPT_VOLT_REF].title = "Volt Reference";
+-  s->opt[OPT_VOLT_REF].desc ="It's brightness equivalant.";
++  s->opt[OPT_VOLT_REF].desc ="It's brightness equivalent.";
+   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
+@@ -308,7 +308,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
diff --git a/debian/patches/0700-mk_reproducible_results.patch b/debian/patches/0700-mk_reproducible_results.patch
index 044e60f..1b61b49 100644
--- a/debian/patches/0700-mk_reproducible_results.patch
+++ b/debian/patches/0700-mk_reproducible_results.patch
@@ -105,7 +105,7 @@ Index: trunk/doc/Makefile.am
 ===================================================================
 --- trunk.orig/doc/Makefile.am
 +++ trunk/doc/Makefile.am
-@@ -278,11 +278,11 @@ sane.ind: $(API_SPEC_INPUTS)
+@@ -279,11 +279,11 @@ sane.ind: $(API_SPEC_INPUTS)
  
  sane.dvi: $(API_SPEC_INPUTS) $(API_SPEC_EPS_FIGS) sane.ind
  	@echo Generating $@ from $<...
diff --git a/debian/patches/0700-mk_reproducible_results.patch~ b/debian/patches/0700-mk_reproducible_results.patch~
new file mode 100644
index 0000000..044e60f
--- /dev/null
+++ b/debian/patches/0700-mk_reproducible_results.patch~
@@ -0,0 +1,154 @@
+Description: Make build reproducible.
+Author: Jörg Frings-Fürst <debian@jff-webhosting.net>
+Last-Update: 2019-08-11
+---
+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
+@@ -2816,8 +2816,10 @@ html_print_footer (void)
+      "<address>\n"
+      "<a href=\"imprint.html\"\n"
+      ">Contact</a>\n" "</address>\n" "<font size=-1>\n");
+-  printf ("This page was last updated on %s by sane-desc %s from %s\n",
+-	  asctime (localtime (&current_time)), SANE_DESC_VERSION, PACKAGE_STRING);
++/*  printf ("This page was last updated on %s by sane-desc %s from %s\n",
++	  asctime (localtime (&current_time)), SANE_DESC_VERSION, PACKAGE_STRING); */
++  printf ("This page was last updated by sane-desc %s from %s\n",
++	  SANE_DESC_VERSION, PACKAGE_STRING);
+   printf ("</font>\n");
+   printf ("</body> </html>\n");
+ }
+@@ -3463,8 +3465,8 @@ print_udev_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"
+@@ -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/testsuite/tools/data/html-backends-split.ref
+===================================================================
+--- trunk.orig/testsuite/tools/data/html-backends-split.ref
++++ trunk/testsuite/tools/data/html-backends-split.ref
+@@ -16496,7 +16496,6 @@ Grandtek Scopecam
+ >Contact</a>
+ </address>
+ <font size=-1>
+-This page was last updated on Wed Jul 31 07:52:48 2013
+- by sane-desc 3.5 from sane-backends 1.0.24git
++This page was last updated by sane-desc 3.5 from sane-backends 1.0.28-debian
+ </font>
+ </body> </html>
+Index: trunk/testsuite/tools/data/html-mfgs.ref
+===================================================================
+--- trunk.orig/testsuite/tools/data/html-mfgs.ref
++++ trunk/testsuite/tools/data/html-mfgs.ref
+@@ -23910,7 +23910,6 @@ qcam<br>(unmaintained)
+ >Contact</a>
+ </address>
+ <font size=-1>
+-This page was last updated on Wed Jul 31 07:52:48 2013
+- by sane-desc 3.5 from sane-backends 1.0.24git
++This page was last updated by sane-desc 3.5 from sane-backends 1.0.28-debian
+ </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.28-debian
+ #
+ # 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.28-debian
+ #
+ # 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.28-debian
+ #
+ # udev rules file for supported USB and SCSI devices
+ #
+Index: trunk/doc/Makefile.am
+===================================================================
+--- trunk.orig/doc/Makefile.am
++++ trunk/doc/Makefile.am
+@@ -278,11 +278,11 @@ sane.ind: $(API_SPEC_INPUTS)
+ 
+ sane.dvi: $(API_SPEC_INPUTS) $(API_SPEC_EPS_FIGS) sane.ind
+ 	@echo Generating $@ from $<...
+-	@$(am_TEXINPUTS) $(LATEX) $< </dev/null >/dev/null
++	@$(am_TEXINPUTS) $(LATEX) --output-comment="" $< </dev/null >/dev/null
+ 
+ sane.ps: sane.dvi
+ 	@echo Generating $@ from $<...
+-	@$(am_TEXINPUTS) $(DVIPS) -q $< -o $@
++	@$(am_TEXINPUTS) $(DVIPS) -q -N $< -o $@
+ 
+ .fig.pdf:
+ 	@test -d $(@D) || $(MKDIR_P) $(@D)
+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.28-debian
+ #
+ # 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.28-debian
+ #
+ # hwdb file for supported USB 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.28-debian
+ #
+ # The entries below are used to detect a USB device and change owner
+ # and permissions on the "device node" used by libusb.