[pybliographer] Update to the new gnome help system



commit 2c38d642f4aafb7a15c74f45c79bdd3753615706
Author: Zoltan Kota <zoltank gmail com>
Date:   Thu Sep 21 14:55:22 2017 +0200

    Update to the new gnome help system

 Makefile.am                |    3 +--
 Pyblio/GnomeUI/Document.py |    2 +-
 autogen.sh                 |    7 ++++++-
 configure.ac               |    2 +-
 help/Makefile.am           |   12 ++++++------
 5 files changed, 15 insertions(+), 11 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 5451ce5..bdecb41 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -61,8 +61,7 @@ EXTRA_DIST =  setup-check.py                  \
                pybliographic.desktop.in        \
                pybliographic.png               \
                pybliographic-logo.png          \
-               pybliographic-viewer.png        \
-               gnome-doc-utils.make
+               pybliographic-viewer.png
 
 
 dist-hook:
diff --git a/Pyblio/GnomeUI/Document.py b/Pyblio/GnomeUI/Document.py
index bb25e2f..f9ce177 100644
--- a/Pyblio/GnomeUI/Document.py
+++ b/Pyblio/GnomeUI/Document.py
@@ -1216,7 +1216,7 @@ class Document (Connector.Publisher):
 
         timestamp = gtk.gdk.CURRENT_TIME
         try:
-            gtk.show_uri (None, "ghelp:pybliographer", timestamp)
+            gtk.show_uri (None, "help:pybliographer", timestamp)
             
         except gobject.GError, msg:
             self.w.error (_("Can't display documentation:\n%s") % msg)
diff --git a/autogen.sh b/autogen.sh
index 71ff473..1dde36a 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -24,7 +24,12 @@ run ()
     $* || error "while running $*"
 }
 
-run gnome-doc-prepare --copy --force
+GNOMEDOC=`which yelp-build`
+    if test -z $GNOMEDOC; then
+        echo "*** The tools to build the documentation are not found,"
+        echo "    please intall the yelp-tools package ***"
+        exit 1
+    fi
 
 run aclocal ${aclocal_extra}
 run autoconf
diff --git a/configure.ac b/configure.ac
index eed317a..a06d2c6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -80,7 +80,7 @@ fi
 dnl NLS is now hand-managed for python.
 
 # Documentation
-GNOME_DOC_INIT
+YELP_HELP_INIT
 
 AC_ARG_ENABLE(update-desktop-database,
 AC_HELP_STRING([--disable-update-desktop-database],
diff --git a/help/Makefile.am b/help/Makefile.am
index 555d8a9..5ad9722 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -20,11 +20,11 @@
 
 AUTOMAKE_OPTIONS = -Wno-portability
 
-include $(top_srcdir)/gnome-doc-utils.make
-dist-hook: doc-dist-hook
+@YELP_HELP_RULES@
 
-DOC_ID = pybliographer
-DOC_FIGURES =  figures/edit.png        \
+HELP_ID = pybliographer
+
+HELP_MEDIA =   figures/edit.png        \
                figures/edit2.png       \
                figures/fields.png      \
                figures/format.png      \
@@ -35,7 +35,7 @@ DOC_FIGURES = figures/edit.png        \
                figures/search.png      \
                figures/sort.png
 
-DOC_PAGES =    about.page              \
+HELP_FILES =   about.page              \
                addhelp.page            \
                command-line.page       \
                customization.page      \
@@ -60,5 +60,5 @@ DOC_PAGES =   about.page              \
                typcon.page             \
                whatsnew.page
 
-DOC_LINGUAS = cs de el es fr sl
+HELP_LINGUAS = cs de el es fr sl
 


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