0.8.6.27:

	* doc/DOCDOC: Add upstream URL for tools
	* doc/Makefile: Add support for Fedora Core 1
	* doc/catalogs/: Move catalog files to this subdirectory

diff --git a/doc/DOCDOC b/doc/DOCDOC
index 034f171..5ce55e3 100644 (file)
--- a/doc/DOCDOC
+++ b/doc/DOCDOC
@@ -68,3 +68,11 @@ Tools for Fink
        
   The easiest way to do this is with the command:
     fink install libxslt docbook-dtd docbook-xsl libxml2-bin
+
+Tools Web Home
+--------------
+xsltproc     http://xmlsoft.org/XSLT/
+DocBook DTD  http://www.docbook.org/xml/
+DocBook XSL  http://sourceforge.net/projects/docbook
+xmllint      http://xmlsoft.org/
+FOP          http://xml.apache.org/fop/

diff --git a/doc/Makefile b/doc/Makefile
index a73e2f7..0f4e6d1 100644 (file)
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -9,10 +9,6 @@ DOCFILE_EXT_DEFAULT:=xml
 SYSTEM:=$(shell uname)
 
 ifeq ($(SYSTEM),Linux) 
-  DEBIAN=$()
-  SUSE=
-  REDHAT=
-
   ifneq ($(shell expr "`cat /etc/issue`" : '.*Debian.*'),0)
     OS:=debian
     else
@@ -21,6 +17,10 @@ ifeq ($(SYSTEM),Linux)
     else   
       ifneq ($(shell expr "`cat /etc/issue`" : 'Red Hat Linux release 9'),0)
         OS=redhat9
+      else   
+        ifneq ($(shell expr "`cat /etc/issue`" : '.*Yarrow.*'),0)
+          OS=fedora1
+        endif
       endif
     endif
   endif
@@ -52,7 +52,7 @@ ifeq ($(XSLTPROC),)
   XSLTPROC:=xsltproc
 endif
 
-CATALOG:=`pwd`/catalog-${OS}.xml
+CATALOG:=`pwd`/catalogs/catalog-${OS}.xml
 CHECK:=XML_CATALOG_FILES="$(CATALOG)" xmllint --noout --xinclude --postvalid $(DOCFILE) || exit 1
 
 .PHONY: all

diff --git a/doc/catalog-debian.xml b/doc/catalog-debian.xml
deleted file mode 100644 (file)
index d940a02..0000000
--- a/doc/catalog-debian.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE catalog
-   PUBLIC "-//OASIS/DTD Entity Resolution XML Catalog V1.0//EN"
-   "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
-
-<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
-
-  <!-- The directory DTD and stylesheet files are installed under -->
-  <group  xml:base="file:///usr/share/sgml/docbook/" >
-
-    <!-- Resolve DTD URL system ID to local file -->
-    <rewriteSystem
-        systemIdStartString="http://www.oasis-open.org/docbook/xml/4.1/"
-        rewritePrefix="dtd/xml/4.1/" />
-    <!-- Resolve stylesheet URL to local file -->
-    <rewriteURI
-        uriStartString="http://docbook.sourceforge.net/release/xsl/current/"
-        rewritePrefix="stylesheet/xsl/nwalsh/" />
-
-    <!-- Resolve DTD PUBLIC identifiers -->
-    <nextCatalog  catalog="dtd/xml/4.1/catalog.xml" />
-
-    <!-- To resolve simple DTD SYSTEM identifiers. -->
-    <!-- Note: this does not work with Java resolver -->
-    <!--   classes in Saxon or Xalan -->
-    <system
-         systemId="docbook.dtd"
-         uri="dtd/xml/4.1/xml/docbookx.dtd" />
-
-    <!-- To resolve short stylesheet references -->
-    <uri
-        name="docbook_html.xsl"
-        uri="stylesheet/xsl/nwalsh/xhtml/docbook.xsl" />
-    <uri 
-        name="docbook_chunk.xsl"
-        uri="stylesheet/xsl/nwalsh/xhtml/chunk.xsl" />
-    <uri
-        name="docbook_fo.xsl"
-        uri="stylesheet/xsl/nwalsh/fo/docbook.xsl" />
-
-  </group>
-
-</catalog>

