GNOME.org
 

[gthumb] Use new yelp-tools instead of gnome-doc-utils

commit a1d26aef2b54114b45248e5309e8b1446f921950
Author: Oliver Propst <oliver propst gmail com>
Date:   Sun Sep 30 14:44:11 2012 +0200

    Use new yelp-tools instead of gnome-doc-utils

 Makefile.am      |    5 +----
 autogen.sh       |    2 +-
 configure.ac     |    2 +-
 git.mk           |   24 +-----------------------
 help/ChangeLog   |    5 +++++
 help/Makefile.am |   43 ++++++++++++++++++++-----------------------
 help/el/el.po    |    4 ++--
 help/es/es.po    |    4 ++--
 help/oc/oc.po    |    2 +-
 help/sl/sl.po    |    4 ++--
 help/sv/sv.po    |    4 ++--
 11 files changed, 38 insertions(+), 61 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 486ea11..d5ac2b9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,8 +17,7 @@ DISTCLEANFILES =                        \
 	po/.intltool-merge-cache        \
 	intltool-extract                \
 	intltool-merge                  \
-	intltool-update                 \
-	gnome-doc-utils.make
+	intltool-update
 
 MAINTAINERCLEANFILES = 			\
 	$(srcdir)/INSTALL		\
@@ -32,7 +31,6 @@ MAINTAINERCLEANFILES = 			\
 	$(srcdir)/depcomp 		\
 	$(srcdir)/install-sh 		\
 	$(srcdir)/ltmain.sh 		\
-	$(srcdir)/m4/gnome-doc-utils.m4	\
 	$(srcdir)/m4/intltool.m4	\
 	$(srcdir)/m4/libtool.m4		\
 	$(srcdir)/m4/lt~obsolete.m4	\
@@ -41,7 +39,6 @@ MAINTAINERCLEANFILES = 			\
 	$(srcdir)/m4/ltversion.m4	\
 	$(srcdir)/missing 		\
 	$(srcdir)/mkinstalldirs 	\
-	$(srcdir)/omf.make 		\
 	$(srcdir)/xmldocs.make 		\
 	$(srcdir)/gtk-doc.make 		\
 	$(srcdir)/ChangeLog 		\
diff --git a/autogen.sh b/autogen.sh
index dab5edd..8723731 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -19,4 +19,4 @@ which gnome-autogen.sh || {
     exit 1
 }
 
-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 5c375b4..b5aae4d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -50,7 +50,7 @@ AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums, glib-mkenums)
 AC_PATH_PROG(GLIB_COMPILE_RESOURCES, glib-compile-resources, glib-compile-resources)
 
 GNOME_COMMON_INIT
-GNOME_DOC_INIT
+YELP_HELP_INIT
 GNOME_MAINTAINER_MODE_DEFINES
 GNOME_COMPILE_WARNINGS([maximum])
 GNOME_CXX_WARNINGS
diff --git a/git.mk b/git.mk
index abd6c0a..e2daabf 100644
--- a/git.mk
+++ b/git.mk
@@ -56,6 +56,7 @@
 #
 # - 2010-12-06 Add support for Mallard docs
 # - 2010-12-06 Start this change log
+# - 2012-09-28 Remove referances to Doc files
 
 git-all: git-mk-install
 
