nm4 2010/05/28 16:38:18 BST
Modified files:
exim-doc/doc-docbook Makefile MyStyle-chunk-html.xsl
MyStyle-filter-fo.xsl
MyStyle-nochunk-html.xsl
MyStyle-spec-fo.xsl MyStyle-txt-html.xsl
OS-Fixups
Log:
Updates to make doc build on tahini
Revision Changes Path
1.14 +3 -2 exim/exim-doc/doc-docbook/Makefile
1.6 +1 -1 exim/exim-doc/doc-docbook/MyStyle-chunk-html.xsl
1.4 +1 -1 exim/exim-doc/doc-docbook/MyStyle-filter-fo.xsl
1.4 +1 -1 exim/exim-doc/doc-docbook/MyStyle-nochunk-html.xsl
1.6 +1 -1 exim/exim-doc/doc-docbook/MyStyle-spec-fo.xsl
1.4 +1 -1 exim/exim-doc/doc-docbook/MyStyle-txt-html.xsl
1.3 +9 -0 exim/exim-doc/doc-docbook/OS-Fixups
Index: Makefile
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-docbook/Makefile,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Makefile 16 Oct 2009 10:36:52 -0000 1.13
+++ Makefile 28 May 2010 15:38:18 -0000 1.14
@@ -1,4 +1,4 @@
-# $Cambridge: exim/exim-doc/doc-docbook/Makefile,v 1.13 2009/10/16 10:36:52 nm4 Exp $
+# $Cambridge: exim/exim-doc/doc-docbook/Makefile,v 1.14 2010/05/28 15:38:18 nm4 Exp $
# Make file for Exim documentation from xfpt source.
@@ -12,8 +12,9 @@
#
# Generate all the documentation files...
#
-everything: spec.pdf spec.ps spec.html spec.info spec.txt \
- filter.pdf filter.ps filter.html filter.info filter.txt \
+## removed info files as I cannot generate them - spec.info filter.info
+everything: spec.pdf spec.ps spec.html spec.txt \
+ filter.pdf filter.ps filter.html filter.txt \
exim.8
############################## MAN PAGE ################################
Index: MyStyle-chunk-html.xsl
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-docbook/MyStyle-chunk-html.xsl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- MyStyle-chunk-html.xsl 9 Nov 2009 16:12:37 -0000 1.5
+++ MyStyle-chunk-html.xsl 28 May 2010 15:38:18 -0000 1.6
@@ -1,4 +1,4 @@
-<!-- $Cambridge: exim/exim-doc/doc-docbook/MyStyle-chunk-html.xsl,v 1.5 2009/11/09 16:12:37 nm4 Exp $ -->
+<!-- $Cambridge: exim/exim-doc/doc-docbook/MyStyle-chunk-html.xsl,v 1.6 2010/05/28 15:38:18 nm4 Exp $ -->
<!-- This stylesheet driver imports the DocBook XML stylesheet for chunked
HTML output, and then imports my common stylesheet for HTML output. Finally, it
@@ -7,7 +7,7 @@
<xsl:stylesheet xmlns:xsl="
http://www.w3.org/1999/XSL/Transform" version='1.0'>
-<xsl:import href="/usr/share/sgml/docbook/xsl-stylesheets-1.70.1/xhtml/chunk.xsl"/>
+<xsl:import href="/usr/share/xml/docbook/stylesheet/nwalsh/1.71.1/xhtml/chunk.xsl"/>
<xsl:import href="MyStyle-html.xsl"/>
Index: MyStyle-filter-fo.xsl
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-docbook/MyStyle-filter-fo.xsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MyStyle-filter-fo.xsl 19 Dec 2006 12:28:35 -0000 1.3
+++ MyStyle-filter-fo.xsl 28 May 2010 15:38:18 -0000 1.4
@@ -1,4 +1,4 @@
-<!-- $Cambridge: exim/exim-doc/doc-docbook/MyStyle-filter-fo.xsl,v 1.3 2006/12/19 12:28:35 ph10 Exp $ -->
+<!-- $Cambridge: exim/exim-doc/doc-docbook/MyStyle-filter-fo.xsl,v 1.4 2010/05/28 15:38:18 nm4 Exp $ -->
<xsl:stylesheet xmlns:xsl="
http://www.w3.org/1999/XSL/Transform" version='1.0'>
@@ -8,7 +8,7 @@
all printed output. Finally, there are some changes that apply only when
printing the filter document. -->
-<xsl:import href="/usr/share/sgml/docbook/xsl-stylesheets-1.70.1/fo/docbook.xsl"/>
+<xsl:import href="/usr/share/xml/docbook/stylesheet/nwalsh/1.71.1/fo/docbook.xsl"/>
<xsl:import href="MyStyle.xsl"/>
<xsl:import href="MyStyle-fo.xsl"/>
Index: MyStyle-nochunk-html.xsl
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-docbook/MyStyle-nochunk-html.xsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MyStyle-nochunk-html.xsl 19 Dec 2006 12:28:35 -0000 1.3
+++ MyStyle-nochunk-html.xsl 28 May 2010 15:38:18 -0000 1.4
@@ -1,11 +1,11 @@
-<!-- $Cambridge: exim/exim-doc/doc-docbook/MyStyle-nochunk-html.xsl,v 1.3 2006/12/19 12:28:35 ph10 Exp $ -->
+<!-- $Cambridge: exim/exim-doc/doc-docbook/MyStyle-nochunk-html.xsl,v 1.4 2010/05/28 15:38:18 nm4 Exp $ -->
<xsl:stylesheet xmlns:xsl="
http://www.w3.org/1999/XSL/Transform" version='1.0'>
<!-- This stylesheet driver imports the DocBook XML stylesheet for unchunked
HTML output, and then imports my common stylesheet for HTML output. -->
-<xsl:import href="/usr/share/sgml/docbook/xsl-stylesheets-1.70.1/xhtml/docbook.xsl"/>
+<xsl:import href="/usr/share/xml/docbook/stylesheet/nwalsh/1.71.1/xhtml/docbook.xsl"/>
<xsl:import href="MyStyle-html.xsl"/>
</xsl:stylesheet>
Index: MyStyle-spec-fo.xsl
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-docbook/MyStyle-spec-fo.xsl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- MyStyle-spec-fo.xsl 19 Dec 2006 12:28:35 -0000 1.5
+++ MyStyle-spec-fo.xsl 28 May 2010 15:38:18 -0000 1.6
@@ -1,4 +1,4 @@
-<!-- $Cambridge: exim/exim-doc/doc-docbook/MyStyle-spec-fo.xsl,v 1.5 2006/12/19 12:28:35 ph10 Exp $ -->
+<!-- $Cambridge: exim/exim-doc/doc-docbook/MyStyle-spec-fo.xsl,v 1.6 2010/05/28 15:38:18 nm4 Exp $ -->
<xsl:stylesheet xmlns:xsl="
http://www.w3.org/1999/XSL/Transform" version='1.0'>
@@ -8,7 +8,7 @@
all printed output. Finally, there are some changes that apply only when
printing the Exim specification document. -->
-<xsl:import href="/usr/share/sgml/docbook/xsl-stylesheets-1.70.1/fo/docbook.xsl"/>
+<xsl:import href="/usr/share/xml/docbook/stylesheet/nwalsh/1.71.1/fo/docbook.xsl"/>
<xsl:import href="MyStyle.xsl"/>
<xsl:import href="MyStyle-fo.xsl"/>
Index: MyStyle-txt-html.xsl
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-docbook/MyStyle-txt-html.xsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MyStyle-txt-html.xsl 19 Dec 2006 12:28:35 -0000 1.3
+++ MyStyle-txt-html.xsl 28 May 2010 15:38:18 -0000 1.4
@@ -1,4 +1,4 @@
-<!-- $Cambridge: exim/exim-doc/doc-docbook/MyStyle-txt-html.xsl,v 1.3 2006/12/19 12:28:35 ph10 Exp $ -->
+<!-- $Cambridge: exim/exim-doc/doc-docbook/MyStyle-txt-html.xsl,v 1.4 2010/05/28 15:38:18 nm4 Exp $ -->
<xsl:stylesheet xmlns:xsl="
http://www.w3.org/1999/XSL/Transform" version='1.0'>
@@ -7,7 +7,7 @@
adds an instruction to use "(c)" for copyright rather than the Unicode
character. -->
-<xsl:import href="/usr/share/sgml/docbook/xsl-stylesheets-1.70.1/xhtml/docbook.xsl"/>
+<xsl:import href="/usr/share/xml/docbook/stylesheet/nwalsh/1.71.1/xhtml/docbook.xsl"/>
<xsl:import href="MyStyle-html.xsl"/>
<xsl:template name="dingbat.characters">
Index: OS-Fixups
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-docbook/OS-Fixups,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- OS-Fixups 9 Nov 2009 16:12:37 -0000 1.2
+++ OS-Fixups 28 May 2010 15:38:18 -0000 1.3
@@ -1,5 +1,5 @@
#!/usr/bin/perl -w
-# $Cambridge: exim/exim-doc/doc-docbook/OS-Fixups,v 1.2 2009/11/09 16:12:37 nm4 Exp $
+# $Cambridge: exim/exim-doc/doc-docbook/OS-Fixups,v 1.3 2010/05/28 15:38:18 nm4 Exp $
use strict;
# Script to hack around using absolute paths in xsl:import with fixups.
@@ -17,6 +17,15 @@
{"/usr/local/share/xml/docbook/4.2/docbookx.dtd"};
}
+sub filter_linux
+{
+# SUSE 10 with extra pkgs
+s{"/usr/share/sgml/docbook/xsl-stylesheets-1.70.1/}
+ {"/usr/share/xml/docbook/stylesheet/nwalsh/1.71.1/};
+s{"
http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"}
+ {"/usr/share/xml/docbook/schema/dtd/4.2/docbookx.dtd"};
+}
+
sub filter_darwin
{
# NB - this uses the Mac Ports installations
