[seahorse] Port to new documentation infrastructure

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

commit 04463d1d26fee97313b367c3bebac2a04cf7bdb3
Author: Javier JardÃn <jjardon gnome org>
Date:   Fri Aug 17 01:26:17 2012 +0900

    Port to new documentation infrastructure
    
    Use yelp-tools instead gnome-doc-utils
    
    Fixes https://bugzilla.gnome.org/show_bug.cgi?id=683307

 .gitignore                             |    1 -
 Makefile.am                            |    5 +----
 configure.ac                           |    4 +++-
 help/C/{seahorse.xml => index.docbook} |    6 +++---
 help/C/legal.xml                       |    2 +-
 help/Makefile.am                       |   16 +++++++++-------
 help/seahorse.omf.in                   |   18 ------------------
 libseahorse/seahorse-widget.c          |    4 ++--
 m4/.gitignore                          |    1 -
 9 files changed, 19 insertions(+), 38 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b503fd6..e893065 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,7 +26,6 @@ tmp-*
 /*.tar.gz
 /seahorse-?.?.?
 /junk
-/gnome-doc-utils.make
 /install-sh
 /intltool-*
 /libtool
diff --git a/Makefile.am b/Makefile.am
index e386fb0..4ab6a19 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -48,12 +48,9 @@ EXTRA_DIST = \
     TODO \
     intltool-extract.in \
     intltool-merge.in \
-    intltool-update.in \
-    gnome-doc-utils.make \
-    omf.make
+    intltool-update.in
 
 DISTCLEANFILES = \
-    gnome-doc-utils.make \
     intltool-extract \
     intltool-merge \
     intltool-update
diff --git a/configure.ac b/configure.ac
index 99ea7f3..6a0b7f2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -72,7 +72,9 @@ AC_SUBST(GTK_LIBS)
 PKG_CHECK_MODULES(SEAHORSE, gmodule-2.0 gio-2.0 gthread-2.0 gtk+-3.0 >= $GTK_REQUIRED gcr-3 >= $GCR_REQUIRED)
 SEAHORSE_CFLAGS="$SEAHORSE_CFLAGS -DGCR_API_SUBJECT_TO_CHANGE -DGCK_API_SUBJECT_TO_CHANGE"
 
-GNOME_DOC_INIT
+# User documentation
+YELP_HELP_INIT
+
 GLIB_GSETTINGS
 AM_GLIB_GNU_GETTEXT
 AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
diff --git a/help/C/seahorse.xml b/help/C/index.docbook
similarity index 99%
rename from help/C/seahorse.xml
rename to help/C/index.docbook
index 37a9e22..2a6f3cc 100644
--- a/help/C/seahorse.xml
+++ b/help/C/index.docbook
@@ -124,7 +124,7 @@
 			<title>Feedback</title>
 			<para>To report a bug or make a suggestion regarding the
 				<application>&app;</application> application or this manual, follow the directions in the
-				<ulink url="ghelp:gnome-feedback" type="help">Gnome Feedback Page</ulink>.
+				<ulink url="help:gnome-feedback" type="help">Gnome Feedback Page</ulink>.
 			</para>
 		</legalnotice>
 
@@ -1404,14 +1404,14 @@
     <para>
       To report a bug or make a suggestion regarding this application or
       this manual, follow the directions in the
-      <ulink url="ghelp:user-guide?feedback-bugs" type="help">Feedback section of the GNOME User Guide</ulink>.
+      <ulink url="help:user-guide?feedback-bugs" type="help">Feedback section of the GNOME User Guide</ulink>.
     </para>
     <para>
       This program is distributed under the terms of the GNU
       General Public license as published by the Free Software
       Foundation; either version 2 of the License, or (at your option)
       any later version. A 
-      <ulink url="ghelp:gpl" type="help">copy of this license</ulink>
+      <ulink url="help:gpl" type="help">copy of this license</ulink>
       is included with this documentation; another can be found in the file
       COPYING included with the source code of this program.
     </para>
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 fd61a58..68f6b44 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -1,10 +1,12 @@
-include $(top_srcdir)/gnome-doc-utils.make
-dist-hook: doc-dist-hook
+ YELP_HELP_RULES@
 
-DOC_MODULE = seahorse
-DOC_ENTITIES = legal.xml
-DOC_INCLUDES = 
-DOC_FIGURES = \
+HELP_ID = seahorse
+
+HELP_FILES = \
+	index.docbook \
+	legal.xml
+
+HELP_MEDIA = \
 	figures/seahorse-window.png
 
-DOC_LINGUAS = ca cs de el en_GB es eu fr gl it ja ko oc ru sl sv vi zh_CN
+HELP_LINGUAS = ca cs de el en_GB es eu fr gl it ja ko oc ru sl sv vi zh_CN
diff --git a/libseahorse/seahorse-widget.c b/libseahorse/seahorse-widget.c
index 80951d6..c887004 100644
--- a/libseahorse/seahorse-widget.c
+++ b/libseahorse/seahorse-widget.c
@@ -449,9 +449,9 @@ seahorse_widget_show_help (SeahorseWidget *swidget)
 
     if (g_str_equal (swidget->name, "key-manager") || 
         g_str_equal (swidget->name, "keyserver-results")) {
-        document = g_strdup ("ghelp:" PACKAGE "?introduction");
+        document = g_strdup ("help:" PACKAGE "/introduction");
     } else {
-        document = g_strdup_printf ("ghelp:" PACKAGE "?%s", swidget->name);
+        document = g_strdup_printf ("help:" PACKAGE "/%s", swidget->name);
     }
 
     if (!g_app_info_launch_default_for_uri (document, NULL, &error)) {
diff --git a/m4/.gitignore b/m4/.gitignore
index a87cbba..6ea5819 100644
--- a/m4/.gitignore
+++ b/m4/.gitignore
@@ -1,4 +1,3 @@
-/gnome-doc-utils.m4
 /intltool.m4
 /libtool.m4
 /lt~obsolete.m4