[cheese] Use yelp-tools to build help, not gnome-doc-utils

[David King <davidk src gnome org>]

commit 3d9676d31d39d9d7e119a98bc8e66f44c2f0516a
Author: David King <amigadave amigadave com>
Date:   Sat Dec 10 23:46:28 2011 +0100

    Use yelp-tools to build help, not gnome-doc-utils

 Makefile.am                 |    1 -
 configure.ac                |    4 ++--
 help/Makefile.am            |   13 +++++--------
 src/cheese-preferences.vala |    2 +-
 src/cheese-window.vala      |    2 +-
 5 files changed, 9 insertions(+), 13 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 698e558..0b3eef9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -443,7 +443,6 @@ MAINTAINERCLEANFILES = \
 	build-aux/config.guess \
 	build-aux/config.sub \
 	build-aux/depcomp \
-	build-aux/gnome-doc-utils.make \
 	build-aux/install-sh \
 	build-aux/ltmain.sh \
 	build-aux/missing \
diff --git a/configure.ac b/configure.ac
index 92c8652..a3954e3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -168,8 +168,8 @@ AS_IF([test "x$enable_man" != "xno"],
 
 AM_CONDITIONAL([ENABLE_MAN], [test "x$have_xsltproc" = "xyes"])
 
-# User manual
-GNOME_DOC_INIT([0.20])
+# Mallard help
+YELP_HELP_INIT
 
 GLIB_GSETTINGS
 #*******************************************************************************
diff --git a/help/Makefile.am b/help/Makefile.am
index e884ff4..3d50412 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -1,11 +1,8 @@
-include $(top_srcdir)/build-aux/gnome-doc-utils.make
-dist-hook: doc-dist-hook
+ YELP_HELP_RULES@
 
-DOC_ID = cheese
+HELP_ID = cheese
 
-DOC_INCLUDES = 
-
-DOC_FIGURES = \
+HELP_MEDIA = \
 	figures/cheese.png \
 	figures/cheese-delete.png \
 	figures/cheese-effects.png \
@@ -17,7 +14,7 @@ DOC_FIGURES = \
 	figures/image-properties.png \
 	figures/settings.png
 
-DOC_PAGES = \
+HELP_FILES = \
 	effects-apply.page \
 	index.page \
 	introduction.page \
@@ -33,4 +30,4 @@ DOC_PAGES = \
 	pref-photo-resolution.page \
 	video-record.page
 
-DOC_LINGUAS = ca cs de el en_GB es fi fr gl hu it ko lv nl oc pa pt_BR ru sl sv th zh_CN
+HELP_LINGUAS = ca cs de el en_GB es fi fr gl hu it ko lv nl oc pa pt_BR ru sl sv th zh_CN
diff --git a/src/cheese-preferences.vala b/src/cheese-preferences.vala
index eb3e1b9..09d0b21 100644
--- a/src/cheese-preferences.vala
+++ b/src/cheese-preferences.vala
@@ -311,7 +311,7 @@ public class Cheese.PreferencesDialog : GLib.Object
   {
     try
     {
-      Gtk.show_uri (this.dialog.get_screen (), "ghelp:cheese?index#preferences",
+      Gtk.show_uri (this.dialog.get_screen (), "help:cheese/index#preferences",
         Gdk.CURRENT_TIME);
     }
     catch
diff --git a/src/cheese-window.vala b/src/cheese-window.vala
index 415d945..d262215 100644
--- a/src/cheese-window.vala
+++ b/src/cheese-window.vala
@@ -414,7 +414,7 @@ public class Cheese.MainWindow : Gtk.Window
     Gdk.Screen screen;
     screen = this.get_screen ();
     try {
-      Gtk.show_uri (screen, "ghelp:cheese", Gtk.get_current_event_time ());
+      Gtk.show_uri (screen, "help:cheese", Gtk.get_current_event_time ());
     } catch (Error err)
     {
       warning ("Error: %s\n", err.message);