[hitori] build: Use yelp-tools instead of gnome-doc-utils
- From: Philip Withnall <pwithnall src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [hitori] build: Use yelp-tools instead of gnome-doc-utils
- Date: Fri, 28 Sep 2012 23:05:28 +0000 (UTC)
commit 34a3d01945f6b3ab27bc571b53079ac9a45fa666
Author: Oliver Propst <oliver propst gmail com>
Date: Sat Sep 8 15:48:12 2012 +0200
build: Use yelp-tools instead of gnome-doc-utils
Closes: https://bugzilla.gnome.org/show_bug.cgi?id=683623
Makefile.am | 2 --
configure.ac | 2 +-
help/Makefile.am | 16 +++++-----------
help/da/da.po | 8 ++++----
help/en_GB/en_GB.po | 8 ++++----
help/es/es.po | 8 ++++----
help/hitori.omf.in | 9 ---------
help/sv/sv.po | 2 +-
help/zh_CN/zh_CN.po | 4 ++--
src/interface.c | 2 +-
10 files changed, 22 insertions(+), 39 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index c92ddf9..7b7ab41 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -94,7 +94,6 @@ EXTRA_DIST += \
intltool-extract.in \
intltool-merge.in \
intltool-update.in \
- gnome-doc-utils.make \
README \
COPYING \
COPYING-DOCS \
@@ -131,7 +130,6 @@ MAINTAINERCLEANFILES = \
`find "m4" -type f -name "*.m4" -print` \
missing \
mkinstalldirs \
- gnome-doc-utils.make \
ChangeLog \
`find "$(srcdir)" -type f -name Makefile.in -print` \
po/Makevars.template \
diff --git a/configure.ac b/configure.ac
index 574c87a..254e1c1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,7 +25,7 @@ AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[gettext package name]
IT_PROG_INTLTOOL([0.35.0])
# Documentation
-GNOME_DOC_INIT
+YELP_HELP_INIT
# Dependencies
PKG_CHECK_MODULES([GENERAL],[glib-2.0 gtk+-3.0 gmodule-2.0 cairo >= 1.4])
diff --git a/help/Makefile.am b/help/Makefile.am
index 9643428..ed4bd8e 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -1,10 +1,9 @@
-include $(top_srcdir)/gnome-doc-utils.make
-dist-hook: doc-dist-hook
+ YELP_HELP_RULES@
-DOC_ID = hitori
-DOC_LINGUAS = cs da de en_GB es fr ro sl sv zh_CN
-DOC_FIGURES = figures/hitori_main_window.png
-DOC_PAGES = \
+HELP_ID = hitori
+HELP_LINGUAS = cs da de en_GB es fr ro sl sv zh_CN
+HELP_MEDIA = figures/hitori_main_window.png
+HELP_FILES = \
customization.page \
game.page \
index.page \
@@ -14,9 +13,4 @@ DOC_PAGES = \
EXTRA_DIST = ChangeLog.pre-0-2-2
-GITIGNOREFILES = \
- $(_DOC_LC_PAGES) \
- $(_DOC_MOFILES) \
- $(NULL)
-
-include $(top_srcdir)/git.mk
diff --git a/help/da/da.po b/help/da/da.po
index 0e1df48..9b18a81 100644
--- a/help/da/da.po
+++ b/help/da/da.po
@@ -360,14 +360,14 @@ msgstr ""
#~ "under the terms of the GNU Free Documentation License (GFDL), Version 1.2 "
#~ "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"
+#~ "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 ""
#~ "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"
+#~ "Du kan se en kopi af GFDL her <ulink type=\"help\" url=\"help:fdl"
#~ "\">link</ulink> eller i filen COPYING-DOCS som distribueres sammen med "
#~ "denne manual."
@@ -520,7 +520,7 @@ msgstr ""
#~ msgid ""
#~ "This program is distributed under the terms of the GNU General Public "
#~ "license as published by the Free Software Foundation; either version 3 of "
-#~ "the License, or (at your option) any later version. A <ulink url=\"ghelp:"
+#~ "the License, or (at your option) any later version. A <ulink url=\"help:"
#~ "gpl\" type=\"help\">copy of this license</ulink> is included with this "
#~ "documentation; another can be found in the file COPYING included with the "
#~ "source code of this program."
@@ -528,7 +528,7 @@ msgstr ""
#~ "Dette program distribueres under betingelserne i licensen GNU General "
#~ "Public der udgives af Free Software Foundation; enten version 3 eller "
#~ "(ved dit valg) enhver senere version. En kopi af denne licens kan findes "
-#~ "her <ulink url=\"ghelp:gpl\" type=\"help\">link</ulink>, eller i filen "
+#~ "her <ulink url=\"help:gpl\" type=\"help\">link</ulink>, eller i filen "
#~ "COPYING der er inkluderet med kildekoden til dette program."
#~ msgid "March 2009"
diff --git a/help/en_GB/en_GB.po b/help/en_GB/en_GB.po
index 95d08c2..9625cf3 100644
--- a/help/en_GB/en_GB.po
+++ b/help/en_GB/en_GB.po
@@ -362,14 +362,14 @@ msgstr "Philip Withnall <philip tecnocode co uk>, 2008, 2010"
#~ "under the terms of the GNU Free Documentation License (GFDL), Version 1.2 "
#~ "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"
+#~ "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 ""
#~ "Permission is granted to copy, distribute and/or modify this document "
#~ "under the terms of the GNU Free Documentation Licence (GFDL), Version 1.2 "
#~ "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"
+#~ "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."
#~ msgid ""
@@ -523,14 +523,14 @@ msgstr "Philip Withnall <philip tecnocode co uk>, 2008, 2010"
#~ msgid ""
#~ "This program is distributed under the terms of the GNU General Public "
#~ "license as published by the Free Software Foundation; either version 3 of "
-#~ "the License, or (at your option) any later version. A <ulink url=\"ghelp:"
+#~ "the License, or (at your option) any later version. A <ulink url=\"help:"
#~ "gpl\" type=\"help\">copy of this license</ulink> is included with this "
#~ "documentation; another can be found in the file COPYING included with the "
#~ "source code of this program."
#~ msgstr ""
#~ "This program is distributed under the terms of the GNU General Public "
#~ "licence as published by the Free Software Foundation; either version 3 of "
-#~ "the Licence, or (at your option) any later version. A <ulink url=\"ghelp:"
+#~ "the Licence, or (at your option) any later version. A <ulink url=\"help:"
#~ "gpl\" type=\"help\">copy of this licence</ulink> is included with this "
#~ "documentation; another can be found in the file COPYING included with the "
#~ "source code of this program."
diff --git a/help/es/es.po b/help/es/es.po
index fa7215a..70f742c 100644
--- a/help/es/es.po
+++ b/help/es/es.po
@@ -384,7 +384,7 @@ msgstr "Jorge GonzÃlez <jorgegonz svn gnome org>, 2007-2010"
#~ "under the terms of the GNU Free Documentation License (GFDL), Version 1.2 "
#~ "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"
+#~ "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 ""
#~ "Se concede permiso para copiar, distribuir o modificar este documento "
@@ -392,7 +392,7 @@ msgstr "Jorge GonzÃlez <jorgegonz svn gnome org>, 2007-2010"
#~ "versiÃn 1.2 o cualquier versiÃn posterior publicada por la Free Software "
#~ "Foundation, sin Secciones invariantes, Textos de portada y Textos de "
#~ "contraportada. Encontrarà una copia de la GFDL en este <ulink type=\"help"
-#~ "\" url=\"ghelp:fdl\">enlace</ulink> o en el archivo COPYING-DOCS "
+#~ "\" url=\"help:fdl\">enlace</ulink> o en el archivo COPYING-DOCS "
#~ "distribuido con este manual."
#~ msgid ""
@@ -549,7 +549,7 @@ msgstr "Jorge GonzÃlez <jorgegonz svn gnome org>, 2007-2010"
#~ msgid ""
#~ "This program is distributed under the terms of the GNU General Public "
#~ "license as published by the Free Software Foundation; either version 3 of "
-#~ "the License, or (at your option) any later version. A <ulink url=\"ghelp:"
+#~ "the License, or (at your option) any later version. A <ulink url=\"help:"
#~ "gpl\" type=\"help\">copy of this license</ulink> is included with this "
#~ "documentation; another can be found in the file COPYING included with the "
#~ "source code of this program."
@@ -557,7 +557,7 @@ msgstr "Jorge GonzÃlez <jorgegonz svn gnome org>, 2007-2010"
#~ "Este programa se distribuye bajo los tÃrminos de la Licencia PÃblica "
#~ "General GNU tal como la publica la Free Software Foundation; tanto en la "
#~ "versiÃn 3 de la Licencia, o (a su opciÃn) cualquier otra versiÃn "
-#~ "posterior. Se incluye <ulink url=\"ghelp:gpl\" type=\"help\"> una copia "
+#~ "posterior. Se incluye <ulink url=\"help:gpl\" type=\"help\"> una copia "
#~ "de esta licencia</ulink> en esta documentaciÃn, otra copia se puede "
#~ "encontrar en el archivo COPYING incluido con el cÃdigo fuente de este "
#~ "programa."
diff --git a/help/sv/sv.po b/help/sv/sv.po
index e442e1e..a6ced5b 100644
--- a/help/sv/sv.po
+++ b/help/sv/sv.po
@@ -145,7 +145,7 @@ msgid "<application>Hitori</application> was written by Philip Withnall (<email>
msgstr "<application>Hitori</application> skrevs av Philip Withnall (<email>philip tecnocode co uk</email>). FÃr att hitta mer information om <application>Hitori</application>, rapportera ett fel eller fÃreslà nÃgonting angÃende detta program eller denna handbok sà besÃk <ulink url=\"http://live.gnome.org/Hitori\"; type=\"http\"><application>Hitoris</application> webbsida</ulink>."
#: C/hitori.xml:138(para)
-msgid "This program is distributed under the terms of the GNU General Public license as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. A <ulink url=\"ghelp:gpl\" type=\"help\">copy of this license</ulink> is included with this documentation; another can be found in the file COPYING included with the source code of this program."
+msgid "This program is distributed under the terms of the GNU General Public license as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. A <ulink url=\"help:gpl\" type=\"help\">copy of this license</ulink> is included with this documentation; another can be found in the file COPYING included with the source code of this program."
msgstr ""
#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2.
diff --git a/help/zh_CN/zh_CN.po b/help/zh_CN/zh_CN.po
index 7ff9b2c..c511bd4 100644
--- a/help/zh_CN/zh_CN.po
+++ b/help/zh_CN/zh_CN.po
@@ -20,7 +20,7 @@ msgid ""
"the terms of the GNU Free Documentation License (GFDL), Version 1.2 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 ""
@@ -290,7 +290,7 @@ msgstr ""
msgid ""
"This program is distributed under the terms of the GNU General Public "
"license as published by the Free Software Foundation; either version 3 of "
-"the License, or (at your option) any later version. A <ulink url=\"ghelp:gpl"
+"the License, or (at your option) any later version. A <ulink url=\"help:gpl"
"\" type=\"help\">copy of this license</ulink> is included with this "
"documentation; another can be found in the file COPYING included with the "
"source code of this program."
diff --git a/src/interface.c b/src/interface.c
index b123ca1..6f81c49 100644
--- a/src/interface.c
+++ b/src/interface.c
@@ -551,7 +551,7 @@ hitori_contents_cb (GtkAction *action, Hitori *hitori)
{
GError *error = NULL;
- if (gtk_show_uri (gtk_widget_get_screen (hitori->window), "ghelp:hitori", gtk_get_current_event_time (), &error) == FALSE) {
+ if (gtk_show_uri (gtk_widget_get_screen (hitori->window), "help:hitori", gtk_get_current_event_time (), &error) == FALSE) {
GtkWidget *dialog = gtk_message_dialog_new (GTK_WINDOW (hitori->window),
GTK_DIALOG_MODAL,
GTK_MESSAGE_ERROR,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
