Merge branch 'release/debian/1.0.14-17'debian/1.0.14-17

5 files changed, 19 insertions, 11 deletions

diff --git a/debian/changelog b/debian/changelog
index ffc2877..4895669 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+sane-frontends (1.0.14-17) unstable; urgency=medium
+
+  * debian/patches/0001-fix_missing_sane-config.patch:
+    - Fix FTBFS (Closes: #1031453).
+      Thanks to Lucas Nussbaum <lucas@debian.org>
+  * Declare compliance with Debian Policy 4.6.2.0 (No changes needed).
+  * debian/copyright:
+    - Add year 2023 to myself.
+  * debian/tests/control:
+    - Remove superficial test.
+
+ -- Jörg Frings-Fürst <debian@jff.email>  Fri, 17 Feb 2023 16:55:10 +0100
+
 sane-frontends (1.0.14-16) unstable; urgency=medium
 
   * debian/watch: Fix to new gitlab download structure.
diff --git a/debian/control b/debian/control
index 37890fb..5359c13 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: sane-frontends
 Section: graphics
 Priority: optional
 Maintainer: Jörg Frings-Fürst <debian@jff.email>
-Standards-Version: 4.5.0
+Standards-Version: 4.6.2.0
 Rules-Requires-Root: no
 Build-Depends:
  debhelper-compat (= 13),
diff --git a/debian/copyright b/debian/copyright
index ed38bb2..16becba 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -15,7 +15,7 @@ License: GPL-2+ with sane exception
 Files: debian/*
 Copyright: 1997-2002 Kevin Dalley <kevind@rahul.net>
            2002-2009 Julien BLACHE <jblache@debian.org>
-           2014-2019 Jörg Frings-Fürst <debian@jff.email>
+           2014-2023 Jörg Frings-Fürst <debian@jff.email>
 License: GPL-2+ with sane exception
 
 Files: include/*.h
diff --git a/debian/patches/0001-fix_missing_sane-config.patch b/debian/patches/0001-fix_missing_sane-config.patch
index 8804be0..2240cba 100644
--- a/debian/patches/0001-fix_missing_sane-config.patch
+++ b/debian/patches/0001-fix_missing_sane-config.patch
@@ -2,20 +2,19 @@ Description: Fix FTBFS against libsane-dev >= 1.0.25-3
  Fix missing sane-config
 Author: Andreas Metzler <ametzler@bebt.de>
 Reviewed-by: Jörg Frings-Fürst <debian@jff-webhosting.net>
-Last-Update: 2017-01-28 
+Last-Update: 2023-02-17 
 Index: trunk/configure.in
 ===================================================================
 --- trunk.orig/configure.in
 +++ trunk/configure.in
-@@ -112,7 +112,10 @@ fi
+@@ -112,7 +112,9 @@ fi
  
  AC_CHECK_TOOL(RANLIB, ranlib, :)
  
 -AM_PATH_SANE(1.0.0, HAVE_SANE=yes, )
-+PKG_CHECK_MODULES([SANE], [sane-backends >= 1.0.0])
++PKG_CHECK_MODULES([SANE], [sane-backends >= 1.0.0], [HAVE_SANE=yes])
 +PKG_CHECK_VAR([SANE_PREFIX], [sane-backends >= 1.0.0], [prefix])
-+PKG_CHECK_VAR([SANE_LDFLAGS], [sane-backends >= 1.0.0], [ldflags],
-+      [HAVE_SANE=yes])
++PKG_CHECK_VAR([SANE_LDFLAGS], [sane-backends >= 1.0.0], [ldflags])
  dnl Print error message if sane is missing
  if test "x${HAVE_SANE}" = "x"; then
    echo "**********************************************************************"
diff --git a/debian/tests/control b/debian/tests/control
deleted file mode 100644
index 3eab6ff..0000000
--- a/debian/tests/control
+++ /dev/null
@@ -1,4 +0,0 @@
-# smoke test
-Test-Command: scanadf -V && xcam -V
-Depends: sane
-Restrictions: superficial