GNOME.org
 

[gnome-games] Build help with yelp-tools instead of gnome-doc-utils

commit 75594084372bda9ad685285b0d6431f9c46e2c9b
Author: Jeremy Bicha <jbicha ubuntu com>
Date:   Sun Jan 22 15:01:26 2012 -0500

    Build help with yelp-tools instead of gnome-doc-utils
    
    Help will be installed to /usr/share/help instead of
    /usr/share/gnome/help and we'll need to use help: instead of ghelp:
    
    Also fixed a couple translation typos that caused build failures

 Makefile.am                   |    5 +----
 autogen.sh                    |    2 +-
 configure.ac                  |    2 +-
 glchess/help/Makefile.am      |   16 +++++++++-------
 glchess/src/glchess.vala      |    2 +-
 glines/help/Makefile.am       |   15 ++++++---------
 glines/src/glines.c           |    2 +-
 gnect/help/Makefile.am        |   18 ++++++++----------
 gnect/help/fi/fi.po           |    4 ++--
 gnect/src/main.c              |    2 +-
 gnibbles/help/Makefile.am     |   18 ++++++++----------
 gnibbles/src/main.c           |    2 +-
 gnobots2/help/Makefile.am     |   16 +++++++---------
 gnobots2/src/menu.c           |    2 +-
 gnome-sudoku/help/Makefile.am |   14 ++++++--------
 gnome-sudoku/help/el/el.po    |    2 +-
 gnomine/help/Makefile.am      |   18 ++++++++----------
 gnomine/src/gnomine.vala      |    2 +-
 gnotravex/help/Makefile.am    |   30 +++++++++++++-----------------
 gnotravex/src/gnotravex.vala  |    2 +-
 gnotski/help/Makefile.am      |   18 ++++++++----------
 gnotski/src/gnotski.c         |    2 +-
 gtali/help/Makefile.am        |   18 ++++++++----------
 gtali/src/gyahtzee.c          |    2 +-
 iagno/help/Makefile.am        |   18 ++++++++----------
 iagno/src/iagno.vala          |    2 +-
 lightsoff/help/Makefile.am    |   16 +++++++---------
 lightsoff/help/fi/fi.po       |    2 +-
 lightsoff/src/lightsoff.vala  |    2 +-
 mahjongg/help/Makefile.am     |   15 ++++++---------
 mahjongg/src/mahjongg.vala    |    2 +-
 quadrapassel/help/Makefile.am |   16 +++++++---------
 quadrapassel/src/tetris.cpp   |    2 +-
 swell-foop/help/Makefile.am   |   19 ++++++++-----------
 34 files changed, 137 insertions(+), 171 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index ad4e931..8ab1049 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,14 +16,12 @@ EXTRA_DIST = \
 	COPYING-DOCS \
 	MAINTAINERS	\
 	HACKING		 \
-	gnome-doc-utils.make \
 	ChangeLog
 
 DISTCLEANFILES = \
 	intltool-extract \
 	intltool-merge \
-	intltool-update \
-	gnome-doc-utils.make
+	intltool-update
 
 MAINTAINERCLEANFILES = \
 	ChangeLog \
@@ -42,7 +40,6 @@ MAINTAINERCLEANFILES = \
 	$(srcdir)/ltmain.sh \
 	$(srcdir)/missing \
 	$(srcdir)/mkinstalldirs \
-	$(srcdir)/gtk-doc.make \
 	$(srcdir)/po/Makefile.in.in \
 	`find "$(srcdir)" -type f -name Makefile.in -print`
 
diff --git a/autogen.sh b/autogen.sh
index d5963be..6a1ad73 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -21,7 +21,7 @@ which gnome-autogen.sh || {
 }
 
 REQUIRED_AUTOMAKE_VERSION=1.9 
-REQUIRED_GNOME_DOC_UTILS_VERSION=0.10.0 
+REQUIRED_YELP_TOOLS_VERSION=3.1.1
 REQUIRED_GETTEXT_VERSION=0.12
 REQUIRED_INTLTOOL_VERSION=0.40.4
 
diff --git a/configure.ac b/configure.ac
index c56ffe0..757b5b1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -429,7 +429,7 @@ IT_PROG_INTLTOOL([0.35.0])
 # Documentation
 # *************
 
-GNOME_DOC_INIT
+YELP_HELP_INIT
 
 # *************
 # setgid checks
