[rhythmbox] help: port to new documentation infrastructure

[Jonathan Matthew <jmatthew src gnome org>]

commit 12207197507a3cbe2ffd52816c4902869f77fa0d
Author: Jeremy Bicha <jbicha ubuntu com>
Date:   Mon Oct 29 08:39:48 2012 -0400

    help: port to new documentation infrastructure
    
    https://live.gnome.org/GnomeGoals/NewDocumentationInfrastructure
    
    https://bugzilla.gnome.org/show_bug.cgi?id=687109

 Makefile.am                             |    2 -
 configure.ac                            |    5 +--
 help/C/Makefile.am                      |   35 ------------------
 help/C/{rhythmbox.xml => index.docbook} |    1 +
 help/C/legal.xml                        |    2 +-
 help/Makefile.am                        |   12 +++----
 help/rhythmbox.omf.in                   |    9 -----
 omf.make                                |   61 -------------------------------
 shell/rb-shell-preferences.c            |    2 +-
 shell/rb-shell.c                        |    2 +-
 10 files changed, 11 insertions(+), 120 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index f3e0e21..7be3970 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,7 +11,6 @@ INCLUDES = rhythmbox.h
 EXTRA_DIST = 			\
 	autogen.sh		\
 	config.h.in		\
-	gnome-doc-utils.make	\
 	rhythmbox.pc.in		\
 	MAINTAINERS		\
 	MAINTAINERS.old		\
@@ -20,7 +19,6 @@ EXTRA_DIST = 			\
 
 DISTCLEANFILES =			\
 	ChangeLog			\
-	gnome-doc-utils.make		\
 	intltool-extract		\
 	intltool-merge			\
 	intltool-update
diff --git a/configure.ac b/configure.ac
index 009c838..e300d3f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -575,9 +575,8 @@ AC_SUBST([NO_STRICT_ALIASING_CFLAGS])
 dnl Enable gtk-doc
 GTK_DOC_CHECK(1.4)
 
-dnl Enable gnome-doc-utils
-GNOME_DOC_INIT
-
+dnl Enable yelp-tools
+YELP_HELP_INIT
 
 dnl ================================================================
 dnl Plugins
diff --git a/help/C/rhythmbox.xml b/help/C/index.docbook
similarity index 99%
rename from help/C/rhythmbox.xml
rename to help/C/index.docbook
index 43637c4..88e5245 100644
--- a/help/C/rhythmbox.xml
+++ b/help/C/index.docbook
@@ -6,6 +6,7 @@
   <!ENTITY manrevision "2.0.3">
   <!ENTITY date "May 2008">
   <!ENTITY app "Rhythmbox Music Player">
+  <!ENTITY mdash   "&#8212;">
 ]>
 <!--
       (Do not remove this comment block.)
diff --git a/help/C/legal.xml b/help/C/legal.xml
index 8acd651..d8b5de6 100644
--- a/help/C/legal.xml
+++ b/help/C/legal.xml
@@ -8,7 +8,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 e897d55..1a7bb82 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -1,10 +1,8 @@
-include $(top_srcdir)/gnome-doc-utils.make
-dist-hook: doc-dist-hook
+ YELP_HELP_RULES@
 
-DOC_MODULE = rhythmbox
-DOC_ENTITIES = fdl-appendix.xml legal.xml
-DOC_INCLUDES = 
-DOC_FIGURES = \
+HELP_ID = rhythmbox
+HELP_FILES = fdl-appendix.xml index.docbook legal.xml
+HELP_MEDIA = \
 	figures/rb-iradio-main.png		\
 	figures/rb-notification-area-menu.png	\
 	figures/rb-notification-window.png	\
@@ -19,4 +17,4 @@ DOC_FIGURES = \
 	figures/rb-window.png			\
 	figures/rb-window-small.png
 
-DOC_LINGUAS = cs da de es el eu fr gl it ja oc pt ro ru sl sv uk zh_CN
+HELP_LINGUAS = cs da de es el eu fr gl it ja oc pt ro ru sl sv uk zh_CN
diff --git a/shell/rb-shell-preferences.c b/shell/rb-shell-preferences.c
index b741cd1..e1d4711 100644
--- a/shell/rb-shell-preferences.c
+++ b/shell/rb-shell-preferences.c
@@ -153,7 +153,7 @@ help_cb (GtkWidget *widget,
 	GError *error = NULL;
 
 	gtk_show_uri (gtk_widget_get_screen (widget),
-		      "ghelp:rhythmbox?prefs",
+		      "help:rhythmbox/prefs",
 		      gtk_get_current_event_time (),
 		      &error);
 
diff --git a/shell/rb-shell.c b/shell/rb-shell.c
index 9a88e28..092a63f 100644
--- a/shell/rb-shell.c
+++ b/shell/rb-shell.c
@@ -2782,7 +2782,7 @@ rb_shell_cmd_contents (GtkAction *action,
 	GError *error = NULL;
 
 	gtk_show_uri (gtk_widget_get_screen (shell->priv->window),
-		      "ghelp:rhythmbox",
+		      "help:rhythmbox",
 		      gtk_get_current_event_time (),
 		      &error);