Merge branch 'release/debian/1.2.1-1'debian/1.2.1-1

1 files changed, 0 insertions, 51 deletions

diff --git a/debian/patches/0185-Change_output_from_sane-find-scanner.patch b/debian/patches/0185-Change_output_from_sane-find-scanner.patch
deleted file mode 100644
index ee4bc1a..0000000
--- a/debian/patches/0185-Change_output_from_sane-find-scanner.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-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);