Commit 3813fed3 authored by Kevin Rosenberg's avatar Kevin Rosenberg
Browse files

0.8.7.26: 

	* doc/catalogs/catalog-debian.xsl: Update for changes in Debian XML
	packages. Retain old catalog as catalog-debian-old.xsl. FIXME: have
	Makefile automatically select which version of catalog to use on Debian
	based on presence of files in new location.
parent 1b6dc226

doc/catalogs/catalog-debian-old.xml

0 → 100644
+43 −0
Original line number Diff line number Diff line 
<?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>

doc/catalogs/catalog-debian.xml

+6 −5
Original line number Diff line number Diff line
@@ -6,7 +6,8 @@ 
<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/" >

  <!-- Older Deb: <group  xml:base="file:///usr/share/sgml/docbook/" > -->

  <group  xml:base="file:///usr/share/xml/docbook/" >



    <!-- Resolve DTD URL system ID to local file -->

    <rewriteSystem
@@ -15,7 +16,7 @@ 
    <!-- Resolve stylesheet URL to local file -->

    <rewriteURI

        uriStartString="http://docbook.sourceforge.net/release/xsl/current/"

        rewritePrefix="stylesheet/xsl/nwalsh/" />

        rewritePrefix="stylesheet/nwalsh/" />



    <!-- Resolve DTD PUBLIC identifiers -->

    <nextCatalog  catalog="dtd/xml/4.1/catalog.xml" />
@@ -30,13 +31,13 @@ 
    <!-- To resolve short stylesheet references -->

    <uri

        name="docbook_html.xsl"

        uri="stylesheet/xsl/nwalsh/xhtml/docbook.xsl" />

        uri="stylesheet/nwalsh/xhtml/docbook.xsl" />

    <uri 

        name="docbook_chunk.xsl"

        uri="stylesheet/xsl/nwalsh/xhtml/chunk.xsl" />

        uri="stylesheet/nwalsh/xhtml/chunk.xsl" />

    <uri

        name="docbook_fo.xsl"

        uri="stylesheet/xsl/nwalsh/fo/docbook.xsl" />

        uri="stylesheet/nwalsh/fo/docbook.xsl" />



  </group>

version.lisp-expr

+1 −1
Original line number Diff line number Diff line
@@ -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.7.25"
 
"0.8.7.26"