diff --git a/doc/catalog-fink.xml b/doc/catalog-fink.xml
deleted file mode 100644 (file)
index 666557f..0000000
--- a/doc/catalog-fink.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE catalog
-   PUBLIC "-//OASIS/DTD Entity Resolution XML Catalog V1.0//EN"
-   "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
-
-<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
-
-  <!-- The directory DTD and stylesheet files are installed under -->
-  <group  xml:base="file:///sw/share/xml/" >
-
-    <!-- Resolve DTD URL system ID to local file -->
-    <rewriteSystem
-        systemIdStartString="http://www.oasis-open.org/docbook/xml/4.1/"
-        rewritePrefix="dtd/docbookx/4.1/" />
-    <!-- Resolve stylesheet URL to local file -->
-    <rewriteURI
-        uriStartString="http://docbook.sourceforge.net/release/xsl/current/"
-        rewritePrefix="xsl/docbook-xsl/" />
-
-    <!-- Resolve DTD PUBLIC identifiers -->
-    <nextCatalog  catalog="dtd/docbookx/catalog" />
-
-    <!-- To resolve simple DTD SYSTEM identifiers. -->
-    <!-- Note: this does not work with Java resolver -->
-    <!--   classes in Saxon or Xalan -->
-    <system
-         systemId="docbook.dtd"
-         uri="dtd/docbookx/4.1/docbookx.dtd" />
-
-    <!-- To resolve short stylesheet references -->
-    <uri
-        name="docbook_html.xsl"
-        uri="xsl/docbok-xsl/xhtml/docbook.xsl" />
-    <uri 
-        name="docbook_chunk.xsl"
-        uri="xsl/docbook-xsl/xhtml/chunk.xsl" />
-    <uri
-        name="docbook_fo.xsl"
-        uri="xsl/docbook-xsl/fo/docbook.xsl" />
-
-  </group>
-
-</catalog>

diff --git a/doc/catalog-redhat9.xml b/doc/catalog-redhat9.xml
deleted file mode 100644 (file)
index 9e1152d..0000000
--- a/doc/catalog-redhat9.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE catalog
-   PUBLIC "-//OASIS/DTD Entity Resolution XML Catalog V1.0//EN"
-   "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
-
-<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
-
-  <!-- The directory DTD and stylesheet files are installed under -->
-  <group  xml:base="file:///usr/share/sgml/docbook/" >
-
-    <!-- Resolve DTD URL system ID to local file -->
-    <rewriteSystem
-        systemIdStartString="http://www.oasis-open.org/docbook/xml/4.1/"
-        rewritePrefix="xml-dtd-4.1.2-1.0-17/" />
-
-    <!-- FIXME: Need to verify the location of the XSL files on RedHat -->
-    <!-- Resolve stylesheet URL to local file -->
-    <rewriteURI
-        uriStartString="http://docbook.sourceforge.net/release/xsl/current/"
-        rewritePrefix="xsl-stylesheets/" />
-
-    <!-- Resolve DTD PUBLIC identifiers -->
-    <nextCatalog  catalog="xmlcatalog" />
-
-    <!-- To resolve simple DTD SYSTEM identifiers. -->
-    <!-- Note: this does not work with Java resolver -->
-    <!--   classes in Saxon or Xalan -->
-    <system
-         systemId="docbook.dtd"
-         uri="xml-dtd-4.1.2-1.0-17/docbookx.dtd" />
-
-    <!-- To resolve short stylesheet references -->
-    <uri
-        name="docbook_html.xsl"
-        uri="xsl-stylesheets/xhtml/docbook.xsl" />
-    <uri 
-        name="docbook_chunk.xsl"
-        uri="xsl-stylesheets/xhtml/chunk.xsl" />
-    <uri
-        name="docbook_fo.xsl"
-        uri="xsl-stylesheets/fo/docbook.xsl" />
-
-  </group>
-
-</catalog>

