Remove not longer needed patches from debian/patches

6 files changed, 5 insertions, 221 deletions

diff --git a/debian/changelog b/debian/changelog
index 49cc640..a30f5f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,10 @@ 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.
+  * Remove not longer needed patches from debian/patches:
+    - 0160-big_endian.patch
+    - 0700-mk_reproducible_results.patch
+    - 0715-20-sane.hwdb_multi-arch.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
diff --git a/debian/control b/debian/control
index b5e3f42..fb8b9f8 100644
--- a/debian/control
+++ b/debian/control
@@ -96,7 +96,7 @@ Depends:
  udev [linux-any],
  ${misc:Depends},
  ${shlibs:Depends}
-Recommends: 
+Recommends:
  sane-utils (>= ${binary:Version}),
  ipp-usb
 Suggests: avahi-daemon, hplip
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/0700-mk_reproducible_results.patch b/debian/patches/0700-mk_reproducible_results.patch
deleted file mode 100644
index ac110f8..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 8426d8a..f7b7531 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,13 +5,10 @@
 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