[dasher] Migrate from gnome-doc-utils to yelp-tools (#169)

[Patrick Welche <pwelche src gnome org>]

commit e6ef4294da061cbc6c3e5f2ec90ed9fec14511c0
Author: Yanko Kaneti <yaneti declera com>
Date:   Sat Feb 1 22:35:32 2020 +0200

    Migrate from gnome-doc-utils to yelp-tools (#169)

 .travis.yml                                     |   2 +-
 Data/Help/Gnome/C/{dasher.xml => index.docbook} |   0
 Data/Help/Gnome/Makefile.am                     |  12 +-
 INSTALL.Linux                                   |   2 +-
 Makefile.am                                     |   2 -
 Src/Gtk2/dasher_main.cpp                        |   2 +-
 configure.ac                                    |  11 +-
 gnome-doc-utils.make                            | 577 ------------------------
 m4/README                                       |   1 -
 m4/gnome-doc-utils.m4                           |  61 ---
 10 files changed, 9 insertions(+), 661 deletions(-)
---
diff --git a/.travis.yml b/.travis.yml
index 72dc80ad..eb29de28 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,7 +16,7 @@ install:
   - sudo apt-get install pkg-config 
   - sudo apt-get install expat
   - sudo apt-get install gnome-common
-  - sudo apt-get install gnome-doc-utils
+  - sudo apt-get install yelp-tools
   - sudo apt-get install libatspi2.0-dev
   - sudo apt-get install libgtk-3-dev
   - sudo apt-get install libspeechd-dev
diff --git a/Data/Help/Gnome/C/dasher.xml b/Data/Help/Gnome/C/index.docbook
similarity index 100%
rename from Data/Help/Gnome/C/dasher.xml
rename to Data/Help/Gnome/C/index.docbook
diff --git a/Data/Help/Gnome/Makefile.am b/Data/Help/Gnome/Makefile.am
index 6ef7839a..526e3421 100644
--- a/Data/Help/Gnome/Makefile.am
+++ b/Data/Help/Gnome/Makefile.am
@@ -1,10 +1,8 @@
-include $(top_srcdir)/gnome-doc-utils.make
-dist-hook: doc-dist-hook
+@YELP_HELP_RULES@
 
-DOC_MODULE = dasher
-DOC_ENTITIES =
-DOC_INCLUDES = 
-DOC_FIGURES = figures/figure2.png \
+HELP_ID = dasher
+HELP_FILES = index.docbook
+HELP_MEDIA =    figures/figure2.png \
                figures/main.png \
                figures/prefs1.png \
                figures/prefs2.png \
@@ -20,5 +18,5 @@ DOC_FIGURES = figures/figure2.png \
                figures/exampleHad3a.png \
                figures/exampleHad4.png
 
-DOC_LINGUAS = ca cs de el en_GB es eu fr oc ro ru sl sv zh_CN
+HELP_LINGUAS = ca cs de el en_GB es eu fr oc ro ru sl sv zh_CN
 
diff --git a/INSTALL.Linux b/INSTALL.Linux
index 73a8100b..16e2813a 100644
--- a/INSTALL.Linux
+++ b/INSTALL.Linux
@@ -17,7 +17,7 @@ based distributions the following can be used.
 
   packages="g++
             gnome-common
-            gnome-doc-utils
+            yelp-tools
             libatspi2.0-dev
             libgtk-3-dev
             libspeechd-dev"
diff --git a/Makefile.am b/Makefile.am
index 776f7b87..1970503d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,9 +14,7 @@ EXTRA_DIST = \
                MAINTAINERS \
                m4/pkg.m4 \
                m4/dgconf-2.m4 \
-               m4/gnome-doc-utils.m4 \
                m4/nls.m4 \
-               gnome-doc-utils.make \
                .tarball-version \
                build-aux/mkversion
 
diff --git a/Src/Gtk2/dasher_main.cpp b/Src/Gtk2/dasher_main.cpp
index 061c0f91..785f3695 100644
--- a/Src/Gtk2/dasher_main.cpp
+++ b/Src/Gtk2/dasher_main.cpp
@@ -996,7 +996,7 @@ dasher_main_command_help(DasherMain *pSelf) {
   GError *err = NULL;
 
   scr = gtk_widget_get_screen(GTK_WIDGET(pPrivate->pMainWindow));
-  if (!gtk_show_uri(scr, "ghelp:dasher", gtk_get_current_event_time(), &err)) {
+  if (!gtk_show_uri(scr, "help:dasher", gtk_get_current_event_time(), &err)) {
     GtkWidget *d;
     d = gtk_message_dialog_new(GTK_WINDOW(pPrivate->pMainWindow),
                                GTK_DIALOG_MODAL,
diff --git a/configure.ac b/configure.ac
index 403b3199..5f7fb14f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -413,19 +413,10 @@ GTKBUILD_LIBS="$X_LIBS $GTK_LIBS $GIO_LIBS $SETTINGS_LIBS $gthread_LIBS $hildon_
 AC_SUBST(GTKBUILD_CFLAGS)
 AC_SUBST(GTKBUILD_LIBS)
 
-AC_MSG_CHECKING([for gnome-doc-utils])
-dnl Avoid default action which is to complain if not found
-GNOME_DOC_INIT([0.9.0],[gdu_cv_have_gdu=yes],[gdu_cv_have_gdu=no])
-AC_MSG_RESULT($gdu_cv_have_gdu)
-
 if test x"$WITHGNOME" = xtrue -a x"$gdu_cv_have_gdu" = xno ; then
-    AC_MSG_ERROR([gnome-doc-utils not found!])
+    YELP_HELP_INIT
 fi
 
-dnl XXX PRLW How is this better than the standard
-dnl gdu_cv_have_gdu && enable_scrollkeeper ?
-AM_CONDITIONAL(ENABLE_SK, test x"$WITHGNOME" = xfalse -a x"$enable_scrollkeeper" = "xyes")
-
 AC_CONFIG_FILES([Data/dasher.desktop.in
                 Data/Makefile
                 Data/training/Makefile
diff --git a/m4/README b/m4/README
index f0f0a737..a346cafb 100644
--- a/m4/README
+++ b/m4/README
@@ -1,4 +1,3 @@
 pkg.m4:                      pkg-config-0.27.1
 dgconf-2.m4:                 modified gconf-2.m4.in from gconf of 2009-04-28 (git HEAD)
-gnome-doc-utils.m4:          gnome-doc-utils-0.20.10
 nls.m4:                      gettext of 2009-04-28 (0.18)