diff --git a/doc/catalog-suse.xml b/doc/catalog-suse.xml
deleted file mode 100644 (file)
index b6ef3c2..0000000
--- a/doc/catalog-suse.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE catalog
-   PUBLIC "-//OASIS/DTD Entity Resolution XML Catalog V1.0//EN"
-   "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
-
-<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
-
-  <!-- The directory DTD and stylesheet files are installed under -->
-  <group  xml:base="file:///usr/share/sgml/" >
-
-    <!-- Resolve DTD URL system ID to local file -->
-    <rewriteSystem
-        systemIdStartString="http://www.oasis-open.org/docbook/xml/4.1/"
-        rewritePrefix="db41xml/" />
-    <!-- Resolve stylesheet URL to local file -->
-    <rewriteURI
-        uriStartString="http://docbook.sourceforge.net/release/xsl/current/"
-        rewritePrefix="docbook/docbook-xsl/" />
-
-    <!-- Resolve DTD PUBLIC identifiers -->
-    <nextCatalog  catalog="db41xml/catalog.xml" />
-
-    <!-- To resolve simple DTD SYSTEM identifiers. -->
-    <!-- Note: this does not work with Java resolver -->
-    <!--   classes in Saxon or Xalan -->
-    <system
-         systemId="docbook.dtd"
-         uri="db41xml/docbookx.dtd" />
-
-    <!-- To resolve short stylesheet references -->
-    <uri
-        name="docbook_html.xsl"
-        uri="docbook/docbook-xsl/xhtml/docbook.xsl" />
-    <uri 
-        name="docbook_chunk.xsl"
-        uri="docbook/docbook-xsl/xhtml/chunk.xsl" />
-    <uri
-        name="docbook_fo.xsl"
-        uri="docbook/docbook-xsl/fo/docbook.xsl" />
-
-  </group>
-
-</catalog>

diff --git a/doc/catalogs/catalog-debian.xml b/doc/catalogs/catalog-debian.xml
new file mode 100644 (file)
index 0000000..d940a02
--- /dev/null
+++ b/doc/catalogs/catalog-debian.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE catalog
+   PUBLIC "-//OASIS/DTD Entity Resolution XML Catalog V1.0//EN"
+   "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
+
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+
+  <!-- The directory DTD and stylesheet files are installed under -->
+  <group  xml:base="file:///usr/share/sgml/docbook/" >
+
+    <!-- Resolve DTD URL system ID to local file -->
+    <rewriteSystem
+        systemIdStartString="http://www.oasis-open.org/docbook/xml/4.1/"
+        rewritePrefix="dtd/xml/4.1/" />
+    <!-- Resolve stylesheet URL to local file -->
+    <rewriteURI
+        uriStartString="http://docbook.sourceforge.net/release/xsl/current/"
+        rewritePrefix="stylesheet/xsl/nwalsh/" />
+
+    <!-- Resolve DTD PUBLIC identifiers -->
+    <nextCatalog  catalog="dtd/xml/4.1/catalog.xml" />
+
+    <!-- To resolve simple DTD SYSTEM identifiers. -->
+    <!-- Note: this does not work with Java resolver -->
+    <!--   classes in Saxon or Xalan -->
+    <system
+         systemId="docbook.dtd"
+         uri="dtd/xml/4.1/xml/docbookx.dtd" />
+
+    <!-- To resolve short stylesheet references -->
+    <uri
+        name="docbook_html.xsl"
+        uri="stylesheet/xsl/nwalsh/xhtml/docbook.xsl" />
+    <uri 
+        name="docbook_chunk.xsl"
+        uri="stylesheet/xsl/nwalsh/xhtml/chunk.xsl" />
+    <uri
+        name="docbook_fo.xsl"
+        uri="stylesheet/xsl/nwalsh/fo/docbook.xsl" />
+
+  </group>
+
+</catalog>

