GNOME.org
 

[gnome-video-arcade] Bug 704632 - Switch from gnome-doc-utils to yelp-tools

commit 1e11ddfe0cb21a9b7c206b05544a5d7eea2f280b
Author: Jeremy Bicha <jbicha ubuntu com>
Date:   Fri Aug 2 23:58:35 2013 +0200

    Bug 704632 - Switch from gnome-doc-utils to yelp-tools

 Makefile.am                                      |    5 -----
 configure.ac                                     |    2 +-
 docs/reference/tmpl/gva-main.sgml                |    2 +-
 help/C/{gnome-video-arcade.xml => index.docbook} |    0
 help/C/legal.xml                                 |    2 +-
 help/Makefile.am                                 |   15 +++++++--------
 help/cs/cs.po                                    |    4 ++--
 help/da/da.po                                    |    4 ++--
 help/de/de.po                                    |    4 ++--
 help/es/es.po                                    |    4 ++--
 help/gnome-video-arcade.omf.in                   |    9 ---------
 help/it/it.po                                    |    4 ++--
 help/sl/sl.po                                    |    2 +-
 help/sv/sv.po                                    |    4 ++--
 src/gva-util.c                                   |    4 ++--
 15 files changed, 25 insertions(+), 40 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 8f139d8..7d40bb9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,7 +8,6 @@ endif
 
 EXTRA_DIST = \
        config.rpath                    \
-       gnome-doc-utils.make            \
        intltool-extract.in             \
        intltool-merge.in               \
        intltool-update.in              \
@@ -29,11 +28,7 @@ MAINTAINERCLEANFILES = \
        $(srcdir)/ltmain.sh             \
        $(srcdir)/missing               \
        $(srcdir)/mkinstalldirs         \
-       $(srcdir)/omf.make              \
-       $(srcdir)/xmldocs.make          \
        $(srcdir)/gtk-doc.make          \
-       $(srcdir)/gnome-doc-utils.make  \
-       $(srcdir)/m4/gnome-doc-utils.m4 \
        $(srcdir)/m4/gtk-doc.m4         \
        $(srcdir)/m4/intltool.m4        \
        $(srcdir)/m4/libtool.m4         \
diff --git a/configure.ac b/configure.ac
index 7ed552b..684596b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -149,7 +149,7 @@ AM_GLIB_GNU_GETTEXT
 # Miscellaneous
 GLIB_GSETTINGS
 GTK_DOC_CHECK(1.6)
-GNOME_DOC_INIT
+YELP_HELP_INIT
 
 # Optional Features
 
diff --git a/docs/reference/tmpl/gva-main.sgml b/docs/reference/tmpl/gva-main.sgml
index f40388d..ddc4b42 100644
--- a/docs/reference/tmpl/gva-main.sgml
+++ b/docs/reference/tmpl/gva-main.sgml
@@ -121,7 +121,7 @@
 
 @context_id: 
 @format: 
- Varargs: 
+    : 
 @Returns: 
 
 
diff --git a/help/C/gnome-video-arcade.xml b/help/C/index.docbook
similarity index 100%
rename from help/C/gnome-video-arcade.xml
rename to help/C/index.docbook
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 2a84c16..98501a8 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -1,13 +1,12 @@
-### Process this file with automake to produce Makefile.in
+ YELP_HELP_RULES@
 
-include $(top_srcdir)/gnome-doc-utils.make
-dist-hook: doc-dist-hook
+HELP_ID = gnome-video-arcade
 
-DOC_MODULE = gnome-video-arcade
-DOC_ENTITIES = legal.xml
-DOC_INCLUDES =
+HELP_FILES = \
+       index.docbook \
+       legal.xml
 
-DOC_FIGURES = \
+HELP_MEDIA = \
        figures/gva_building_database.png       \
        figures/gva_column_preferences.png      \
        figures/gva_general_preferences.png     \
@@ -15,6 +14,6 @@ DOC_FIGURES = \
        figures/gva_recorded_games.png          \
        figures/gva_search_window.png
 
-DOC_LINGUAS = cs da de es it sl sv
+HELP_LINGUAS = cs da de es it sl sv
 
 -include $(top_srcdir)/git.mk
diff --git a/help/cs/cs.po b/help/cs/cs.po
index 8183e5e..1a3328e 100644
--- a/help/cs/cs.po
+++ b/help/cs/cs.po
@@ -103,14 +103,14 @@ msgid ""
 "the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any "
 "later version published 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 "
+"of the GFDL at this <ulink type=\"help\" url=\"help:fdl\">link</ulink> or "
 "in the file COPYING-DOCS distributed with this manual."
 msgstr ""
 "Je povoleno kopírovat, šířit a/nebo upravovat tento dokument za podmínek GNU "
 "Free Documentation License, verze 1.1 nebo jakékoli další verze vydané "
 "nadací Free Software Foundation; bez neměnných oddílů, bez textů předních "
 "desek a bez textů zadních desek. Kopie této licence je zahrnuta v oddílu "