diff --git a/glchess/help/Makefile.am b/glchess/help/Makefile.am
index fabe028..d852638 100644
--- a/glchess/help/Makefile.am
+++ b/glchess/help/Makefile.am
@@ -1,13 +1,15 @@
-include $(top_srcdir)/gnome-doc-utils.make
-dist-hook: doc-dist-hook
+ YELP_HELP_RULES@
+HELP_ID = glchess
 
-DOC_MODULE = glchess
-DOC_ENTITIES = legal.xml
-DOC_INCLUDES =
-DOC_FIGURES = figures/new_game.png \
+HELP_MEDIA = figures/new_game.png \
 	      figures/game.png \
               figures/preferences_game.png \
 	      figures/preferences_view.png
-DOC_LINGUAS = ca cs da de el en_GB es eu fr ja ko oc pt_BR ru sl sr sr latin sv zh_CN
+
+HELP_FILES = \
+	glchess.xml \
+	legal.xml
+
+HELP_LINGUAS = ca cs da de el en_GB es eu fr ja ko oc pt_BR ru sl sr sr latin sv zh_CN
 
 -include $(top_srcdir)/git.mk
diff --git a/glchess/src/glchess.vala b/glchess/src/glchess.vala
index 97dfd35..bb68948 100644
--- a/glchess/src/glchess.vala
+++ b/glchess/src/glchess.vala
@@ -1342,7 +1342,7 @@ public class Application : Gtk.Application
     {
         try
         {
-            Gtk.show_uri (window.get_screen (), "ghelp:glchess", Gtk.get_current_event_time ());
+            Gtk.show_uri (window.get_screen (), "help:glchess", Gtk.get_current_event_time ());
         }
         catch (Error e)
         {
diff --git a/glines/help/Makefile.am b/glines/help/Makefile.am
index cc0bda2..eeda86d 100644
--- a/glines/help/Makefile.am
+++ b/glines/help/Makefile.am
@@ -1,11 +1,7 @@
-include $(top_srcdir)/gnome-doc-utils.make
-dist-hook: doc-dist-hook
+ YELP_HELP_RULES@
+HELP_ID = glines
 
-DOC_ID = glines
-DOC_INCLUDES = \
-	legal.xml
-
-DOC_FIGURES = \
+HELP_MEDIA = \
 	figures/color-balls.png		\
 	figures/color-shapes.png	\
 	figures/diagonal.png		\
@@ -20,7 +16,7 @@ DOC_FIGURES = \
 	figures/small.png		\
 	figures/vertical.png
 
-DOC_PAGES = \
+HELP_FILES = \
 	bug-filing.page			\
 	change-board-size.page		\
 	change-theme.page		\
@@ -29,6 +25,7 @@ DOC_PAGES = \
 	documentation.page		\
 	fast-moves.page			\
 	index.page			\
+	legal.xml			\
 	license.page			\
 	play.page			\
 	rules.page			\
@@ -37,6 +34,6 @@ DOC_PAGES = \
 	strategy.page			\
 	translate.page
 
-DOC_LINGUAS = ca cs de el en_GB es eu fr it oc pl ru sl sr sr latin sv tr zh_CN
+HELP_LINGUAS = ca cs de el en_GB es eu fr it oc pl ru sl sr sr latin sv tr zh_CN
 
 -include $(top_srcdir)/git.mk
diff --git a/glines/src/glines.c b/glines/src/glines.c
index 194d0a5..a5a3f44 100644
--- a/glines/src/glines.c
+++ b/glines/src/glines.c
@@ -1421,7 +1421,7 @@ game_help_callback (GtkAction * action, gpointer data)
 {
   GError *error = NULL;
 
-  gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (app)), "ghelp:glines", gtk_get_current_event_time (), &error);
+  gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (app)), "help:glines", gtk_get_current_event_time (), &error);
   if (error)
     g_warning ("Failed to show help: %s", error->message);
   g_clear_error (&error);
diff --git a/gnect/help/Makefile.am b/gnect/help/Makefile.am
index c30a054..48ab446 100644
--- a/gnect/help/Makefile.am
+++ b/gnect/help/Makefile.am
@@ -1,18 +1,16 @@
-include $(top_srcdir)/gnome-doc-utils.make
+ YELP_HELP_RULES@
+HELP_ID = gnect
 