diff --git a/doc/catalogs/catalog-fedora1.xml b/doc/catalogs/catalog-fedora1.xml
new file mode 100644 (file)
index 0000000..eff5508
--- /dev/null
+++ b/doc/catalogs/catalog-fedora1.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE catalog
+   PUBLIC "-//OASIS/DTD Entity Resolution XML Catalog V1.0//EN"
+   "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
+
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+
+  <!-- The directory DTD and stylesheet files are installed under -->
+  <group  xml:base="file:///usr/share/sgml/docbook/" >
+
+    <!-- Resolve DTD URL system ID to local file -->
+    <rewriteSystem
+        systemIdStartString="http://www.oasis-open.org/docbook/xml/4.1/"
+        rewritePrefix="xml-dtd-4.1.2-1.0-22.1/" />
+
+    <!-- FIXME: Need to verify the location of the XSL files on RedHat -->
+    <!-- Resolve stylesheet URL to local file -->
+    <rewriteURI
+        uriStartString="http://docbook.sourceforge.net/release/xsl/current/"
+        rewritePrefix="xsl-stylesheets/" />
+
+    <!-- Resolve DTD PUBLIC identifiers -->
+    <nextCatalog  catalog="xmlcatalog" />
+
+    <!-- To resolve simple DTD SYSTEM identifiers. -->
+    <!-- Note: this does not work with Java resolver -->
+    <!--   classes in Saxon or Xalan -->
+    <system
+         systemId="docbook.dtd"
+         uri="xml-dtd-4.1.2-1.0-22.1/docbookx.dtd" />
+
+    <!-- To resolve short stylesheet references -->
+    <uri
+        name="docbook_html.xsl"
+        uri="xsl-stylesheets/xhtml/docbook.xsl" />
+    <uri 
+        name="docbook_chunk.xsl"
+        uri="xsl-stylesheets/xhtml/chunk.xsl" />
+    <uri
+        name="docbook_fo.xsl"
+        uri="xsl-stylesheets/fo/docbook.xsl" />
+
+  </group>
+
+</catalog>

diff --git a/doc/catalogs/catalog-fink.xml b/doc/catalogs/catalog-fink.xml
new file mode 100644 (file)
index 0000000..666557f
--- /dev/null
+++ b/doc/catalogs/catalog-fink.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE catalog
+   PUBLIC "-//OASIS/DTD Entity Resolution XML Catalog V1.0//EN"
+   "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
+
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+
+  <!-- The directory DTD and stylesheet files are installed under -->
+  <group  xml:base="file:///sw/share/xml/" >
+
+    <!-- Resolve DTD URL system ID to local file -->
+    <rewriteSystem
+        systemIdStartString="http://www.oasis-open.org/docbook/xml/4.1/"
+        rewritePrefix="dtd/docbookx/4.1/" />
+    <!-- Resolve stylesheet URL to local file -->
+    <rewriteURI
+        uriStartString="http://docbook.sourceforge.net/release/xsl/current/"
+        rewritePrefix="xsl/docbook-xsl/" />
+
+    <!-- Resolve DTD PUBLIC identifiers -->
+    <nextCatalog  catalog="dtd/docbookx/catalog" />
+
+    <!-- To resolve simple DTD SYSTEM identifiers. -->
+    <!-- Note: this does not work with Java resolver -->
+    <!--   classes in Saxon or Xalan -->
+    <system
+         systemId="docbook.dtd"
+         uri="dtd/docbookx/4.1/docbookx.dtd" />
+
+    <!-- To resolve short stylesheet references -->
+    <uri
+        name="docbook_html.xsl"
+        uri="xsl/docbok-xsl/xhtml/docbook.xsl" />
+    <uri 
+        name="docbook_chunk.xsl"
+        uri="xsl/docbook-xsl/xhtml/chunk.xsl" />
+    <uri
+        name="docbook_fo.xsl"
+        uri="xsl/docbook-xsl/fo/docbook.xsl" />
+
+  </group>
+
+</catalog>

