From: Colin Clark <colin.clark@cclark.uk>
Date: Mon, 30 Dec 2019 11:59:07 +0000 (+0000)
Subject: Fix #736: Please migrate from gnome-doc-tool to yelp-build
X-Git-Tag: v1.6~105
X-Git-Url: http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=commitdiff_plain;h=c9ea0d5b58270f360530ccf70d0a90758fe47490

Fix #736: Please migrate from gnome-doc-tool to yelp-build

https://github.com/BestImageViewer/geeqie/issues/736
---

diff --git a/autogen.sh b/autogen.sh
index 9a326050..3e247c45 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -58,6 +58,13 @@ test -n "$NO_AUTOMAKE" || (aclocal --version) < /dev/null > /dev/null 2>&1 || {
   DIE=1
 }
 
+GNOMEDOC=`which yelp-build`
+if test -z $GNOMEDOC; then
+  echo "*** The tools to build the documentation are not found,"
+  echo "    please intall the yelp-tool package ***"
+  DIE=1
+fi
+
 if test "$DIE" -eq 1; then
   exit 1
 fi
diff --git a/configure.ac b/configure.ac
index 29f54ae7..2ba122f1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -242,7 +242,7 @@ AC_ARG_WITH(htmldir, [  --with-htmldir=DIR      install path for html files],
 AC_DEFINE_UNQUOTED(GQ_HELPDIR, "$readmedir", [Location of documentation files])
 AC_DEFINE_UNQUOTED(GQ_HTMLDIR, "$htmldir", [Location of html documentation])
 
-AC_PATH_PROG(GNOME_DOC_TOOL, gnome-doc-tool)
+AC_PATH_PROG(GNOME_DOC_TOOL, yelp-build)
 
 AC_SUBST(readmedir)
 AC_SUBST(htmldir)
diff --git a/web/geeqie-install-debian.sh b/web/geeqie-install-debian.sh
index 29267926..6fff72e4 100755
--- a/web/geeqie-install-debian.sh
+++ b/web/geeqie-install-debian.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-version="2019-08-13"
+version="2019-12-30"
 description=$'
 Geeqie is an image viewer.
 This script will download, compile, and install Geeqie on Debian-based systems.
@@ -24,6 +24,7 @@ essential_array=(
 "libglib2.0-0"
 "intltool"
 "libtool"
+"yelp-tools"
 )
 
 # Optional for both GTK2 and GTK3