Merge branch 'release/debian/1.0.31-2' into masterdebian/1.0.31-2

11 files changed, 50 insertions, 226 deletions

diff --git a/debian/patches/0100-source_spelling.patch b/debian/patches/0100-source_spelling.patch
index 493c3ae..17bde04 100644
--- a/debian/patches/0100-source_spelling.patch
+++ b/debian/patches/0100-source_spelling.patch
@@ -1,6 +1,6 @@
 Description: Correct source typos
 Author: Jörg Frings-Fürst <debian@jff-webhosting.net>
-Forwarded: not needed
+Forwarded: not-needed
 Last-Update: 2019-04-28
 ----
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
diff --git a/debian/patches/0140-avahi.patch b/debian/patches/0140-avahi.patch
index 9c993b0..c424323 100644
--- a/debian/patches/0140-avahi.patch
+++ b/debian/patches/0140-avahi.patch
@@ -1,7 +1,7 @@
 Description: Avoid assertion failure when net_avahi_init failed
 Author: Andreas Henriksson <andreas@fatal.se>
 Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=861112
-Forwarded: not needed
+Forwarded: not-needed
 Last-Update: 2017-06-20
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
diff --git a/debian/patches/0145-avahi.patch b/debian/patches/0145-avahi.patch
index 67c874b..d358a41 100644
--- a/debian/patches/0145-avahi.patch
+++ b/debian/patches/0145-avahi.patch
@@ -1,7 +1,7 @@
 Description: scanimage assert failure: *** Error in `scanimage': double free or corruption (top)
 Author: Laurent Vivier Laurent@vivier.eu
 Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/sane-backends/+bug/1208091
-Forwarded: not needed
+Forwarded: not-needed
 Last-Update: 2017-06-20
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
diff --git a/debian/patches/0150-i386-test.patch b/debian/patches/0150-i386-test.patch
index 864d32a..4c064c5 100644
--- a/debian/patches/0150-i386-test.patch
+++ b/debian/patches/0150-i386-test.patch
@@ -1,6 +1,6 @@
 Description: Disable some tests that fail on i386
 Author: Jörg Frings-Fürst <debian@jff.email>
-Forwarded: not needed
+Forwarded: not-needed
 Last-Update: 2020-04-01 
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
diff --git a/debian/patches/0160-big_endian.patch b/debian/patches/0160-big_endian.patch
deleted file mode 100644
index 234088d..0000000
--- a/debian/patches/0160-big_endian.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Use depth from session
-Author: Jörg Frings-Fürst <debian@jff.email>
-Last-Update: 2020-04-01 
-Index: trunk/backend/genesys/low.cpp
-===================================================================
---- trunk.orig/backend/genesys/low.cpp
-+++ trunk/backend/genesys/low.cpp
-@@ -539,7 +539,7 @@ Image read_unshuffled_image_from_scanner
-     }
- 
- #ifdef WORDS_BIGENDIAN
--    if (depth == 16) {
-+    if (session.params.depth == 16) {
-         dev->pipeline.push_node<ImagePipelineNodeSwap16BitEndian>();
-     }
- #endif
diff --git a/debian/patches/0165-respect_local_only_parameter.patch b/debian/patches/0165-respect_local_only_parameter.patch
index 24fd39c..f73a731 100644
--- a/debian/patches/0165-respect_local_only_parameter.patch
+++ b/debian/patches/0165-respect_local_only_parameter.patch
@@ -2,7 +2,7 @@ Description: respect 'local_only' parameter of sane_get_devices()
 Author: Barnabás Pőcze <pobrn@protonmail.com>
 Origin: backport, https://gitlab.com/sane-project/backends/-/commit/245564dffe96ddf0fd1c703c48973cd35fddd268
 Bug: https://gitlab.com/sane-project/backends/-/merge_requests/502/
-Forwarded: no
+Forwarded: no-needed
 Last-Update: 2020-09-05
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
diff --git a/debian/patches/0170-return_empty_list_when_local_devices_requested.patch b/debian/patches/0170-return_empty_list_when_local_devices_requested.patch
new file mode 100644
index 0000000..5d0ba04
--- /dev/null
+++ b/debian/patches/0170-return_empty_list_when_local_devices_requested.patch
@@ -0,0 +1,43 @@
+Description: eturn_empty_list_when_local_devices_requested
+Author: Barnabás Pőcze <pobrn@protonmail.com>
+Origin: backport, https://gitlab.com/sane-project/backends/-/commit/c946aa5a84297f33b30cddb0c89fcf375ed65d10
+Bug: https://gitlab.com/sane-project/backends/-/merge_requests/506
+Forwarded: not-needed
+Last-Update: 2020-09-19
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: trunk/backend/dell1600n_net.c
+===================================================================
+--- trunk.orig/backend/dell1600n_net.c
++++ trunk/backend/dell1600n_net.c
+@@ -233,6 +233,9 @@ static void JpegDecompTermSource (j_deco
+ /* Results of last call to sane_get_devices */
+ static struct DeviceRecord *gKnownDevices[MAX_SCANNERS];
+ 
++/* Empty list for when network devices are not wanted */
++static const SANE_Device *gEmptyDeviceList[1];
++
+ /* Array of open scanner device states.
+    :NOTE: (int)SANE_Handle is an offset into this array */
+ static struct ScannerState *gOpenScanners[MAX_SCANNERS];
+@@ -306,15 +309,17 @@ sane_get_devices (const SANE_Device ***
+   const char *pVal;
+   int valLen;
+ 
++  if (local_only) {
++    *device_list = gEmptyDeviceList;
++    return SANE_STATUS_GOOD;
++  }
++
+   /* init variables */
+   ret = SANE_STATUS_GOOD;
+   sock = 0;
+   pDevice = NULL;
+   optYes = 1;
+ 
+-  if (local_only)
+-    return ret;
+-
+   InitComBuf (&queryPacket);
+ 
+   /* clear previous results */
diff --git a/debian/patches/0600-scanimage_manpage.patch b/debian/patches/0600-scanimage_manpage.patch
index e163e9c..ddf125f 100644
--- a/debian/patches/0600-scanimage_manpage.patch
+++ b/debian/patches/0600-scanimage_manpage.patch
@@ -1,7 +1,7 @@
 Description: Add remark to options.
 Author: Jörg Frings-Fürst <debian@jff-webhosting.net>
 Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=418630
-Forwarded: not needed
+Forwarded: not-needed
 Last-Update: 2015-01-18
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
diff --git a/debian/patches/0700-mk_reproducible_results.patch b/debian/patches/0700-mk_reproducible_results.patch
deleted file mode 100644
index 78f9e5b..0000000
--- a/debian/patches/0700-mk_reproducible_results.patch
+++ /dev/null
@@ -1,155 +0,0 @@
-Description: Make build reproducible.
-Author: Jörg Frings-Fürst <debian@jff-webhosting.net>
-Forwarded: not needed
-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.29-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.29-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.29-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.29-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.29-debian
- #
- # udev rules file for supported USB and SCSI devices
- #
-Index: trunk/doc/Makefile.am
-===================================================================
---- trunk.orig/doc/Makefile.am
-+++ trunk/doc/Makefile.am
-@@ -279,11 +279,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.29-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.29-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.29-debian
- #
- # 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/0715-20-sane.hwdb_multi-arch.patch b/debian/patches/0715-20-sane.hwdb_multi-arch.patch
deleted file mode 100644
index e590649..0000000
--- a/debian/patches/0715-20-sane.hwdb_multi-arch.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-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-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
-@@ -3328,10 +3328,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"
-@@ -3400,8 +3400,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"
-@@ -3768,8 +3768,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"
diff --git a/debian/patches/series b/debian/patches/series
index d79cdd7..f7b7531 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,15 +5,13 @@
 0140-avahi.patch
 0145-avahi.patch
 0600-scanimage_manpage.patch
-#0700-mk_reproducible_results.patch
 0705-kfreebsd.patch
-#0715-20-sane.hwdb_multi-arch.patch
 0725-fix_link_60-libsane_rule.patch
 0150-i386-test.patch
 0155-hurd_PATH_MAX.patch
-#0160-big_endian.patch
 0045-disable_lock_test_at_build_time.patch
 0050-Use-python3-shebang.patch
 0055-Fix_build_error.patch
 0060-cross.patch
 0165-respect_local_only_parameter.patch
+0170-return_empty_list_when_local_devices_requested.patch