Remove now useless lintian override; refresh patches

5 files changed, 11 insertions, 30 deletions

diff --git a/debian/changelog b/debian/changelog
index e30b687..086cd78 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ sane-backends (1.0.29-1~experimental2) UNRELEASED; urgency=medium
     - Remove 4 tests failed tests on i386.
   * New patches/0155-hurd_PATH_MAX.patch:
     - Fix missing PATH_MAX on hurd-i386.
-  New patches/0160-big_endian.patch:
+  * New patches/0160-big_endian.patch:
     - Fix FTBFS on big endian systems.
+  * Remove now useless lintian overrides.
 
  -- Jörg Frings-Fürst <debian@jff.email>  Mon, 30 Mar 2020 21:32:22 +0200
 
diff --git a/debian/libsane-dev.lintian-overrides b/debian/libsane-dev.lintian-overrides
deleted file mode 100644
index db3e644..0000000
--- a/debian/libsane-dev.lintian-overrides
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# see Bug #954146
-#
-libsane-dev: gzip-file-is-not-multi-arch-same-safe usr/share/doc/libsane-dev/NEWS.Debian.gz
-libsane-dev: gzip-file-is-not-multi-arch-same-safe usr/share/doc/libsane-dev/backend-writing.txt.gz
-libsane-dev: gzip-file-is-not-multi-arch-same-safe usr/share/doc/libsane-dev/changelog.Debian.gz
-libsane-dev: gzip-file-is-not-multi-arch-same-safe usr/share/doc/libsane-dev/changelog.gz
diff --git a/debian/libsane1.lintian-overrides b/debian/libsane1.lintian-overrides
deleted file mode 100644
index d054496..0000000
--- a/debian/libsane1.lintian-overrides
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# doc/gt68xx/gt68xx.CHANGES:442:- Added "afe" option for gt68xx.conf for selecting default afe values.
-#
-libsane1: spelling-error-in-binary usr/lib/x86_64-linux-gnu/sane/libsane-artec_eplus48u.so.1.0.28 afe safe
-libsane1: spelling-error-in-binary usr/lib/x86_64-linux-gnu/sane/libsane-canon_dr.so.1.0.28 afe safe
-libsane1: spelling-error-in-binary usr/lib/x86_64-linux-gnu/sane/libsane-gt68xx.so.1.0.28 afe safe
-#
-# see Bug #954146
-#
-libsane1: gzip-file-is-not-multi-arch-same-safe usr/share/doc/libsane1/NEWS.Debian.gz
-libsane1: gzip-file-is-not-multi-arch-same-safe usr/share/doc/libsane1/README.Debian.gz
-libsane1: gzip-file-is-not-multi-arch-same-safe usr/share/doc/libsane1/changelog.Debian.gz
-libsane1: gzip-file-is-not-multi-arch-same-safe usr/share/doc/libsane1/changelog.gz
diff --git a/debian/patches/0040-remove_git.patch b/debian/patches/0040-remove_git.patch
index b45e898..290f43b 100644
--- a/debian/patches/0040-remove_git.patch
+++ b/debian/patches/0040-remove_git.patch
@@ -13,7 +13,7 @@ Index: trunk/configure.ac
  dnl  and remove the git suffix.
  dnl ******************************************************************
 -AC_INIT([sane-backends],m4_esyscmd_s([git describe --dirty]),
-+AC_INIT([sane-backends],[1.0.28-debian],
++AC_INIT([sane-backends],[1.0.29-debian],
          [sane-devel@alioth-lists.debian.net])
  AC_PREREQ([2.69])               dnl minimum autoconf version required
  AC_CONFIG_MACRO_DIR([m4])
diff --git a/debian/patches/0700-mk_reproducible_results.patch b/debian/patches/0700-mk_reproducible_results.patch
index 1b61b49..1b0a7bc 100644
--- a/debian/patches/0700-mk_reproducible_results.patch
+++ b/debian/patches/0700-mk_reproducible_results.patch
@@ -52,7 +52,7 @@ Index: trunk/testsuite/tools/data/html-backends-split.ref
  <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.28-debian
++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
@@ -65,7 +65,7 @@ Index: trunk/testsuite/tools/data/html-mfgs.ref
  <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.28-debian
++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
@@ -75,7 +75,7 @@ Index: 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.28-debian
++# by sane-desc 3.5 from sane-backends 1.0.29-debian
  #
  # udev rules file for supported USB and SCSI devices
  #
@@ -86,7 +86,7 @@ Index: 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.28-debian
++# by sane-desc 3.5 from sane-backends 1.0.29-debian
  #
  # udev rules file for supported USB and SCSI devices
  #
@@ -97,7 +97,7 @@ Index: 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.28-debian
++# by sane-desc 3.5 from sane-backends 1.0.29-debian
  #
  # udev rules file for supported USB and SCSI devices
  #
@@ -126,7 +126,7 @@ Index: 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.28-debian
++# 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
@@ -137,7 +137,7 @@ Index: 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.28-debian
++# by sane-desc 3.5 from sane-backends 1.0.29-debian
  #
  # hwdb file for supported USB devices
  #
@@ -148,7 +148,7 @@ Index: 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.28-debian
++# 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.