-"jménem <ulink type=\"help\" url=\"ghelp:fdl\">GNU Free Documentation "
+"jménem <ulink type=\"help\" url=\"help:fdl\">GNU Free Documentation "
 "License</ulink> nebo v souboru COPYING-DOCS dodávaném s touto příručkou."
 
 #: C/gnome-video-arcade.xml:12(para)
diff --git a/help/da/da.po b/help/da/da.po
index 618ff05..cbc4e86 100644
--- a/help/da/da.po
+++ b/help/da/da.po
@@ -22,14 +22,14 @@ msgid ""
 "the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any "
 "later version published 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 "
+"of the GFDL at this <ulink type=\"help\" url=\"help:fdl\">link</ulink> or "
 "in the file COPYING-DOCS distributed with this manual."
 msgstr ""
 "Tilladelse er givet til at kopiere, distribuere og/eller ændre dette "
 "dokument under betingelserne i GNU Free Documentation License (GFDL), "
 "version 1.1 eller enhver senere version udgivet af Free Software Foundation; "
 "uden invariante afsnit, forsidetekster, samt bagsidetekster. Du kan se en "
-"kopi af GFDL her <ulink type=\"help\" url=\"ghelp:fdl\">link</ulink> eller i "
+"kopi af GFDL her <ulink type=\"help\" url=\"help:fdl\">link</ulink> eller i "
 "filen COPYING-DOCS som distribueres sammen med denne manual."
 
 #: ../C/legal.xml:12(para)
diff --git a/help/de/de.po b/help/de/de.po
index 5add8af..c00b8e4 100644
--- a/help/de/de.po
+++ b/help/de/de.po
@@ -90,7 +90,7 @@ msgid ""
 "the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any "
 "later version published 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 "
+"of the GFDL at this <ulink type=\"help\" url=\"help:fdl\">link</ulink> or in "
 "the file COPYING-DOCS distributed with this manual."
 msgstr ""
 "Das vorliegende Dokument kann gemäß den Bedingungen der GNU Free "
@@ -98,7 +98,7 @@ msgstr ""
 "Software Foundation veröffentlichten Version ohne unveränderbare Abschnitte "
 "sowie ohne Texte auf dem vorderen und hinteren Buchdeckel kopiert, verteilt "
 "und/oder modifiziert werden. Eine Kopie der GFDL finden Sie unter diesem "
-"<ulink type=\"help\" url=\"ghelp:fdl\">Link</ulink> oder in der mit diesem "
+"<ulink type=\"help\" url=\"help:fdl\">Link</ulink> oder in der mit diesem "
 "Handbuch gelieferten Datei COPYING-DOCS."
 
 #: C/gnome-video-arcade.xml:12(para)
diff --git a/help/es/es.po b/help/es/es.po
index d46bad3..ddb619e 100644
--- a/help/es/es.po
+++ b/help/es/es.po
@@ -109,7 +109,7 @@ msgid ""
 "the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any "
 "later version published 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 "
+"of the GFDL at this <ulink type=\"help\" url=\"help:fdl\">link</ulink> or "
 "in the file COPYING-DOCS distributed with this manual."
 msgstr ""
 "Se otorga permiso para copiar, distribuir y/o modificar este documento bajo "
@@ -117,7 +117,7 @@ msgstr ""
 "cualquier otra versión posterior publicada por la Free Software Foundation; "
 "sin Secciones Invariantes ni Textos de Cubierta Delantera ni Textos de "
 "Cubierta Trasera. Puede encontrar una copia de la licencia GFDL en este "
-"<ulink type=\"help\" url=\"ghelp:fdl\">enlace</ulink> o en el archivo "
+"<ulink type=\"help\" url=\"help:fdl\">enlace</ulink> o en el archivo "
 "COPYING-DOCS distribuido con este manual."
 
 #: C/gnome-video-arcade.xml:12(para)
diff --git a/help/it/it.po b/help/it/it.po
index c455347..fe4c80d 100644
--- a/help/it/it.po
+++ b/help/it/it.po
@@ -66,8 +66,8 @@ msgid "Matthew Barnes"
 msgstr "Matthew Barnes"
 
 #: /home/diego/gnome-video-arcade-0.6.7/help/C/gnome-video-arcade.xml:2(para)