-DOC_LINGUAS = ca cs da de el en_GB es eu fi fr it oc sl sr sr latin sv zh_CN
-
-DOC_MODULE = gnect
-
-DOC_ENTITIES = \
-	legal.xml
-
-DOC_FIGURES = \
+HELP_MEDIA = \
 	figures/mainwindow.png \
 	figures/tileset.png \
 	figures/connect.png \
 	figures/tables.png 
 
-dist-hook: doc-dist-hook
+HELP_FILES = \
+	gnect.xml \
+	legal.xml
+
+HELP_LINGUAS = ca cs da de el en_GB es eu fi fr it oc sl sr sr latin sv zh_CN
 
 -include $(top_srcdir)/git.mk
diff --git a/gnect/help/fi/fi.po b/gnect/help/fi/fi.po
index 3fa4fe4..a804507 100644
--- a/gnect/help/fi/fi.po
+++ b/gnect/help/fi/fi.po
@@ -230,8 +230,8 @@ msgid ""
 "command line."
 msgstr ""
 "Voit kÃynnistÃà <application>Neljà rivissÃ</application> -pelin valitsemalla "
-"<guimenu>Sovellukset</guimenu>-valikon <guisubmenu>Pelit</guisubmenu>-"
-"alavalikon kohdan <guimenuitem>Neljà rivissÃ</guimenu>, tai komentoriviltà "
+"<guimenuitem>Sovellukset</guimenuitem>-valikon <guisubmenu>Pelit</guisubmenu>-"
+"alavalikon kohdan <guimenu>Neljà rivissÃ</guimenu>, tai komentoriviltà "
 "komennolla <command>gnect</command>."
 
 #: C/gnect.xml:131(para)
diff --git a/gnect/src/main.c b/gnect/src/main.c
index 8a91452..468ad8f 100644
--- a/gnect/src/main.c
+++ b/gnect/src/main.c
@@ -843,7 +843,7 @@ on_help_contents (GtkAction * action, gpointer data)
 {
   GError *error = NULL;
 
-  gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (app)), "ghelp:gnect", gtk_get_current_event_time (), &error);
+  gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (app)), "help:gnect", gtk_get_current_event_time (), &error);
   if (error)
     g_warning ("Failed to show help: %s", error->message);
   g_clear_error (&error);
diff --git a/gnibbles/help/Makefile.am b/gnibbles/help/Makefile.am
index f6896cd..844e460 100644
--- a/gnibbles/help/Makefile.am
+++ b/gnibbles/help/Makefile.am
@@ -1,13 +1,7 @@
-include $(top_srcdir)/gnome-doc-utils.make
+ YELP_HELP_RULES@
+HELP_ID = gnibbles
 
-DOC_LINGUAS = ca cs de el en_GB es eu fr it oc sl sr sr latin sv zh_CN
-
-DOC_MODULE = gnibbles
-
-DOC_ENTITIES = \
-	legal.xml
-
-DOC_FIGURES = \
+HELP_MEDIA = \
 	figures/game.png \
 	figures/intro.png \
 	figures/playing.png \
@@ -15,6 +9,10 @@ DOC_FIGURES = \
 	figures/tables.png \
 	figures/worm_op.png
 
-dist-hook: doc-dist-hook
+HELP_FILES = \
+	gnibbles.xml \
+	legal.xml
+
+HELP_LINGUAS = ca cs de el en_GB es eu fr it oc sl sr sr latin sv zh_CN
 
 -include $(top_srcdir)/git.mk
diff --git a/gnibbles/src/main.c b/gnibbles/src/main.c
index 9a6303f..792c750 100644
--- a/gnibbles/src/main.c
+++ b/gnibbles/src/main.c
@@ -594,7 +594,7 @@ help_cb (GtkAction * action, gpointer data)
 {
   GError *error = NULL;
 
-  gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (window)), "ghelp:gnibbles", gtk_get_current_event_time (), &error);
+  gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (window)), "help:gnibbles", gtk_get_current_event_time (), &error);
   if (error)
     g_warning ("Failed to show help: %s", error->message);
   g_clear_error (&error);
diff --git a/gnobots2/help/Makefile.am b/gnobots2/help/Makefile.am
index 16f0d0d..efaac06 100644
--- a/gnobots2/help/Makefile.am
+++ b/gnobots2/help/Makefile.am
@@ -1,15 +1,13 @@
-include $(top_srcdir)/gnome-doc-utils.make
+ YELP_HELP_RULES@
+HELP_ID = gnobots2
 
