[gnome-panel] doc: drop version.xml.in



commit 6068c0e64a7f7e96ab0e018b4bc0694f30564f6e
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Sat Sep 12 02:42:03 2015 +0300

    doc: drop version.xml.in

 configure.ac                                     |    3 +--
 doc/reference/panel-applet/Makefile.am           |    8 +-------
 doc/reference/panel-applet/panel-applet-docs.xml |   14 ++++++++------
 doc/reference/panel-applet/version.xml.in        |    1 -
 4 files changed, 10 insertions(+), 16 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 3cc5e97..8db13bb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -201,7 +201,7 @@ AM_GLIB_GNU_GETTEXT
 
 dnl gtk-doc stuff
 
-GTK_DOC_CHECK([1.10],[--flavour no-tmpl])
+GTK_DOC_CHECK([1.24.1], [--flavour no-tmpl])
 
 dnl yelp-tools stuff
 
@@ -241,7 +241,6 @@ applets/wncklet/Makefile
 doc/Makefile
 doc/reference/Makefile
 doc/reference/panel-applet/Makefile
-doc/reference/panel-applet/version.xml
 help/Makefile
 help/clock/Makefile
 help/fish/Makefile
diff --git a/doc/reference/panel-applet/Makefile.am b/doc/reference/panel-applet/Makefile.am
index ad01ae8..a586ef4 100644
--- a/doc/reference/panel-applet/Makefile.am
+++ b/doc/reference/panel-applet/Makefile.am
@@ -61,9 +61,7 @@ HTML_IMAGES = \
 
 # Extra files that are included by $(DOC_MAIN_SGML_FILE).
 # e.g. content_files=running.xml building.xml changes-2.0.xml
-content_files = \
-       version.xml \
-       $(NULL)
+content_files =
 
 # Files where gtk-doc abbrevations (#GtkWidget) are expanded
 # e.g. expand_content_files=running.xml
@@ -88,10 +86,6 @@ GTKDOC_LIBS = \
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
 include $(top_srcdir)/gtk-doc.make
 
-EXTRA_DIST += \
-       version.xml.in \
-       $(NULL)
-
 # Comment this out if you want 'make check' to test you doc status
 # and run some sanity checks
 if ENABLE_GTK_DOC
diff --git a/doc/reference/panel-applet/panel-applet-docs.xml 
b/doc/reference/panel-applet/panel-applet-docs.xml
index 1c1df58..edb4e48 100644
--- a/doc/reference/panel-applet/panel-applet-docs.xml
+++ b/doc/reference/panel-applet/panel-applet-docs.xml
@@ -1,15 +1,17 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
-               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd";
+<?xml version="1.0"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd";
 [
-<!ENTITY version SYSTEM "version.xml">
+  <!ENTITY % local.common.attrib "xmlns:xi  CDATA  #FIXED 'http://www.w3.org/2003/XInclude'">
+  <!ENTITY % gtkdocentities SYSTEM "xml/gtkdocentities.ent">
+  %gtkdocentities;
 ]>
-<book id="index" xmlns:xi="http://www.w3.org/2003/XInclude";>
+<book id="index">
 
   <bookinfo>
     <title>Panel Applet Library Reference Manual</title>
     <releaseinfo>
-      This document is for the Panel Applet 5.0 library, version &version;.
+      This document is for the Panel Applet 5.0 library, version &package_version;.
       The latest versions can be found online at
       <ulink role="online-location" 
url="http://developer.gnome.org/panel-applet/";>http://developer.gnome.org/panel-applet/</ulink>.
     </releaseinfo>


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