[gnome-dictionary] Use yelp-tools insted of gnome-doc-utils

[Javier JardÃn <jjardon src gnome org>]

commit 4f27e243eb1ac92c5ad93220031d508ba18ca0b9
Author: Oliver Propst <oliver propst gmail com>
Date:   Thu Aug 16 13:37:26 2012 +0200

    Use yelp-tools insted of gnome-doc-utils
    
    Signed-off-by: Javier JardÃn <jjardon gnome org>

 .gitignore                                     |    1 -
 autogen.sh                                     |    2 +-
 configure.ac                                   |    2 +-
 help/C/{gnome-dictionary.xml => index.docbook} |    2 +-
 help/C/legal.xml                               |    2 +-
 help/Makefile.am                               |   25 ++++++++++++++++++-----
 help/gnome-dictionary.omf.in                   |    9 --------
 src/gdict-app.c                                |    2 +-
 src/gdict-pref-dialog.c                        |    2 +-
 src/gdict-source-dialog.c                      |    2 +-
 10 files changed, 26 insertions(+), 23 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 87572bd..e2d386b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -56,7 +56,6 @@ docs/reference/gdict/tmpl.stamp
 docs/reference/gdict/tmpl/
 docs/reference/gdict/version.xml
 docs/reference/gdict/xml/
-gnome-doc-utils.make
 gtk-doc.make
 install-sh
 libgdict/.deps/
diff --git a/autogen.sh b/autogen.sh
index b790341..61a9200 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -18,4 +18,4 @@ which gnome-autogen.sh || {
     exit 1
 }
 
-USE_GNOME2_MACROS=1 USE_COMMON_DOC_BUILD=yes . gnome-autogen.sh
+USE_GNOME2_MACROS=1 . gnome-autogen.sh
diff --git a/configure.ac b/configure.ac
index 8c70ff7..f7b9d5b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -151,7 +151,7 @@ GLIB_GSETTINGS
 
 GTK_DOC_CHECK([1.15], [--flavour no-tmpl])
 
-GNOME_DOC_INIT
+YELP_HELP_INIT
 
 GLIB_MIN_VERSION=2.28.0
 GTK_MIN_VERSION=3.0.0
diff --git a/help/C/gnome-dictionary.xml b/help/C/index.docbook
similarity index 99%
rename from help/C/gnome-dictionary.xml
rename to help/C/index.docbook
index 0dec71b..c7d57ad 100644
--- a/help/C/gnome-dictionary.xml
+++ b/help/C/index.docbook
@@ -90,7 +90,7 @@
       <title>Feedback</title> 
       <para>To report a bug or make a suggestion regarding the &app;
       application or this manual, follow the directions in the
-      <ulink url="ghelp:gnome-feedback" type="help">GNOME Feedback
+      <ulink url="help:gnome-feedback" type="help">GNOME Feedback
       Page</ulink>.</para>
       
 <!-- Translators may also add here feedback address for translations -->
diff --git a/help/C/legal.xml b/help/C/legal.xml
index ac97e1d..899282c 100644
--- a/help/C/legal.xml
+++ b/help/C/legal.xml
@@ -6,7 +6,7 @@
 	  by the Free Software Foundation with no Invariant Sections,
 	  no Front-Cover Texts, and no Back-Cover Texts.  You can find
 	  a copy of the GFDL at this <ulink type="help"
-	  url="ghelp:fdl">link</ulink> or in the file COPYING-DOCS
+	  url="help:fdl">link</ulink> or in the file COPYING-DOCS
 	  distributed with this manual.
          </para>
          <para> This manual is part of a collection of GNOME manuals
diff --git a/help/Makefile.am b/help/Makefile.am
index 1724783..299feeb 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -1,8 +1,21 @@
-include $(top_srcdir)/gnome-doc-utils.make
-dist-hook: doc-dist-hook
+ YELP_HELP_RULES@
+
+HELP_ID = gnome-dictionary
+
+HELP_FILES = \
+	   index.docbook \
+	   legal.xml
+				
+HELP_MEDIA = \
+	figures/gnome-dictionary-add-source.png	\	
+	figures/gnome-dictionary-applet-window.png \	
+	figures/gnome-dictionary-applet.png \	
+	figures/gnome-dictionary-application.png \	
+	figures/gnome-dictionary-find.png \	
+	figures/gnome-dictionary-lookup.png \
+	figures/gnome-dictionary-preferences-print.png \	
+	figures/gnome-dictionary-preferences-source.png	
+
+HELP_LINGUAS = ca cs da de el en_GB es eu fi fr gl id it oc ru sl sv uk zh_CN
 
-DOC_MODULE = gnome-dictionary
-DOC_ENTITIES = legal.xml
-DOC_INCLUDES = 
 
-DOC_LINGUAS = ca cs da de el en_GB es eu fi fr gl id it oc ru sl sv uk zh_CN
diff --git a/src/gdict-app.c b/src/gdict-app.c
index a3455b5..dd2f7ce 100644
--- a/src/gdict-app.c
+++ b/src/gdict-app.c
@@ -122,7 +122,7 @@ gdict_app_cmd_help (GSimpleAction *action,
 
   window = GDICT_WINDOW (gtk_application_get_windows (app)->data);
   gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (window)),
-                "ghelp:gnome-dictionary",
+                "help:gnome-dictionary",
                 gtk_get_current_event_time (), &err);
   if (err)
     {
diff --git a/src/gdict-pref-dialog.c b/src/gdict-pref-dialog.c
index d2758c5..a41bc2b 100644
--- a/src/gdict-pref-dialog.c
+++ b/src/gdict-pref-dialog.c
@@ -486,7 +486,7 @@ response_cb (GtkDialog *dialog,
     {
     case GTK_RESPONSE_HELP:
       gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (dialog)),
-                    "ghelp:gnome-dictionary#gnome-dictionary-preferences",
+                    "help:gnome-dictionary/gnome-dictionary-preferences",
                     gtk_get_current_event_time (), &err);
       if (err)
 	{
diff --git a/src/gdict-source-dialog.c b/src/gdict-source-dialog.c
index 7bc7152..1e262d5 100644
--- a/src/gdict-source-dialog.c
+++ b/src/gdict-source-dialog.c
@@ -469,7 +469,7 @@ gdict_source_dialog_response_cb (GtkDialog *dialog,
       break;
     case GTK_RESPONSE_HELP:
       gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (dialog)),
-                    "ghelp:gnome-dictionary#gnome-dictionary-add-source",
+                    "help:gnome-dictionary/gnome-dictionary-add-source",
                     gtk_get_current_event_time (), &err);
       if (err)
         {