[eog] Port to new documentation infrastructure

[Felix Riemann <friemann src gnome org>]

commit a0ee3f7cf078b95f0220a3c74ee14a5d895b9b57
Author: Javier JardÃn <jjardon gnome org>
Date:   Fri Aug 17 02:18:09 2012 +0900

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

 Makefile.am      |   15 ++++-----------
 autogen.sh       |    2 +-
 configure.ac     |    8 ++++----
 help/Makefile.am |   13 ++++++-------
 src/eog-util.c   |    4 ++--
 5 files changed, 17 insertions(+), 25 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 97a09d0..36c8e66 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,19 +9,14 @@ EXTRA_DIST = 			\
 	MAINTAINERS		\
 	ChangeLog-2.6		\
 	ChangeLog-2.18		\
-	ChangeLog.pre-git	\
-	gnome-doc-utils.make
+	ChangeLog.pre-git
 
 DISTCLEANFILES =                \
         intltool-extract        \
         intltool-merge          \
-        intltool-update         \
-	gnome-doc-utils.make
+        intltool-update
 
-DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper --enable-gtk-doc
-
-# Ignore scrollkeeper issues for now.  @#*$& scrollkeeper
-distuninstallcheck_listfiles = find . -type f -print | grep -v scrollkeeper | grep -v /share/gnome/help/ | grep -v \.omf
+DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
 
 MAINTAINERCLEANFILES = \
 	$(srcdir)/aclocal.m4 \
@@ -33,9 +28,7 @@ MAINTAINERCLEANFILES = \
 	$(srcdir)/install-sh \
 	$(srcdir)/ltmain.sh \
 	$(srcdir)/missing \
-	$(srcdir)/mkinstalldirs \
-	$(srcdir)/omf.make \
-	$(srcdir)/xmldocs.make
+	$(srcdir)/mkinstalldirs
 
 -include $(top_srcdir)/git.mk
 
diff --git a/autogen.sh b/autogen.sh
index f064623..7e2d5b8 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -27,4 +27,4 @@ REQUIRED_AUTOMAKE_VERSION=1.11
 REQUIRED_INTLTOOL_VERSION=0.40.0
 REQUIRED_PKG_CONFIG_VERSION=0.16.0
 REQUIRED_GTK_DOC_VERSION=1.9
-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 01d25a4..1a139e1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -40,6 +40,8 @@ AM_PROG_CC_C_O
 AC_PATH_PROG([GLIB_GENMARSHAL], [glib-genmarshal])
 AC_PATH_PROG([GLIB_MKENUMS],[glib-mkenums])
 
+PKG_PROG_PKG_CONFIG
+
 GTK_DOC_CHECK(1.9)
 
 AC_CHECK_FUNCS(strptime)
@@ -73,11 +75,9 @@ AC_SUBST(CFLAGS)
 AC_SUBST(LDFLAGS)
 
 # ***************
-# gnome-doc-utils
+# User documentation
 # ***************
-
-PKG_PROG_PKG_CONFIG
-GNOME_DOC_INIT
+YELP_HELP_INIT
 
 # **********
 # GNOME Libs
diff --git a/help/Makefile.am b/help/Makefile.am
index e50e014..05697f0 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_ID = eog
-DOC_INCLUDES = legal.xml
+HELP_ID = eog
 
-DOC_FIGURES = \
+HELP_MEDIA = \
 	figures/eog-logo.png			\
 	figures/eog-toolbar-editor.png		\
 	figures/eog-trail.png			\
@@ -19,7 +17,7 @@ DOC_FIGURES = \
 	figures/prefs-plugins.png		\
 	figures/slideshow-prefs.png
 
-DOC_PAGES = \
+HELP_FILES = \
 	bug-filing.page				\
 	commandline.page			\
 	copy-paste.page				\
@@ -34,6 +32,7 @@ DOC_PAGES = \
 	formats-view.page			\
 	index.page				\
 	introduction.page			\
+	legal.xml				\
 	license.page				\
 	open.page				\
 	plugin-exif-digital.page		\
@@ -56,6 +55,6 @@ DOC_PAGES = \
 	view.page				\
 	zoom.page
 
-DOC_LINGUAS = ar ca cs da de el en_GB es eu fi fr gl hu it ja ko lv oc pa pl pt_BR ru sl sv te th uk zh_CN zh_TW
+HELP_LINGUAS = ar ca cs da de el en_GB es eu fi fr gl hu it ja ko lv oc pa pl pt_BR ru sl sv te th uk zh_CN zh_TW
 
 -include $(top_srcdir)/git.mk
diff --git a/src/eog-util.c b/src/eog-util.c
index 3dabd64..0460aa1 100644
--- a/src/eog-util.c
+++ b/src/eog-util.c
@@ -51,9 +51,9 @@ eog_util_show_help (const gchar *section, GtkWindow *parent)
 	gchar *uri = NULL;
 
 	if (section)
-		uri = g_strdup_printf ("ghelp:eog?%s", section);
+		uri = g_strdup_printf ("help:eog/%s", section);
 
-	gtk_show_uri (NULL, ((uri != NULL) ? uri : "ghelp:eog"),
+	gtk_show_uri (NULL, ((uri != NULL) ? uri : "help:eog"),
 		      gtk_get_current_event_time (), &error);
 
 	g_free (uri);