summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog4
-rw-r--r--debian/patches/0185-Change_output_from_sane-find-scanner.patch51
-rw-r--r--debian/patches/series1
3 files changed, 55 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index e977760..cd0c51d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,13 +10,15 @@ sane-backends (1.1.1-3) UNRELEASED; urgency=medium
* debian/control:
- Add Recommends: sane-airscan to libsane1 (Closes: 1005817).
* Move man page sane-umax_pp.5 back to libsane-common (Closes: #1005736):
- - debian/rules:
+ - debian/rules:
- Remove delete manpage vom libsane-common.
- New debian/sane-utils.preinst to remove man page and sysmlink.
- debian/sane-utils.link:
- Remove create link from sane-umax_pp.5
- debian/control:
- Add new Breaks and Replace.
+ * New debian/patches/0185-Change_output_from_sane-find-scanner.patch:
+ - Improve output for possible USB scanners (Closes: #983332).
-- Jörg Frings-Fürst <debian@jff.email> Mon, 14 Feb 2022 21:28:17 +0100
diff --git a/debian/patches/0185-Change_output_from_sane-find-scanner.patch b/debian/patches/0185-Change_output_from_sane-find-scanner.patch
new file mode 100644
index 0000000..ee4bc1a
--- /dev/null
+++ b/debian/patches/0185-Change_output_from_sane-find-scanner.patch
@@ -0,0 +1,51 @@
+Description: Improve output for possible USB scanners
+Author: Ralph Little
+Origin: upstream, https://gitlab.com/sane-project/backends/-/commit/b701c499c9ce56c6bbea14b2fac2feea37f2410f
+Bug: https://gitlab.com/sane-project/backends/-/issues/575
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=983332
+Forwarded: not-needed
+Applied-Upstream: commit b701c499c9ce56c6bbea14b2fac2feea37f2410f
+Last-Update: 2022-02-21
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: trunk/tools/sane-find-scanner.c
+===================================================================
+--- trunk.orig/tools/sane-find-scanner.c
++++ trunk/tools/sane-find-scanner.c
+@@ -384,7 +384,7 @@ check_usb_file (char *file_name)
+ {
+ if (verbose > 1)
+ printf (" open ok, vendor and product ids were identified\n");
+- printf ("found USB scanner (vendor=0x%04x, "
++ printf ("found possible USB scanner (vendor=0x%04x, "
+ "product=0x%04x) at %s\n", vendor, product, file_name);
+ }
+ else
+@@ -392,7 +392,7 @@ check_usb_file (char *file_name)
+ if (verbose > 1)
+ printf (" open ok, but vendor and product could NOT be "
+ "identified\n");
+- printf ("found USB scanner (UNKNOWN vendor and product) "
++ printf ("found possible USB scanner (UNKNOWN vendor and product) "
+ "at device %s\n", file_name);
+ unknown_found = SANE_TRUE;
+ }
+@@ -676,7 +676,8 @@ check_libusb_device (struct usb_device *
+ {
+ char * chipset = check_usb_chip (dev, verbose, from_file);
+
+- printf ("found USB scanner (vendor=0x%04x", dev->descriptor.idVendor);
++ printf ("found possible USB scanner (vendor=0x%04x",
++ dev->descriptor.idVendor);
+ if (vendor)
+ printf (" [%s]", vendor);
+ printf (", product=0x%04x", dev->descriptor.idProduct);
+@@ -1066,7 +1067,7 @@ check_libusb_device (libusb_device *dev,
+ if(!from_file)
+ chipset = check_usb_chip (verbose, desc, hdl, config0);
+
+- printf ("found USB scanner (vendor=0x%04x", vid);
++ printf ("found possible USB scanner (vendor=0x%04x", vid);
+ if (vendor)
+ printf (" [%s]", vendor);
+ printf (", product=0x%04x", pid);
diff --git a/debian/patches/series b/debian/patches/series
index a1dd4c2..31378d7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -18,3 +18,4 @@
#0170-return_empty_list_when_local_devices_requested.patch
0605-fix_groff-warnings.patch
#0180-gt68xx_fix_use-after-free_two_memleaks.patch
+0185-Change_output_from_sane-find-scanner.patch