-DOC_LINGUAS = ca cs da de el en_GB es eu fr it oc sl sr sr latin sv zh_CN
-
-DOC_MODULE = gnobots2
+HELP_MEDIA = \
+	figures/gnobots2-main.png
 
-DOC_ENTITIES = \
+HELP_FILES = \
+	gnobots2.xml \
 	legal.xml
 
-DOC_FIGURES = \
-	figures/gnobots2-main.png
-
-dist-hook: doc-dist-hook
+HELP_LINGUAS = ca cs da de el en_GB es eu fr it oc sl sr sr latin sv zh_CN
 
 -include $(top_srcdir)/git.mk
diff --git a/gnobots2/src/menu.c b/gnobots2/src/menu.c
index f3ae434..ad50e25 100644
--- a/gnobots2/src/menu.c
+++ b/gnobots2/src/menu.c
@@ -232,7 +232,7 @@ help_cb (GtkAction * action, gpointer data)
 {
   GError *error = NULL;
 
-  gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (app)), "ghelp:gnobots2", gtk_get_current_event_time (), &error);
+  gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (app)), "help:gnobots2", gtk_get_current_event_time (), &error);
   if (error)
     g_warning ("Failed to show help: %s", error->message);
   g_clear_error (&error);
diff --git a/gnome-sudoku/help/Makefile.am b/gnome-sudoku/help/Makefile.am
index 74543c5..0eb898c 100644
--- a/gnome-sudoku/help/Makefile.am
+++ b/gnome-sudoku/help/Makefile.am
@@ -1,10 +1,7 @@
-include $(top_srcdir)/gnome-doc-utils.make
-dist-hook: doc-dist-hook
+ YELP_HELP_RULES@
+HELP_ID = gnome-sudoku
 
-DOC_ID = gnome-sudoku
-DOC_INCLUDES = legal.xml
-
-DOC_FIGURES = \
+HELP_MEDIA = \
 	figures/logo32.png		\
 	figures/logo.png		\
 	figures/possible-numbers.png	\
@@ -14,7 +11,7 @@ DOC_FIGURES = \
 	figures/strategy2.png		\
 	figures/trackers.webm
 
-DOC_PAGES = \
+HELP_FILES = \
 	basics.page			\
 	bug-filing.page			\
 	commandline.page		\
@@ -25,6 +22,7 @@ DOC_PAGES = \
 	index.page			\
 	intro.page			\
 	keyboard-shortcuts.page		\
+	legal.xml			\
 	license.page			\
 	notes.page			\
 	print-blank-puzzles.page	\
@@ -37,6 +35,6 @@ DOC_PAGES = \
 	trackers.page			\
 	translate.page
 
-DOC_LINGUAS = ca cs de el en_GB es eu fr it oc pt_BR ru sl sr sr latin sv da zh_CN
+HELP_LINGUAS = ca cs de en_GB el es eu fr it oc pt_BR ru sl sr sr latin sv da zh_CN
 
 -include $(top_srcdir)/git.mk
diff --git a/gnome-sudoku/help/el/el.po b/gnome-sudoku/help/el/el.po
index 28771af..ccc4e9b 100644
--- a/gnome-sudoku/help/el/el.po
+++ b/gnome-sudoku/help/el/el.po
@@ -126,7 +126,7 @@ msgstr ""
 #: C/trackers.page:54(p)
 msgid "You can create as many trackers as you want by clicking <gui>Add</gui>."
 msgstr ""
-"ÎÏÎÏÎÎÏÎ ÎÎ ÎÎÎÎÎÏÏÎÎÏÎÏÎ ÏÏÎÏÏ ÎÎÏÎÎÏÎÏÎÎÏ ÎÎÎÎÏÎ ÏÎÏÏÎÏÎÏ <gui<ÎÏÎÏÎÎÎÎ</"
+"ÎÏÎÏÎÎÏÎ ÎÎ ÎÎÎÎÎÏÏÎÎÏÎÏÎ ÏÏÎÏÏ ÎÎÏÎÎÏÎÏÎÎÏ ÎÎÎÎÏÎ ÏÎÏÏÎÏÎÏ <gui>ÎÏÎÏÎÎÎÎ</"
 "gui>."
 
 #: C/trackers.page:59(p)
