[moserial] doc: Port from long-obsolete gnome-doc-utils to yelp
- From: Michael J. Chudobiak <mjc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [moserial] doc: Port from long-obsolete gnome-doc-utils to yelp
- Date: Tue, 10 Nov 2015 14:11:17 +0000 (UTC)
commit 6a7782932435222ecc31539c28ec4952279dd5b2
Author: Bastien Nocera <hadess hadess net>
Date: Sat Nov 7 14:34:15 2015 +0100
doc: Port from long-obsolete gnome-doc-utils to yelp
Allowing moserial to build on a recent distribution.
https://bugzilla.gnome.org/show_bug.cgi?id=757733
.gitignore | 1 -
Makefile.am | 10 ----------
configure.ac | 2 +-
doc/C/{moserial.xml => index.docbook} | 0
doc/Makefile.am | 13 ++++++-------
src/MainWindow.vala | 2 +-
6 files changed, 8 insertions(+), 20 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0cbab66..8a7ceea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,5 +41,4 @@ po/Makefile.in.in
doc/*/.xml2po.mo
doc/*/moserial.xml
doc/*.omf
-gnome-doc-utils.make
diff --git a/Makefile.am b/Makefile.am
index 9b9c188..2381172 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -57,10 +57,6 @@ moserial_LDADD = \
$(MOSERIAL_LIBS) \
$(NULL)
-distcleancheck_listfiles = find . -type f -print | grep -v 'omf\.out'
-
-distuninstallcheck_listfiles = find . -type f -print | grep -v '^\./var/scrollkeeper' | grep -v 'omf' | grep
-v 'figures'
-
EXTRA_DIST = \
intltool-extract.in \
intltool-update.in \
@@ -68,9 +64,7 @@ EXTRA_DIST = \
$(moserial_VALASOURCES) \
src/Config.vapi \
src/moserial.vala.stamp \
- omf.make \
xmldocs.make \
- gnome-doc-utils.make \
MAINTAINERS \
ChangeLog.pre-git \
$(NULL)
@@ -83,12 +77,8 @@ DISTCLEANFILES = \
intltool-update \
intltool-merge \
po/.intltool-merge-cache \
- gnome-doc-utils.make \
$(NULL)
-DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper
-
-
# Build ChangeLog from GIT history
ChangeLog:
@if test -d $(top_srcdir)/.git; then \
diff --git a/configure.ac b/configure.ac
index 557d5bf..ab30d7e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@ AC_PATH_PROG(VALAC, valac, valac)
AC_SUBST(VALAC)
AC_CONFIG_MACRO_DIR([m4])
-GNOME_DOC_INIT
+YELP_HELP_INIT
AH_TEMPLATE([GETTEXT_PACKAGE], [Package name for gettext])
GETTEXT_PACKAGE=moserial
diff --git a/doc/C/moserial.xml b/doc/C/index.docbook
similarity index 100%
rename from doc/C/moserial.xml
rename to doc/C/index.docbook
diff --git a/doc/Makefile.am b/doc/Makefile.am
index cf12a29..906850e 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,10 +1,9 @@
-include $(top_srcdir)/gnome-doc-utils.make
-dist-hook: doc-dist-hook
+ YELP_HELP_RULES@
-DOC_MODULE = moserial
-DOC_ENTITIES = legal.xml
-DOC_INCLUDES =
-DOC_FIGURES = figures/main-toolbar.png \
+HELP_ID = moserial
+HELP_FILES = index.docbook
+HELP_EXTRA = legal.xml
+HELP_MEDIA = figures/main-toolbar.png \
figures/statusbar.png \
figures/port-setup.png \
figures/connect.png \
@@ -22,4 +21,4 @@ DOC_FIGURES = figures/main-toolbar.png \
figures/receive-progress.png \
figures/receive-file-dialog.png \
figures/preferences.png
-DOC_LINGUAS = cs de el es fr sl sv
+HELP_LINGUAS = cs de el es fr sl sv
diff --git a/src/MainWindow.vala b/src/MainWindow.vala
index f597a40..ecb6739 100644
--- a/src/MainWindow.vala
+++ b/src/MainWindow.vala
@@ -757,7 +757,7 @@ public class moserial.MainWindow : Gtk.Window //Have to extend Gtk.Winow to get
private void showHelp () {
try {
- show_uri(null, "ghelp:moserial", Gdk.CURRENT_TIME);
+ show_uri(null, "help:moserial", Gdk.CURRENT_TIME);
} catch (GLib.Error e) {
warning(_("Unable to display help file: %s"), e.message);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]