[pitivi] Use yelp-tools instead of gnome-doc-utils



commit 75b96b2868f2c2e1429aeecf45acd2833e28cad9
Author: Oliver Propst <oliver propst gmail com>
Date:   Fri Jul 26 19:49:18 2013 +0200

    Use yelp-tools instead of gnome-doc-utils
    
    Fixes bug #687563
    Keep "ghelp" URIs for launching locally (see bug #706223)

 .gitignore             |    1 -
 Makefile.am            |    2 --
 autogen.sh             |   10 +++++-----
 configure.ac           |    2 +-
 help/Makefile.am       |   12 +++++-------
 pitivi/configure.py.in |    2 +-
 6 files changed, 12 insertions(+), 17 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 619a941..cf7d7c1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,7 +15,6 @@ help/*/*.mo
 help/*/*.page
 !help/C/*.page
 
-gnome-doc-utils.make
 install-sh
 libtool
 locale/
diff --git a/Makefile.am b/Makefile.am
index 170a1fb..35f37a5 100755
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,12 +12,10 @@ EXTRA_DIST = \
        NEWS \
        AUTHORS \
        RELEASE \
-       gnome-doc-utils.make \
     pitivi.xml
 
 
 DISTCLEANFILES =                \
-        gnome-doc-utils.make    \
         intltool-extract        \
         intltool-merge          \
         intltool-update
diff --git a/autogen.sh b/autogen.sh
index 61a8c98..048a2ec 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -62,11 +62,11 @@ fi
 
 toplevel_check $srcfile
 
-echo "+ checking for GNOME Doc Utils"
-# gnome-doc-prepare is a gnome_doc_utils tool which creates a link to
-# gnome-doc-utils.make, which is required to build the user manual.
-tool_run "gnome-doc-prepare" "--automake" \
-    "echo Install gnome-doc-utils if gnome-doc-prepare is missing."
+GNOMEDOC=`which yelp-build`
+if test -z $GNOMEDOC; then
+  echo "Please intall the yelp-tools package"
+  exit 1
+fi
 
 # This is needed to create ltmain.sh for our C bits.
 tool_run "$libtoolize" "--copy --force"
diff --git a/configure.ac b/configure.ac
index af2f573..d54e959 100644
--- a/configure.ac
+++ b/configure.ac
@@ -72,7 +72,7 @@ AC_CONFIG_FILES([bin/pitivi], [chmod +x bin/pitivi])
 
 PKG_CHECK_MODULES([cairo], [cairo])
 
-GNOME_DOC_INIT([0.18.0])
+YELP_HELP_INIT
 
 dnl output stuff
 AC_OUTPUT(
diff --git a/help/Makefile.am b/help/Makefile.am
index 73bb9bd..398426e 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -1,9 +1,7 @@
-include $(top_srcdir)/gnome-doc-utils.make
+ YELP_HELP_RULES@
 
-dist-hook: doc-dist-hook
-
-DOC_ID = pitivi
-DOC_FIGURES = \
+HELP_ID = pitivi
+HELP_MEDIA = \
     figures/codecscontainers.jpg\
     figures/fadestep1.png \
     figures/fadestep2.png \
@@ -22,7 +20,7 @@ DOC_FIGURES = \
     figures/ruler.png \
     figures/trimming-individual.png
 
-DOC_PAGES = \
+HELP_FILES = \
     about.page \
     cheatsheet.page \
     codecscontainers.page \
@@ -56,7 +54,7 @@ DOC_PAGES = \
     usingclips.page \
     welcomedialog.page
 
-DOC_LINGUAS = de el es fr sl uk
+HELP_LINGUAS = cs de el es fr sl uk
 
 html:
        mkdir -p html
diff --git a/pitivi/configure.py.in b/pitivi/configure.py.in
index 4f673c7..f971926 100644
--- a/pitivi/configure.py.in
+++ b/pitivi/configure.py.in
@@ -45,7 +45,7 @@ RELEASES_URL = 'http://pitivi.org/releases.txt'
 if _in_devel():
     APPMANUALURL_OFFLINE = 'ghelp://%s' % os.path.join(_get_root_dir(), 'help/C')
 else:
-    APPMANUALURL_OFFLINE = 'ghelp:pitivi'
+    APPMANUALURL_OFFLINE = 'help:pitivi'
 
 APPMANUALURL_ONLINE = 'http://www.pitivi.org/manual'
 


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