diff --git a/gnomine/help/Makefile.am b/gnomine/help/Makefile.am
index 850711d..32ab243 100644
--- a/gnomine/help/Makefile.am
+++ b/gnomine/help/Makefile.am
@@ -1,13 +1,7 @@
-include $(top_srcdir)/gnome-doc-utils.make
+ YELP_HELP_RULES@
+HELP_ID = gnomine
 
-DOC_LINGUAS = ca cs da de el en_GB es eu fr it oc sl sr sr latin sv zh_CN
-
-DOC_MODULE = gnomine
-
-DOC_ENTITIES = \
-	legal.xml
-
-DOC_FIGURES = \
+HELP_MEDIA = \
 	figures/easy-hints-1.png \
 	figures/easy-hints-2.png \
 	figures/easy-hints-3.png \
@@ -22,6 +16,10 @@ DOC_FIGURES = \
 	figures/preferences.png \
 	figures/statusbar.png
 
-dist-hook: doc-dist-hook
+HELP_FILES = \
+	gnomine.xml \
+	legal.xml
+
+HELP_LINGUAS = ca cs da de el en_GB es eu fr it oc sl sr sr latin sv zh_CN
 
 -include $(top_srcdir)/git.mk
diff --git a/gnomine/src/gnomine.vala b/gnomine/src/gnomine.vala
index 9b8e225..1ce8b96 100644
--- a/gnomine/src/gnomine.vala
+++ b/gnomine/src/gnomine.vala
@@ -694,7 +694,7 @@ public class GnoMine : Gtk.Application
     {
         try
         {
-            Gtk.show_uri (window.get_screen (), "ghelp:gnomine", Gtk.get_current_event_time ());
+            Gtk.show_uri (window.get_screen (), "help:gnomine", Gtk.get_current_event_time ());
         }
         catch (Error e)
         {
diff --git a/gnotravex/help/Makefile.am b/gnotravex/help/Makefile.am
index ca84f21..a73554a 100644
--- a/gnotravex/help/Makefile.am
+++ b/gnotravex/help/Makefile.am
@@ -1,24 +1,20 @@
-include $(top_srcdir)/gnome-doc-utils.make
+ YELP_HELP_RULES@
+HELP_ID = gnotravex
 
-DOC_ID = gnotravex
-
-DOC_FIGURES = \
+HELP_MEDIA = \
 	figures/gnotravex-logo.png \
-	figures/gnotravex-main-window.png \
 	figures/gnotravex-video.ogv
 
-DOC_PAGES = \
-  hint.page \
-  index.page \
-  license.page \
-  move.page \
-  shortcut.page \
-  size.page \
-  usage.page \
-  winning.page
-
-DOC_LINGUAS = ca cs da de el en_GB es eu fr it oc ru sl sr sr latin sv zh_CN
+HELP_FILES = \
+	hint.page \
+	index.page \
+	license.page \
+	move.page \
+	shortcut.page \
+	size.page \
+	usage.page \
+	winning.page
 
-dist-hook: doc-dist-hook
+HELP_LINGUAS = ca cs da de el en_GB es eu fr it oc ru sl sr sr latin sv zh_CN
 
 -include $(top_srcdir)/git.mk
diff --git a/gnotravex/src/gnotravex.vala b/gnotravex/src/gnotravex.vala
index 2f30044..4f4a643 100644
--- a/gnotravex/src/gnotravex.vala
+++ b/gnotravex/src/gnotravex.vala
@@ -202,7 +202,7 @@ public class Gnotravex : Gtk3.Application
     {
         try
         {
-            Gtk.show_uri (window.get_screen (), "ghelp:gnotravex", Gtk.get_current_event_time ());
+            Gtk.show_uri (window.get_screen (), "help:gnotravex", Gtk.get_current_event_time ());
         }
         catch (Error e)
         {
diff --git a/gnotski/help/Makefile.am b/gnotski/help/Makefile.am
index a9b34e2..e7fbb18 100644
--- a/gnotski/help/Makefile.am
+++ b/gnotski/help/Makefile.am
@@ -1,16 +1,14 @@
-include $(top_srcdir)/gnome-doc-utils.make
+ YELP_HELP_RULES@
+HELP_ID = gnotski
 
-DOC_LINGUAS = ca cs da de el en_GB es eu fr it oc sl sr sr latin sv zh_CN
-
-DOC_MODULE = gnotski
-
-DOC_ENTITIES = \
-	legal.xml
-
-DOC_FIGURES = \
+HELP_MEDIA = \
 	figures/gnotski_start_window.png \
 	figures/gnotski_win.png
 
-dist-hook: doc-dist-hook
+HELP_FILES = \
+	gnotski.xml \
+	legal.xml
+
+HELP_LINGUAS = ca cs da de el en_GB es eu fr it oc sl sr sr latin sv zh_CN
 
 -include $(top_srcdir)/git.mk
diff --git a/gnotski/src/gnotski.c b/gnotski/src/gnotski.c
index 5e1af38..dbb4ab6 100644
--- a/gnotski/src/gnotski.c
+++ b/gnotski/src/gnotski.c
@@ -1425,7 +1425,7 @@ help_cb (GtkAction * action)
 {
   GError *error = NULL;
 
-  gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (window)), "ghelp:gnotski", gtk_get_current_event_time (), &error);
+  gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (window)), "help:gnotski", gtk_get_current_event_time (), &error);
   if (error)
     g_warning ("Failed to show help: %s", error->message);
   g_clear_error (&error);
diff --git a/gtali/help/Makefile.am b/gtali/help/Makefile.am
index 1cfb94d..3cee57e 100644
--- a/gtali/help/Makefile.am
+++ b/gtali/help/Makefile.am
@@ -1,16 +1,14 @@
-include $(top_srcdir)/gnome-doc-utils.make
+ YELP_HELP_RULES@
+HELP_ID = gtali
 
-DOC_LINGUAS = ca cs da de el en_GB es eu fr gl it oc pt_BR sl sr sr latin sv zh_CN
-
-DOC_MODULE = gtali
-
-DOC_ENTITIES = \
-	legal.xml
-
-DOC_FIGURES = \
+HELP_MEDIA = \
 	figures/mainwindow.png \
 	figures/preferences.png
 
-dist-hook: doc-dist-hook
+HELP_FILES = \
+	gtali.xml \
+	legal.xml
+
+HELP_LINGUAS = ca cs da de el en_GB es eu fr gl it oc pt_BR sl sr sr latin sv zh_CN
 
 -include $(top_srcdir)/git.mk
diff --git a/gtali/src/gyahtzee.c b/gtali/src/gyahtzee.c
index 6d8f7f3..1c2c59c 100644
--- a/gtali/src/gyahtzee.c
+++ b/gtali/src/gyahtzee.c
@@ -699,7 +699,7 @@ help_cb (GtkAction * action, gpointer data)
 {
   GError *error = NULL;
 
-  gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (window)), "ghelp:gtali", gtk_get_current_event_time (), &error);
+  gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (window)), "help:gtali", gtk_get_current_event_time (), &error);
   if (error)
     g_warning ("Failed to show help: %s", error->message);
   g_clear_error (&error);
