Merge 28-yelp-tools.patch

From James Cowgill <jcowgill@debian.org> for the Debian/Ubuntu package.
https://bugs.debian.org/830028

diff --git a/Makefile.am b/Makefile.am
index 6b2a2873bb7391dd4c256d14394e46030408da75..1d337a4224126165113ec9178d71758c9af2831b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,13 +4,10 @@ EXTRA_DIST = COPYING-DOCS\
        README.PERFORMANCE\
        terminatorX.spec.in\
        terminatorX.appdata.xml\
-       gnome-doc-utils.make\
        terminatorX.desktop\
        autogen.sh\
        terminatorX.mime
 
-DISTCLEANFILES = gnome-doc-utils.make
-
 # Destkop Entry
 desktopdir = $(datadir)/applications
 desktop_DATA = terminatorX.desktop

diff --git a/autogen.sh b/autogen.sh
index ea7f65072af4234faa824a05e5677d8e7a11c767..535e286fbb641ce964b807b885426cc3c3e22d48 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 
 echo Creating files required for building terminatorX...
-gnome-doc-prepare --force --automake
 aclocal -Wno-portability
 autoheader
 automake --add-missing -Wno-portability

diff --git a/configure.ac b/configure.ac
index f9dc35182478898a96e812d40daf1b19fd1d1d93..164e68a599f68a43c0ea2347c2066a439e36bdb3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -583,12 +583,9 @@ if test "$enable_lrdf" != "no"; then
 fi
 
 dnl User Manual
-GNOME_DOC_INIT
+YELP_HELP_INIT
 
-xml_man="\\\"${datadir}/gnome/help/terminatorX-manual/C/terminatorX-manual.xml\\\""
-
-
-CFLAGS="$XML_CFLAGS $CFLAGS -DXML_MANUAL=$xml_man"
+CFLAGS="$XML_CFLAGS $CFLAGS"
 LIBS="$XML_LIBS $LIBS"
 
 AC_OUTPUT(Makefile 

diff --git a/help/C/terminatorX-manual.xml b/help/C/index.docbook
similarity index 99%
rename from help/C/terminatorX-manual.xml
rename to help/C/index.docbook
index b2e0a6d7027c8fc89ae9ecdd7142cea12c7e508d..e19e537ad48c05072134dc7c49fbf0bc55c2c8af 100644 (file)
--- a/help/C/terminatorX-manual.xml
+++ b/help/C/index.docbook
@@ -42,7 +42,7 @@
       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">
+      of the GFDL at this <ulink type="help" url="help:fdl">
       link</ulink> or in the file COPYING-DOCS distributed with this 
       manual.</para>
 

diff --git a/help/Makefile.am b/help/Makefile.am
index 4457a02f05bb9956af03707593752607eec241c8..2f2dda07c89db2910e31dccf07373b45e56f19a8 100644 (file)
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -1,9 +1,5 @@
-include $(top_srcdir)/gnome-doc-utils.make
-dist-hook: doc-dist-hook
+@YELP_HELP_RULES@
 
-DOC_MODULE = terminatorX-manual
-DOC_ENTITIES = 
-DOC_INCLUDES = 
-DOC_FIGURES = figures/signalflow.png
-
-DOC_LINGUAS = 
+HELP_ID = terminatorX-manual
+HELP_FILES = index.docbook
+HELP_MEDIA = figures/signalflow.png

diff --git a/src/tX_mastergui.cc b/src/tX_mastergui.cc
index 396a4e25a0ee79682f90571eecba5f19ba8e15f6..dcf144731b60faa6467b6bfa6c4ae45c356927f3 100644 (file)
--- a/src/tX_mastergui.cc
+++ b/src/tX_mastergui.cc
@@ -1754,7 +1754,7 @@ void display_help()
        
        if (help_child==0) {
                // child
-               execlp("gnome-help","gnome-help","file://" XML_MANUAL, NULL);           
+               execlp("gnome-help","gnome-help","help:terminatorX-manual", NULL);
                _exit(-1);
        } else if (help_child==-1) {
                tx_note("System error: couldn't fork() to run the help process.", true);