[gucharmap] Port to new documentation infrastructure

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

commit 3e1526c0568f0b395fce68f9d9e09431dfcaef35
Author: Javier JardÃn <jjardon gnome org>
Date:   Fri Aug 17 02:02:53 2012 +0900

    Port to new documentation infrastructure
    
    Use yelp-tools instead gnome-doc-tools

 Makefile.am                             |    4 -
 autogen.sh                              |    1 -
 configure.ac                            |    4 +-
 gucharmap/gucharmap-window.c            |    2 +-
 help/C/{gucharmap.xml => index.docbook} |    2 +-
 help/C/legal.xml                        |    2 +-
 help/Makefile.am                        |   13 ++--
 help/gucharmap.omf.in                   |   11 ----
 help/xmldocs.make                       |   96 -------------------------------
 9 files changed, 13 insertions(+), 122 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 745e152..d9891ee 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,7 +27,6 @@ EXTRA_DIST = \
 	ChangeLog.README \
 	autogen.sh \
 	gtkrc.win32 \
-	gnome-doc-utils.make \
 	COPYING.UNICODE \
 	$(NULL)
 
@@ -57,10 +56,7 @@ MAINTAINERCLEANFILES = \
 	$(srcdir)/ltmain.sh \
 	$(srcdir)/missing \
 	$(srcdir)/mkinstalldirs \
-	$(srcdir)/omf.make \
-	$(srcdir)/xmldocs.make \
 	$(srcdir)/gtk-doc.make \
-	$(srcdir)/gnome-doc-utils.make \
 	`find "$(srcdir)" -type f -name Makefile.in -print`
 
 ChangeLog:
diff --git a/autogen.sh b/autogen.sh
index e8bf3fd..e494548 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -20,5 +20,4 @@ which gnome-autogen.sh || {
 
 REQUIRED_INTLTOOL_VERSION=0.40.4
 REQUIRED_AUTOMAKE_VERSION=1.9
-REQUIRED_GNOME_DOC_UTILS_VERSION=0.9.0
 . gnome-autogen.sh
diff --git a/configure.ac b/configure.ac
index 96c3580..b6ac22a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -55,9 +55,11 @@ IT_PROG_INTLTOOL([0.40.0])
 AM_PROG_CC_C_O
 
 # checks for stuff
-GNOME_COMMON_INIT
 GNOME_DEBUG_CHECK
 
+# User documentation
+YELP_HELP_INIT
+
 GLIB_REQUIRED=2.32.0
 GIO_REQUIRED=2.32.0
 
diff --git a/gucharmap/gucharmap-window.c b/gucharmap/gucharmap-window.c
index 5800958..55ff889 100644
--- a/gucharmap/gucharmap-window.c
+++ b/gucharmap/gucharmap-window.c
@@ -419,7 +419,7 @@ help_contents (GSimpleAction *action,
   if (!uri)
     return;
 
-  url = g_strconcat ("ghelp://", uri, NULL);
+  url = g_strconcat ("help:", uri, NULL);
   open_url (GTK_WINDOW (window), url, gtk_get_current_event_time ());
   g_free (uri);
   g_free (url);
diff --git a/help/C/gucharmap.xml b/help/C/index.docbook
similarity index 99%
rename from help/C/gucharmap.xml
rename to help/C/index.docbook
index bdc0bc2..5e806f0 100644
--- a/help/C/gucharmap.xml
+++ b/help/C/index.docbook
@@ -125,7 +125,7 @@
 
     <legalnotice> 
       <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>. 
+      <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="help:gnome-feedback" type="help">GNOME Feedback Page</ulink>. 
       </para>
 <!-- Translators may also add here feedback address for translations -->
     </legalnotice> 
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 9d39f24..54342fc 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -1,10 +1,11 @@
-include $(top_srcdir)/gnome-doc-utils.make
-dist-hook: doc-dist-hook
+ YELP_HELP_RULES@
 
-DOC_MODULE = gucharmap
-DOC_ENTITIES = legal.xml
-DOC_INCLUDES = 
+HELP_ID = gucharmap
 
-DOC_LINGUAS = bg ca cs de el en_GB es fi fr gl ko oc pt_BR ru sl sv vi zh_CN
+HELP_FILES = \
+	index.docbook \
+	legal.xml
+
+HELP_LINGUAS = bg ca cs de el en_GB es fi fr gl ko oc pt_BR ru sl sv vi zh_CN
 
 -include $(top_srcdir)/git.mk