@@ -88,29 +89,6 @@ git-mk-install:
 $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
 	$(AM_V_GEN) \
 	{ \
-		if test "x$(DOC_MODULE)" = x -o "x$(DOC_MAIN_SGML_FILE)" = x; then :; else \
-			for x in \
-				$(DOC_MODULE)-decl-list.txt \
-				$(DOC_MODULE)-decl.txt \
-				tmpl/$(DOC_MODULE)-unused.sgml \
-				"tmpl/*.bak" \
-				xml html \
-			; do echo /$$x; done; \
-		fi; \
-		if test "x$(DOC_MODULE)$(DOC_ID)" = x -o "x$(DOC_LINGUAS)" = x; then :; else \
-			for x in \
-				$(_DOC_C_DOCS) \
-				$(_DOC_LC_DOCS) \
-				$(_DOC_OMF_ALL) \
-				$(_DOC_DSK_ALL) \
-				$(_DOC_HTML_ALL) \
-				$(_DOC_MOFILES) \
-				$(_DOC_POFILES) \
-				$(DOC_H_FILE) \
-				"*/.xml2po.mo" \
-				"*/*.omf.out" \
-			; do echo /$$x; done; \
-		fi; \
 		if test "x$(gsettings_SCHEMAS)" = x; then :; else \
 			for x in \
 				$(gsettings_SCHEMAS:.xml=.valid) \
diff --git a/help/ChangeLog b/help/ChangeLog
index 28cef6d..a79cffc 100644
--- a/help/ChangeLog
+++ b/help/ChangeLog
@@ -1,3 +1,8 @@
+2012-09-29 Oliver Propst <oliver gmail com>
+
+	**.po:change all "ghelp" referances to "help.
+	* Makefile.am:Use yelp documenation system.
+
 2009-04-03  Simos Xenitellis  <simos gnome org>
 
 	* el/el.po: Added Greek tranlsation (Sterios Prosiniklis).
diff --git a/help/Makefile.am b/help/Makefile.am
index da5b2f1..29c9174 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -1,23 +1,8 @@
-include $(top_srcdir)/gnome-doc-utils.make
-dist-hook: doc-dist-hook
+ YELP_HELP_RULES@
 
-DOC_ID = gthumb
-DOC_INCLUDES = legal.xml
+HELP_ID = gthumb
 
-DOC_FIGURES = \
- 	figures/comment.png \
-	figures/main-win.png \
-	figures/nav-button.png \
-	figures/preferences.png \
-	figures/palette.png \
-	figures/thumbnail-pane.png \
-	figures/general-filter.png \
-	figures/specific-filter.png \
-	figures/import.png \
-	figures/import-pref-auto-folder.png \
-        figures/import-pref-custom-format.png
-
-DOC_PAGES = \
+HELP_FILES = \
 	index.page \
 	attributes.page \
 	strftime.page \
@@ -50,10 +35,22 @@ DOC_PAGES = \
 	bookmarks.page \
 	import.page \
 	slideshow.page \
-	file-copy-move.page
-	
-DOC_LINGUAS = de el es eu fr oc sl sv zh_CN
+	file-copy-move.page \
+	legal.xml
+
+HELP_MEDIA = \
+	figures/comment.png \
+	figures/main-win.png \
+	figures/nav-button.png \
+	figures/preferences.png \
+	figures/palette.png \
+	figures/thumbnail-pane.png \
+	figures/general-filter.png \
+	figures/specific-filter.png \
+	figures/import.png \
+	figures/import-pref-auto-folder.png \
+        figures/import-pref-custom-format.png
 
-EXTRA_DIST = album-theme-format.txt
+HELP_EXTRA = album-theme-format.txt
 
--include $(top_srcdir)/git.mk
+HELP_LINGUAS = de el es eu fr oc sl sv zh_CN
diff --git a/help/el/el.po b/help/el/el.po
index 6e3cc16..2e0e462 100644
--- a/help/el/el.po
+++ b/help/el/el.po
@@ -58,14 +58,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 ""
 "ÎÎÎÎÏÎÎ ÎÎÎÎÎ ÎÎÎ ÎÎÏÎÎÏÎÏÎ, ÎÎÎÎÎÎÎ ÎÎÎ/Î ÏÏÎÏÎÏÎÎÎÏÎ ÏÎÏ ÎÎÎÏÎÏÎÏ ÏÏÏ ÏÎÏÏ "
 "ÏÏÎÏÏ ÏÎÏ ÎÎÎÏÎÎÏÎÏ ÎÎÎÎÎÏ ÎÎÎÎÎÏÎÏÏÎÏ GNU (GFDL), ÎÎÎÎÏÎ 1.1 Î "
 "ÎÎÏÎÎÎÎÎÏÏÎÏÎ ÎÎÎÎÎÏÎÎÎÎ ÎÏÏ ÏÎ ÎÎÏÏÎÎ ÎÎÎÏÎÎÏÎÏ ÎÎÎÎÏÎÎÎÎÏ ÏÏÏÎÏ ÎÏÎÎÎÏÎ "
 "ÎÎÎÏÎÎ, ÏÏÏÎÏ ÎÎÏÏÏÎÎÎ ÎÎÎÎÎÎÎÏ ÎÎÎ ÏÏÏÎÏ ÎÏÎÏÎÏÏÏÎÎÎ ÎÎÎÎÎÎÎÏ. ÎÏÎÏÎÎÏÎ ÎÎ "
-"ÎÏÎÎÏÎ ÎÎÎ ÎÎÏÎÎÏÎÏÎ ÏÎÏ GFDL ÏÎ ÎÏÏÏÎ ÏÎÎ <ulink type=\"help\" url=\"ghelp:"
+"ÎÏÎÎÏÎ ÎÎÎ ÎÎÏÎÎÏÎÏÎ ÏÎÏ GFDL ÏÎ ÎÏÏÏÎ ÏÎÎ <ulink type=\"help\" url=\"help:"
 "fdl\">ÏÏÎÎÎÏÎÎ</ulink> Î ÏÏÎ ÎÏÏÎÎÎ COPYING-DOCS ÏÎÏ ÎÎÎÎÎÎÎÎÎÎÎ ÎÎ ÎÏÏÏÎ "
 "ÏÎÎ ÎÎÎÎÏ."
 
diff --git a/help/es/es.po b/help/es/es.po
index eac7c0f..73f503b 100644
--- a/help/es/es.po
+++ b/help/es/es.po
@@ -2977,7 +2977,7 @@ msgstr ""
 #~ "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"
+#~ "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 otorga permiso para copiar, distribuir y/o modificar este documento "
@@ -2985,7 +2985,7 @@ msgstr ""
 #~ "1.1 o 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 "
+#~ "en este <ulink type=\"help\" url=\"help:fdl\">enlace</ulink> o en el "
 #~ "archivo COPYING-DOCS distribuido con este manual."
 
 #~ msgid ""
diff --git a/help/oc/oc.po b/help/oc/oc.po
index 7b1a588..a8c3199 100644
--- a/help/oc/oc.po
+++ b/help/oc/oc.po
@@ -61,7 +61,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 ""
 
diff --git a/help/sl/sl.po b/help/sl/sl.po
index 6c9039a..0746d5c 100644
--- a/help/sl/sl.po
+++ b/help/sl/sl.po
@@ -1872,14 +1872,14 @@ msgstr "Andrej ÅnidarÅiÄ <andrej znidarsic gmail com>, 2010"
 #~ "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"
+#~ "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 ""
 #~ "Dano je dovoljenje za kopiranje, distribuiranje in/ali spreminjanje tega "
 #~ "dokumenta pod pogoji GNU Free Documentaction Licence (GFDL) razliÄice 1.1 "
 #~ "ali katerekoli kasnejÅe razliÄice, ki jo je objavila Free Software "
 #~ "Foundation brez stalnih odsekov, besedila naslovnice in zadnje strani. "
-#~ "Kopijo GFDL lahko najdete na tej <ulink type=\"help\" url=\"ghelp:fdl"
+#~ "Kopijo GFDL lahko najdete na tej <ulink type=\"help\" url=\"help:fdl"
 #~ "\">povezavi</ulink> ali v COPYING-DOCS distribuiranim s tem priroÄnikom."
 
 #~ msgid ""
diff --git a/help/sv/sv.po b/help/sv/sv.po
index 985f5ff..c5ef529 100644
--- a/help/sv/sv.po
+++ b/help/sv/sv.po
@@ -51,8 +51,8 @@ msgid "GNOME Documentation Project"
 msgstr "Dokumentationsprojekt fÃr GNOME"
 
 #: C/gthumb.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/gthumb.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."
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]