New d/p/0170-return_empty_list_when_local_devices_requested.patch; fir typos

10 files changed, 60 insertions, 7 deletions

diff --git a/debian/changelog b/debian/changelog
index 3917c26..49cc640 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+sane-backends (1.0.31-2) UNRELEASED; urgency=medium
+
+  * Upload into unstable.
+  * New patch:
+    - debian/patches/0170-return_empty_list_when_local_devices_requested.patch.
+  * Fix typos in the Forwarded tag in the patch headers.
+
+ -- Jörg Frings-Fürst <debian@jff.email>  Sat, 19 Sep 2020 16:53:17 +0200
+
 sane-backends (1.0.31-1~experimental1) experimental; urgency=medium
 
   * New upstream release (Closes: #968949, #962539).
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/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
index 78f9e5b..ac110f8 100644
--- a/debian/patches/0700-mk_reproducible_results.patch
+++ b/debian/patches/0700-mk_reproducible_results.patch
@@ -1,6 +1,6 @@
 Description: Make build reproducible.
 Author: Jörg Frings-Fürst <debian@jff-webhosting.net>
-Forwarded: not needed
+Forwarded: not-needed
 Last-Update: 2019-08-11
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
diff --git a/debian/patches/series b/debian/patches/series
index d79cdd7..8426d8a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -17,3 +17,4 @@
 0055-Fix_build_error.patch
 0060-cross.patch
 0165-respect_local_only_parameter.patch
+0170-return_empty_list_when_local_devices_requested.patch