summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff.email>2023-02-17 15:53:35 +0100
committerJörg Frings-Fürst <debian@jff.email>2023-02-17 15:53:35 +0100
commitfe397f4137fcb7d427641836984ca6bbbd45b4c9 (patch)
tree2feadeb58cc653f4eb42fab5f4d90b706a789e76
parent95d323d21ebece74f6741bbd50cdf11003bb83ec (diff)
d/p/0001-fix_missing_sane-config.patch: Fix FTBFS
-rw-r--r--debian/changelog8
-rw-r--r--debian/patches/0001-fix_missing_sane-config.patch7
2 files changed, 11 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog
index ffc2877..12b045c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+sane-frontends (1.0.14-17) UNRELEASED; urgency=medium
+
+ * debian/patches/0001-fix_missing_sane-config.patch:
+ - Fix FTBFS (Closes: #1031453).
+ Thanks to Lucas Nussbaum <lucas@debian.org>
+
+ -- Jörg Frings-Fürst <debian@jff.email> Fri, 17 Feb 2023 15:40:19 +0100
+
sane-frontends (1.0.14-16) unstable; urgency=medium
* debian/watch: Fix to new gitlab download structure.
diff --git a/debian/patches/0001-fix_missing_sane-config.patch b/debian/patches/0001-fix_missing_sane-config.patch
index 8804be0..5ad31e5 100644
--- a/debian/patches/0001-fix_missing_sane-config.patch
+++ b/debian/patches/0001-fix_missing_sane-config.patch
@@ -7,15 +7,14 @@ 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 "**********************************************************************"