[telegnome] Migrate from gnome-doc-utils to yelp-tools



commit 8fe1286be4c5b5ad8b709e210d4c63b87e4ecbdc
Author: Colin Watson <cjwatson debian org>
Date:   Wed Jul 6 00:08:26 2016 +0100

    Migrate from gnome-doc-utils to yelp-tools
    
    * Makefile.am (EXTRA_DIST): Remove gnome-doc-utils.make.
    (MAINTAINERCLEANFILES): Remove.
    * configure.ac: Replace GNOME_DOC_INIT with YELP_HELP_INIT.
    * doc/.gitignore: Remove *.omf.  Add */*.stamp.  Replace telegnome.xml
    with index.docbook.
    * doc/C/telegnome.xml: Rename to ...
    * doc/C/index.docbook: ... this.
    * doc/Makefile.am: Replace gnome-doc-utils.make inclusion with
    @YELP_HELP_RULES@.
    (dist-hook): Remove.
    (DOC_MODULE): Rename to ...
    (HELP_ID): ... this.
    (HELP_FILES): New variable.
    (DOC_LINGUAS): Rename to ...
    (HELP_LINGUAS): ... this.
    * doc/telegnome.omf.in: Remove.
    * src/gui.vala (Gui.activate_help_contents): Change help target from
    "ghelp:telegnome" to "help:telegnome".

 Makefile.am                            |    3 ---
 configure.ac                           |    2 +-
 doc/.gitignore                         |    6 +++---
 doc/C/{telegnome.xml => index.docbook} |    0
 doc/Makefile.am                        |    8 ++++----
 doc/telegnome.omf.in                   |    9 ---------
 src/gui.vala                           |    2 +-
 7 files changed, 9 insertions(+), 21 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 0c84464..d56cb23 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,7 +3,6 @@ SUBDIRS = data src po pixmaps doc
 EXTRA_DIST = \
        ChangeLog-pre-2-0 \
        MAINTAINERS \
-       gnome-doc-utils.make \
        intltool-extract.in \
        intltool-merge.in \
        intltool-update.in \
@@ -11,8 +10,6 @@ EXTRA_DIST = \
 
 DISTCLEANFILES = intltool-extract intltool-merge intltool-update
 
-MAINTAINERCLEANFILES = gnome-doc-utils.make
-
 appsdir=$(datadir)/applications
 apps_in_files = telegnome.desktop.in
 apps_DATA = $(apps_in_files:.desktop.in=.desktop)
diff --git a/configure.ac b/configure.ac
index 37da8aa..5719cbb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 GNOME_COMMON_INIT
 GNOME_DEBUG_CHECK
 GNOME_COMPILE_WARNINGS([maximum])
-GNOME_DOC_INIT
+YELP_HELP_INIT
 GLIB_GSETTINGS
 
 AC_ISC_POSIX
diff --git a/doc/.gitignore b/doc/.gitignore
index 3b1c0b6..d8b8bcc 100644
--- a/doc/.gitignore
+++ b/doc/.gitignore
@@ -1,5 +1,5 @@
-*.omf
 */*.mo
+*/*.stamp
 .xml2po.mo
-telegnome.xml
-!C/telegnome.xml
+index.docbook
+!C/index.docbook
diff --git a/doc/C/telegnome.xml b/doc/C/index.docbook
similarity index 100%
rename from doc/C/telegnome.xml
rename to doc/C/index.docbook
diff --git a/doc/Makefile.am b/doc/Makefile.am
index f5a7234..a119e19 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,9 +1,9 @@
-include $(top_srcdir)/gnome-doc-utils.make
+@YELP_HELP_RULES@
 
 dist_man1_MANS = telegnome.1
 
-dist-hook: doc-dist-hook
+HELP_ID = telegnome
 
-DOC_MODULE = telegnome
+HELP_FILES = index.docbook
 
-DOC_LINGUAS = cs da de el es fr pt_BR ro sl sv uk zh_CN
+HELP_LINGUAS = cs da de el es fr pt_BR ro sl sv uk zh_CN
diff --git a/src/gui.vala b/src/gui.vala
index efa6945..06ac2e4 100644
--- a/src/gui.vala
+++ b/src/gui.vala
@@ -436,7 +436,7 @@ public class Gui : Object {
                                            Variant? parameter) {
                try {
                        Gtk.show_uri (window.get_screen (),
-                                     "ghelp:telegnome", Gdk.CURRENT_TIME);
+                                     "help:telegnome", Gdk.CURRENT_TIME);
                } catch (Error e) {
                        warning ("Error displaying help: %s", e.message);
                }


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]