diff --git a/doc/catalogs/catalog-redhat9.xml b/doc/catalogs/catalog-redhat9.xml
new file mode 100644 (file)
index 0000000..9e1152d
--- /dev/null
+++ b/doc/catalogs/catalog-redhat9.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE catalog
+   PUBLIC "-//OASIS/DTD Entity Resolution XML Catalog V1.0//EN"
+   "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
+
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+
+  <!-- The directory DTD and stylesheet files are installed under -->
+  <group  xml:base="file:///usr/share/sgml/docbook/" >
+
+    <!-- Resolve DTD URL system ID to local file -->
+    <rewriteSystem
+        systemIdStartString="http://www.oasis-open.org/docbook/xml/4.1/"
+        rewritePrefix="xml-dtd-4.1.2-1.0-17/" />
+
+    <!-- FIXME: Need to verify the location of the XSL files on RedHat -->
+    <!-- Resolve stylesheet URL to local file -->
+    <rewriteURI
+        uriStartString="http://docbook.sourceforge.net/release/xsl/current/"
+        rewritePrefix="xsl-stylesheets/" />
+
+    <!-- Resolve DTD PUBLIC identifiers -->
+    <nextCatalog  catalog="xmlcatalog" />
+
+    <!-- To resolve simple DTD SYSTEM identifiers. -->
+    <!-- Note: this does not work with Java resolver -->
+    <!--   classes in Saxon or Xalan -->
+    <system
+         systemId="docbook.dtd"
+         uri="xml-dtd-4.1.2-1.0-17/docbookx.dtd" />
+
+    <!-- To resolve short stylesheet references -->
+    <uri
+        name="docbook_html.xsl"
+        uri="xsl-stylesheets/xhtml/docbook.xsl" />
+    <uri 
+        name="docbook_chunk.xsl"
+        uri="xsl-stylesheets/xhtml/chunk.xsl" />
+    <uri
+        name="docbook_fo.xsl"
+        uri="xsl-stylesheets/fo/docbook.xsl" />
+
+  </group>
+
+</catalog>

diff --git a/doc/catalogs/catalog-suse.xml b/doc/catalogs/catalog-suse.xml
new file mode 100644 (file)
index 0000000..b6ef3c2
--- /dev/null
+++ b/doc/catalogs/catalog-suse.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE catalog
+   PUBLIC "-//OASIS/DTD Entity Resolution XML Catalog V1.0//EN"
+   "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
+
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+
+  <!-- The directory DTD and stylesheet files are installed under -->
+  <group  xml:base="file:///usr/share/sgml/" >
+
+    <!-- Resolve DTD URL system ID to local file -->
+    <rewriteSystem
+        systemIdStartString="http://www.oasis-open.org/docbook/xml/4.1/"
+        rewritePrefix="db41xml/" />
+    <!-- Resolve stylesheet URL to local file -->
+    <rewriteURI
+        uriStartString="http://docbook.sourceforge.net/release/xsl/current/"
+        rewritePrefix="docbook/docbook-xsl/" />
+
+    <!-- Resolve DTD PUBLIC identifiers -->
+    <nextCatalog  catalog="db41xml/catalog.xml" />
+
+    <!-- To resolve simple DTD SYSTEM identifiers. -->
+    <!-- Note: this does not work with Java resolver -->
+    <!--   classes in Saxon or Xalan -->
+    <system
+         systemId="docbook.dtd"
+         uri="db41xml/docbookx.dtd" />
+
+    <!-- To resolve short stylesheet references -->
+    <uri
+        name="docbook_html.xsl"
+        uri="docbook/docbook-xsl/xhtml/docbook.xsl" />
+    <uri 
+        name="docbook_chunk.xsl"
+        uri="docbook/docbook-xsl/xhtml/chunk.xsl" />
+    <uri
+        name="docbook_fo.xsl"
+        uri="docbook/docbook-xsl/fo/docbook.xsl" />
+
+  </group>
+
+</catalog>

diff --git a/version.lisp-expr b/version.lisp-expr
index a6841e7..04f41be 100644 (file)
--- a/version.lisp-expr
+++ b/version.lisp-expr
@@ -17,4 +17,4 @@
 ;;; checkins which aren't released. (And occasionally for internal
 ;;; versions, especially for internal versions off the main CVS
 ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".)
-"0.8.6.26"
+"0.8.6.27"