diff --git a/iagno/help/Makefile.am b/iagno/help/Makefile.am
index 1f59d16..11fa9ac 100644
--- a/iagno/help/Makefile.am
+++ b/iagno/help/Makefile.am
@@ -1,17 +1,15 @@
-include $(top_srcdir)/gnome-doc-utils.make
+ YELP_HELP_RULES@
+HELP_ID = iagno
 
-DOC_LINGUAS = ca cs de el en_GB es eu fr it oc pt_BR sl sr sr latin sv zh_CN
-
-DOC_MODULE = iagno
-
-DOC_ENTITIES = \
-	legal.xml
-
-DOC_FIGURES = \
+HELP_MEDIA = \
 	figures/BLOCK.png \
 	figures/FIRST.png \
 	figures/START.png
 
-dist-hook: doc-dist-hook
+HELP_FILES = \
+	iagno.xml \
+	legal.xml
+
+HELP_LINGUAS = ca cs de el en_GB es eu fr it oc pt_BR sl sr sr latin sv zh_CN
 
 -include $(top_srcdir)/git.mk
diff --git a/iagno/src/iagno.vala b/iagno/src/iagno.vala
index 04a5c5c..dfc5a84 100644
--- a/iagno/src/iagno.vala
+++ b/iagno/src/iagno.vala
@@ -298,7 +298,7 @@ public class Iagno : Gtk.Application
     {
         try
         {
-            Gtk.show_uri (window.get_screen (), "ghelp:iagno", Gtk.get_current_event_time ());
+            Gtk.show_uri (window.get_screen (), "help:iagno", Gtk.get_current_event_time ());
         }
         catch (Error e)
         {
diff --git a/lightsoff/help/Makefile.am b/lightsoff/help/Makefile.am
index f1ba09a..be29efd 100644
--- a/lightsoff/help/Makefile.am
+++ b/lightsoff/help/Makefile.am
@@ -1,14 +1,12 @@
-include $(top_srcdir)/gnome-doc-utils.make
+ YELP_HELP_RULES@
+HELP_ID = lightsoff
 
-DOC_LINGUAS = de el es fi fr gl ko ro ru sl sv zh_CN
+HELP_MEDIA = 
 
-DOC_MODULE = lightsoff
+HELP_FILES = \
+	legal.xml \
+	lightsoff.xml
 
-DOC_ENTITIES = \
-	legal.xml
-
-DOC_FIGURES =
-
-dist-hook: doc-dist-hook
+HELP_LINGUAS = de el es fi fr gl ko ro ru sl sv zh_CN
 
 -include $(top_srcdir)/git.mk
diff --git a/lightsoff/help/fi/fi.po b/lightsoff/help/fi/fi.po
index 592703b..99dc8c7 100644
--- a/lightsoff/help/fi/fi.po
+++ b/lightsoff/help/fi/fi.po
@@ -112,7 +112,7 @@ msgstr "<application>Valot pois</application> on pulmapeli, jossa tavoitteena on
 #. running game
 #: C/lightsoff.xml:132(para)
 msgid "To run <application>Lights Off</application>, select <menuchoice><guimenu>Applications</guimenu><guisubmenu>Games</guisubmenu><guimenuitem>Lights Off</guimenuitem></menuchoice>, or type <command>lightsoff</command> in the command line."
-msgstr "Voit kÃynnistÃÃ <application>Valot pois<application> -pelin, valitsemalla <menuchoice><guimenu>Sovellukset</guimenu><guisubmenu>Pelit</guisubmenu><guimenuitem>Valot pois</guimenuitem></menuchoice>, tai kirjoittamalla komentoriville <command>lightsoff</command>."
+msgstr "Voit kÃynnistÃÃ <application>Valot pois</application> -pelin, valitsemalla <menuchoice><guimenu>Sovellukset</guimenu><guisubmenu>Pelit</guisubmenu><guimenuitem>Valot pois</guimenuitem></menuchoice>, tai kirjoittamalla komentoriville <command>lightsoff</command>."
 
 #. part of gnome-games
 #: C/lightsoff.xml:135(para)
diff --git a/lightsoff/src/lightsoff.vala b/lightsoff/src/lightsoff.vala
index dee9582..1ce124a 100644
--- a/lightsoff/src/lightsoff.vala
+++ b/lightsoff/src/lightsoff.vala
@@ -99,7 +99,7 @@ public class LightsOff : Gtk.Application
     {
         try
         {
-            Gtk.show_uri (window.get_screen (), "ghelp:lightsoff", Gtk.get_current_event_time ());
+            Gtk.show_uri (window.get_screen (), "help:lightsoff", Gtk.get_current_event_time ());
         }
         catch (Error e)
         {
diff --git a/mahjongg/help/Makefile.am b/mahjongg/help/Makefile.am
index 0f83446..b6b4651 100644
--- a/mahjongg/help/Makefile.am
+++ b/mahjongg/help/Makefile.am
@@ -1,18 +1,14 @@
-include $(top_srcdir)/gnome-doc-utils.make
-dist-hook: doc-dist-hook
+ YELP_HELP_RULES@
+HELP_ID = mahjongg
 
-DOC_ID = mahjongg
-DOC_INCLUDES = legal.xml
-
-
-DOC_FIGURES = \
+HELP_MEDIA = \
 	figures/hints-video.ogv		\
 	figures/logo32.png		\
 	figures/logo.png		\
 	figures/mahjongg-video.ogv	\
 	figures/moves-left.png
 
-DOC_PAGES = \
+HELP_FILES = \
 	bug-filing.page			\
 	choosing.page			\
 	commandline.page		\
@@ -21,6 +17,7 @@ DOC_PAGES = \
 	gameplay.page			\
 	hints.page			\
 	index.page			\
+	legal.xml			\
 	license.page			\
 	map.page			\
 	moves.page			\
@@ -32,6 +29,6 @@ DOC_PAGES = \
 	toolbar.page			\
 	translate.page
 
-DOC_LINGUAS = ca cs da el en_GB es eu fr it oc pl ru sl sr sr latin sv de zh_CN
+HELP_LINGUAS = ca cs da el en_GB es eu fr it oc pl ru sl sr sr latin sv de zh_CN
 
 -include $(top_srcdir)/git.mk
diff --git a/mahjongg/src/mahjongg.vala b/mahjongg/src/mahjongg.vala
index 73b5d16..06c8bd4 100644
--- a/mahjongg/src/mahjongg.vala
+++ b/mahjongg/src/mahjongg.vala
@@ -639,7 +639,7 @@ public class Mahjongg : Gtk.Application
     {
         try
         {
-            Gtk.show_uri (window.get_screen (), "ghelp:mahjongg", Gtk.get_current_event_time ());
+            Gtk.show_uri (window.get_screen (), "help:mahjongg", Gtk.get_current_event_time ());
         }
         catch (Error e)
         {
diff --git a/quadrapassel/help/Makefile.am b/quadrapassel/help/Makefile.am
index 09286a5..044acb1 100644
--- a/quadrapassel/help/Makefile.am
+++ b/quadrapassel/help/Makefile.am
@@ -1,14 +1,12 @@
-include $(top_srcdir)/gnome-doc-utils.make
+ YELP_HELP_RULES@
+HELP_ID = quadrapassel
 
-DOC_LINGUAS = ca cs de el en_GB es eu fi fr it ja oc sl sr sr latin sv zh_CN
+HELP_MEDIA = 
 
-DOC_MODULE = quadrapassel
+HELP_FILES = \
+	legal.xml \
+	quadrapassel.xml
 
-DOC_ENTITIES = \
-	legal.xml
-
-DOC_FIGURES =
-
-dist-hook: doc-dist-hook
+HELP_LINGUAS = ca cs de el en_GB es eu fi fr it ja oc sl sr sr latin sv zh_CN
 
 -include $(top_srcdir)/git.mk
diff --git a/quadrapassel/src/tetris.cpp b/quadrapassel/src/tetris.cpp
index 76fbe3d..570106d 100644
--- a/quadrapassel/src/tetris.cpp
+++ b/quadrapassel/src/tetris.cpp
@@ -1256,7 +1256,7 @@ Tetris::gameHelp(GtkAction *action, void *data)
 	Tetris *t = (Tetris*) data;
 	GError *error = NULL;
 
-	gtk_show_uri (gtk_widget_get_screen (t->getWidget ()), "ghelp:quadrapassel", gtk_get_current_event_time (), &error);
+	gtk_show_uri (gtk_widget_get_screen (t->getWidget ()), "help:quadrapassel", gtk_get_current_event_time (), &error);
 	if (error)
 		g_warning ("Failed to show help: %s", error->message);
 	g_clear_error (&error);
diff --git a/swell-foop/help/Makefile.am b/swell-foop/help/Makefile.am
index 8030040..69188c7 100644
--- a/swell-foop/help/Makefile.am
+++ b/swell-foop/help/Makefile.am
@@ -1,20 +1,17 @@
-include $(top_srcdir)/gnome-doc-utils.make
+ YELP_HELP_RULES@
+HELP_ID = swell-foop
 
-DOC_LINGUAS = ca cs de el en_GB es eu fr it oc ru sl sr sr latin sv zh_CN
-
-DOC_MODULE = swell-foop
-
-DOC_ENTITIES = 
-DOC_INCLUDES = \
-	legal.xml
-
-DOC_FIGURES = \
+HELP_MEDIA = \
 	figures/play1.png \
 	figures/play2.png \
 	figures/play3.png \
 	figures/play4.png \
 	figures/start-up.png
 
-dist-hook: doc-dist-hook
+HELP_FILES = \
+	legal.xml \
+	swell-foop.xml
+
+HELP_LINGUAS = ca cs de el en_GB es eu fr it oc ru sl sr sr latin sv zh_CN
 
 -include $(top_srcdir)/git.mk
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]