-msgid "Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free 
Documentation License (GFDL), Version 1.1 or any later version published 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 distributed with this manual."
-msgstr "Viene concesso il permesso di copiare, distribuire e/o modificare questo documento sotto i termini 
della licenza GNU Free Documentation License (GFDL), Versione 1.1 o qualunque altra versione successiva 
pubblicata dalla Free Software Foundation senza Sezioni invarianti, senza Testi nella copertina, e senza 
Testi nel retro copertina. Si può trovare una copia della GFDL in questo <ulink type=\"help\" 
url=\"ghelp:fdl\">collegamento</ulink> oppure nel file COPYING-DOCS distribuito con questo manuale."
+msgid "Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free 
Documentation License (GFDL), Version 1.1 or any later version published 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=\"help:fdl\">link</ulink> or in the file COPYING-DOCS distributed with this manual."
+msgstr "Viene concesso il permesso di copiare, distribuire e/o modificare questo documento sotto i termini 
della licenza GNU Free Documentation License (GFDL), Versione 1.1 o qualunque altra versione successiva 
pubblicata dalla Free Software Foundation senza Sezioni invarianti, senza Testi nella copertina, e senza 
Testi nel retro copertina. Si può trovare una copia della GFDL in questo <ulink type=\"help\" 
url=\"help:fdl\">collegamento</ulink> oppure nel file COPYING-DOCS distribuito con questo manuale."
 
 #: /home/diego/gnome-video-arcade-0.6.7/help/C/gnome-video-arcade.xml:12(para)
 msgid "This manual is part of a collection of GNOME manuals distributed under the GFDL. If you want to 
distribute this manual separately from the collection, you can do so by adding a copy of the license to the 
manual, as described in section 6 of the license."
diff --git a/help/sl/sl.po b/help/sl/sl.po
index a35ea24..b8166d6 100644
--- a/help/sl/sl.po
+++ b/help/sl/sl.po
@@ -76,7 +76,7 @@ msgid "Matthew Barnes"
 msgstr "Matthew Barnes"
 
 #: C/gnome-video-arcade.xml:2(para)
-msgid "Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free 
Documentation License (GFDL), Version 1.1 or any later version published 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 distributed with this manual."
+msgid "Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free 
Documentation License (GFDL), Version 1.1 or any later version published 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=\"help:fdl\">link</ulink> or in the file COPYING-DOCS distributed with this manual."
 msgstr ""
 
 #: C/gnome-video-arcade.xml:12(para)
diff --git a/help/sv/sv.po b/help/sv/sv.po
index f185a8f..dbb9b75 100644
--- a/help/sv/sv.po
+++ b/help/sv/sv.po
@@ -66,8 +66,8 @@ msgid "Matthew Barnes"
 msgstr "Matthew Barnes"
 
 #: C/gnome-video-arcade.xml:2(para)
-msgid "Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free 
Documentation License (GFDL), Version 1.1 or any later version published 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 distributed with this manual."
-msgstr "Tillstånd att kopiera, distribuera och/eller modifiera detta dokument ges under villkoren i GNU Free 
Documentation License (GFDL), version 1.1 eller senare, utgivet av Free Software Foundation utan 
standardavsnitt och omslagstexter.  En kopia av GFDL finns att hämta på denna <ulink type=\"help\" 
url=\"ghelp:fdl\">länk</ulink> eller i filen COPYING-DOCS som medföljer denna handbok."
+msgid "Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free 
Documentation License (GFDL), Version 1.1 or any later version published 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=\"help:fdl\">link</ulink> or in the file COPYING-DOCS distributed with this manual."
+msgstr "Tillstånd att kopiera, distribuera och/eller modifiera detta dokument ges under villkoren i GNU Free 
Documentation License (GFDL), version 1.1 eller senare, utgivet av Free Software Foundation utan 
standardavsnitt och omslagstexter.  En kopia av GFDL finns att hämta på denna <ulink type=\"help\" 
url=\"help:fdl\">länk</ulink> eller i filen COPYING-DOCS som medföljer denna handbok."
 
 #: C/gnome-video-arcade.xml:12(para)
 msgid "This manual is part of a collection of GNOME manuals distributed under the GFDL. If you want to 
distribute this manual separately from the collection, you can do so by adding a copy of the license to the 
manual, as described in section 6 of the license."
diff --git a/src/gva-util.c b/src/gva-util.c
index 9ff83da..3439586 100644
--- a/src/gva-util.c
+++ b/src/gva-util.c
@@ -385,14 +385,14 @@ gva_help_display (GtkWindow *parent,
         GError *error = NULL;
         guint32 timestamp;
 
-        uri = g_string_new ("ghelp:" PACKAGE);
+        uri = g_string_new ("help:" PACKAGE);
         timestamp = gtk_get_current_event_time ();
 
         if (parent != NULL)
                 screen = gtk_widget_get_screen (GTK_WIDGET (parent));
 
         if (link_id != NULL)
-                g_string_append_printf (uri, "?%s", link_id);
+                g_string_append_printf (uri, "/%s", link_id);
 
         if (gtk_show_uri (screen, uri->str, timestamp, &error))
                 goto exit;
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]