--- docbook-xml-4.5.orig/catalog.xml
+++ docbook-xml-4.5/catalog.xml
@@ -0,0 +1,31 @@
+<?xml version='1.0'?>
+<!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">
+
+<!-- ..................................................................... -->
+<!-- This catalog was written for the Debian system. ..................... -->
+<!-- ..................................................................... -->
+
+<!-- The FPI and SYSIDs for 4.1 should point to 4.1.2. ................... -->
+
+<public publicId="-//OASIS//DTD DocBook XML V4.1//EN"
+        uri="4.1/docbookx.dtd"/>
+
+<system systemId="http://www.oasis-open.org/docbook/xml/4.1/docbookx.dtd"
+        uri="4.1/docbookx.dtd"/>
+
+<system systemId="http://docbook.org/xml/4.1/docbookx.dtd"
+        uri="4.1/docbookx.dtd"/>
+
+<!-- General FPIs shall point to latest DocBook .......................... -->
+
+<public publicId="-//OASIS//DTD DocBook XML V4//EN"
+        uri="4/docbookx.dtd"/>
+
+<public publicId="-//OASIS//DTD DocBook XML//EN"
+        uri="4/docbookx.dtd"/>
+
+</catalog>
+
--- docbook-xml-4.5.orig/catalog
+++ docbook-xml-4.5/catalog
@@ -0,0 +1,38 @@
+  -- ...................................................................... --
+  -- This catalog was written for the Debian system ....................... --
+  -- ...................................................................... --
+
+  -- ...................................................................... --
+  -- Prefer PUBID to SYSID ................................................ --
+OVERRIDE YES
+
+  -- ...................................................................... --
+  -- Register FPI "-//OASIS//DTD DocBook XML V4.1//EN" pointing to 4.1.2 .. --
+  -- <URL:http://bugs.debian.org/189129> .................................. --
+PUBLIC  "-//OASIS//DTD DocBook XML V4.1//EN"
+        "4.1/docbookx.dtd"
+SYSTEM  "http://www.oasis-open.org/docbook/xml/4.1/docbookx.dtd"
+        "4.1/docbookx.dtd"
+SYSTEM  "http://docbook.org/xml/4.1/docbookx.dtd"
+        "4.1/docbookx.dtd"
+DTDDECL "-//OASIS//DTD DocBook XML V4.1//EN"
+        "/usr/share/xml/declaration/xml.dcl"
+
+  -- ...................................................................... --
+  -- Register FPI "-//OASIS//DTD DocBook XML V4//EN" for latest DocBook ... --
+PUBLIC  "-//OASIS//DTD DocBook XML V4//EN"
+        "4/docbookx.dtd"
+SYSTEM  "http://www.oasis-open.org/docbook/xml/4/docbookx.dtd"
+        "4/docbookx.dtd"
+SYSTEM  "http://docbook.org/xml/4/docbookx.dtd"
+        "4/docbookx.dtd"
+DTDDECL "-//OASIS//DTD DocBook XML V4//EN"
+        "/usr/share/xml/declaration/xml.dcl"
+
+  -- ...................................................................... --
+  -- Register FPI "-//OASIS//DTD DocBook XML//EN" for latest DocBook ...... --
+PUBLIC  "-//OASIS//DTD DocBook XML//EN"
+        "4/docbookx.dtd"
+DTDDECL "-//OASIS//DTD DocBook XML//EN"
+        "/usr/share/xml/declaration/xml.dcl"
+
--- docbook-xml-4.5.orig/docbook-4.0/catalog.xml
+++ docbook-xml-4.5/docbook-4.0/catalog.xml
@@ -0,0 +1,72 @@
+<?xml version='1.0'?>
+<!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">
+
+<!-- ...................................................................... -->
+<!-- XML Catalog data for DocBook XML V4.0............................... -->
+<!-- File catalog.xml ..................................................... -->
+
+<!-- Please direct all questions, bug reports, or suggestions for
+     changes to the docbook@lists.oasis-open.org mailing list. For more
+     information, see http://www.oasis-open.org/.
+  -->
+
+<!-- This is the catalog data file for DocBook V4.0. It is provided as
+     a convenience in building your own catalog files. You need not use
+     the filenames listed here, and need not use the filename method of
+     identifying storage objects at all.  See the documentation for
+     detailed information on the files associated with the DocBook DTD.
+     See XML Catalogs at http://www.oasis-open.org/committees/entity/ for
+     detailed information on supplying and using catalog data.
+  -->
+
+<!-- ...................................................................... -->
+<!-- DocBook driver file .................................................. -->
+
+<public publicId="-//Norman Walsh//DTD DocBk XML V4.0//EN"
+        uri="docbookx.dtd"/>
+
+<!-- Other ways to refer to DocBook XML v4.0............................... -->
+<public publicId="-//Norman Walsh//DTD DocBook XML V4.0//EN"
+        uri="docbookx.dtd"/>
+
+<system systemId="http://www.oasis-open.org/docbook/xml/4.0/docbookx.dtd"
+        uri="docbookx.dtd"/>
+
+<!-- ...................................................................... -->
+<!-- DocBook modules ...................................................... -->
+
+<public publicId="-//Norman Walsh//ENTITIES DocBook XML Notations V4.0//EN"
+        uri="dbnotnx.mod"/>
+
+<public publicId="-//Norman Walsh//ENTITIES DocBook XML Character Entities V4.0//EN"
+        uri="dbcentx.mod"/>
+
+<public publicId="-//Norman Walsh//ELEMENTS DocBook XML Information Pool V4.0//EN"
+        uri="dbpoolx.mod"/>
+
+<public publicId="-//Norman Walsh//ELEMENTS DocBook XML Document Hierarchy V4.0//EN"
+        uri="dbhierx.mod"/>
+
+<public publicId="-//Norman Walsh//ENTITIES DocBook XML Additional General Entities V4.0//EN"
+        uri="dbgenent.mod"/>
+
+<public publicId="-//Norman Walsh//DTD CALS Table Model XML V4.0//EN"
+        uri="calstblx.dtd"/>
+
+<!-- UNOFFICIAL conversion of the exchange table model to XML, based on the OASIS Exchange -->
+<!--    Table Model PUBLIC "-//SGML Open//DTD Exchange Table Model 19960430//EN"           -->
+<public publicId="-//Normal Walsh//Exchange Table Model 19960430 XML V4.0//EN"
+        uri="soextblx.dtd"/>
+
+<!-- the following FPI is declared for the DTD inside the DTD, but we'll -->
+<!-- use the version from the latest DocBook
+<public publicId="-//OASIS//DTD XML Exchange Table Model 19990315//EN"
+        uri="soextblx.dtd"/> -->
+
+<!-- End of catalog data for DocBook XML V4.0 ............................. -->
+<!-- ...................................................................... -->
+
+</catalog>
--- docbook-xml-4.5.orig/docbook-4.0/docbook.cat
+++ docbook-xml-4.5/docbook-4.0/docbook.cat
@@ -0,0 +1,39 @@
+  -- ...................................................................... --
+  -- Catalog data for DocBook XML V4.0 .................................... --
+  -- ...................................................................... --
+
+  -- public identifiers override system identifiers, if both are supplied   --
+OVERRIDE YES
+
+  -- ...................................................................... --
+  -- DocBook driver file .................................................. --
+
+PUBLIC "-//Norman Walsh//DTD DocBk XML V4.0//EN" "docbookx.dtd"
+SYSTEM "http://www.oasis-open.org/docbook/xml/4.0/docbookx.dtd" "docbookx.dtd"
+SYSTEM "http://docbook.org/xml/4.0/docbookx.dtd" "docbookx.dtd"
+DTDDECL "-//Norman Walsh//DTD DocBk XML V4.0//EN" "/usr/share/xml/declaration/xml.dcl"
+
+  -- ...................................................................... --
+  -- Other ways to refer to DocBook XML v4.0............................... --
+
+PUBLIC "-//Norman Walsh//DTD DocBook XML V4.0//EN" "docbookx.dtd"
+DTDDECL "-//Norman Walsh//DTD DocBook XML V4.0//EN" "/usr/share/xml/declaration/xml.dcl"
+
+  -- ...................................................................... --
+  -- DocBook modules ...................................................... --
+
+PUBLIC "-//Norman Walsh//ENTITIES DocBook XML Notations V4.0//EN" "dbnotnx.mod"
+PUBLIC "-//Norman Walsh//ENTITIES DocBook XML Character Entities V4.0//EN" "dbcentx.mod"
+PUBLIC "-//Norman Walsh//ELEMENTS DocBook XML Information Pool V4.0//EN" "dbpoolx.mod"
+PUBLIC "-//Norman Walsh//ELEMENTS DocBook XML Document Hierarchy V4.0//EN" "dbhierx.mod"
+PUBLIC "-//Norman Walsh//ENTITIES DocBook XML Additional General Entities V4.0//EN" "dbgenent.ent"
+
+-- Unofficial XML version of the CALS Table Model, publicly known as --
+--    PUBLIC "-//USA-DOD//DTD Table Model 951010//EN"                --
+PUBLIC "-//Norman Walsh//DTD CALS Table Model XML V4.0//EN" "calstblx.dtd"
+
+-- UNOFFICIAL conversion of the exchange table model to XML, based on the OASIS Exchange --
+--    Table Model PUBLIC "-//SGML Open//DTD Exchange Table Model 19960430//EN"           --
+PUBLIC "-//Norman Walsh//DTD Exchange Table Model 19960430 XML V4.0//EN" "soextblx.dtd"
+-- the following FPI is declared for the DTD inside the DTD, so I include it             --
+PUBLIC "-//OASIS//DTD XML Exchange Table Model 19990315//EN" "soextblx.dtd"
--- docbook-xml-4.5.orig/docbook-4.1.2/catalog.xml
+++ docbook-xml-4.5/docbook-4.1.2/catalog.xml
@@ -0,0 +1,66 @@
+<?xml version='1.0'?>
+<!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">
+
+<!-- ...................................................................... -->
+<!-- XML Catalog data for DocBook XML V4.1.2............................... -->
+<!-- File catalog.xml ..................................................... -->
+
+<!-- Please direct all questions, bug reports, or suggestions for
+     changes to the docbook@lists.oasis-open.org mailing list. For more
+     information, see http://www.oasis-open.org/.
+  -->
+
+<!-- This is the catalog data file for DocBook V4.1.2. It is provided as
+     a convenience in building your own catalog files. You need not use
+     the filenames listed here, and need not use the filename method of
+     identifying storage objects at all.  See the documentation for
+     detailed information on the files associated with the DocBook DTD.
+     See XML Catalogs at http://www.oasis-open.org/committees/entity/ for
+     detailed information on supplying and using catalog data.
+  -->
+
+<!-- ...................................................................... -->
+<!-- DocBook driver file .................................................. -->
+
+<public publicId="-//OASIS//DTD DocBook XML V4.1.2//EN"
+        uri="docbookx.dtd"/>
+
+<system systemId="http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"
+        uri="docbookx.dtd"/>
+
+<system systemId="http://docbook.org/xml/4.1.2/docbookx.dtd"
+        uri="docbookx.dtd"/>
+
+<!-- ...................................................................... -->
+<!-- DocBook modules ...................................................... -->
+
+<public publicId="-//OASIS//DTD DocBook CALS Table Model V4.1.2//EN"
+        uri="calstblx.dtd"/>
+
+  <!-- already included in docbook 4.2
+<public publicId="-//OASIS//DTD XML Exchange Table Model 19990315//EN"
+        uri="soextblx.dtd"/> -->
+
+<public publicId="-//OASIS//ELEMENTS DocBook XML Information Pool V4.1.2//EN"
+        uri="dbpoolx.mod"/>
+
+<public publicId="-//OASIS//ELEMENTS DocBook Document Hierarchy V4.1.2//EN"
+        uri="dbhierx.mod"/>
+
+<public publicId="-//OASIS//ENTITIES DocBook Additional General Entities V4.1.2//EN"
+        uri="dbgenent.mod"/>
+
+<public publicId="-//OASIS//ENTITIES DocBook Notations V4.1.2//EN"
+        uri="dbnotnx.mod"/>
+
+<public publicId="-//OASIS//ENTITIES DocBook Character Entities V4.1.2//EN"
+        uri="dbcentx.mod"/>
+
+
+<!-- End of catalog data for DocBook XML V4.1.2 ............................. -->
+<!-- ...................................................................... -->
+
+</catalog>
--- docbook-xml-4.5.orig/debian/rules
+++ docbook-xml-4.5/debian/rules
@@ -0,0 +1,165 @@
+#!/usr/bin/make -f
+# rules file for docbook-xml
+#
+# Some bytes in this file may have been touched by Ian Jackson,
+# so I can never remove his name from this file.
+
+PACKAGE := docbook-xml
+
+include /usr/share/dpatch/dpatch.make
+
+
+debian/docbook-xml.install:
+	set -ex ; \
+	touch $@ ; \
+	for dbx in docbook-* ; do \
+		dbxver=`echo $${dbx} | sed -e 's/docbook-//g'` ; \
+		for file in $${dbx}/*.dtd $${dbx}/*.ent $${dbx}/*.mod $${dbx}/*.ver ; do \
+			if [ -f $${file} ] ; then \
+				if [ $${file} != $${dbx}/dbgenent.* ] ; then \
+					echo "$${file} usr/share/xml/docbook/schema/dtd/$${dbxver}" >> $@ ; \
+				else \
+					echo "$${file} etc/sgml/docbook-xml/$${dbxver}" >> $@ ; \
+				fi ; \
+			fi ; \
+		done ; \
+		[ -f $${dbx}/catalog.xml ] && \
+		    echo "$${dbx}/catalog.xml usr/share/xml/docbook/schema/dtd/$${dbxver}" >> $@ ; \
+	done
+
+debian/docbook-xml.links:
+	set -ex ; \
+	touch $@ ; \
+	cat $@.in >> $@ ; \
+	for dbx in docbook-* ; do \
+		dbxver=`echo $${dbx} | sed -e 's/docbook-//g'` ; \
+		for file in $${dbx}/dbgenent.* ; do \
+			dbfile=`echo $${file} | sed -e 's/[^\/]*\///g'` ; \
+			echo -n "etc/sgml/docbook-xml/$${dbxver}/$${dbfile} " >> $@ && \
+			    echo "usr/share/xml/docbook/schema/dtd/$${dbxver}/$${dbfile}" >> $@ ; \
+		done ; \
+		[ -f $${dbx}/docbook.cat ] && \
+		    echo -n "usr/share/xml/docbook/schema/dtd/$${dbxver}/catalog " >> $@ && \
+		        echo "usr/share/xml/docbook/schema/dtd/$${dbxver}/docbook.cat" >> $@ ; \
+		[ -d $${dbx}/ent ] && \
+		    echo -n "usr/share/xml/entities/xml-iso-entities-8879.1986 " >> $@ && \
+		        echo "usr/share/xml/docbook/schema/dtd/$${dbxver}/ent" >> $@ ; \
+		echo "usr/share/xml/docbook/schema/dtd/$${dbxver} usr/share/sgml/docbook/dtd/xml/$${dbxver}" >> $@ ; \
+	done
+
+debian/docbook-xml.sgmlcatalogs:
+	set -ex ; \
+	touch $@ ; \
+	echo "catalog /usr/share/xml/docbook/schema/dtd/catalog" > $@ ; \
+	for dbx in docbook-* ; do \
+		dbxver=`echo $${dbx} | sed -e 's/docbook-//g'` ; \
+		[ -f $${dbx}/docbook.cat ] && \
+		    echo "$${dbx}/docbook.cat /usr/share/xml/docbook/schema/dtd/$${dbxver}/catalog" >> $@ ; \
+	done
+
+debian/docbook-xml.xmlcatalogs:
+	set -ex ; \
+	touch $@ ; \
+	cat $@.in >> $@ ; \
+	for dbx in docbook-* ; do \
+		dbxver=`echo $${dbx} | sed -e 's/docbook-//g'` ; \
+		if [ -f $${dbx}/catalog.xml ] ; then \
+			echo "local;$${dbx}/catalog.xml;/usr/share/xml/docbook/schema/dtd/$${dbxver}/catalog.xml" >> $@ ; \
+			sysids=`egrep -e "<system systemId=\"[^\"]+\"" $${dbx}/catalog.xml | \
+			        sed -e 's/<system systemId=\"\(.*\)\"/\1;/g'` IFS=';' ; \
+			echo $${sysids} | while read id ; do \
+				echo "package;system;$${id};/usr/share/xml/docbook/schema/dtd/$${dbxver}/catalog.xml" >> $@ ; \
+			done ; \
+			pubids=`egrep -e "<public publicId=\"[^\"]+\"" $${dbx}/catalog.xml | \
+			        sed -e 's/<public publicId=\"\(.*\)\"/\1;/g'` IFS=';' ; \
+			echo $${pubids} | while read id ; do \
+				echo "package;public;$${id};/usr/share/xml/docbook/schema/dtd/$${dbxver}/catalog.xml" >> $@ ; \
+			done ; \
+			echo >> $@ ; \
+		fi ; \
+	done ; \
+	fpiregex="s/^.*\-\/\/OASIS\/\/DTD XML Exchange Table Model 19990315\/\/EN.*\/dtd\/4\.[^5].*//g" ; \
+	sed -i -e 's/\ ;\/usr/;\/usr/g' -e $${fpiregex} $@
+
+build: patch-stamp build-stamp
+
+build-stamp: debian/docbook-xml.install debian/docbook-xml.links debian/docbook-xml.sgmlcatalogs debian/docbook-xml.xmlcatalogs
+	dh_testdir
+	touch build-stamp
+
+clean: unpatch
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp patch-stamp
+	rm -f debian/docbook-xml.install \
+	      debian/docbook-xml.links \
+	      debian/docbook-xml.sgmlcatalogs \
+	      debian/docbook-xml.xmlcatalogs \
+	dh_clean
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+
+binary-arch: build
+binary-indep: build
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs ChangeLog.upstream
+	dh_install
+	dh_installdocs
+	dh_installexamples
+	dh_installcatalogs
+	dh_installxmlcatalogs
+	dh_link
+	find $(CURDIR)/debian/$(PACKAGE) -type l -follow >/dev/null # exits 1 on broken links
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+
+version=$(shell dpkg-parsechangelog | sed -n -e 's/^Version: \(.*\)-[^-]*/\1/p')
+get-orig-source:
+	set -ex ; \
+	TMPDIR=`mktemp -d docbook-xml-$(version).orig.XXXXXX` ; \
+	touch "$$TMPDIR"/ChangeLog.upstream ; \
+	for db in 4.5 4.4 4.3 4.2 ; do \
+		dbxver=`echo $${db} | sed -e 's/\.//g'` ; \
+		dbxzip=docbook-xml-$${db}.zip ; \
+		mkdir -p "$$TMPDIR"/docbook-$${db} ; \
+		wget -P "$$TMPDIR" http://www.oasis-open.org/docbook/xml/$${db}/"$$dbxzip" ; \
+		unzip -d "$$TMPDIR"/docbook-$${db} "$$TMPDIR"/"$$dbxzip" ; \
+		rm -f "$$TMPDIR"/"$$dbxzip" ; \
+		([ -f "$$TMPDIR"/docbook-$${db}/ChangeLog ] && [ "$$dbxver" -ge 44 ] ) && \
+		    cat "$$TMPDIR"/docbook-$${db}/ChangeLog >> "$$TMPDIR"/ChangeLog.upstream ; \
+	done; \
+	for db in 4.1.2 4.0 ; do \
+		dbxver=`echo $${db} | sed -e 's/\.//g'` ; \
+		dbxzip=docbkx"$$dbxver".zip ; \
+		mkdir -p "$$TMPDIR"/docbook-$${db} ; \
+		wget -P "$$TMPDIR" http://www.oasis-open.org/docbook/xml/$${db}/"$$dbxzip" ; \
+		unzip -d "$$TMPDIR"/docbook-$${db} "$$TMPDIR"/"$$dbxzip" ; \
+		rm -f "$$TMPDIR"/"$$dbxzip" ; \
+		if [ $${db} = "4.1.2" ] ; then \
+			cat "$$TMPDIR"/docbook-$${db}/ChangeLog >> "$$TMPDIR"/ChangeLog.upstream ; \
+			cat "$$TMPDIR"/docbook-$${db}/41chg.txt >> "$$TMPDIR"/ChangeLog.upstream ; \
+			cat "$$TMPDIR"/docbook-$${db}/40chg.txt >> "$$TMPDIR"/ChangeLog.upstream ; \
+		else \
+			cat "$$TMPDIR"/docbook-$${db}/"$$dbxver"chg.txt >> "$$TMPDIR"/ChangeLog.upstream ; \
+		fi ; \
+	done ; \
+	find "$$TMPDIR" -type f ! -perm 644 -exec chmod 644 "{}" ";" ; \
+	mv "$$TMPDIR" docbook-xml-$(version).orig ; \
+	GZIP=-9 tar --remove-files -czf $(CURDIR)/docbook-xml_${version}.orig.tar.gz \
+	    docbook-xml-$(version).orig
+
+.PHONY: binary binary-arch binary-indep build clean get-orig-source
+#Local variables:
+#mode: makefile
+#End:
--- docbook-xml-4.5.orig/debian/docbook-xml.links.in
+++ docbook-xml-4.5/debian/docbook-xml.links.in
@@ -0,0 +1,6 @@
+usr/share/xml/docbook/schema/dtd/4.5   usr/share/xml/docbook/schema/dtd/4
+usr/share/sgml/docbook/dtd/xml/4.5     usr/share/sgml/docbook/dtd/xml/4
+
+usr/share/xml/docbook/schema/dtd/4.1.2 usr/share/xml/docbook/schema/dtd/4.1 
+usr/share/sgml/docbook/dtd/xml/4.1.2   usr/share/sgml/docbook/dtd/xml/4.1
+
--- docbook-xml-4.5.orig/debian/control
+++ docbook-xml-4.5/debian/control
@@ -0,0 +1,38 @@
+Source: docbook-xml
+Section: text
+Priority: optional
+Maintainer: Debian XML/SGML Group <debian-xml-sgml-pkgs@lists.alioth.debian.org>
+Uploaders: Adam Di Carlo <aph@debian.org>,
+ Daniel Leidert (dale) <daniel.leidert@wgdd.de>
+Build-Depends: debhelper (>= 5), dpatch
+Build-Depends-Indep: xml-core (>= 0.6)
+Standards-Version: 3.8.3
+Homepage: http://docbook.org/schemas/4x.html
+Vcs-Browser: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xml/trunk/
+Vcs-Svn: svn://svn.debian.org/svn/debian-xml-sgml/packages/docbook-xml/trunk/
+DM-Upload-Allowed: yes
+
+Package: docbook-xml
+Architecture: all
+Depends: sgml-data (>= 2.0.2), ${misc:Depends}, xml-core(>= 0.12)
+Suggests: docbook, docbook-dsssl, docbook-xsl, docbook-defguide
+Provides: docbk-xml
+Description: standard XML documentation system for software and systems
+ DocBook is an XML document type definition (DTD).  That is, it
+ contains the "DocBook" document structure.  This is used by authors
+ or editors writing documents in the DocBook XML format.  DocBook was
+ designed for books, articles, or reference documentation about
+ technical matters or software.  It has emerged as an open, standard
+ DTD in the software industry, and is the documentation system of
+ choice for many free software projects.
+ .
+ This package contains the XML DTD for DocBook, which describes the
+ formal structure for documents following this format.  If you wish to
+ author DocBook documents using SGML rather than XML, use the
+ 'docbook' package.  You will need other packages in order to edit
+ (psgml), validate (opensp, libxml2-utils) or format (docbook-xsl,
+ docbook-dsssl) DocBook documents.
+ .
+ This package ships with the latest DocBook 4.5 XML DTD, as well as a
+ selected set of legacy DTDs for use with older documents, including
+ 4.0, 4.1.2, 4.2, 4.3 and 4.4.
--- docbook-xml-4.5.orig/debian/README.Debian
+++ docbook-xml-4.5/debian/README.Debian
@@ -0,0 +1,34 @@
+docbook-xml -- DocBook XML for Debian
+-------------------------------------
+
+DocBook is pretty much the standard for software documentation.  It is managed
+by a committee formed at OASIS, the Organization for the Advancement of
+Structured Information Standards <URL:http://www.oasis-open.org/docbook/>.
+More information on DocBook, including the user support community for it, can
+be found at <URL:http://www.docbook.org/>.
+
+This package contains the XML versions of the version 4.x DTDs.  The 'docbook'
+package contains the SGML DTDs.  A number of customization packages are also
+available, generally used to mark up specialized subsets or special
+applications of DocBook XML.  Rather than list them here, please do
+'apt-cache search docbook-xml'.
+
+Version 5 of DocBook XML is a complete rewrite of DocBook in RELAX NG.  It's
+available in a separate package 'docbook5-xml'.
+
+A wonderful introduction and reference is available in the docbook-defguide
+package, which can also be read online at <URL:http://www.docbook.org/tdg/>.
+A FAQ is maintained by Dave Pawson at <URL:http://www.dpawson.co.uk/docbook/>.
+Consider these documents before you send a question.
+
+If you wish to format DocBook documents, you'll want to apply a stylesheet to
+the document, in conjunction with a processor which applies the style.  The
+available stylesheets for DocBook are the docbook-dsssl' ('docbook-dsssl-doc')
+and 'docbook-xsl' ('docbook-xsl-doc') packages, for DSSSL and XSL stylesheets,
+respectively.  Instructions on operating those stylesheets and DSSSL or XSL
+processors is beyond the scope of this README.  The documentation for the
+mentioned packages and the Debian SGML/XML HOWTO at
+<URL:http://www.debian.org/doc/misc-manuals#sgml-howto> should
+give some guidance.
+
+-- Adam Di Carlo <aph@debian.org>, Daniel Leidert <daniel.leidert@wgdd.de>
--- docbook-xml-4.5.orig/debian/docbook-xml.preinst
+++ docbook-xml-4.5/debian/docbook-xml.preinst
@@ -0,0 +1,38 @@
+#!/bin/sh
+
+set -e
+
+rm_conffile() {
+	CONFFILE="$1"
+	
+	if [ -e "$CONFFILE" ]; then
+		md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`"
+		old_md5sum="`dpkg-query -W -f='${Conffiles}' docbook-xml | grep $CONFFILE | awk '{print $2}'`"
+		if [ "$md5sum" != "$old_md5sum" ]; then
+			echo "Obsolete conffile $CONFFILE has been modified by you."
+			echo "Saving as $CONFFILE.dpkg-bak ..."
+			mv -f "$CONFFILE" "$CONFFILE".dpkg-bak
+		else
+			echo "Removing obsolete conffile $CONFFILE ..."
+			rm -f "$CONFFILE"
+		fi
+	fi
+}
+
+# converting a directory to symlinks during package upgrade doesn't work,
+# lets remove the junk in here by hand
+# bug 143780, problems caused by danging symlinks
+if [ "$1" = upgrade ]; then
+    rm -r /usr/share/sgml/docbook/dtd/xml/[1-9]* || true
+fi
+
+# handle obsolete dbgenent.ent files, that are placed in /etc/sgml/docbook-xml
+# fixes bug #426058
+# 4.5: obsoletes 3.1.7
+if [ "$1" = remove ] || [ "$1" = upgrade ]; then
+	if dpkg --compare-versions "$2" lt "4.5"; then
+		rm_conffile "/etc/sgml/docbook-xml/3.1.7/dbgenent.ent"
+	fi
+fi
+
+#DEBHELPER#
--- docbook-xml-4.5.orig/debian/watch
+++ docbook-xml-4.5/debian/watch
@@ -0,0 +1,4 @@
+# See uscan(1) for format
+
+version=3
+http://www.oasis-open.org/docbook/xml/4\.([\d]+)/docbook-xml-([\d\.]+).zip
--- docbook-xml-4.5.orig/debian/copyright
+++ docbook-xml-4.5/debian/copyright
@@ -0,0 +1,41 @@
+The Debian package was created by Adam Di Carlo <aph@debian.org>, who
+is also the current maintainer.  No changes, except bug-fixes were made
+to the upstream version of these materials.  All Debian integration scripts
+and packages are under the GPL v2 or later, a copy of which can be found
+on Debian systems in '/usr/share/common-licenses/GPL'.
+
+The package is currently maintained as part of the Debian XML/SGML group.
+
+Download:
+
+  The original upstream materials may be downloaded from
+  <URL:http://www.oasis-open.org/docbook/xml/>. This process is
+  transparent via the `get-orig-source' target in debian/rules.
+
+Copyright for DocBook XML v4.x:
+
+  Copyright 1992-2006 HaL Computer Systems, Inc.,
+  O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software
+  Corporation, Norman Walsh, Sun Microsystems, Inc., and the
+  Organization for the Advancement of Structured Information
+  Standards (OASIS).
+
+License and Warranty for DocBook XML v4.x:
+
+  Permission to use, copy, modify and distribute the DocBook XML DTD
+  and its accompanying documentation for any purpose and without fee
+  is hereby granted in perpetuity, provided that the above copyright
+  notice and this paragraph appear in all copies.  The copyright
+  holders make no representation about the suitability of the DTD for
+  any purpose.  It is provided "as is" without expressed or implied
+  warranty.
+
+  If you modify the DocBook DTD in any way, except for declaring and
+  referencing additional sets of general entities and declaring
+  additional notations, label your DTD as a variant of DocBook.  See
+  the maintenance documentation for more information.
+
+  Please direct all questions, bug reports, or suggestions for 
+  changes to the docbook@lists.oasis-open.org mailing list. For more
+  information, see http://www.oasis-open.org/docbook/.
+
--- docbook-xml-4.5.orig/debian/README.source
+++ docbook-xml-4.5/debian/README.source
@@ -0,0 +1,7 @@
+docbook-xml for Debian
+----------------------
+
+The package uses the dpatch management solution. See
+/usr/share/doc/dpatch/README.source.gz.
+
+ -- Daniel Leidert <daniel.leidert@wgdd.de>, September 2009
--- docbook-xml-4.5.orig/debian/docbook-xml.examples
+++ docbook-xml-4.5/debian/docbook-xml.examples
@@ -0,0 +1 @@
+debian/examples/*
--- docbook-xml-4.5.orig/debian/source.lintian-overrides
+++ docbook-xml-4.5/debian/source.lintian-overrides
@@ -0,0 +1,3 @@
+## Because this is a compilation of upstream sources and because I don't want
+## to create files by a patch system, I hereby overwrite the lintian warnings:
+docbook-xml source: patch-system-but-direct-changes-in-diff
--- docbook-xml-4.5.orig/debian/TODO
+++ docbook-xml-4.5/debian/TODO
@@ -0,0 +1,7 @@
+TODO for the docbook-xml Debian package
+---------------------------------------
+
+* Fix the outstanding bug http://bugs.debian.org/209147.
+  There were different opinions about this bug. See
+  http://lists.oasis-open.org/archives/docbook/200703/msg00074.html.
+
--- docbook-xml-4.5.orig/debian/docbook-xml.dirs
+++ docbook-xml-4.5/debian/docbook-xml.dirs
@@ -0,0 +1,2 @@
+usr/share/xml/docbook/schema/dtd
+etc/sgml/docbook-xml
--- docbook-xml-4.5.orig/debian/docbook-xml.xmlcatalogs.in
+++ docbook-xml-4.5/debian/docbook-xml.xmlcatalogs.in
@@ -0,0 +1,23 @@
+root;system;http://www.oasis-open.org/docbook/xml/
+root;system;http://docbook.org/xml/
+
+root;public;-//Norman Walsh//DTD DocBook XML
+root;public;-//Norman Walsh//DTD DocBk XML
+root;public;-//Norman Walsh//ENTITIES DocBk XML
+root;public;-//Norman Walsh//ELEMENTS DocBk XML
+root;public;-//Norman Walsh//DTD CALS Table Model XML
+root;public;-//Normal Walsh//Exchange Table Model 19960430
+
+root;public;-//OASIS//DTD DocBook XML
+root;public;-//OASIS//DTD DocBook CALS Table Model
+root;public;-//OASIS//DTD XML Exchange Table Model 19990315
+root;public;-//OASIS//ELEMENTS DocBook
+root;public;-//OASIS//ENTITIES DocBook
+
+local;catalog.xml;/usr/share/xml/docbook/schema/dtd/catalog.xml
+package;system;http://www.oasis-open.org/docbook/xml/4.1/docbookx.dtd;/usr/share/xml/docbook/schema/dtd/catalog.xml
+package;system;http://docbook.org/xml/4.1/docbookx.dtd;/usr/share/xml/docbook/schema/dtd/catalog.xml
+package;public;-//OASIS//DTD DocBook XML V4.1//EN;/usr/share/xml/docbook/schema/dtd/catalog.xml
+package;public;-//OASIS//DTD DocBook XML V4//EN;/usr/share/xml/docbook/schema/dtd/catalog.xml
+package;public;-//OASIS//DTD DocBook XML//EN;/usr/share/xml/docbook/schema/dtd/catalog.xml
+
--- docbook-xml-4.5.orig/debian/changelog
+++ docbook-xml-4.5/debian/changelog
@@ -0,0 +1,548 @@
+docbook-xml (4.5-7.2) unstable; urgency=high
+
+  [ Helmut Grohne ]
+  * Non-maintainer upload.
+  * Demote Pre-Depends on xml-core to Depends. It was used to fix upgrades
+    from etch to lenny, but this is no longer necessary.  Closes: #705452.
+
+ -- Julien Cristau <jcristau@debian.org>  Wed, 24 Apr 2013 16:17:54 +0200
+
+docbook-xml (4.5-7.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Rebuild against debhelper (>= 9.20120528) to fix postinst that
+    unconditionally overwrites files in /etc (see: #477751, closes: #675482).
+    Thanks to Helmut Grohne for the bug report.
+
+ -- Jakub Wilk <jwilk@debian.org>  Sat, 09 Jun 2012 11:47:30 +0200
+
+docbook-xml (4.5-7) unstable; urgency=low
+
+  * debian/control (Standards-Version): Bumped to 3.8.3.
+    (Homepage): Changed to docbook.org (closes: #545145).
+    (Description): Fixed typo.
+  * debian/copyright: Fixed copyright-refers-to-versionless-license-file.
+  * debian/rules (get-orig-source): Fixed mktemp invocation (closes: #545147).
+  * debian/README.Debian: Updated a bit.
+  * debian/README.source: Added to make lintian happy.
+
+ -- Daniel Leidert (dale) <daniel.leidert@wgdd.de>  Tue, 08 Sep 2009 15:18:15 +0200
+
+docbook-xml (4.5-6) unstable; urgency=low
+
+  * debian/compat: Raised to v5.
+  * debian/control: Vcs fields transition. Added DM-Upload-Allowed.
+    (Vcs-Svn): Fixed location.
+    (Build-Depends): Raised debhelper to v5.
+    (Depends): Moved xml-core to Pre-Depends and increased the version to 0.12
+    (closes: #482140).
+    (Standards-Version): Raised to 3.7.3.
+  * debian/rules (debian/docbook-xml.install): Fixed to not put non-existent
+    files into the .install file.
+    (debian/docbook-xml.xmlcatalogs): Use `sed -i' and do not create a
+    temporary file.
+  * debian/source.lintian-overrides: Added to override
+    patch-system-but-direct-changes-in-diff warning, because file creation is
+    intended.
+
+ -- Daniel Leidert (dale) <daniel.leidert@wgdd.de>  Sun, 26 Oct 2008 15:13:10 +0100
+
+docbook-xml (4.5-5) unstable; urgency=low
+
+  * debian/control: Homepage field transition.
+    (Suggests): Replaced non-existing docbook-doc package with
+    docbook-defguide.
+    (Description): Added information about the included versions.
+  * debian/docbook-xml.postinst: Removed (only pre-etch legacy stuff).
+  * debian/docbook-xml.preinst: Parsing of dpkg status file is considered
+    harmful. Replacing this with a dpkg-query call. Thanks to Guillem Jover
+    for bringing this up.
+  * debian/README.Debian: Added note about the DocBook guide.
+
+ -- Daniel Leidert (dale) <daniel.leidert@wgdd.de>  Wed, 26 Sep 2007 22:28:02 +0200
+
+docbook-xml (4.5-4) unstable; urgency=low
+
+  [ Daniel Leidert ]
+  * debian/docbook-xml.preinst: Added some code to remove
+    /etc/sgml/docbook-xml/3.1.7/dbgenent.ent automatically, if not touched
+    (closes: #426058).
+  * debian/watch: Added watch file.
+
+ -- Daniel Leidert (dale) <daniel.leidert@wgdd.de>  Mon, 28 May 2007 22:32:57 +0200
+
+docbook-xml (4.5-3) unstable; urgency=medium
+
+  * debian/control (Maintainer, Uploaders): Set the Debian XML/SGML team as
+    maintainer, so bug-reports go to the team list first.
+  * debian/rules: Removed bashisms (closes: #421897). Thanks to Sebastian
+    Dröge for the report.
+
+ -- Daniel Leidert (dale) <daniel.leidert@wgdd.de>  Thu, 03 May 2007 19:47:56 +0200
+
+docbook-xml (4.5-2) unstable; urgency=low
+
+  * Adding the Debian XML/SGML group and myself as co-maintainers closes:
+    #358520. Simply forgot it.
+
+  [ Daniel Leidert ]
+  * catalog: Added system IDs too for DOCTYPE declarations only containing a
+    system ID.
+  * docbook-4.0/docbook.cat: Likewise.
+  * debian/patches/06_add_system_identifiers_to_catalog.dpatch: Likewise.
+  * debian/docbook-xml.examples: Fixed examples location: will re-add them
+    back to the package.
+  * debian/docbook-xml.xmlcatalogs.in: Added entry for "-//OASIS//DTD XML
+    Exchange Table Model 19990315//EN" FPI to the root catalog.
+
+ -- Daniel Leidert (dale) <daniel.leidert@wgdd.de>  Wed, 18 Apr 2007 20:53:41 +0200
+
+docbook-xml (4.5-1) unstable; urgency=low
+
+  * New upstream release DocBook XML 4.5 added (closes: #413167).
+  * DocBook XML 3.1.7 was dropped from the package.
+
+  [ Daniel Leidert ]
+  * catalog: Added. Contains 4.1 compat stuff and general FPIs pointing to
+    latest DB4 release.
+  * catalog.xml: Added for same reason.
+  * docbook-4.0/catalog.xml: Fixed several wrong FPIs refering to "DocBk".
+  * docbook-4.0/docbook.cat: Fixed several wrong FPIs refering to "DocBk".
+  * docbook-4.1.2/catalog.xml: Moved compat catalog entries for DB 4.1 to a
+    general catalog. Fixed FPI "-//OASIS//ELEMENTS DocBook XML Information
+    Pool V4.1.2//EN".
+  * debian/control: Added XS-Vcs-* fields.
+    (Uploaders): Added the Debian XML/SGML group and myself.
+    (Build-Depends-Indep): Moved debhelper to Build-Depends.
+    (Build-Depends): Added dpatch.
+    (Standards-Version): Bump to latest standards version 3.7.2.
+    (Description): Fixed libxml2-utils package reference.
+  * debian/compat: Added missing newline at file end.
+  * debian/copyright: Updated copyright information. Removed DocBook XML 3.1.7
+    relevant information.
+  * debian/rules: Added get-orig-source and dpatch targets. Cleaned the file.
+    Added targets to automatically walk through the source and create
+    .install, .links, .sgmlcatalogs and .xmlcatalogs debhelper template files.
+  * debian/docbook-xml.dirs: Added (removed relevant code from debian/rules,
+    added new code to create the final template file automatically).
+  * debian/docbook-xml.examples: Added.
+  * debian/docbook-xml.links.in: Added. This is a template, that holds the
+    static (keep-over-time) links. The final debhelper .xmlcatalogs template
+    is created via debian/rules.
+  * debian/xmlcatalogs: Renamed to debian/docbook-xml.xmlcatalogs.in and
+    removed the non-static stuff. Added the stuff from the general
+    catalog.xml. The final debhelper .xmlcatalogs template is created via
+    debian/rules.
+  * debian/patches/01_use_the_entities_from_sgml_data.dpatch: Added and applied
+    to DB 4.5 as well.
+  * debian/patches/02_add_dtddecl_and_force_fpi_over_sysid.dpatch: Added and
+    applied to DB 4.5 as well.
+  * debian/patches/03_fix_wrong_371_fpi_in_40.dpatch: Added. Moves package
+    change into dpatch patch. Found another appearence of a wrong FPI and
+    replaced it too.
+  * debian/patches/05_add_doctype_to_catalog_xml.dpatch: Added. Moves package
+    change into dpatch patch. Applied to 4.3, 4.4 and 4.5 too.
+  * debian/patches/06_add_system_identifiers_to_catalog.dpatch: Added.
+    Moves package change into dpatch patch.
+  * debian/patches/07_add_fpi_for_htmltblx_mod_to_43_catalogs.dpatch: Added.
+    Moves package change into dpatch patch.
+  * debian/patches/10_fix_101779_mention_artheader_to_articleinfo_change.dpatch:
+    Added. Moves package change into dpatch patch.
+  * debian/patches/11_fix_dbpoolx_mod_header_comment_pubid.dpatch: Added.
+  * debian/patches/12_fix_256119_and_turn_on_sgml_mode.dpatch: Added. Moves
+    package change into dpatch patch.
+  * debian/patches/00list: Added. Move all changes at the source into dpatch
+    patches.
+  * debian/postinst: Renamed to debian/docbook-xml.postinst.
+  * debian/preinst: Renamed to debian/docbook-xml.preinst.
+  * debian/install-dtds: Removed. Everything is done via debian/rules.
+  * debian/examples: Removed DB 3.1.7 examples and added 4.5 ones.
+
+ -- Daniel Leidert (dale) <daniel.leidert@wgdd.de>  Sat, 14 Apr 2007 19:45:40 +0200
+
+docbook-xml (4.4-5) unstable; urgency=low
+
+  * 4.3/dbpoolx.mod: xml-base.attrib needs to be properly protected
+    from SGML; note the XML and SGML versions of these files stand in for
+    each other
+  * 4.{3,4}/htmltblx.mod: rules made into CDATA attribute rather than an
+    enumeration list; cf
+    http://www.oasis-open.org/archives/docbook/200406/msg00027.html
+  * 4.{3,4}/htmltblx.mod: include tag minimization entity for
+    cross-function with SGML
+  * examples/Makefile: cosmetic
+
+ -- Adam Di Carlo <aph@debian.org>  Thu, 25 May 2006 17:42:58 -0400
+
+docbook-xml (4.4-4) unstable; urgency=low
+
+  * register "http://docbook.org/xml/" in  for pre-4.3 versions as well
+  * proper XML catalog registration for "-//OASIS//DTD DocBook XML V4.1//EN"
+    (to 4.1.2)
+  * proper XML root catalog registration for "http://docbook.org/xml/" 
+    (thanks, Michael Smith!)
+  * debian/examples: testing of URL system identifiers
+  * correct the filename of ISO entities in the 4.4 DTD; closes: #305745
+
+ -- Adam Di Carlo <aph@debian.org>  Thu, 21 Apr 2005 18:37:40 -0400
+
+docbook-xml (4.4-3) unstable; urgency=low
+
+  * SGML catalog fixes: apply my standard changes to 4.4; make 4.4 the
+    default version 4 DocBook
+
+ -- Adam Di Carlo <aph@debian.org>  Thu, 21 Apr 2005 11:29:15 -0400
+
+docbook-xml (4.4-2) unstable; urgency=low
+
+  * oops, apply the NMU; closes: #284453
+  * minor fixes in the examples
+
+ -- Adam Di Carlo <aph@debian.org>  Thu, 21 Apr 2005 10:35:21 -0400
+
+docbook-xml (4.4-1) unstable; urgency=low
+
+  * new upstream version; closes: #292689
+  * debian/examples: add 4.4 examples
+  * add FPI for htmltblx.mod to catalogs for DocBook 4.3; 4.4 already had
+    this; closes: #268364
+  * add SYSTEM entries for DocBook 4.3:
+    http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd and
+    http://docbook.org/xml/4.3/docbookx.dtd; closes: #301157, #304057
+
+ -- Adam Di Carlo <aph@debian.org>  Wed, 20 Apr 2005 18:18:45 -0400
+
+docbook-xml (4.3-1.1) unstable; urgency=high
+
+  * Non-maintainer upload.
+  * High-urgency upload for sarge-targetted RC bugfix
+  * Edit debian/rules to remove build-dependency on symlinks, which is
+    slated for removal; and drop no-longer-needed dependency of 
+    symlinks (closes: #284453).
+ 
+ -- Steve Langasek <vorlon@debian.org>  Wed, 15 Dec 2004 22:46:22 -0800
+
+docbook-xml (4.3-1) unstable; urgency=low
+
+  * new upstream version; closes: #250688
+  * debian/rules: remove some unnecessary stuff
+  * debian/examples: add 4.3 examples; add some examples for (unofficial)
+    V4 stuff
+
+ -- Adam Di Carlo <aph@debian.org>  Wed, 16 Jun 2004 00:22:22 -0400
+
+docbook-xml (4.2-12) unstable; urgency=low
+
+  * require latest (2.0.2) sgml-data; closes: #234293, #233291
+
+ -- Adam Di Carlo <aph@debian.org>  Thu, 26 Feb 2004 13:33:04 -0500
+
+docbook-xml (4.2-11) unstable; urgency=low
+
+  * replace /usr/share/sgml/entities by /usr/share/xml/entities in
+    dbcentx.mod, all versions of DTD; closes: #232600
+
+ -- Adam Di Carlo <aph@debian.org>  Sun, 15 Feb 2004 14:04:26 -0500
+
+docbook-xml (4.2-10) unstable; urgency=low
+
+  * preinst: remove crufty old /usr/share/sgml/docbook/dtd/xml handling
+    and instead flush out [0-9]* in that dir because dpkg cannot really
+    handle a directory turing into a symlink on upgrade; closes: #232600
+
+ -- Adam Di Carlo <aph@debian.org>  Sat, 14 Feb 2004 15:36:01 -0500
+
+docbook-xml (4.2-9) unstable; urgency=low
+
+  * register FPI "-//OASIS//DTD DocBook XML V4.1//EN" pointing to 4.1.2;
+    closes: #189129
+  * each DTD directory has a symlink 'ent' pointing to
+    /usr/share/xml/entities/xml-iso-entities-8879.1986; closes: #184291
+  * examples: add more test cases and a README and Makefile refinements;
+    note that test-bad-si-4.1.xml is failing, I need to investigate why
+
+ -- Adam Di Carlo <aph@debian.org>  Sat,  7 Feb 2004 14:57:42 -0500
+
+docbook-xml (4.2-8) unstable; urgency=low
+
+  * XML materials move to /usr/share/xml; closes: #227218
+  * provide symlinks from old location under /usr/share/sgml/docbook/dtd/xml
+  * XML catalog registration using dh_installxmlcatalogs from xml-core,
+    requires >= 0.6; closes: #155129, #181362, #223867, #217367, #222265,
+    #223231, #223643, #225382, #230611, #134789, #214006
+  * examples: system identifiers should use
+    http://www.oasis-open.org/docbook/xml/ URL whenever possible, or fully
+    qualified filesystem locations when not possible; closes: #198489
+  * add official HTTP DTD location to XML catalog registration
+  * examples: improve Makefile
+  * update home page to <http://www.oasis-open.org/docbook/xml/>
+  * drop useless CSS dir, /usr/share/sgml/stylesheet/css/docbook-xml
+  * SGML catalogs: DTDDECLs require absolute path to (new) xml.dcl location
+  * rewrite the package long description a bit for less technical users
+  * check against standards version 3.6.1
+
+ -- Adam Di Carlo <aph@debian.org>  Mon,  2 Feb 2004 09:34:15 -0500
+
+docbook-xml (4.2-7) unstable; urgency=low
+
+  * fix a typo in a couple of catalog.xml files; closes: #184238
+  * use new dh_installcatalogs, requires debhelper 4.1.31 or better;
+    maintainer scripts greatly simplified
+  * stop building the symlinks under /usr/share/sgml; we don't need
+    sgml-data to build anymore
+  * crib improved package description from 'docbook'; remove 'author'
+
+ -- Adam Di Carlo <aph@debian.org>  Wed, 12 Mar 2003 00:52:32 -0500
+
+docbook-xml (4.2-6) unstable; urgency=low
+
+  * docbook 4 symlink points to latest version (4.2)
+  * 4.0: use "-//OASIS//DTD XML Exchange Table Model 19990315//EN" from
+    latest DocBook
+
+ -- Adam Di Carlo <aph@debian.org>  Sun, 19 Jan 2003 18:55:29 -0500
+
+docbook-xml (4.2-5) unstable; urgency=low
+
+  * require sgml-data 1.7.2 or better
+  * 4.1.2: remove catalog registration for an entity also registered with 4.2
+  * 4.2: remove ISO 8879:1986 XML character registration, that is handled
+    in the sgml-data package now (which is what supplies the XML character
+    entities)
+  * add XML catalogs for 3.1.7, 4.0 and 4.1.2
+
+    Note that these catalogs will be centrally registered on install when
+    the xml-core package shows up; for now, users have to register them by
+    hand.  Be sure to also remember to register ISO 8879:1986 XML
+    characters from the sgml-data package.
+
+ -- Adam Di Carlo <aph@debian.org>  Tue, 14 Jan 2003 10:31:00 -0500
+
+docbook-xml (4.2-4) unstable; urgency=low
+
+  * "-//OASIS//DTD DocBook XML V4//EN" and "-//OASIS//DTD DocBook XML//EN"
+    now refers to 4.2 version
+
+ -- Adam Di Carlo <aph@debian.org>  Tue, 31 Dec 2002 03:40:53 -0500
+
+docbook-xml (4.2-3) unstable; urgency=low
+
+  * Frederic Schutz found a little bug in my install-dtds helper script
+  * purge case now handled correctly
+  * 'command -v' is not POSIX, use 'which' from debianutils (required)
+  * rules: test for all maintainer scripts
+  * remove full-stop at end of synopsis
+
+ -- Adam Di Carlo <aph@debian.org>  Fri, 13 Dec 2002 12:08:41 -0500
+
+docbook-xml (4.2-2) unstable; urgency=low
+
+  * postinst: /usr/share/sgml/docbook/dtd/xml/4.2.cr2 was hanging around
+    for some reason, must be some sort of odd dpkg symlink handling bug;
+    remove it if it exists as a dir
+  * examples: validation was failing if opensp wasn't installed since
+    nsgmls needs "-mdeclaration/xml.soc", closes: #161891
+  * README.Debian: updates and corrections; add more introductory text
+  * debhelper 4 compatibility enabled
+  * policy compliance checked against 3.5.8, no other changes needed
+  * control: fix stylesheet package names for Suggests; downgrade docbook
+    recommendation to Suggests; rewrite the summary line and description
+  * rules: split out tests into a test target, called by binary-indep,
+    some changes for debhelper v4
+
+ -- Adam Di Carlo <aph@debian.org>  Mon,  2 Dec 2002 12:06:51 -0500
+
+docbook-xml (4.2-1) unstable; urgency=low
+
+  * new upstream version
+  * preinst: remove danging symlinks prior to installation, requires that
+    symlinks is installed.  In the lack of information from the bug
+    submitters, I'm hoping it closes: #143780
+  * depend on symlinks
+  * explicitly register DTD 4.1.2 rather than 4.1, hoping to close another
+    bug I cannot reproduce, closes: #148489
+  * removing conffiles is not allowed by policy, even if the package no
+    longer uses them; we do remove the old junk in the purge target,
+    however; closes: #143777
+  * rules: unhack stuff done for the wacky cr numbering; don't make a 4.2
+    -> 4.2 symlink; dangling symlinks are displayed, should stop the build
+    but I couldn't work it out...
+  * preinst: remove /usr/share/sgml/docbook/dtd/xml/4.2 symlink on install
+    or else the 4.2.cr2 directory gets installed into
+
+ -- Adam Di Carlo <aph@debian.org>  Sat,  3 Aug 2002 08:35:21 -0400
+
+docbook-xml (4.1.99really4.2.cr2-1) unstable; urgency=low
+
+  * new upstream version
+  * add home page and author to package description
+  * 4.2.cr2: correct some references to CR1; some references remain
+  * 4.2.cr2: correct some invalid system references to the ISO entities;
+    this was a flaw in the 4.1.cr1 Debian versions
+  * postinst machinery to remove reference to 4.2.cr1 catalog which is gone
+  * The question of XML catalog report requires system-wide coordination;
+    it's up to users to set this up for themselves; I don't know what I,
+    as a person who is shipping this DTD, can do to help.
+  
+    For now, it is only shipped in the dir with the DTDs as 'catalog.xml'.
+    When there is a policy for me to follow to register it, I will gladly
+    follow it.  If anyone has a suggestion about how I can better handle
+    the situation in a way that will not cause user confusion or break
+    backwards compatibility for folks using jade to process XML (like me),
+    please do let me know.  Bug #134789 reassigned for sgml-base for
+    planning; probably will result in a new xml-base package.
+
+ -- Adam Di Carlo <aph@debian.org>  Mon, 27 May 2002 16:14:10 -0400
+
+docbook-xml (4.1.99really4.2.cr1-2) unstable; urgency=low
+
+  * fix a problem building from source, perms in the diff aren't
+    preserved, forgot about that; closes: #139538
+  * include docbook 4.2 validation in the examples; I hope they fix the
+    "unused parameter" warnings caused by the 4.2 cr1 DTD...
+
+ -- Adam Di Carlo <aph@debian.org>  Sat, 30 Mar 2002 19:36:53 -0500
+
+docbook-xml (4.1.99really4.2.cr1-1) unstable; urgency=low
+
+  * new upstream version, pre-release of docbook-xml 4.2
+    note that docbook 4.1 is still considered the latest version and
+    latest 4.x version until 4.2 is actually released
+  * rearrange file area completely; now the "upstream tarball" is actually
+    a conglomerated set of all the included docbook-xml DTD Zips; this
+    allows one to see in the diff how we vary from the upstream DTDs and
+    such
+  * standards compliant with 3.5.6
+  * debian/rules: use a separate shell-script for more flexible operation,
+    deal with new versions more easily, and reducing redundancy
+  * 4.1.2: catalog got some DTDDECLs wrong, fixed
+  * 4.0 catalog wasn't registered before, fixed
+
+ -- Adam Di Carlo <aph@debian.org>  Fri, 22 Mar 2002 02:41:25 -0500
+
+docbook-xml (4.1.2-8) unstable; urgency=low
+
+  * 40chg.txt: notate ArtHeader to ArticleInfo, from 'docbook' changes of
+    the same nature
+
+ -- Adam Di Carlo <aph@debian.org>  Tue,  2 Oct 2001 03:17:22 -0400
+
+docbook-xml (4.1.2-7) unstable; urgency=medium
+
+  * in the system entity references, prepend /usr/share/sgml to the file
+    names, so they are absolute references, thus we do not rely on
+    /usr/share/sgml being in the system entity search path
+    closes: #102605
+  * this is severity medium because the way it is now will break a lot of
+    tools that don't have SGML Open Catalog support
+
+ -- Adam Di Carlo <aph@debian.org>  Tue, 10 Jul 2001 02:48:48 -0400
+
+docbook-xml (4.1.2-6) unstable; urgency=medium
+
+  * oops, last upload was supposed to be urgency medium
+  * debian/control: docbook-stylesheets dropped from recommends to
+    suggests; docbook-xsl-stylesheets added to suggests
+
+ -- Adam Di Carlo <aph@debian.org>  Mon, 25 Jun 2001 02:24:28 -0400
+
+docbook-xml (4.1.2-5) unstable; urgency=low
+
+  * add historic version of DocBk XML v4.0
+  * debian/{changelog,rules}: rather trivial fixups
+  * debian/control: add Build-Depends-Indep for symlinks
+  * debian/control: drop docbook-doc from Recommends to Suggests
+    closes: #91984
+  * fix system entities based on the file locations in the new SGML
+    layout; this change causes the urgency setting, since it used to break
+    XP/XT
+    closes: #99993
+  * debian/postrm: remove useless and stale file
+    closes: #101181
+
+ -- Adam Di Carlo <aph@debian.org>  Mon, 25 Jun 2001 01:55:04 -0400
+
+docbook-xml (4.1.2-4) unstable; urgency=low
+
+  * force building with sgml-data 1.5.1 or better; 1.5.0 had an annoying
+    bug with the FPI stuff
+  * fix the examples and add a makefile to test validation
+
+ -- Adam Di Carlo <aph@debian.org>  Sun, 18 Mar 2001 18:19:16 -0500
+
+docbook-xml (4.1.2-3) unstable; urgency=low
+
+  * prerm: explicitly remove /etc/sgml/docbook-xml on purge
+    closes: #69560
+  * add some more example files
+
+ -- Adam Di Carlo <aph@debian.org>  Sat, 17 Mar 2001 20:38:40 -0500
+
+docbook-xml (4.1.2-2) unstable; urgency=low
+
+  * debian/control: remove useless depends on jade (docbook-stylesheets
+    brings that in); require new sgml-base and sgml-data; upgrade policy
+    to 3.5.2; update description
+  * debian/rules: fix the location of sgml-catalog-check.pl since it moved
+    in sgml-data 1.4.1; require that sgml-data version when building
+    (thanks to ddkilzer for patch)
+    closes: #85744
+  * debian/rules: transition from /usr/lib/sgml to /usr/share/sgml and new
+    SGML policy of delegated SGML catalogs
+  * debian/postinst,prerm: likewise
+  * debian/rules: check for dangling symlinks (informational); better
+    failure if we can't figure out our own version
+  * catalogs: add DTDDECL declarations for convenience
+  * catalogs: force public identifiers to override system identifiers, if
+    both are supplied
+  * debian/rules: provide /usr/share/sgml/docbook/dtd/xml/{3,4} symlinks
+    and such
+  * debian/copyright: update GPL location and upstream URL
+  * README.Debian: updates
+
+ -- Adam Di Carlo <aph@debian.org>  Sat, 17 Mar 2001 20:24:34 -0500
+
+docbook-xml (4.1.2-1) unstable; urgency=low
+
+  * new upstream version, from OASIS officially now, also ship 3.1.7
+    (closes: Bug#68513)
+  * split off simplified docbook-xml, now in it's own package, sdocbook-xml
+  * copyright: update
+  * README.Debian: update
+  * SGML catalog: update and correct (closes: Bug#55113); provide some FPI
+    aliases for referring to DocBook XML without specifying the full version
+  * debian/rules: reorganize the dir structure, use versioned dirs under
+    /usr/lib/sgml/dtd/; FHS updates
+  * debain/control: update Policy to 3.2.1, add Build-Depends-Indep
+
+ -- Adam Di Carlo <aph@debian.org>  Sun, 17 Sep 2000 16:19:15 -0400
+
+docbook-xml (3.1.7.1-1) unstable; urgency=low
+
+  * new upstream version
+
+ -- Adam Di Carlo <aph@debian.org>  Mon, 20 Dec 1999 12:59:22 -0500
+
+docbook-xml (3.1.6.1-1) unstable; urgency=low
+
+  * new upstream version
+
+ -- Adam Di Carlo <aph@debian.org>  Sat,  6 Nov 1999 13:33:21 -0500
+
+docbook-xml (3.1.5.1-1) unstable; urgency=low
+
+  * new upstream versions
+  * don't install ISO XML entities, which are now in sgml-data package
+  * debian/control: modify the package description a bit at the suggestion
+    of Mark Eichin; add "Provides: docbk-xml" in case people are looking
+    at the upstream name; add versioned depends on sgml-data
+  * debian/rules: clean is cleaner
+
+ -- Adam Di Carlo <aph@debian.org>  Thu,  7 Oct 1999 01:35:22 -0400
+
+docbook-xml (3.1.3.6-1) unstable; urgency=low
+
+  * initial Debian version
+
+ -- Adam Di Carlo <aph@debian.org>  Mon, 24 May 1999 01:19:44 -0400
+
--- docbook-xml-4.5.orig/debian/compat
+++ docbook-xml-4.5/debian/compat
@@ -0,0 +1 @@
+5
--- docbook-xml-4.5.orig/debian/patches/06_add_system_identifiers_to_catalog.dpatch
+++ docbook-xml-4.5/debian/patches/06_add_system_identifiers_to_catalog.dpatch
@@ -0,0 +1,114 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 06_add_system_identifiers_to_catalog.dpatch by Adam Di Carlo <aph@debian.org>.
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: * docbook-4.{2,3}/catalog.xml: Adds system identifiers to the catalog.
+## DP: * docbook-4.x/docbook.cat: Likewise.
+## DP:
+## DP: <URL:http://bugs.debian.org/301157>
+## DP: <URL:http://bugs.debian.org/304057>
+## DP: <URL:http://packages.debian.org/changelogs/pool/main/d/docbook-xml/current/changelog#versionversion4.2-8>
+## DP: <URL:http://packages.debian.org/changelogs/pool/main/d/docbook-xml/current/changelog#versionversion4.4-1>
+## DP: <URL:http://packages.debian.org/changelogs/pool/main/d/docbook-xml/current/changelog#versionversion4.5-2>
+
+@DPATCH@
+diff -urNad docbook-xml-4.5~/docbook-4.1.2/docbook.cat docbook-xml-4.5/docbook-4.1.2/docbook.cat
+--- docbook-xml-4.5~/docbook-4.1.2/docbook.cat	2007-04-18 20:35:45.000000000 +0200
++++ docbook-xml-4.5/docbook-4.1.2/docbook.cat	2007-04-18 20:37:36.000000000 +0200
+@@ -23,6 +23,8 @@
+   -- DocBook driver file .................................................. --
+ 
+ PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "docbookx.dtd"
++SYSTEM "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" "docbookx.dtd"
++SYSTEM "http://docbook.org/xml/4.1.2/docbookx.dtd" "docbookx.dtd"
+ DTDDECL "-//OASIS//DTD DocBook XML V4.1.2//EN" "/usr/share/xml/declaration/xml.dcl"
+ 
+   -- ...................................................................... --
+diff -urNad docbook-xml-4.5~/docbook-4.2/catalog.xml docbook-xml-4.5/docbook-4.2/catalog.xml
+--- docbook-xml-4.5~/docbook-4.2/catalog.xml	2007-04-18 20:35:45.000000000 +0200
++++ docbook-xml-4.5/docbook-4.2/catalog.xml	2007-04-18 20:35:46.000000000 +0200
+@@ -28,6 +28,12 @@
+ <public publicId="-//OASIS//DTD DocBook XML V4.2//EN"
+         uri="docbookx.dtd"/>
+ 
++<system systemId="http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
++        uri="docbookx.dtd"/>
++
++<system systemId="http://docbook.org/xml/4.2/docbookx.dtd"
++        uri="docbookx.dtd"/>
++
+ <!-- ...................................................................... -->
+ <!-- DocBook modules ...................................................... -->
+ 
+diff -urNad docbook-xml-4.5~/docbook-4.2/docbook.cat docbook-xml-4.5/docbook-4.2/docbook.cat
+--- docbook-xml-4.5~/docbook-4.2/docbook.cat	2007-04-18 20:35:45.000000000 +0200
++++ docbook-xml-4.5/docbook-4.2/docbook.cat	2007-04-18 20:38:16.000000000 +0200
+@@ -24,6 +24,10 @@
+ 
+ PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+        "docbookx.dtd"
++SYSTEM "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
++       "docbookx.dtd"
++SYSTEM "http://docbook.org/xml/4.2/docbookx.dtd"
++       "docbookx.dtd"
+ DTDDECL "-//OASIS//DTD DocBook XML V4.2//EN"
+         "/usr/share/xml/declaration/xml.dcl"
+ 
+diff -urNad docbook-xml-4.5~/docbook-4.3/catalog.xml docbook-xml-4.5/docbook-4.3/catalog.xml
+--- docbook-xml-4.5~/docbook-4.3/catalog.xml	2007-04-18 20:35:45.000000000 +0200
++++ docbook-xml-4.5/docbook-4.3/catalog.xml	2007-04-18 20:35:46.000000000 +0200
+@@ -28,6 +28,12 @@
+ <public publicId="-//OASIS//DTD DocBook XML V4.3//EN"
+         uri="docbookx.dtd"/>
+ 
++<system systemId="http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
++        uri="docbookx.dtd"/>
++
++<system systemId="http://docbook.org/xml/4.3/docbookx.dtd"
++        uri="docbookx.dtd"/>
++
+ <!-- ...................................................................... -->
+ <!-- DocBook modules ...................................................... -->
+ 
+diff -urNad docbook-xml-4.5~/docbook-4.3/docbook.cat docbook-xml-4.5/docbook-4.3/docbook.cat
+--- docbook-xml-4.5~/docbook-4.3/docbook.cat	2007-04-18 20:35:45.000000000 +0200
++++ docbook-xml-4.5/docbook-4.3/docbook.cat	2007-04-18 20:38:47.000000000 +0200
+@@ -24,6 +24,10 @@
+ 
+ PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+        "docbookx.dtd"
++SYSTEM "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
++       "docbookx.dtd"
++SYSTEM "http://docbook.org/xml/4.3/docbookx.dtd"
++       "docbookx.dtd"
+ DTDDECL "-//OASIS//DTD DocBook XML V4.3//EN"
+         "/usr/share/xml/declaration/xml.dcl"
+ 
+diff -urNad docbook-xml-4.5~/docbook-4.4/docbook.cat docbook-xml-4.5/docbook-4.4/docbook.cat
+--- docbook-xml-4.5~/docbook-4.4/docbook.cat	2007-04-18 20:35:45.000000000 +0200
++++ docbook-xml-4.5/docbook-4.4/docbook.cat	2007-04-18 20:39:13.000000000 +0200
+@@ -24,6 +24,10 @@
+ 
+ PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+        "docbookx.dtd"
++SYSTEM "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd"
++       "docbookx.dtd"
++SYSTEM "http://docbook.org/xml/4.4/docbookx.dtd"
++       "docbookx.dtd"
+ DTDDECL "-//OASIS//DTD DocBook XML V4.4//EN"
+         "/usr/share/xml/declaration/xml.dcl"
+ 
+diff -urNad docbook-xml-4.5~/docbook-4.5/docbook.cat docbook-xml-4.5/docbook-4.5/docbook.cat
+--- docbook-xml-4.5~/docbook-4.5/docbook.cat	2007-04-18 20:35:45.000000000 +0200
++++ docbook-xml-4.5/docbook-4.5/docbook.cat	2007-04-18 20:39:48.000000000 +0200
+@@ -24,6 +24,10 @@
+ 
+ PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+        "docbookx.dtd"
++SYSTEM "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"
++       "docbookx.dtd"
++SYSTEM "http://docbook.org/xml/4.5/docbookx.dtd"
++       "docbookx.dtd"
+ DTDDECL "-//OASIS//DTD DocBook XML V4.5//EN"
+         "/usr/share/xml/declaration/xml.dcl"
+ 
--- docbook-xml-4.5.orig/debian/patches/12_fix_256119_and_turn_on_sgml_mode.dpatch
+++ docbook-xml-4.5/debian/patches/12_fix_256119_and_turn_on_sgml_mode.dpatch
@@ -0,0 +1,103 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 12_fix_256119_and_turn_on_sgml_mode.dpatch by Adam Di Carlo <aph@debian.org>.
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: * docbook-4.3/dbpoolx.mod: xml-base.attrib needs to be properly
+## DP:   protected from SGML; note the XML and SGML versions of these files
+## DP:   stand in for each other
+## DP:
+## DP: * docbook-4.3/htmltblx.mod: rules made into CDATA attribute rather than
+## DP:   an enumeration list
+## DP:
+## DP: <URL:http://www.oasis-open.org/archives/docbook/200406/msg00027.html>
+## DP:
+## DP: * docbook-4.{3,4}/htmltblx.mod: include tag minimization entity for
+## DP:   cross-function with SGML
+## DP:
+## DP: <URL:http://bugs.debian.org/256119>
+## DP: <URL:http://packages.debian.org/changelogs/pool/main/d/docbook/current/changelog#versionversion4.4-1>
+## DP: <URL:http://packages.debian.org/changelogs/pool/main/d/docbook-xml/current/changelog#versionversion4.4-5>
+
+@DPATCH@
+diff -urNad docbook-xml-4.5~/docbook-4.3/dbpoolx.mod docbook-xml-4.5/docbook-4.3/dbpoolx.mod
+--- docbook-xml-4.5~/docbook-4.3/dbpoolx.mod	2007-03-25 23:53:00.000000000 +0200
++++ docbook-xml-4.5/docbook-4.3/dbpoolx.mod	2007-03-25 23:53:00.000000000 +0200
+@@ -633,6 +633,9 @@
+ 
+ <!-- xml:base: base URI -->
+ 
++<![%sgml.features;[
++<!ENTITY % xml-base.attrib "">
++]]>
+ <!ENTITY % xml-base.attrib
+ 	"xml:base	CDATA		#IMPLIED">
+ 
+diff -urNad docbook-xml-4.5~/docbook-4.3/htmltblx.mod docbook-xml-4.5/docbook-4.3/htmltblx.mod
+--- docbook-xml-4.5~/docbook-4.3/htmltblx.mod	2004-03-31 13:20:20.000000000 +0200
++++ docbook-xml-4.5/docbook-4.3/htmltblx.mod	2007-03-25 23:53:00.000000000 +0200
+@@ -63,6 +63,9 @@
+   >
+ 
+ <!-- Does not contain lang or dir because they are in %common.attribs -->
++<![%sgml.features;[
++<!ENTITY % i18n "">
++]]>
+ <!ENTITY % i18n
+  "xml:lang    NMTOKEN        #IMPLIED"
+   >
+@@ -92,11 +95,11 @@
+   "valign     (top|middle|bottom|baseline) #IMPLIED"
+   >
+ 
+-<!ELEMENT colgroup (col)*>
+-<!ELEMENT col      EMPTY>
+-<!ELEMENT tr       (th|td)+>
+-<!ELEMENT th       (%para.char.mix; | %tabentry.mix;)*>
+-<!ELEMENT td       (%para.char.mix; | %tabentry.mix;)*>
++<!ELEMENT colgroup %ho; (col)*>
++<!ELEMENT col      %ho; EMPTY>
++<!ELEMENT tr       %ho; (th|td)+>
++<!ELEMENT th       %ho; (%para.char.mix; | %tabentry.mix;)*>
++<!ELEMENT td       %ho; (%para.char.mix; | %tabentry.mix;)*>
+ 
+ <!ATTLIST colgroup
+   %attrs;
+@@ -206,7 +209,7 @@
+     summary     CDATA          #IMPLIED
+     width       CDATA        #IMPLIED
+     border      CDATA        #IMPLIED
+-    rules       (none | groups | rows | cols | all)      #IMPLIED
++    rules       CDATA        #IMPLIED
+     cellspacing CDATA        #IMPLIED
+     cellpadding CDATA        #IMPLIED
+     align       (left|center|right)   #IMPLIED
+diff -urNad docbook-xml-4.5~/docbook-4.4/htmltblx.mod docbook-xml-4.5/docbook-4.4/htmltblx.mod
+--- docbook-xml-4.5~/docbook-4.4/htmltblx.mod	2005-01-27 14:57:19.000000000 +0100
++++ docbook-xml-4.5/docbook-4.4/htmltblx.mod	2007-03-25 23:53:00.000000000 +0200
+@@ -63,6 +63,9 @@
+   >
+ 
+ <!-- Does not contain lang or dir because they are in %common.attribs -->
++<![%sgml.features;[
++<!ENTITY % i18n "">
++]]>
+ <!ENTITY % i18n
+  "xml:lang    NMTOKEN        #IMPLIED"
+   >
+@@ -92,11 +95,11 @@
+   "valign     (top|middle|bottom|baseline) #IMPLIED"
+   >
+ 
+-<!ELEMENT colgroup (col)*>
+-<!ELEMENT col      EMPTY>
+-<!ELEMENT tr       (th|td)+>
+-<!ELEMENT th       (%para.char.mix; | %tabentry.mix; | table | informaltable)*>
+-<!ELEMENT td       (%para.char.mix; | %tabentry.mix; | table | informaltable)*>
++<!ELEMENT colgroup %ho; (col)*>
++<!ELEMENT col      %ho; EMPTY>
++<!ELEMENT tr       %ho; (th|td)+>
++<!ELEMENT th       %ho; (%para.char.mix; | %tabentry.mix; | table | informaltable)*>
++<!ELEMENT td       %ho; (%para.char.mix; | %tabentry.mix; | table | informaltable)*>
+ 
+ <!ATTLIST colgroup
+   %attrs;
--- docbook-xml-4.5.orig/debian/patches/00list
+++ docbook-xml-4.5/debian/patches/00list
@@ -0,0 +1,9 @@
+01_use_the_entities_from_sgml_data
+02_add_dtddecl_and_force_fpi_over_sysid
+03_fix_wrong_371_fpi_in_40
+05_add_doctype_to_catalog_xml
+06_add_system_identifiers_to_catalog
+07_add_fpi_for_htmltblx_mod_to_43_catalogs
+10_fix_101779_mention_artheader_to_articleinfo_change
+11_fix_dbpoolx_mod_header_comment_pubid
+12_fix_256119_and_turn_on_sgml_mode
--- docbook-xml-4.5.orig/debian/patches/02_add_dtddecl_and_force_fpi_over_sysid.dpatch
+++ docbook-xml-4.5/debian/patches/02_add_dtddecl_and_force_fpi_over_sysid.dpatch
@@ -0,0 +1,110 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_add_dtddecl_and_force_fpi_over_sysid.dpatch by Adam Di Carlo <aph@debian.org>.
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: * docbook-4.x/docbook.cat: Adds DTDDECL declarations for convenience.
+## DP:   Forces FPI to override SYSTEM IDs, if both are supplied.
+## DP:
+## DP: <URL:http://packages.debian.org/changelogs/pool/main/d/docbook-xml/current/changelog#versionversion4.1.2-2>
+## DP: <URL:http://packages.debian.org/changelogs/pool/main/d/docbook-xml/current/changelog#versionversion4.2-8>
+## DP: <URL:http://packages.debian.org/changelogs/pool/main/d/docbook-xml/current/changelog#versionversion4.5-1>
+
+@DPATCH@
+diff -urNad docbook-xml-4.5~/docbook-4.1.2/docbook.cat docbook-xml-4.5/docbook-4.1.2/docbook.cat
+--- docbook-xml-4.5~/docbook-4.1.2/docbook.cat	2007-03-25 21:45:05.000000000 +0200
++++ docbook-xml-4.5/docbook-4.1.2/docbook.cat	2007-03-25 21:47:30.000000000 +0200
+@@ -16,10 +16,14 @@
+      on supplying and using catalog data.
+   --
+ 
++  -- public identifiers override system identifiers, if both are supplied   --
++OVERRIDE YES
++
+   -- ...................................................................... --
+   -- DocBook driver file .................................................. --
+ 
+ PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "docbookx.dtd"
++DTDDECL "-//OASIS//DTD DocBook XML V4.1.2//EN" "/usr/share/xml/declaration/xml.dcl"
+ 
+   -- ...................................................................... --
+   -- DocBook modules ...................................................... --
+diff -urNad docbook-xml-4.5~/docbook-4.2/docbook.cat docbook-xml-4.5/docbook-4.2/docbook.cat
+--- docbook-xml-4.5~/docbook-4.2/docbook.cat	2007-03-25 21:45:05.000000000 +0200
++++ docbook-xml-4.5/docbook-4.2/docbook.cat	2007-03-25 21:48:01.000000000 +0200
+@@ -16,11 +16,16 @@
+      on supplying and using catalog data.
+   --
+ 
++  -- public identifiers override system identifiers, if both are supplied   --
++OVERRIDE YES
++
+   -- ...................................................................... --
+   -- DocBook driver file .................................................. --
+ 
+ PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+        "docbookx.dtd"
++DTDDECL "-//OASIS//DTD DocBook XML V4.2//EN"
++        "/usr/share/xml/declaration/xml.dcl"
+ 
+   -- ...................................................................... --
+   -- DocBook modules ...................................................... --
+diff -urNad docbook-xml-4.5~/docbook-4.3/docbook.cat docbook-xml-4.5/docbook-4.3/docbook.cat
+--- docbook-xml-4.5~/docbook-4.3/docbook.cat	2007-03-25 21:45:05.000000000 +0200
++++ docbook-xml-4.5/docbook-4.3/docbook.cat	2007-03-25 21:55:39.000000000 +0200
+@@ -16,11 +16,16 @@
+      on supplying and using catalog data.
+   --
+ 
++  -- public identifiers override system identifiers, if both are supplied   --
++OVERRIDE YES
++
+   -- ...................................................................... --
+   -- DocBook driver file .................................................. --
+ 
+ PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+        "docbookx.dtd"
++DTDDECL "-//OASIS//DTD DocBook XML V4.3//EN"
++        "/usr/share/xml/declaration/xml.dcl"
+ 
+   -- ...................................................................... --
+   -- DocBook modules ...................................................... --
+diff -urNad docbook-xml-4.5~/docbook-4.4/docbook.cat docbook-xml-4.5/docbook-4.4/docbook.cat
+--- docbook-xml-4.5~/docbook-4.4/docbook.cat	2007-03-25 21:45:05.000000000 +0200
++++ docbook-xml-4.5/docbook-4.4/docbook.cat	2007-03-25 21:48:30.000000000 +0200
+@@ -16,11 +16,16 @@
+      on supplying and using catalog data.
+   --
+ 
++  -- public identifiers override system identifiers, if both are supplied   --
++OVERRIDE YES
++
+   -- ...................................................................... --
+   -- DocBook driver file .................................................. --
+ 
+ PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+        "docbookx.dtd"
++DTDDECL "-//OASIS//DTD DocBook XML V4.4//EN"
++        "/usr/share/xml/declaration/xml.dcl"
+ 
+   -- ...................................................................... --
+   -- DocBook modules ...................................................... --
+diff -urNad docbook-xml-4.5~/docbook-4.5/docbook.cat docbook-xml-4.5/docbook-4.5/docbook.cat
+--- docbook-xml-4.5~/docbook-4.5/docbook.cat	2007-03-25 21:45:05.000000000 +0200
++++ docbook-xml-4.5/docbook-4.5/docbook.cat	2007-03-25 21:55:23.000000000 +0200
+@@ -16,11 +16,16 @@
+      on supplying and using catalog data.
+   --
+ 
++  -- public identifiers override system identifiers, if both are supplied   --
++OVERRIDE YES
++
+   -- ...................................................................... --
+   -- DocBook driver file .................................................. --
+ 
+ PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+        "docbookx.dtd"
++DTDDECL "-//OASIS//DTD DocBook XML V4.5//EN"
++        "/usr/share/xml/declaration/xml.dcl"
+ 
+   -- ...................................................................... --
+   -- DocBook modules ...................................................... --
--- docbook-xml-4.5.orig/debian/patches/05_add_doctype_to_catalog_xml.dpatch
+++ docbook-xml-4.5/debian/patches/05_add_doctype_to_catalog_xml.dpatch
@@ -0,0 +1,55 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 05_add_doctype_to_catalog_xml.dpatch by Adam Di Carlo <aph@debian.org> and
+##     and Daniel Leidert <daniel.leidert@wgdd.de>.
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: * docbook-4.{2,3,4,5}/catalog.xml: Adds the missing DOCTYPE.
+## DP:
+## DP: <URL:http://packages.debian.org/changelogs/pool/main/d/docbook-xml/current/changelog#versionversion4.2-8>
+## DP: <URL:http://packages.debian.org/changelogs/pool/main/d/docbook-xml/current/changelog#versionversion4.5-1>
+
+@DPATCH@
+diff -urNad docbook-xml-4.5~/docbook-4.2/catalog.xml docbook-xml-4.5/docbook-4.2/catalog.xml
+--- docbook-xml-4.5~/docbook-4.2/catalog.xml	2007-03-25 22:16:26.000000000 +0200
++++ docbook-xml-4.5/docbook-4.2/catalog.xml	2007-03-25 22:17:56.000000000 +0200
+@@ -1,4 +1,7 @@
+ <?xml version='1.0'?>
++<!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">
+ 
+ <!-- ...................................................................... -->
+diff -urNad docbook-xml-4.5~/docbook-4.3/catalog.xml docbook-xml-4.5/docbook-4.3/catalog.xml
+--- docbook-xml-4.5~/docbook-4.3/catalog.xml	2007-03-25 22:16:26.000000000 +0200
++++ docbook-xml-4.5/docbook-4.3/catalog.xml	2007-03-25 22:18:09.000000000 +0200
+@@ -1,4 +1,7 @@
+ <?xml version='1.0'?>
++<!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">
+ 
+ <!-- ...................................................................... -->
+diff -urNad docbook-xml-4.5~/docbook-4.4/catalog.xml docbook-xml-4.5/docbook-4.4/catalog.xml
+--- docbook-xml-4.5~/docbook-4.4/catalog.xml	2007-03-25 22:16:26.000000000 +0200
++++ docbook-xml-4.5/docbook-4.4/catalog.xml	2007-03-25 22:18:24.000000000 +0200
+@@ -1,4 +1,7 @@
+ <?xml version='1.0'?>
++<!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" prefer="public">
+ 
+ <!-- ...................................................................... -->
+diff -urNad docbook-xml-4.5~/docbook-4.5/catalog.xml docbook-xml-4.5/docbook-4.5/catalog.xml
+--- docbook-xml-4.5~/docbook-4.5/catalog.xml	2007-03-25 22:16:26.000000000 +0200
++++ docbook-xml-4.5/docbook-4.5/catalog.xml	2007-03-25 22:18:37.000000000 +0200
+@@ -1,4 +1,7 @@
+ <?xml version='1.0'?>
++<!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" prefer="public">
+ 
+ <!-- ...................................................................... -->
--- docbook-xml-4.5.orig/debian/patches/07_add_fpi_for_htmltblx_mod_to_43_catalogs.dpatch
+++ docbook-xml-4.5/debian/patches/07_add_fpi_for_htmltblx_mod_to_43_catalogs.dpatch
@@ -0,0 +1,37 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 07_add_fpi_for_htmltblx_mod_to_43_catalogs.dpatch by Adam Di Carlo <aph@debian.org>.
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: * docbook-4.3/{catalog.xml,docbook.cat}: The catalogs for DB 4.3 miss
+## DP:   the FPI "-//OASIS//ELEMENTS DocBook XML HTML Tables V4.3//EN".
+## DP:
+## DP: <URL:http://bugs.debian.org/268364>
+## DP: <URL:http://packages.debian.org/changelogs/pool/main/d/docbook-xml/current/changelog#versionversion4.4-1>
+
+@DPATCH@
+diff -urNad docbook-xml-4.5~/docbook-4.3/catalog.xml docbook-xml-4.5/docbook-4.3/catalog.xml
+--- docbook-xml-4.5~/docbook-4.3/catalog.xml	2007-03-25 23:29:54.000000000 +0200
++++ docbook-xml-4.5/docbook-4.3/catalog.xml	2007-03-25 23:31:04.000000000 +0200
+@@ -40,6 +40,9 @@
+ <public publicId="-//OASIS//DTD DocBook CALS Table Model V4.3//EN"
+         uri="calstblx.dtd"/>
+ 
++<public publicId="-//OASIS//ELEMENTS DocBook XML HTML Tables V4.3//EN"
++        uri="htmltblx.mod"/>
++
+ <public publicId="-//OASIS//DTD XML Exchange Table Model 19990315//EN"
+         uri="soextblx.dtd"/>
+ 
+diff -urNad docbook-xml-4.5~/docbook-4.3/docbook.cat docbook-xml-4.5/docbook-4.3/docbook.cat
+--- docbook-xml-4.5~/docbook-4.3/docbook.cat	2007-03-25 23:29:53.000000000 +0200
++++ docbook-xml-4.5/docbook-4.3/docbook.cat	2007-03-25 23:31:42.000000000 +0200
+@@ -33,6 +33,9 @@
+ PUBLIC "-//OASIS//DTD DocBook CALS Table Model V4.3//EN"
+        "calstblx.dtd"
+ 
++PUBLIC "-//OASIS//ELEMENTS DocBook XML HTML Tables V4.3//EN"
++       "htmltblx.mod"
++
+ PUBLIC "-//OASIS//DTD XML Exchange Table Model 19990315//EN"
+        "soextblx.dtd"
+ 
--- docbook-xml-4.5.orig/debian/patches/10_fix_101779_mention_artheader_to_articleinfo_change.dpatch
+++ docbook-xml-4.5/debian/patches/10_fix_101779_mention_artheader_to_articleinfo_change.dpatch
@@ -0,0 +1,33 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_fix_101779_mention_artheader_to_articleinfo_change.dpatch by Adam Di Carlo <aph@debian.org>.
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: The removal of ArtHeader in 4.0 is not documented in ChangeLog. This
+## DP: patch fixes it.
+## DP:
+## DP: <URL:http://bugs.debian.org/bug=101779>
+## DP: <URL:http://packages.debian.org/changelogs/pool/main/d/docbook-xml/current/changelog#versionversion4.1.2-7>
+
+@DPATCH@
+diff -urNad docbook-xml-4.5~/ChangeLog.upstream docbook-xml-4.5/ChangeLog.upstream
+--- docbook-xml-4.5~/ChangeLog.upstream	2007-03-10 13:16:33.000000000 +0100
++++ docbook-xml-4.5/ChangeLog.upstream	2007-03-14 19:42:54.000000000 +0100
+@@ -769,6 +769,7 @@
+ - Added synopsis markup for modern programming languages (e.g, object
+   oriented languages like Java, C++, and IDL)
+ - Renamed DocInfo to PrefaceInfo, ChapterInfo, AppendixInfo, etc.
++  (and ArtHeader to ArticleInfo)
+ - Comment was renamed Remark
+ - InterfaceDefinition was removed
+ 
+diff -urNad docbook-xml-4.5~/docbook-4.1.2/40chg.txt docbook-xml-4.5/docbook-4.1.2/40chg.txt
+--- docbook-xml-4.5~/docbook-4.1.2/40chg.txt	2000-08-27 17:19:41.000000000 +0200
++++ docbook-xml-4.5/docbook-4.1.2/40chg.txt	2007-03-14 19:42:33.000000000 +0100
+@@ -37,6 +37,7 @@
+ - Added synopsis markup for modern programming languages (e.g, object
+   oriented languages like Java, C++, and IDL)
+ - Renamed DocInfo to PrefaceInfo, ChapterInfo, AppendixInfo, etc.
++  (and ArtHeader to ArticleInfo)
+ - Comment was renamed Remark
+ - InterfaceDefinition was removed
+ 
--- docbook-xml-4.5.orig/debian/patches/03_fix_wrong_371_fpi_in_40.dpatch
+++ docbook-xml-4.5/debian/patches/03_fix_wrong_371_fpi_in_40.dpatch
@@ -0,0 +1,33 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03_fix_wrong_table_model_fpi_in_40.dpatch by Adam Di Carlo <aph@debian.org>
+##     and Daniel Leidert (dale) <daniel.leidert@wgdd.de>.
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: * docbook-4.0/dbpoolx.mod: Fixes some 3.1.7 references, that should be
+## DP:   4.0 FPIs.
+## DP:
+## DP: <URL:http://packages.debian.org/changelogs/pool/main/d/docbook-xml/current/changelog#versionversion4.2-6>
+## DP: <URL:http://packages.debian.org/changelogs/pool/main/d/docbook-xml/current/changelog#versionversion4.5-1>
+
+@DPATCH@
+diff -urNad docbook-xml-4.5~/docbook-4.0/dbpoolx.mod docbook-xml-4.5/docbook-4.0/dbpoolx.mod
+--- docbook-xml-4.5~/docbook-4.0/dbpoolx.mod	2000-05-18 21:40:49.000000000 +0200
++++ docbook-xml-4.5/docbook-4.0/dbpoolx.mod	2007-03-25 22:48:52.000000000 +0200
+@@ -3354,7 +3354,7 @@
+ 
+ <!-- Reference SGML Open Exchange Table Model -->
+ <!ENTITY % tablemodel 
+-  PUBLIC "-//Norman Walsh//DTD CALS Table Model XML V3.1.7//EN" 
++  PUBLIC "-//Norman Walsh//DTD CALS Table Model XML V4.0//EN" 
+   "calstblx.dtd">
+ ]]>
+ 
+@@ -3388,7 +3388,7 @@
+ <!ENTITY % tbl.entry.mdl "(%para.char.mix; | %tabentry.mix;)*">
+ 
+ <!ENTITY % tablemodel 
+-  PUBLIC "-//Norman Walsh//DTD Exchange Table Model 19960430 XML V3.1.7//EN"
++  PUBLIC "-//Norman Walsh//DTD Exchange Table Model 19960430 XML V4.0//EN"
+   "soextblx.dtd">
+ ]]>
+ 
--- docbook-xml-4.5.orig/debian/patches/01_use_the_entities_from_sgml_data.dpatch
+++ docbook-xml-4.5/debian/patches/01_use_the_entities_from_sgml_data.dpatch
@@ -0,0 +1,1588 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_use_the_entities_from_sgml_data.dpatch by Adam Di Carlo <aph@debian.org>
+##     and Daniel Leidert (dale) <daniel.leidert@wgdd.de>.
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: * docbook-4.x/dbcentx.mod: don't install and reference ISO XML
+## DP:   entities, which are in the sgml-data package
+## DP:
+## DP: * docbook-4.x/{docbook.cat,catalog.xml}: Removes the ISO XML entity
+## DP:   references, which are part of sgml-data
+## DP:
+## DP: <URL:http://bugs.debian.org/99993>
+## DP: <URL:http://bugs.debian.org/102605>
+## DP: <URL:http://bugs.debian.org/232600>
+## DP: <URL:http://bugs.debian.org/305736>
+## DP: <URL:http://packages.debian.org/changelogs/pool/main/d/docbook-xml/current/changelog#versionversion3.1.5.1-1>
+## DP: <URL:http://packages.debian.org/changelogs/pool/main/d/docbook-xml/current/changelog#versionversion4.1.2-5>
+## DP: <URL:http://packages.debian.org/changelogs/pool/main/d/docbook-xml/current/changelog#versionversion4.1.2-7>
+## DP: <URL:http://packages.debian.org/changelogs/pool/main/d/docbook-xml/current/changelog#versionversion4.2-5>
+## DP: <URL:http://packages.debian.org/changelogs/pool/main/d/docbook-xml/current/changelog#versionversion4.2-11>
+## DP: <URL:http://packages.debian.org/changelogs/pool/main/d/docbook-xml/current/changelog#versionversion4.5-1>
+## DP:
+## DP: for i in `find . -type f` ; \
+## DP: 		do sed -e 's/^\"ent\/iso-/\"\/usr\/share\/xml\/entities\/xml-iso-entities-8879\.1986\/ISO/g' < $i > $i.new ; \
+## DP: 		mv $i.new $i ; \
+## DP: done
+
+@DPATCH@
+diff -urNad docbook-xml-4.5~/docbook-4.0/dbcentx.mod docbook-xml-4.5/docbook-4.0/dbcentx.mod
+--- docbook-xml-4.5~/docbook-4.0/dbcentx.mod	2000-05-18 21:40:49.000000000 +0200
++++ docbook-xml-4.5/docbook-4.0/dbcentx.mod	2007-03-25 23:42:57.000000000 +0200
+@@ -52,7 +52,7 @@
+ <![%ISOamsa.module;[
+ <!ENTITY % ISOamsa PUBLIC
+ "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN//XML"
+-"ent/iso-amsa.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOamsa.ent">
+ %ISOamsa;
+ <!--end of ISOamsa.module-->]]>
+ 
+@@ -60,7 +60,7 @@
+ <![%ISOamsb.module;[
+ <!ENTITY % ISOamsb PUBLIC
+ "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN//XML"
+-"ent/iso-amsb.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOamsb.ent">
+ %ISOamsb;
+ <!--end of ISOamsb.module-->]]>
+ 
+@@ -68,7 +68,7 @@
+ <![%ISOamsc.module;[
+ <!ENTITY % ISOamsc PUBLIC
+ "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN//XML"
+-"ent/iso-amsc.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOamsc.ent">
+ %ISOamsc;
+ <!--end of ISOamsc.module-->]]>
+ 
+@@ -76,7 +76,7 @@
+ <![%ISOamsn.module;[
+ <!ENTITY % ISOamsn PUBLIC
+ "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN//XML"
+-"ent/iso-amsn.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOamsn.ent">
+ %ISOamsn;
+ <!--end of ISOamsn.module-->]]>
+ 
+@@ -84,7 +84,7 @@
+ <![%ISOamso.module;[
+ <!ENTITY % ISOamso PUBLIC
+ "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN//XML"
+-"ent/iso-amso.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOamso.ent">
+ %ISOamso;
+ <!--end of ISOamso.module-->]]>
+ 
+@@ -92,7 +92,7 @@
+ <![%ISOamsr.module;[
+ <!ENTITY % ISOamsr PUBLIC
+ "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN//XML"
+-"ent/iso-amsr.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOamsr.ent">
+ %ISOamsr;
+ <!--end of ISOamsr.module-->]]>
+ 
+@@ -100,7 +100,7 @@
+ <![%ISObox.module;[
+ <!ENTITY % ISObox PUBLIC
+ "ISO 8879:1986//ENTITIES Box and Line Drawing//EN//XML"
+-"ent/iso-box.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISObox.ent">
+ %ISObox;
+ <!--end of ISObox.module-->]]>
+ 
+@@ -108,7 +108,7 @@
+ <![%ISOcyr1.module;[
+ <!ENTITY % ISOcyr1 PUBLIC
+ "ISO 8879:1986//ENTITIES Russian Cyrillic//EN//XML"
+-"ent/iso-cyr1.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOcyr1.ent">
+ %ISOcyr1;
+ <!--end of ISOcyr1.module-->]]>
+ 
+@@ -116,7 +116,7 @@
+ <![%ISOcyr2.module;[
+ <!ENTITY % ISOcyr2 PUBLIC
+ "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN//XML"
+-"ent/iso-cyr2.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOcyr2.ent">
+ %ISOcyr2;
+ <!--end of ISOcyr2.module-->]]>
+ 
+@@ -124,7 +124,7 @@
+ <![%ISOdia.module;[
+ <!ENTITY % ISOdia PUBLIC
+ "ISO 8879:1986//ENTITIES Diacritical Marks//EN//XML"
+-"ent/iso-dia.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOdia.ent">
+ %ISOdia;
+ <!--end of ISOdia.module-->]]>
+ 
+@@ -132,7 +132,7 @@
+ <![%ISOgrk1.module;[
+ <!ENTITY % ISOgrk1 PUBLIC
+ "ISO 8879:1986//ENTITIES Greek Letters//EN//XML"
+-"ent/iso-grk1.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOgrk1.ent">
+ %ISOgrk1;
+ <!--end of ISOgrk1.module-->]]>
+ 
+@@ -140,7 +140,7 @@
+ <![%ISOgrk2.module;[
+ <!ENTITY % ISOgrk2 PUBLIC
+ "ISO 8879:1986//ENTITIES Monotoniko Greek//EN//XML"
+-"ent/iso-grk2.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOgrk2.ent">
+ %ISOgrk2;
+ <!--end of ISOgrk2.module-->]]>
+ 
+@@ -148,7 +148,7 @@
+ <![%ISOgrk3.module;[
+ <!ENTITY % ISOgrk3 PUBLIC
+ "ISO 8879:1986//ENTITIES Greek Symbols//EN//XML"
+-"ent/iso-grk3.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOgrk3.ent">
+ %ISOgrk3;
+ <!--end of ISOgrk3.module-->]]>
+ 
+@@ -156,7 +156,7 @@
+ <![%ISOgrk4.module;[
+ <!ENTITY % ISOgrk4 PUBLIC
+ "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN//XML"
+-"ent/iso-grk4.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOgrk4.ent">
+ %ISOgrk4;
+ <!--end of ISOgrk4.module-->]]>
+ 
+@@ -164,7 +164,7 @@
+ <![%ISOlat1.module;[
+ <!ENTITY % ISOlat1 PUBLIC
+ "ISO 8879:1986//ENTITIES Added Latin 1//EN//XML"
+-"ent/iso-lat1.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOlat1.ent">
+ %ISOlat1;
+ <!--end of ISOlat1.module-->]]>
+ 
+@@ -172,7 +172,7 @@
+ <![%ISOlat2.module;[
+ <!ENTITY % ISOlat2 PUBLIC
+ "ISO 8879:1986//ENTITIES Added Latin 2//EN//XML"
+-"ent/iso-lat2.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOlat2.ent">
+ %ISOlat2;
+ <!--end of ISOlat2.module-->]]>
+ 
+@@ -180,7 +180,7 @@
+ <![%ISOnum.module;[
+ <!ENTITY % ISOnum PUBLIC
+ "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN//XML"
+-"ent/iso-num.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOnum.ent">
+ %ISOnum;
+ <!--end of ISOnum.module-->]]>
+ 
+@@ -188,7 +188,7 @@
+ <![%ISOpub.module;[
+ <!ENTITY % ISOpub PUBLIC
+ "ISO 8879:1986//ENTITIES Publishing//EN//XML"
+-"ent/iso-pub.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOpub.ent">
+ %ISOpub;
+ <!--end of ISOpub.module-->]]>
+ 
+@@ -196,7 +196,7 @@
+ <![%ISOtech.module;[
+ <!ENTITY % ISOtech PUBLIC
+ "ISO 8879:1986//ENTITIES General Technical//EN//XML"
+-"ent/iso-tech.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOtech.ent">
+ %ISOtech;
+ <!--end of ISOtech.module-->]]>
+ 
+diff -urNad docbook-xml-4.5~/docbook-4.1.2/dbcentx.mod docbook-xml-4.5/docbook-4.1.2/dbcentx.mod
+--- docbook-xml-4.5~/docbook-4.1.2/dbcentx.mod	2000-08-27 17:19:42.000000000 +0200
++++ docbook-xml-4.5/docbook-4.1.2/dbcentx.mod	2007-03-25 23:42:57.000000000 +0200
+@@ -52,7 +52,7 @@
+ <![%ISOamsa.module;[
+ <!ENTITY % ISOamsa PUBLIC
+ "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN//XML"
+-"ent/iso-amsa.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOamsa.ent">
+ %ISOamsa;
+ <!--end of ISOamsa.module-->]]>
+ 
+@@ -60,7 +60,7 @@
+ <![%ISOamsb.module;[
+ <!ENTITY % ISOamsb PUBLIC
+ "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN//XML"
+-"ent/iso-amsb.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOamsb.ent">
+ %ISOamsb;
+ <!--end of ISOamsb.module-->]]>
+ 
+@@ -68,7 +68,7 @@
+ <![%ISOamsc.module;[
+ <!ENTITY % ISOamsc PUBLIC
+ "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN//XML"
+-"ent/iso-amsc.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOamsc.ent">
+ %ISOamsc;
+ <!--end of ISOamsc.module-->]]>
+ 
+@@ -76,7 +76,7 @@
+ <![%ISOamsn.module;[
+ <!ENTITY % ISOamsn PUBLIC
+ "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN//XML"
+-"ent/iso-amsn.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOamsn.ent">
+ %ISOamsn;
+ <!--end of ISOamsn.module-->]]>
+ 
+@@ -84,7 +84,7 @@
+ <![%ISOamso.module;[
+ <!ENTITY % ISOamso PUBLIC
+ "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN//XML"
+-"ent/iso-amso.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOamso.ent">
+ %ISOamso;
+ <!--end of ISOamso.module-->]]>
+ 
+@@ -92,7 +92,7 @@
+ <![%ISOamsr.module;[
+ <!ENTITY % ISOamsr PUBLIC
+ "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN//XML"
+-"ent/iso-amsr.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOamsr.ent">
+ %ISOamsr;
+ <!--end of ISOamsr.module-->]]>
+ 
+@@ -100,7 +100,7 @@
+ <![%ISObox.module;[
+ <!ENTITY % ISObox PUBLIC
+ "ISO 8879:1986//ENTITIES Box and Line Drawing//EN//XML"
+-"ent/iso-box.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISObox.ent">
+ %ISObox;
+ <!--end of ISObox.module-->]]>
+ 
+@@ -108,7 +108,7 @@
+ <![%ISOcyr1.module;[
+ <!ENTITY % ISOcyr1 PUBLIC
+ "ISO 8879:1986//ENTITIES Russian Cyrillic//EN//XML"
+-"ent/iso-cyr1.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOcyr1.ent">
+ %ISOcyr1;
+ <!--end of ISOcyr1.module-->]]>
+ 
+@@ -116,7 +116,7 @@
+ <![%ISOcyr2.module;[
+ <!ENTITY % ISOcyr2 PUBLIC
+ "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN//XML"
+-"ent/iso-cyr2.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOcyr2.ent">
+ %ISOcyr2;
+ <!--end of ISOcyr2.module-->]]>
+ 
+@@ -124,7 +124,7 @@
+ <![%ISOdia.module;[
+ <!ENTITY % ISOdia PUBLIC
+ "ISO 8879:1986//ENTITIES Diacritical Marks//EN//XML"
+-"ent/iso-dia.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOdia.ent">
+ %ISOdia;
+ <!--end of ISOdia.module-->]]>
+ 
+@@ -132,7 +132,7 @@
+ <![%ISOgrk1.module;[
+ <!ENTITY % ISOgrk1 PUBLIC
+ "ISO 8879:1986//ENTITIES Greek Letters//EN//XML"
+-"ent/iso-grk1.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOgrk1.ent">
+ %ISOgrk1;
+ <!--end of ISOgrk1.module-->]]>
+ 
+@@ -140,7 +140,7 @@
+ <![%ISOgrk2.module;[
+ <!ENTITY % ISOgrk2 PUBLIC
+ "ISO 8879:1986//ENTITIES Monotoniko Greek//EN//XML"
+-"ent/iso-grk2.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOgrk2.ent">
+ %ISOgrk2;
+ <!--end of ISOgrk2.module-->]]>
+ 
+@@ -148,7 +148,7 @@
+ <![%ISOgrk3.module;[
+ <!ENTITY % ISOgrk3 PUBLIC
+ "ISO 8879:1986//ENTITIES Greek Symbols//EN//XML"
+-"ent/iso-grk3.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOgrk3.ent">
+ %ISOgrk3;
+ <!--end of ISOgrk3.module-->]]>
+ 
+@@ -156,7 +156,7 @@
+ <![%ISOgrk4.module;[
+ <!ENTITY % ISOgrk4 PUBLIC
+ "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN//XML"
+-"ent/iso-grk4.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOgrk4.ent">
+ %ISOgrk4;
+ <!--end of ISOgrk4.module-->]]>
+ 
+@@ -164,7 +164,7 @@
+ <![%ISOlat1.module;[
+ <!ENTITY % ISOlat1 PUBLIC
+ "ISO 8879:1986//ENTITIES Added Latin 1//EN//XML"
+-"ent/iso-lat1.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOlat1.ent">
+ %ISOlat1;
+ <!--end of ISOlat1.module-->]]>
+ 
+@@ -172,7 +172,7 @@
+ <![%ISOlat2.module;[
+ <!ENTITY % ISOlat2 PUBLIC
+ "ISO 8879:1986//ENTITIES Added Latin 2//EN//XML"
+-"ent/iso-lat2.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOlat2.ent">
+ %ISOlat2;
+ <!--end of ISOlat2.module-->]]>
+ 
+@@ -180,7 +180,7 @@
+ <![%ISOnum.module;[
+ <!ENTITY % ISOnum PUBLIC
+ "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN//XML"
+-"ent/iso-num.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOnum.ent">
+ %ISOnum;
+ <!--end of ISOnum.module-->]]>
+ 
+@@ -188,7 +188,7 @@
+ <![%ISOpub.module;[
+ <!ENTITY % ISOpub PUBLIC
+ "ISO 8879:1986//ENTITIES Publishing//EN//XML"
+-"ent/iso-pub.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOpub.ent">
+ %ISOpub;
+ <!--end of ISOpub.module-->]]>
+ 
+@@ -196,7 +196,7 @@
+ <![%ISOtech.module;[
+ <!ENTITY % ISOtech PUBLIC
+ "ISO 8879:1986//ENTITIES General Technical//EN//XML"
+-"ent/iso-tech.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOtech.ent">
+ %ISOtech;
+ <!--end of ISOtech.module-->]]>
+ 
+diff -urNad docbook-xml-4.5~/docbook-4.1.2/docbook.cat docbook-xml-4.5/docbook-4.1.2/docbook.cat
+--- docbook-xml-4.5~/docbook-4.1.2/docbook.cat	2000-08-27 17:19:42.000000000 +0200
++++ docbook-xml-4.5/docbook-4.1.2/docbook.cat	2007-03-25 23:42:57.000000000 +0200
+@@ -32,28 +32,5 @@
+ PUBLIC "-//OASIS//ENTITIES DocBook XML Notations V4.1.2//EN" "dbnotnx.mod"
+ PUBLIC "-//OASIS//ENTITIES DocBook XML Character Entities V4.1.2//EN" "dbcentx.mod"
+ 
+-  -- ...................................................................... --
+-  -- ISO entity sets ...................................................... --
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN" "ent/iso-dia.ent"
+-PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" "ent/iso-num.ent"
+-PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN" "ent/iso-pub.ent"
+-PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN" "ent/iso-tech.ent"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN" "ent/iso-lat1.ent"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN" "ent/iso-lat2.ent"
+-PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN" "ent/iso-grk1.ent"
+-PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" "ent/iso-grk2.ent"
+-PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN" "ent/iso-grk3.ent"
+-PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" "ent/iso-grk4.ent"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" "ent/iso-amsa.ent"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" "ent/iso-amsb.ent"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" "ent/iso-amsc.ent"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" "ent/iso-amsn.ent"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" "ent/iso-amso.ent"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" "ent/iso-amsr.ent"
+-PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" "ent/iso-box.ent"
+-PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" "ent/iso-cyr1.ent"
+-PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" "ent/iso-cyr2.ent"
+-
+   -- End of catalog data for DocBook XML V4.1.2 ............................. --
+   -- ...................................................................... --
+diff -urNad docbook-xml-4.5~/docbook-4.2/catalog.xml docbook-xml-4.5/docbook-4.2/catalog.xml
+--- docbook-xml-4.5~/docbook-4.2/catalog.xml	2002-07-17 18:14:41.000000000 +0200
++++ docbook-xml-4.5/docbook-4.2/catalog.xml	2007-03-25 23:42:57.000000000 +0200
+@@ -49,66 +49,6 @@
+ <public publicId="-//OASIS//ENTITIES DocBook Character Entities V4.2//EN"
+         uri="dbcentx.mod"/>
+ 
+-<!-- ...................................................................... -->
+-<!-- ISO entity sets ...................................................... -->
+-
+-<public publicId="ISO 8879:1986//ENTITIES Diacritical Marks//EN//XML"
+-        uri="ent/iso-dia.ent"/>
+-
+-<public publicId="ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN//XML"
+-        uri="ent/iso-num.ent"/>
+-
+-<public publicId="ISO 8879:1986//ENTITIES Publishing//EN//XML"
+-        uri="ent/iso-pub.ent"/>
+-
+-<public publicId="ISO 8879:1986//ENTITIES General Technical//EN//XML"
+-        uri="ent/iso-tech.ent"/>
+-
+-<public publicId="ISO 8879:1986//ENTITIES Added Latin 1//EN//XML"
+-        uri="ent/iso-lat1.ent"/>
+-
+-<public publicId="ISO 8879:1986//ENTITIES Added Latin 2//EN//XML"
+-        uri="ent/iso-lat2.ent"/>
+-
+-<public publicId="ISO 8879:1986//ENTITIES Greek Letters//EN//XML"
+-        uri="ent/iso-grk1.ent"/>
+-
+-<public publicId="ISO 8879:1986//ENTITIES Monotoniko Greek//EN//XML"
+-        uri="ent/iso-grk2.ent"/>
+-
+-<public publicId="ISO 8879:1986//ENTITIES Greek Symbols//EN//XML"
+-        uri="ent/iso-grk3.ent"/>
+-
+-<public publicId="ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN//XML"
+-        uri="ent/iso-grk4.ent"/>
+-
+-<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN//XML"
+-        uri="ent/iso-amsa.ent"/>
+-
+-<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN//XML"
+-        uri="ent/iso-amsb.ent"/>
+-
+-<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN//XML"
+-        uri="ent/iso-amsc.ent"/>
+-
+-<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN//XML"
+-        uri="ent/iso-amsn.ent"/>
+-
+-<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN//XML"
+-        uri="ent/iso-amso.ent"/>
+-
+-<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN//XML"
+-        uri="ent/iso-amsr.ent"/>
+-
+-<public publicId="ISO 8879:1986//ENTITIES Box and Line Drawing//EN//XML"
+-        uri="ent/iso-box.ent"/>
+-
+-<public publicId="ISO 8879:1986//ENTITIES Russian Cyrillic//EN//XML"
+-        uri="ent/iso-cyr1.ent"/>
+-
+-<public publicId="ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN//XML"
+-        uri="ent/iso-cyr2.ent"/>
+-
+ <!-- End of catalog data for DocBook XML V4.2 ............................. -->
+ <!-- ...................................................................... -->
+ 
+diff -urNad docbook-xml-4.5~/docbook-4.2/dbcentx.mod docbook-xml-4.5/docbook-4.2/dbcentx.mod
+--- docbook-xml-4.5~/docbook-4.2/dbcentx.mod	2002-07-17 18:14:41.000000000 +0200
++++ docbook-xml-4.5/docbook-4.2/dbcentx.mod	2007-03-25 23:42:57.000000000 +0200
+@@ -173,133 +173,133 @@
+ <![%ISOamsa.module;[
+ <!ENTITY % ISOamsa PUBLIC
+ "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN//XML"
+-"ent/iso-amsa.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOamsa.ent">
+ <!--end of ISOamsa.module-->]]>
+ 
+ <!ENTITY % ISOamsb.module "INCLUDE">
+ <![%ISOamsb.module;[
+ <!ENTITY % ISOamsb PUBLIC
+ "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN//XML"
+-"ent/iso-amsb.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOamsb.ent">
+ <!--end of ISOamsb.module-->]]>
+ 
+ <!ENTITY % ISOamsc.module "INCLUDE">
+ <![%ISOamsc.module;[
+ <!ENTITY % ISOamsc PUBLIC
+ "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN//XML"
+-"ent/iso-amsc.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOamsc.ent">
+ <!--end of ISOamsc.module-->]]>
+ 
+ <!ENTITY % ISOamsn.module "INCLUDE">
+ <![%ISOamsn.module;[
+ <!ENTITY % ISOamsn PUBLIC
+ "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN//XML"
+-"ent/iso-amsn.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOamsn.ent">
+ <!--end of ISOamsn.module-->]]>
+ 
+ <!ENTITY % ISOamso.module "INCLUDE">
+ <![%ISOamso.module;[
+ <!ENTITY % ISOamso PUBLIC
+ "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN//XML"
+-"ent/iso-amso.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOamso.ent">
+ <!--end of ISOamso.module-->]]>
+ 
+ <!ENTITY % ISOamsr.module "INCLUDE">
+ <![%ISOamsr.module;[
+ <!ENTITY % ISOamsr PUBLIC
+ "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN//XML"
+-"ent/iso-amsr.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOamsr.ent">
+ <!--end of ISOamsr.module-->]]>
+ 
+ <!ENTITY % ISObox.module "INCLUDE">
+ <![%ISObox.module;[
+ <!ENTITY % ISObox PUBLIC
+ "ISO 8879:1986//ENTITIES Box and Line Drawing//EN//XML"
+-"ent/iso-box.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISObox.ent">
+ <!--end of ISObox.module-->]]>
+ 
+ <!ENTITY % ISOcyr1.module "INCLUDE">
+ <![%ISOcyr1.module;[
+ <!ENTITY % ISOcyr1 PUBLIC
+ "ISO 8879:1986//ENTITIES Russian Cyrillic//EN//XML"
+-"ent/iso-cyr1.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOcyr1.ent">
+ <!--end of ISOcyr1.module-->]]>
+ 
+ <!ENTITY % ISOcyr2.module "INCLUDE">
+ <![%ISOcyr2.module;[
+ <!ENTITY % ISOcyr2 PUBLIC
+ "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN//XML"
+-"ent/iso-cyr2.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOcyr2.ent">
+ <!--end of ISOcyr2.module-->]]>
+ 
+ <!ENTITY % ISOdia.module "INCLUDE">
+ <![%ISOdia.module;[
+ <!ENTITY % ISOdia PUBLIC
+ "ISO 8879:1986//ENTITIES Diacritical Marks//EN//XML"
+-"ent/iso-dia.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOdia.ent">
+ <!--end of ISOdia.module-->]]>
+ 
+ <!ENTITY % ISOgrk1.module "INCLUDE">
+ <![%ISOgrk1.module;[
+ <!ENTITY % ISOgrk1 PUBLIC
+ "ISO 8879:1986//ENTITIES Greek Letters//EN//XML"
+-"ent/iso-grk1.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOgrk1.ent">
+ <!--end of ISOgrk1.module-->]]>
+ 
+ <!ENTITY % ISOgrk2.module "INCLUDE">
+ <![%ISOgrk2.module;[
+ <!ENTITY % ISOgrk2 PUBLIC
+ "ISO 8879:1986//ENTITIES Monotoniko Greek//EN//XML"
+-"ent/iso-grk2.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOgrk2.ent">
+ <!--end of ISOgrk2.module-->]]>
+ 
+ <!ENTITY % ISOgrk3.module "INCLUDE">
+ <![%ISOgrk3.module;[
+ <!ENTITY % ISOgrk3 PUBLIC
+ "ISO 8879:1986//ENTITIES Greek Symbols//EN//XML"
+-"ent/iso-grk3.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOgrk3.ent">
+ <!--end of ISOgrk3.module-->]]>
+ 
+ <!ENTITY % ISOgrk4.module "INCLUDE">
+ <![%ISOgrk4.module;[
+ <!ENTITY % ISOgrk4 PUBLIC
+ "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN//XML"
+-"ent/iso-grk4.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOgrk4.ent">
+ <!--end of ISOgrk4.module-->]]>
+ 
+ <!ENTITY % ISOlat1.module "INCLUDE">
+ <![%ISOlat1.module;[
+ <!ENTITY % ISOlat1 PUBLIC
+ "ISO 8879:1986//ENTITIES Added Latin 1//EN//XML"
+-"ent/iso-lat1.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOlat1.ent">
+ <!--end of ISOlat1.module-->]]>
+ 
+ <!ENTITY % ISOlat2.module "INCLUDE">
+ <![%ISOlat2.module;[
+ <!ENTITY % ISOlat2 PUBLIC
+ "ISO 8879:1986//ENTITIES Added Latin 2//EN//XML"
+-"ent/iso-lat2.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOlat2.ent">
+ <!--end of ISOlat2.module-->]]>
+ 
+ <!ENTITY % ISOnum.module "INCLUDE">
+ <![%ISOnum.module;[
+ <!ENTITY % ISOnum PUBLIC
+ "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN//XML"
+-"ent/iso-num.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOnum.ent">
+ <!--end of ISOnum.module-->]]>
+ 
+ <!ENTITY % ISOpub.module "INCLUDE">
+ <![%ISOpub.module;[
+ <!ENTITY % ISOpub PUBLIC
+ "ISO 8879:1986//ENTITIES Publishing//EN//XML"
+-"ent/iso-pub.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOpub.ent">
+ <!--end of ISOpub.module-->]]>
+ 
+ <!ENTITY % ISOtech.module "INCLUDE">
+ <![%ISOtech.module;[
+ <!ENTITY % ISOtech PUBLIC
+ "ISO 8879:1986//ENTITIES General Technical//EN//XML"
+-"ent/iso-tech.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOtech.ent">
+ <!--end of ISOtech.module-->]]>
+ 
+ <!--end of xml.features-->]]>
+diff -urNad docbook-xml-4.5~/docbook-4.2/docbook.cat docbook-xml-4.5/docbook-4.2/docbook.cat
+--- docbook-xml-4.5~/docbook-4.2/docbook.cat	2002-07-17 18:14:41.000000000 +0200
++++ docbook-xml-4.5/docbook-4.2/docbook.cat	2007-03-25 23:42:57.000000000 +0200
+@@ -46,65 +46,5 @@
+ PUBLIC "-//OASIS//ENTITIES DocBook Character Entities V4.2//EN"
+        "dbcentx.mod"
+ 
+-  -- ...................................................................... --
+-  -- ISO entity sets ...................................................... --
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN//XML"
+-       "ent/iso-dia.ent"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN//XML"
+-       "ent/iso-num.ent"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN//XML"
+-       "ent/iso-pub.ent"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN//XML"
+-       "ent/iso-tech.ent"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN//XML"
+-       "ent/iso-lat1.ent"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN//XML"
+-       "ent/iso-lat2.ent"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN//XML"
+-       "ent/iso-grk1.ent"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN//XML"
+-       "ent/iso-grk2.ent"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN//XML"
+-       "ent/iso-grk3.ent"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN//XML"
+-       "ent/iso-grk4.ent"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN//XML"
+-       "ent/iso-amsa.ent"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN//XML"
+-       "ent/iso-amsb.ent"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN//XML"
+-       "ent/iso-amsc.ent"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN//XML"
+-       "ent/iso-amsn.ent"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN//XML"
+-       "ent/iso-amso.ent"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN//XML"
+-       "ent/iso-amsr.ent"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN//XML"
+-       "ent/iso-box.ent"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN//XML"
+-       "ent/iso-cyr1.ent"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN//XML"
+-       "ent/iso-cyr2.ent"
+-
+   -- End of catalog data for DocBook XML V4.2 ............................. --
+   -- ...................................................................... --
+diff -urNad docbook-xml-4.5~/docbook-4.3/catalog.xml docbook-xml-4.5/docbook-4.3/catalog.xml
+--- docbook-xml-4.5~/docbook-4.3/catalog.xml	2004-03-31 13:22:12.000000000 +0200
++++ docbook-xml-4.5/docbook-4.3/catalog.xml	2007-03-25 23:42:57.000000000 +0200
+@@ -49,66 +49,6 @@
+ <public publicId="-//OASIS//ENTITIES DocBook Character Entities V4.3//EN"
+         uri="dbcentx.mod"/>
+ 
+-<!-- ...................................................................... -->
+-<!-- ISO entity sets ...................................................... -->
+-
+-<public publicId="ISO 8879:1986//ENTITIES Diacritical Marks//EN//XML"
+-        uri="ent/iso-dia.ent"/>
+-
+-<public publicId="ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN//XML"
+-        uri="ent/iso-num.ent"/>
+-
+-<public publicId="ISO 8879:1986//ENTITIES Publishing//EN//XML"
+-        uri="ent/iso-pub.ent"/>
+-
+-<public publicId="ISO 8879:1986//ENTITIES General Technical//EN//XML"
+-        uri="ent/iso-tech.ent"/>
+-
+-<public publicId="ISO 8879:1986//ENTITIES Added Latin 1//EN//XML"
+-        uri="ent/iso-lat1.ent"/>
+-
+-<public publicId="ISO 8879:1986//ENTITIES Added Latin 2//EN//XML"
+-        uri="ent/iso-lat2.ent"/>
+-
+-<public publicId="ISO 8879:1986//ENTITIES Greek Letters//EN//XML"
+-        uri="ent/iso-grk1.ent"/>
+-
+-<public publicId="ISO 8879:1986//ENTITIES Monotoniko Greek//EN//XML"
+-        uri="ent/iso-grk2.ent"/>
+-
+-<public publicId="ISO 8879:1986//ENTITIES Greek Symbols//EN//XML"
+-        uri="ent/iso-grk3.ent"/>
+-
+-<public publicId="ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN//XML"
+-        uri="ent/iso-grk4.ent"/>
+-
+-<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN//XML"
+-        uri="ent/iso-amsa.ent"/>
+-
+-<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN//XML"
+-        uri="ent/iso-amsb.ent"/>
+-
+-<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN//XML"
+-        uri="ent/iso-amsc.ent"/>
+-
+-<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN//XML"
+-        uri="ent/iso-amsn.ent"/>
+-
+-<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN//XML"
+-        uri="ent/iso-amso.ent"/>
+-
+-<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN//XML"
+-        uri="ent/iso-amsr.ent"/>
+-
+-<public publicId="ISO 8879:1986//ENTITIES Box and Line Drawing//EN//XML"
+-        uri="ent/iso-box.ent"/>
+-
+-<public publicId="ISO 8879:1986//ENTITIES Russian Cyrillic//EN//XML"
+-        uri="ent/iso-cyr1.ent"/>
+-
+-<public publicId="ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN//XML"
+-        uri="ent/iso-cyr2.ent"/>
+-
+ <!-- End of catalog data for DocBook XML V4.3 ............................. -->
+ <!-- ...................................................................... -->
+ 
+diff -urNad docbook-xml-4.5~/docbook-4.3/dbcentx.mod docbook-xml-4.5/docbook-4.3/dbcentx.mod
+--- docbook-xml-4.5~/docbook-4.3/dbcentx.mod	2004-03-31 13:20:20.000000000 +0200
++++ docbook-xml-4.5/docbook-4.3/dbcentx.mod	2007-03-25 23:42:57.000000000 +0200
+@@ -173,133 +173,133 @@
+ <![%ISOamsa.module;[
+ <!ENTITY % ISOamsa PUBLIC
+ "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN//XML"
+-"ent/iso-amsa.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOamsa.ent">
+ <!--end of ISOamsa.module-->]]>
+ 
+ <!ENTITY % ISOamsb.module "INCLUDE">
+ <![%ISOamsb.module;[
+ <!ENTITY % ISOamsb PUBLIC
+ "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN//XML"
+-"ent/iso-amsb.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOamsb.ent">
+ <!--end of ISOamsb.module-->]]>
+ 
+ <!ENTITY % ISOamsc.module "INCLUDE">
+ <![%ISOamsc.module;[
+ <!ENTITY % ISOamsc PUBLIC
+ "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN//XML"
+-"ent/iso-amsc.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOamsc.ent">
+ <!--end of ISOamsc.module-->]]>
+ 
+ <!ENTITY % ISOamsn.module "INCLUDE">
+ <![%ISOamsn.module;[
+ <!ENTITY % ISOamsn PUBLIC
+ "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN//XML"
+-"ent/iso-amsn.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOamsn.ent">
+ <!--end of ISOamsn.module-->]]>
+ 
+ <!ENTITY % ISOamso.module "INCLUDE">
+ <![%ISOamso.module;[
+ <!ENTITY % ISOamso PUBLIC
+ "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN//XML"
+-"ent/iso-amso.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOamso.ent">
+ <!--end of ISOamso.module-->]]>
+ 
+ <!ENTITY % ISOamsr.module "INCLUDE">
+ <![%ISOamsr.module;[
+ <!ENTITY % ISOamsr PUBLIC
+ "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN//XML"
+-"ent/iso-amsr.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOamsr.ent">
+ <!--end of ISOamsr.module-->]]>
+ 
+ <!ENTITY % ISObox.module "INCLUDE">
+ <![%ISObox.module;[
+ <!ENTITY % ISObox PUBLIC
+ "ISO 8879:1986//ENTITIES Box and Line Drawing//EN//XML"
+-"ent/iso-box.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISObox.ent">
+ <!--end of ISObox.module-->]]>
+ 
+ <!ENTITY % ISOcyr1.module "INCLUDE">
+ <![%ISOcyr1.module;[
+ <!ENTITY % ISOcyr1 PUBLIC
+ "ISO 8879:1986//ENTITIES Russian Cyrillic//EN//XML"
+-"ent/iso-cyr1.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOcyr1.ent">
+ <!--end of ISOcyr1.module-->]]>
+ 
+ <!ENTITY % ISOcyr2.module "INCLUDE">
+ <![%ISOcyr2.module;[
+ <!ENTITY % ISOcyr2 PUBLIC
+ "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN//XML"
+-"ent/iso-cyr2.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOcyr2.ent">
+ <!--end of ISOcyr2.module-->]]>
+ 
+ <!ENTITY % ISOdia.module "INCLUDE">
+ <![%ISOdia.module;[
+ <!ENTITY % ISOdia PUBLIC
+ "ISO 8879:1986//ENTITIES Diacritical Marks//EN//XML"
+-"ent/iso-dia.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOdia.ent">
+ <!--end of ISOdia.module-->]]>
+ 
+ <!ENTITY % ISOgrk1.module "INCLUDE">
+ <![%ISOgrk1.module;[
+ <!ENTITY % ISOgrk1 PUBLIC
+ "ISO 8879:1986//ENTITIES Greek Letters//EN//XML"
+-"ent/iso-grk1.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOgrk1.ent">
+ <!--end of ISOgrk1.module-->]]>
+ 
+ <!ENTITY % ISOgrk2.module "INCLUDE">
+ <![%ISOgrk2.module;[
+ <!ENTITY % ISOgrk2 PUBLIC
+ "ISO 8879:1986//ENTITIES Monotoniko Greek//EN//XML"
+-"ent/iso-grk2.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOgrk2.ent">
+ <!--end of ISOgrk2.module-->]]>
+ 
+ <!ENTITY % ISOgrk3.module "INCLUDE">
+ <![%ISOgrk3.module;[
+ <!ENTITY % ISOgrk3 PUBLIC
+ "ISO 8879:1986//ENTITIES Greek Symbols//EN//XML"
+-"ent/iso-grk3.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOgrk3.ent">
+ <!--end of ISOgrk3.module-->]]>
+ 
+ <!ENTITY % ISOgrk4.module "INCLUDE">
+ <![%ISOgrk4.module;[
+ <!ENTITY % ISOgrk4 PUBLIC
+ "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN//XML"
+-"ent/iso-grk4.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOgrk4.ent">
+ <!--end of ISOgrk4.module-->]]>
+ 
+ <!ENTITY % ISOlat1.module "INCLUDE">
+ <![%ISOlat1.module;[
+ <!ENTITY % ISOlat1 PUBLIC
+ "ISO 8879:1986//ENTITIES Added Latin 1//EN//XML"
+-"ent/iso-lat1.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOlat1.ent">
+ <!--end of ISOlat1.module-->]]>
+ 
+ <!ENTITY % ISOlat2.module "INCLUDE">
+ <![%ISOlat2.module;[
+ <!ENTITY % ISOlat2 PUBLIC
+ "ISO 8879:1986//ENTITIES Added Latin 2//EN//XML"
+-"ent/iso-lat2.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOlat2.ent">
+ <!--end of ISOlat2.module-->]]>
+ 
+ <!ENTITY % ISOnum.module "INCLUDE">
+ <![%ISOnum.module;[
+ <!ENTITY % ISOnum PUBLIC
+ "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN//XML"
+-"ent/iso-num.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOnum.ent">
+ <!--end of ISOnum.module-->]]>
+ 
+ <!ENTITY % ISOpub.module "INCLUDE">
+ <![%ISOpub.module;[
+ <!ENTITY % ISOpub PUBLIC
+ "ISO 8879:1986//ENTITIES Publishing//EN//XML"
+-"ent/iso-pub.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOpub.ent">
+ <!--end of ISOpub.module-->]]>
+ 
+ <!ENTITY % ISOtech.module "INCLUDE">
+ <![%ISOtech.module;[
+ <!ENTITY % ISOtech PUBLIC
+ "ISO 8879:1986//ENTITIES General Technical//EN//XML"
+-"ent/iso-tech.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOtech.ent">
+ <!--end of ISOtech.module-->]]>
+ 
+ <!--end of xml.features-->]]>
+diff -urNad docbook-xml-4.5~/docbook-4.3/docbook.cat docbook-xml-4.5/docbook-4.3/docbook.cat
+--- docbook-xml-4.5~/docbook-4.3/docbook.cat	2004-03-31 13:22:18.000000000 +0200
++++ docbook-xml-4.5/docbook-4.3/docbook.cat	2007-03-25 23:42:57.000000000 +0200
+@@ -46,65 +46,5 @@
+ PUBLIC "-//OASIS//ENTITIES DocBook Character Entities V4.3//EN"
+        "dbcentx.mod"
+ 
+-  -- ...................................................................... --
+-  -- ISO entity sets ...................................................... --
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN//XML"
+-       "ent/iso-dia.ent"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN//XML"
+-       "ent/iso-num.ent"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN//XML"
+-       "ent/iso-pub.ent"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN//XML"
+-       "ent/iso-tech.ent"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN//XML"
+-       "ent/iso-lat1.ent"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN//XML"
+-       "ent/iso-lat2.ent"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN//XML"
+-       "ent/iso-grk1.ent"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN//XML"
+-       "ent/iso-grk2.ent"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN//XML"
+-       "ent/iso-grk3.ent"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN//XML"
+-       "ent/iso-grk4.ent"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN//XML"
+-       "ent/iso-amsa.ent"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN//XML"
+-       "ent/iso-amsb.ent"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN//XML"
+-       "ent/iso-amsc.ent"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN//XML"
+-       "ent/iso-amsn.ent"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN//XML"
+-       "ent/iso-amso.ent"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN//XML"
+-       "ent/iso-amsr.ent"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN//XML"
+-       "ent/iso-box.ent"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN//XML"
+-       "ent/iso-cyr1.ent"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN//XML"
+-       "ent/iso-cyr2.ent"
+-
+   -- End of catalog data for DocBook XML V4.3 ............................. --
+   -- ...................................................................... --
+diff -urNad docbook-xml-4.5~/docbook-4.4/catalog.xml docbook-xml-4.5/docbook-4.4/catalog.xml
+--- docbook-xml-4.5~/docbook-4.4/catalog.xml	2005-01-27 14:57:19.000000000 +0100
++++ docbook-xml-4.5/docbook-4.4/catalog.xml	2007-03-25 23:42:57.000000000 +0200
+@@ -58,66 +58,6 @@
+ <public publicId="-//OASIS//ENTITIES DocBook Character Entities V4.4//EN"
+         uri="dbcentx.mod"/>
+ 
+-<!-- ...................................................................... -->
+-<!-- ISO entity sets ...................................................... -->
+-
+-<public publicId="ISO 8879:1986//ENTITIES Diacritical Marks//EN//XML"
+-        uri="ent/isodia.ent"/>
+-
+-<public publicId="ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN//XML"
+-        uri="ent/isonum.ent"/>
+-
+-<public publicId="ISO 8879:1986//ENTITIES Publishing//EN//XML"
+-        uri="ent/isopub.ent"/>
+-
+-<public publicId="ISO 8879:1986//ENTITIES General Technical//EN//XML"
+-        uri="ent/isotech.ent"/>
+-
+-<public publicId="ISO 8879:1986//ENTITIES Added Latin 1//EN//XML"
+-        uri="ent/isolat1.ent"/>
+-
+-<public publicId="ISO 8879:1986//ENTITIES Added Latin 2//EN//XML"
+-        uri="ent/isolat2.ent"/>
+-
+-<public publicId="ISO 8879:1986//ENTITIES Greek Letters//EN//XML"
+-        uri="ent/isogrk1.ent"/>
+-
+-<public publicId="ISO 8879:1986//ENTITIES Monotoniko Greek//EN//XML"
+-        uri="ent/isogrk2.ent"/>
+-
+-<public publicId="ISO 8879:1986//ENTITIES Greek Symbols//EN//XML"
+-        uri="ent/isogrk3.ent"/>
+-
+-<public publicId="ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN//XML"
+-        uri="ent/isogrk4.ent"/>
+-
+-<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN//XML"
+-        uri="ent/isoamsa.ent"/>
+-
+-<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN//XML"
+-        uri="ent/isoamsb.ent"/>
+-
+-<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN//XML"
+-        uri="ent/isoamsc.ent"/>
+-
+-<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN//XML"
+-        uri="ent/isoamsn.ent"/>
+-
+-<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN//XML"
+-        uri="ent/isoamso.ent"/>
+-
+-<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN//XML"
+-        uri="ent/isoamsr.ent"/>
+-
+-<public publicId="ISO 8879:1986//ENTITIES Box and Line Drawing//EN//XML"
+-        uri="ent/isobox.ent"/>
+-
+-<public publicId="ISO 8879:1986//ENTITIES Russian Cyrillic//EN//XML"
+-        uri="ent/isocyr1.ent"/>
+-
+-<public publicId="ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN//XML"
+-        uri="ent/isocyr2.ent"/>
+-
+ <!-- End of catalog data for DocBook XML V4.4 ............................. -->
+ <!-- ...................................................................... -->
+ 
+diff -urNad docbook-xml-4.5~/docbook-4.4/dbcentx.mod docbook-xml-4.5/docbook-4.4/dbcentx.mod
+--- docbook-xml-4.5~/docbook-4.4/dbcentx.mod	2005-01-27 14:57:19.000000000 +0100
++++ docbook-xml-4.5/docbook-4.4/dbcentx.mod	2007-03-25 23:42:57.000000000 +0200
+@@ -173,133 +173,133 @@
+ <![%ISOamsa.module;[
+ <!ENTITY % ISOamsa PUBLIC
+ "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN//XML"
+-"ent/isoamsa.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOamsa.ent">
+ <!--end of ISOamsa.module-->]]>
+ 
+ <!ENTITY % ISOamsb.module "INCLUDE">
+ <![%ISOamsb.module;[
+ <!ENTITY % ISOamsb PUBLIC
+ "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN//XML"
+-"ent/isoamsb.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOamsb.ent">
+ <!--end of ISOamsb.module-->]]>
+ 
+ <!ENTITY % ISOamsc.module "INCLUDE">
+ <![%ISOamsc.module;[
+ <!ENTITY % ISOamsc PUBLIC
+ "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN//XML"
+-"ent/isoamsc.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOamsc.ent">
+ <!--end of ISOamsc.module-->]]>
+ 
+ <!ENTITY % ISOamsn.module "INCLUDE">
+ <![%ISOamsn.module;[
+ <!ENTITY % ISOamsn PUBLIC
+ "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN//XML"
+-"ent/isoamsn.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOamsn.ent">
+ <!--end of ISOamsn.module-->]]>
+ 
+ <!ENTITY % ISOamso.module "INCLUDE">
+ <![%ISOamso.module;[
+ <!ENTITY % ISOamso PUBLIC
+ "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN//XML"
+-"ent/isoamso.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOamso.ent">
+ <!--end of ISOamso.module-->]]>
+ 
+ <!ENTITY % ISOamsr.module "INCLUDE">
+ <![%ISOamsr.module;[
+ <!ENTITY % ISOamsr PUBLIC
+ "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN//XML"
+-"ent/isoamsr.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOamsr.ent">
+ <!--end of ISOamsr.module-->]]>
+ 
+ <!ENTITY % ISObox.module "INCLUDE">
+ <![%ISObox.module;[
+ <!ENTITY % ISObox PUBLIC
+ "ISO 8879:1986//ENTITIES Box and Line Drawing//EN//XML"
+-"ent/isobox.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISObox.ent">
+ <!--end of ISObox.module-->]]>
+ 
+ <!ENTITY % ISOcyr1.module "INCLUDE">
+ <![%ISOcyr1.module;[
+ <!ENTITY % ISOcyr1 PUBLIC
+ "ISO 8879:1986//ENTITIES Russian Cyrillic//EN//XML"
+-"ent/isocyr1.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOcyr1.ent">
+ <!--end of ISOcyr1.module-->]]>
+ 
+ <!ENTITY % ISOcyr2.module "INCLUDE">
+ <![%ISOcyr2.module;[
+ <!ENTITY % ISOcyr2 PUBLIC
+ "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN//XML"
+-"ent/isocyr2.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOcyr2.ent">
+ <!--end of ISOcyr2.module-->]]>
+ 
+ <!ENTITY % ISOdia.module "INCLUDE">
+ <![%ISOdia.module;[
+ <!ENTITY % ISOdia PUBLIC
+ "ISO 8879:1986//ENTITIES Diacritical Marks//EN//XML"
+-"ent/isodia.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOdia.ent">
+ <!--end of ISOdia.module-->]]>
+ 
+ <!ENTITY % ISOgrk1.module "INCLUDE">
+ <![%ISOgrk1.module;[
+ <!ENTITY % ISOgrk1 PUBLIC
+ "ISO 8879:1986//ENTITIES Greek Letters//EN//XML"
+-"ent/isogrk1.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOgrk1.ent">
+ <!--end of ISOgrk1.module-->]]>
+ 
+ <!ENTITY % ISOgrk2.module "INCLUDE">
+ <![%ISOgrk2.module;[
+ <!ENTITY % ISOgrk2 PUBLIC
+ "ISO 8879:1986//ENTITIES Monotoniko Greek//EN//XML"
+-"ent/isogrk2.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOgrk2.ent">
+ <!--end of ISOgrk2.module-->]]>
+ 
+ <!ENTITY % ISOgrk3.module "INCLUDE">
+ <![%ISOgrk3.module;[
+ <!ENTITY % ISOgrk3 PUBLIC
+ "ISO 8879:1986//ENTITIES Greek Symbols//EN//XML"
+-"ent/isogrk3.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOgrk3.ent">
+ <!--end of ISOgrk3.module-->]]>
+ 
+ <!ENTITY % ISOgrk4.module "INCLUDE">
+ <![%ISOgrk4.module;[
+ <!ENTITY % ISOgrk4 PUBLIC
+ "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN//XML"
+-"ent/isogrk4.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOgrk4.ent">
+ <!--end of ISOgrk4.module-->]]>
+ 
+ <!ENTITY % ISOlat1.module "INCLUDE">
+ <![%ISOlat1.module;[
+ <!ENTITY % ISOlat1 PUBLIC
+ "ISO 8879:1986//ENTITIES Added Latin 1//EN//XML"
+-"ent/isolat1.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOlat1.ent">
+ <!--end of ISOlat1.module-->]]>
+ 
+ <!ENTITY % ISOlat2.module "INCLUDE">
+ <![%ISOlat2.module;[
+ <!ENTITY % ISOlat2 PUBLIC
+ "ISO 8879:1986//ENTITIES Added Latin 2//EN//XML"
+-"ent/isolat2.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOlat2.ent">
+ <!--end of ISOlat2.module-->]]>
+ 
+ <!ENTITY % ISOnum.module "INCLUDE">
+ <![%ISOnum.module;[
+ <!ENTITY % ISOnum PUBLIC
+ "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN//XML"
+-"ent/isonum.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOnum.ent">
+ <!--end of ISOnum.module-->]]>
+ 
+ <!ENTITY % ISOpub.module "INCLUDE">
+ <![%ISOpub.module;[
+ <!ENTITY % ISOpub PUBLIC
+ "ISO 8879:1986//ENTITIES Publishing//EN//XML"
+-"ent/isopub.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOpub.ent">
+ <!--end of ISOpub.module-->]]>
+ 
+ <!ENTITY % ISOtech.module "INCLUDE">
+ <![%ISOtech.module;[
+ <!ENTITY % ISOtech PUBLIC
+ "ISO 8879:1986//ENTITIES General Technical//EN//XML"
+-"ent/isotech.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOtech.ent">
+ <!--end of ISOtech.module-->]]>
+ 
+ <!--end of xml.features-->]]>
+diff -urNad docbook-xml-4.5~/docbook-4.4/docbook.cat docbook-xml-4.5/docbook-4.4/docbook.cat
+--- docbook-xml-4.5~/docbook-4.4/docbook.cat	2005-01-27 14:57:19.000000000 +0100
++++ docbook-xml-4.5/docbook-4.4/docbook.cat	2007-03-25 23:42:57.000000000 +0200
+@@ -49,65 +49,5 @@
+ PUBLIC "-//OASIS//ENTITIES DocBook Character Entities V4.4//EN"
+        "dbcentx.mod"
+ 
+-  -- ...................................................................... --
+-  -- ISO entity sets ...................................................... --
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN//XML"
+-       "ent/isodia.ent"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN//XML"
+-       "ent/isonum.ent"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN//XML"
+-       "ent/isopub.ent"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN//XML"
+-       "ent/isotech.ent"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN//XML"
+-       "ent/isolat1.ent"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN//XML"
+-       "ent/isolat2.ent"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN//XML"
+-       "ent/isogrk1.ent"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN//XML"
+-       "ent/isogrk2.ent"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN//XML"
+-       "ent/isogrk3.ent"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN//XML"
+-       "ent/isogrk4.ent"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN//XML"
+-       "ent/isoamsa.ent"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN//XML"
+-       "ent/isoamsb.ent"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN//XML"
+-       "ent/isoamsc.ent"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN//XML"
+-       "ent/isoamsn.ent"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN//XML"
+-       "ent/isoamso.ent"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN//XML"
+-       "ent/isoamsr.ent"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN//XML"
+-       "ent/isobox.ent"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN//XML"
+-       "ent/isocyr1.ent"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN//XML"
+-       "ent/isocyr2.ent"
+-
+   -- End of catalog data for DocBook XML V4.4 ............................. --
+   -- ...................................................................... --
+diff -urNad docbook-xml-4.5~/docbook-4.5/catalog.xml docbook-xml-4.5/docbook-4.5/catalog.xml
+--- docbook-xml-4.5~/docbook-4.5/catalog.xml	2006-10-03 15:26:00.000000000 +0200
++++ docbook-xml-4.5/docbook-4.5/catalog.xml	2007-03-25 23:42:57.000000000 +0200
+@@ -58,66 +58,6 @@
+ <public publicId="-//OASIS//ENTITIES DocBook Character Entities V4.5//EN"
+         uri="dbcentx.mod"/>
+ 
+-<!-- ...................................................................... -->
+-<!-- ISO entity sets ...................................................... -->
+-
+-<public publicId="ISO 8879:1986//ENTITIES Diacritical Marks//EN//XML"
+-        uri="ent/isodia.ent"/>
+-
+-<public publicId="ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN//XML"
+-        uri="ent/isonum.ent"/>
+-
+-<public publicId="ISO 8879:1986//ENTITIES Publishing//EN//XML"
+-        uri="ent/isopub.ent"/>
+-
+-<public publicId="ISO 8879:1986//ENTITIES General Technical//EN//XML"
+-        uri="ent/isotech.ent"/>
+-
+-<public publicId="ISO 8879:1986//ENTITIES Added Latin 1//EN//XML"
+-        uri="ent/isolat1.ent"/>
+-
+-<public publicId="ISO 8879:1986//ENTITIES Added Latin 2//EN//XML"
+-        uri="ent/isolat2.ent"/>
+-
+-<public publicId="ISO 8879:1986//ENTITIES Greek Letters//EN//XML"
+-        uri="ent/isogrk1.ent"/>
+-
+-<public publicId="ISO 8879:1986//ENTITIES Monotoniko Greek//EN//XML"
+-        uri="ent/isogrk2.ent"/>
+-
+-<public publicId="ISO 8879:1986//ENTITIES Greek Symbols//EN//XML"
+-        uri="ent/isogrk3.ent"/>
+-
+-<public publicId="ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN//XML"
+-        uri="ent/isogrk4.ent"/>
+-
+-<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN//XML"
+-        uri="ent/isoamsa.ent"/>
+-
+-<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN//XML"
+-        uri="ent/isoamsb.ent"/>
+-
+-<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN//XML"
+-        uri="ent/isoamsc.ent"/>
+-
+-<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN//XML"
+-        uri="ent/isoamsn.ent"/>
+-
+-<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN//XML"
+-        uri="ent/isoamso.ent"/>
+-
+-<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN//XML"
+-        uri="ent/isoamsr.ent"/>
+-
+-<public publicId="ISO 8879:1986//ENTITIES Box and Line Drawing//EN//XML"
+-        uri="ent/isobox.ent"/>
+-
+-<public publicId="ISO 8879:1986//ENTITIES Russian Cyrillic//EN//XML"
+-        uri="ent/isocyr1.ent"/>
+-
+-<public publicId="ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN//XML"
+-        uri="ent/isocyr2.ent"/>
+-
+ <!-- End of catalog data for DocBook XML V4.5 ............................. -->
+ <!-- ...................................................................... -->
+ 
+diff -urNad docbook-xml-4.5~/docbook-4.5/dbcentx.mod docbook-xml-4.5/docbook-4.5/dbcentx.mod
+--- docbook-xml-4.5~/docbook-4.5/dbcentx.mod	2006-10-03 15:26:00.000000000 +0200
++++ docbook-xml-4.5/docbook-4.5/dbcentx.mod	2007-03-25 23:42:57.000000000 +0200
+@@ -173,133 +173,133 @@
+ <![%ISOamsa.module;[
+ <!ENTITY % ISOamsa PUBLIC
+ "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN//XML"
+-"ent/isoamsa.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOamsa.ent">
+ <!--end of ISOamsa.module-->]]>
+ 
+ <!ENTITY % ISOamsb.module "INCLUDE">
+ <![%ISOamsb.module;[
+ <!ENTITY % ISOamsb PUBLIC
+ "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN//XML"
+-"ent/isoamsb.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOamsb.ent">
+ <!--end of ISOamsb.module-->]]>
+ 
+ <!ENTITY % ISOamsc.module "INCLUDE">
+ <![%ISOamsc.module;[
+ <!ENTITY % ISOamsc PUBLIC
+ "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN//XML"
+-"ent/isoamsc.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOamsc.ent">
+ <!--end of ISOamsc.module-->]]>
+ 
+ <!ENTITY % ISOamsn.module "INCLUDE">
+ <![%ISOamsn.module;[
+ <!ENTITY % ISOamsn PUBLIC
+ "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN//XML"
+-"ent/isoamsn.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOamsn.ent">
+ <!--end of ISOamsn.module-->]]>
+ 
+ <!ENTITY % ISOamso.module "INCLUDE">
+ <![%ISOamso.module;[
+ <!ENTITY % ISOamso PUBLIC
+ "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN//XML"
+-"ent/isoamso.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOamso.ent">
+ <!--end of ISOamso.module-->]]>
+ 
+ <!ENTITY % ISOamsr.module "INCLUDE">
+ <![%ISOamsr.module;[
+ <!ENTITY % ISOamsr PUBLIC
+ "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN//XML"
+-"ent/isoamsr.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOamsr.ent">
+ <!--end of ISOamsr.module-->]]>
+ 
+ <!ENTITY % ISObox.module "INCLUDE">
+ <![%ISObox.module;[
+ <!ENTITY % ISObox PUBLIC
+ "ISO 8879:1986//ENTITIES Box and Line Drawing//EN//XML"
+-"ent/isobox.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISObox.ent">
+ <!--end of ISObox.module-->]]>
+ 
+ <!ENTITY % ISOcyr1.module "INCLUDE">
+ <![%ISOcyr1.module;[
+ <!ENTITY % ISOcyr1 PUBLIC
+ "ISO 8879:1986//ENTITIES Russian Cyrillic//EN//XML"
+-"ent/isocyr1.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOcyr1.ent">
+ <!--end of ISOcyr1.module-->]]>
+ 
+ <!ENTITY % ISOcyr2.module "INCLUDE">
+ <![%ISOcyr2.module;[
+ <!ENTITY % ISOcyr2 PUBLIC
+ "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN//XML"
+-"ent/isocyr2.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOcyr2.ent">
+ <!--end of ISOcyr2.module-->]]>
+ 
+ <!ENTITY % ISOdia.module "INCLUDE">
+ <![%ISOdia.module;[
+ <!ENTITY % ISOdia PUBLIC
+ "ISO 8879:1986//ENTITIES Diacritical Marks//EN//XML"
+-"ent/isodia.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOdia.ent">
+ <!--end of ISOdia.module-->]]>
+ 
+ <!ENTITY % ISOgrk1.module "INCLUDE">
+ <![%ISOgrk1.module;[
+ <!ENTITY % ISOgrk1 PUBLIC
+ "ISO 8879:1986//ENTITIES Greek Letters//EN//XML"
+-"ent/isogrk1.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOgrk1.ent">
+ <!--end of ISOgrk1.module-->]]>
+ 
+ <!ENTITY % ISOgrk2.module "INCLUDE">
+ <![%ISOgrk2.module;[
+ <!ENTITY % ISOgrk2 PUBLIC
+ "ISO 8879:1986//ENTITIES Monotoniko Greek//EN//XML"
+-"ent/isogrk2.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOgrk2.ent">
+ <!--end of ISOgrk2.module-->]]>
+ 
+ <!ENTITY % ISOgrk3.module "INCLUDE">
+ <![%ISOgrk3.module;[
+ <!ENTITY % ISOgrk3 PUBLIC
+ "ISO 8879:1986//ENTITIES Greek Symbols//EN//XML"
+-"ent/isogrk3.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOgrk3.ent">
+ <!--end of ISOgrk3.module-->]]>
+ 
+ <!ENTITY % ISOgrk4.module "INCLUDE">
+ <![%ISOgrk4.module;[
+ <!ENTITY % ISOgrk4 PUBLIC
+ "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN//XML"
+-"ent/isogrk4.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOgrk4.ent">
+ <!--end of ISOgrk4.module-->]]>
+ 
+ <!ENTITY % ISOlat1.module "INCLUDE">
+ <![%ISOlat1.module;[
+ <!ENTITY % ISOlat1 PUBLIC
+ "ISO 8879:1986//ENTITIES Added Latin 1//EN//XML"
+-"ent/isolat1.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOlat1.ent">
+ <!--end of ISOlat1.module-->]]>
+ 
+ <!ENTITY % ISOlat2.module "INCLUDE">
+ <![%ISOlat2.module;[
+ <!ENTITY % ISOlat2 PUBLIC
+ "ISO 8879:1986//ENTITIES Added Latin 2//EN//XML"
+-"ent/isolat2.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOlat2.ent">
+ <!--end of ISOlat2.module-->]]>
+ 
+ <!ENTITY % ISOnum.module "INCLUDE">
+ <![%ISOnum.module;[
+ <!ENTITY % ISOnum PUBLIC
+ "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN//XML"
+-"ent/isonum.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOnum.ent">
+ <!--end of ISOnum.module-->]]>
+ 
+ <!ENTITY % ISOpub.module "INCLUDE">
+ <![%ISOpub.module;[
+ <!ENTITY % ISOpub PUBLIC
+ "ISO 8879:1986//ENTITIES Publishing//EN//XML"
+-"ent/isopub.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOpub.ent">
+ <!--end of ISOpub.module-->]]>
+ 
+ <!ENTITY % ISOtech.module "INCLUDE">
+ <![%ISOtech.module;[
+ <!ENTITY % ISOtech PUBLIC
+ "ISO 8879:1986//ENTITIES General Technical//EN//XML"
+-"ent/isotech.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOtech.ent">
+ <!--end of ISOtech.module-->]]>
+ 
+ <!--end of xml.features-->]]>
+diff -urNad docbook-xml-4.5~/docbook-4.5/docbook.cat docbook-xml-4.5/docbook-4.5/docbook.cat
+--- docbook-xml-4.5~/docbook-4.5/docbook.cat	2006-10-03 15:26:00.000000000 +0200
++++ docbook-xml-4.5/docbook-4.5/docbook.cat	2007-03-25 23:42:57.000000000 +0200
+@@ -49,65 +49,5 @@
+ PUBLIC "-//OASIS//ENTITIES DocBook Character Entities V4.5//EN"
+        "dbcentx.mod"
+ 
+-  -- ...................................................................... --
+-  -- ISO entity sets ...................................................... --
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN//XML"
+-       "ent/isodia.ent"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN//XML"
+-       "ent/isonum.ent"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN//XML"
+-       "ent/isopub.ent"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN//XML"
+-       "ent/isotech.ent"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN//XML"
+-       "ent/isolat1.ent"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN//XML"
+-       "ent/isolat2.ent"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN//XML"
+-       "ent/isogrk1.ent"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN//XML"
+-       "ent/isogrk2.ent"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN//XML"
+-       "ent/isogrk3.ent"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN//XML"
+-       "ent/isogrk4.ent"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN//XML"
+-       "ent/isoamsa.ent"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN//XML"
+-       "ent/isoamsb.ent"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN//XML"
+-       "ent/isoamsc.ent"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN//XML"
+-       "ent/isoamsn.ent"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN//XML"
+-       "ent/isoamso.ent"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN//XML"
+-       "ent/isoamsr.ent"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN//XML"
+-       "ent/isobox.ent"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN//XML"
+-       "ent/isocyr1.ent"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN//XML"
+-       "ent/isocyr2.ent"
+-
+   -- End of catalog data for DocBook XML V4.5 ............................. --
+   -- ...................................................................... --
--- docbook-xml-4.5.orig/debian/patches/11_fix_dbpoolx_mod_header_comment_pubid.dpatch
+++ docbook-xml-4.5/debian/patches/11_fix_dbpoolx_mod_header_comment_pubid.dpatch
@@ -0,0 +1,67 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 11_fix_dbpoolx_mod_header_comment_pubid.dpatch by Daniel Leidert (dale) <daniel.leidert@wgdd.de>.
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: There are some wrong references to the PUBID 
+## DP: "-//OASIS//ELEMENTS DocBook XML Information Pool V4.x//EN", which should be
+## DP: "-//OASIS//ELEMENTS DocBook Information Pool V4.x//EN". This patch fixes them.
+## DP:
+## DP: <URL:https://sourceforge.net/tracker/?func=detail&atid=384107&aid=1679712&group_id=21935>
+## DP:
+## DP: <URL:http://packages.debian.org/changelogs/pool/main/d/docbook-xml/current/changelog#versionversion4.5-1>
+## DP:
+## DP: # only apply to DB >= 4.2!
+## DP: for i in `find . -type f` ; do \
+## DP: 		sed -e 's/ELEMENTS DocBook XML Information Pool/ELEMENTS DocBook Information Pool/g' < $i > $i.new ; \
+## DP: 		mv $i.new $i ; \
+## DP: done
+
+@DPATCH@
+diff -urNad docbook-xml-4.5~/docbook-4.2/dbpoolx.mod docbook-xml-4.5/docbook-4.2/dbpoolx.mod
+--- docbook-xml-4.5~/docbook-4.2/dbpoolx.mod	2002-07-17 18:14:41.000000000 +0200
++++ docbook-xml-4.5/docbook-4.2/dbpoolx.mod	2007-03-25 20:10:29.000000000 +0200
+@@ -50,7 +50,7 @@
+      declaration that uses the public identifier shown below:
+ 
+      <!ENTITY % dbpool PUBLIC
+-     "-//OASIS//ELEMENTS DocBook XML Information Pool V4.2//EN"
++     "-//OASIS//ELEMENTS DocBook Information Pool V4.2//EN"
+      "dbpoolx.mod">
+      %dbpool;
+ 
+diff -urNad docbook-xml-4.5~/docbook-4.3/dbpoolx.mod docbook-xml-4.5/docbook-4.3/dbpoolx.mod
+--- docbook-xml-4.5~/docbook-4.3/dbpoolx.mod	2004-03-31 13:20:20.000000000 +0200
++++ docbook-xml-4.5/docbook-4.3/dbpoolx.mod	2007-03-25 20:10:29.000000000 +0200
+@@ -50,7 +50,7 @@
+      declaration that uses the public identifier shown below:
+ 
+      <!ENTITY % dbpool PUBLIC
+-     "-//OASIS//ELEMENTS DocBook XML Information Pool V4.3//EN"
++     "-//OASIS//ELEMENTS DocBook Information Pool V4.3//EN"
+      "dbpoolx.mod">
+      %dbpool;
+ 
+diff -urNad docbook-xml-4.5~/docbook-4.4/dbpoolx.mod docbook-xml-4.5/docbook-4.4/dbpoolx.mod
+--- docbook-xml-4.5~/docbook-4.4/dbpoolx.mod	2005-01-27 14:57:19.000000000 +0100
++++ docbook-xml-4.5/docbook-4.4/dbpoolx.mod	2007-03-25 20:10:29.000000000 +0200
+@@ -50,7 +50,7 @@
+      declaration that uses the public identifier shown below:
+ 
+      <!ENTITY % dbpool PUBLIC
+-     "-//OASIS//ELEMENTS DocBook XML Information Pool V4.4//EN"
++     "-//OASIS//ELEMENTS DocBook Information Pool V4.4//EN"
+      "dbpoolx.mod">
+      %dbpool;
+ 
+diff -urNad docbook-xml-4.5~/docbook-4.5/dbpoolx.mod docbook-xml-4.5/docbook-4.5/dbpoolx.mod
+--- docbook-xml-4.5~/docbook-4.5/dbpoolx.mod	2006-10-03 15:26:00.000000000 +0200
++++ docbook-xml-4.5/docbook-4.5/dbpoolx.mod	2007-03-25 20:10:29.000000000 +0200
+@@ -50,7 +50,7 @@
+      declaration that uses the public identifier shown below:
+ 
+      <!ENTITY % dbpool PUBLIC
+-     "-//OASIS//ELEMENTS DocBook XML Information Pool V4.5//EN"
++     "-//OASIS//ELEMENTS DocBook Information Pool V4.5//EN"
+      "dbpoolx.mod">
+      %dbpool;
+ 
--- docbook-xml-4.5.orig/debian/examples/test-legacy-si-4.3.xml
+++ docbook-xml-4.5/debian/examples/test-legacy-si-4.3.xml
@@ -0,0 +1,42 @@
+<?xml version='1.0'?>
+<!DOCTYPE book SYSTEM "/usr/share/sgml/docbook/dtd/xml/4.3/docbookx.dtd">
+<book><title>foo</title>
+
+<chapter><title>bar</title>
+
+<para>
+foo
+</para>
+
+<informaltable>
+<tgroup cols="1">
+<tbody>
+<row>
+<entry>foo</entry></row>
+<row><entry>bar</entry></row>
+</tbody>
+</tgroup>
+</informaltable>
+
+<table><title>bar</title>
+<tgroup cols="1">
+<tbody>
+<row><entry>bar</entry></row>
+</tbody>
+</tgroup>
+</table>
+
+</chapter>
+
+<glossary>
+<glossentry><glossterm>foo</glossterm>
+<indexterm><primary>foo</primary></indexterm>
+<glossdef>
+<para>
+Some appropriate definition goes here.
+</para>
+</glossdef>
+</glossentry>
+</glossary>
+
+</book>
--- docbook-xml-4.5.orig/debian/examples/test-bad-si-4.2.xml
+++ docbook-xml-4.5/debian/examples/test-bad-si-4.2.xml
@@ -0,0 +1,43 @@
+<?xml version='1.0'?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+               "docbookx.dtd">
+<book><title>foo</title>
+
+<chapter><title>bar</title>
+
+<para>
+foo
+</para>
+
+<informaltable>
+<tgroup cols="1">
+<tbody>
+<row>
+<entry>foo</entry></row>
+<row><entry>bar</entry></row>
+</tbody>
+</tgroup>
+</informaltable>
+
+<table><title>bar</title>
+<tgroup cols="1">
+<tbody>
+<row><entry>bar</entry></row>
+</tbody>
+</tgroup>
+</table>
+
+</chapter>
+
+<glossary>
+<glossentry><glossterm>foo</glossterm>
+<indexterm><primary>foo</primary></indexterm>
+<glossdef>
+<para>
+Some appropriate definition goes here.
+</para>
+</glossdef>
+</glossentry>
+</glossary>
+
+</book>
--- docbook-xml-4.5.orig/debian/examples/test-si-url-docbook.org-4.4.xml
+++ docbook-xml-4.5/debian/examples/test-si-url-docbook.org-4.4.xml
@@ -0,0 +1,42 @@
+<?xml version='1.0'?>
+<!DOCTYPE book SYSTEM "http://docbook.org/xml/4.4/docbookx.dtd">
+<book><title>foo</title>
+
+<chapter><title>bar</title>
+
+<para>
+foo
+</para>
+
+<informaltable>
+<tgroup cols="1">
+<tbody>
+<row>
+<entry>foo</entry></row>
+<row><entry>bar</entry></row>
+</tbody>
+</tgroup>
+</informaltable>
+
+<table><title>bar</title>
+<tgroup cols="1">
+<tbody>
+<row><entry>bar</entry></row>
+</tbody>
+</tgroup>
+</table>
+
+</chapter>
+
+<glossary>
+<glossentry><glossterm>foo</glossterm>
+<indexterm><primary>foo</primary></indexterm>
+<glossdef>
+<para>
+Some appropriate definition goes here.
+</para>
+</glossdef>
+</glossentry>
+</glossary>
+
+</book>
--- docbook-xml-4.5.orig/debian/examples/test-legacy-si-4.2.xml
+++ docbook-xml-4.5/debian/examples/test-legacy-si-4.2.xml
@@ -0,0 +1,42 @@
+<?xml version='1.0'?>
+<!DOCTYPE book SYSTEM "/usr/share/sgml/docbook/dtd/xml/4.2/docbookx.dtd">
+<book><title>foo</title>
+
+<chapter><title>bar</title>
+
+<para>
+foo
+</para>
+
+<informaltable>
+<tgroup cols="1">
+<tbody>
+<row>
+<entry>foo</entry></row>
+<row><entry>bar</entry></row>
+</tbody>
+</tgroup>
+</informaltable>
+
+<table><title>bar</title>
+<tgroup cols="1">
+<tbody>
+<row><entry>bar</entry></row>
+</tbody>
+</tgroup>
+</table>
+
+</chapter>
+
+<glossary>
+<glossentry><glossterm>foo</glossterm>
+<indexterm><primary>foo</primary></indexterm>
+<glossdef>
+<para>
+Some appropriate definition goes here.
+</para>
+</glossdef>
+</glossentry>
+</glossary>
+
+</book>
--- docbook-xml-4.5.orig/debian/examples/test-4.1.2.xml
+++ docbook-xml-4.5/debian/examples/test-4.1.2.xml
@@ -0,0 +1,43 @@
+<?xml version='1.0'?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
+               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
+<book><title>foo</title>
+
+<chapter><title>bar</title>
+
+<para>
+foo
+</para>
+
+<informaltable>
+<tgroup cols="1">
+<tbody>
+<row>
+<entry>foo</entry></row>
+<row><entry>bar</entry></row>
+</tbody>
+</tgroup>
+</informaltable>
+
+<table><title>bar</title>
+<tgroup cols="1">
+<tbody>
+<row><entry>bar</entry></row>
+</tbody>
+</tgroup>
+</table>
+
+</chapter>
+
+<glossary>
+<glossentry><glossterm>foo</glossterm>
+<indexterm><primary>foo</primary></indexterm>
+<glossdef>
+<para>
+Some appropriate definition goes here.
+</para>
+</glossdef>
+</glossentry>
+</glossary>
+
+</book>
--- docbook-xml-4.5.orig/debian/examples/Makefile
+++ docbook-xml-4.5/debian/examples/Makefile
@@ -0,0 +1,29 @@
+
+SRCS	:= $(wildcard *.xml)
+NSGMLS	:= $(shell if command -v onsgmls 2>/dev/null; then	 \
+			:					;\
+		   elif command -v nsgmls 2>/dev/null; then	 \
+			:					;\
+		   else						 \
+			echo "false"				;\
+			echo "warning: no nsgmls found" >&2	;\
+		   fi)
+
+NSGMLSARGS	:= -m/usr/share/sgml/declaration/xml.soc
+
+# settings for XML files
+export SP_CHARSET_FIXED = YES
+export SP_ENCODING = XML
+
+.PHONY: validate
+validate:	$(addsuffix .nsgmls,$(SRCS)) $(addsuffix .xmllint,$(SRCS))
+
+%.xmllint  : %
+	xmllint --nonet --noout --valid $<
+
+%.nsgmls   : %
+	$(NSGMLS) -E1 -wxml -wall $(NSGMLSARGS) -gues $<
+
+.PHONY: clean
+clean:
+	rm -f *.html *~
--- docbook-xml-4.5.orig/debian/examples/test-legacy-si-4.1.2.xml
+++ docbook-xml-4.5/debian/examples/test-legacy-si-4.1.2.xml
@@ -0,0 +1,42 @@
+<?xml version='1.0'?>
+<!DOCTYPE book SYSTEM "/usr/share/sgml/docbook/dtd/xml/4.1.2/docbookx.dtd">
+<book><title>foo</title>
+
+<chapter><title>bar</title>
+
+<para>
+foo
+</para>
+
+<informaltable>
+<tgroup cols="1">
+<tbody>
+<row>
+<entry>foo</entry></row>
+<row><entry>bar</entry></row>
+</tbody>
+</tgroup>
+</informaltable>
+
+<table><title>bar</title>
+<tgroup cols="1">
+<tbody>
+<row><entry>bar</entry></row>
+</tbody>
+</tgroup>
+</table>
+
+</chapter>
+
+<glossary>
+<glossentry><glossterm>foo</glossterm>
+<indexterm><primary>foo</primary></indexterm>
+<glossdef>
+<para>
+Some appropriate definition goes here.
+</para>
+</glossdef>
+</glossentry>
+</glossary>
+
+</book>
--- docbook-xml-4.5.orig/debian/examples/test-si-url-oasis-4.3.xml
+++ docbook-xml-4.5/debian/examples/test-si-url-oasis-4.3.xml
@@ -0,0 +1,42 @@
+<?xml version='1.0'?>
+<!DOCTYPE book SYSTEM "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
+<book><title>foo</title>
+
+<chapter><title>bar</title>
+
+<para>
+foo
+</para>
+
+<informaltable>
+<tgroup cols="1">
+<tbody>
+<row>
+<entry>foo</entry></row>
+<row><entry>bar</entry></row>
+</tbody>
+</tgroup>
+</informaltable>
+
+<table><title>bar</title>
+<tgroup cols="1">
+<tbody>
+<row><entry>bar</entry></row>
+</tbody>
+</tgroup>
+</table>
+
+</chapter>
+
+<glossary>
+<glossentry><glossterm>foo</glossterm>
+<indexterm><primary>foo</primary></indexterm>
+<glossdef>
+<para>
+Some appropriate definition goes here.
+</para>
+</glossdef>
+</glossentry>
+</glossary>
+
+</book>
--- docbook-xml-4.5.orig/debian/examples/test-si-url-oasis-4.5.xml
+++ docbook-xml-4.5/debian/examples/test-si-url-oasis-4.5.xml
@@ -0,0 +1,42 @@
+<?xml version='1.0'?>
+<!DOCTYPE book SYSTEM "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+<book><title>foo</title>
+
+<chapter><title>bar</title>
+
+<para>
+foo
+</para>
+
+<informaltable>
+<tgroup cols="1">
+<tbody>
+<row>
+<entry>foo</entry></row>
+<row><entry>bar</entry></row>
+</tbody>
+</tgroup>
+</informaltable>
+
+<table><title>bar</title>
+<tgroup cols="1">
+<tbody>
+<row><entry>bar</entry></row>
+</tbody>
+</tgroup>
+</table>
+
+</chapter>
+
+<glossary>
+<glossentry><glossterm>foo</glossterm>
+<indexterm><primary>foo</primary></indexterm>
+<glossdef>
+<para>
+Some appropriate definition goes here.
+</para>
+</glossdef>
+</glossentry>
+</glossary>
+
+</book>
--- docbook-xml-4.5.orig/debian/examples/test-4.0.xml
+++ docbook-xml-4.5/debian/examples/test-4.0.xml
@@ -0,0 +1,43 @@
+<?xml version='1.0'?>
+<!DOCTYPE book PUBLIC "-//Norman Walsh//DTD DocBk XML V4.0//EN"
+               "http://www.oasis-open.org/docbook/xml/4.0/docbookx.dtd">
+<book><title>foo</title>
+
+<chapter><title>bar</title>
+
+<para>
+foo
+</para>
+
+<informaltable>
+<tgroup cols="1">
+<tbody>
+<row>
+<entry>foo</entry></row>
+<row><entry>bar</entry></row>
+</tbody>
+</tgroup>
+</informaltable>
+
+<table><title>bar</title>
+<tgroup cols="1">
+<tbody>
+<row><entry>bar</entry></row>
+</tbody>
+</tgroup>
+</table>
+
+</chapter>
+
+<glossary>
+<glossentry><glossterm>foo</glossterm>
+<indexterm><primary>foo</primary></indexterm>
+<glossdef>
+<para>
+Some appropriate definition goes here.
+</para>
+</glossdef>
+</glossentry>
+</glossary>
+
+</book>
--- docbook-xml-4.5.orig/debian/examples/test-bad-si-4.1.xml
+++ docbook-xml-4.5/debian/examples/test-bad-si-4.1.xml
@@ -0,0 +1,43 @@
+<?xml version='1.0'?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1//EN"
+               "docbookx.dtd">
+<book><title>foo</title>
+
+<chapter><title>bar</title>
+
+<para>
+foo
+</para>
+
+<informaltable>
+<tgroup cols="1">
+<tbody>
+<row>
+<entry>foo</entry></row>
+<row><entry>bar</entry></row>
+</tbody>
+</tgroup>
+</informaltable>
+
+<table><title>bar</title>
+<tgroup cols="1">
+<tbody>
+<row><entry>bar</entry></row>
+</tbody>
+</tgroup>
+</table>
+
+</chapter>
+
+<glossary>
+<glossentry><glossterm>foo</glossterm>
+<indexterm><primary>foo</primary></indexterm>
+<glossdef>
+<para>
+Some appropriate definition goes here.
+</para>
+</glossdef>
+</glossentry>
+</glossary>
+
+</book>
--- docbook-xml-4.5.orig/debian/examples/test-legacy-si-4.0.xml
+++ docbook-xml-4.5/debian/examples/test-legacy-si-4.0.xml
@@ -0,0 +1,42 @@
+<?xml version='1.0'?>
+<!DOCTYPE book SYSTEM "/usr/share/sgml/docbook/dtd/xml/4.0/docbookx.dtd">
+<book><title>foo</title>
+
+<chapter><title>bar</title>
+
+<para>
+foo
+</para>
+
+<informaltable>
+<tgroup cols="1">
+<tbody>
+<row>
+<entry>foo</entry></row>
+<row><entry>bar</entry></row>
+</tbody>
+</tgroup>
+</informaltable>
+
+<table><title>bar</title>
+<tgroup cols="1">
+<tbody>
+<row><entry>bar</entry></row>
+</tbody>
+</tgroup>
+</table>
+
+</chapter>
+
+<glossary>
+<glossentry><glossterm>foo</glossterm>
+<indexterm><primary>foo</primary></indexterm>
+<glossdef>
+<para>
+Some appropriate definition goes here.
+</para>
+</glossdef>
+</glossentry>
+</glossary>
+
+</book>
--- docbook-xml-4.5.orig/debian/examples/test-bad-si-4.1.2.xml
+++ docbook-xml-4.5/debian/examples/test-bad-si-4.1.2.xml
@@ -0,0 +1,43 @@
+<?xml version='1.0'?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
+               "docbookx.dtd">
+<book><title>foo</title>
+
+<chapter><title>bar</title>
+
+<para>
+foo
+</para>
+
+<informaltable>
+<tgroup cols="1">
+<tbody>
+<row>
+<entry>foo</entry></row>
+<row><entry>bar</entry></row>
+</tbody>
+</tgroup>
+</informaltable>
+
+<table><title>bar</title>
+<tgroup cols="1">
+<tbody>
+<row><entry>bar</entry></row>
+</tbody>
+</tgroup>
+</table>
+
+</chapter>
+
+<glossary>
+<glossentry><glossterm>foo</glossterm>
+<indexterm><primary>foo</primary></indexterm>
+<glossdef>
+<para>
+Some appropriate definition goes here.
+</para>
+</glossdef>
+</glossentry>
+</glossary>
+
+</book>
--- docbook-xml-4.5.orig/debian/examples/test-si-url-docbook.org-4.3.xml
+++ docbook-xml-4.5/debian/examples/test-si-url-docbook.org-4.3.xml
@@ -0,0 +1,42 @@
+<?xml version='1.0'?>
+<!DOCTYPE book SYSTEM "http://docbook.org/xml/4.3/docbookx.dtd">
+<book><title>foo</title>
+
+<chapter><title>bar</title>
+
+<para>
+foo
+</para>
+
+<informaltable>
+<tgroup cols="1">
+<tbody>
+<row>
+<entry>foo</entry></row>
+<row><entry>bar</entry></row>
+</tbody>
+</tgroup>
+</informaltable>
+
+<table><title>bar</title>
+<tgroup cols="1">
+<tbody>
+<row><entry>bar</entry></row>
+</tbody>
+</tgroup>
+</table>
+
+</chapter>
+
+<glossary>
+<glossentry><glossterm>foo</glossterm>
+<indexterm><primary>foo</primary></indexterm>
+<glossdef>
+<para>
+Some appropriate definition goes here.
+</para>
+</glossdef>
+</glossentry>
+</glossary>
+
+</book>
--- docbook-xml-4.5.orig/debian/examples/test-si-url-docbook.org-4.1.2.xml
+++ docbook-xml-4.5/debian/examples/test-si-url-docbook.org-4.1.2.xml
@@ -0,0 +1,42 @@
+<?xml version='1.0'?>
+<!DOCTYPE book SYSTEM "http://docbook.org/xml/4.1.2/docbookx.dtd">
+<book><title>foo</title>
+
+<chapter><title>bar</title>
+
+<para>
+foo
+</para>
+
+<informaltable>
+<tgroup cols="1">
+<tbody>
+<row>
+<entry>foo</entry></row>
+<row><entry>bar</entry></row>
+</tbody>
+</tgroup>
+</informaltable>
+
+<table><title>bar</title>
+<tgroup cols="1">
+<tbody>
+<row><entry>bar</entry></row>
+</tbody>
+</tgroup>
+</table>
+
+</chapter>
+
+<glossary>
+<glossentry><glossterm>foo</glossterm>
+<indexterm><primary>foo</primary></indexterm>
+<glossdef>
+<para>
+Some appropriate definition goes here.
+</para>
+</glossdef>
+</glossentry>
+</glossary>
+
+</book>
--- docbook-xml-4.5.orig/debian/examples/test-si-4.4.xml
+++ docbook-xml-4.5/debian/examples/test-si-4.4.xml
@@ -0,0 +1,42 @@
+<?xml version='1.0'?>
+<!DOCTYPE book SYSTEM "/usr/share/xml/docbook/schema/dtd/4.4/docbookx.dtd">
+<book><title>foo</title>
+
+<chapter><title>bar</title>
+
+<para>
+foo
+</para>
+
+<informaltable>
+<tgroup cols="1">
+<tbody>
+<row>
+<entry>foo</entry></row>
+<row><entry>bar</entry></row>
+</tbody>
+</tgroup>
+</informaltable>
+
+<table><title>bar</title>
+<tgroup cols="1">
+<tbody>
+<row><entry>bar</entry></row>
+</tbody>
+</tgroup>
+</table>
+
+</chapter>
+
+<glossary>
+<glossentry><glossterm>foo</glossterm>
+<indexterm><primary>foo</primary></indexterm>
+<glossdef>
+<para>
+Some appropriate definition goes here.
+</para>
+</glossdef>
+</glossentry>
+</glossary>
+
+</book>
--- docbook-xml-4.5.orig/debian/examples/test-si-4.xml
+++ docbook-xml-4.5/debian/examples/test-si-4.xml
@@ -0,0 +1,42 @@
+<?xml version='1.0'?>
+<!DOCTYPE book SYSTEM "/usr/share/xml/docbook/schema/dtd/4/docbookx.dtd">
+<book><title>foo</title>
+
+<chapter><title>bar</title>
+
+<para>
+foo
+</para>
+
+<informaltable>
+<tgroup cols="1">
+<tbody>
+<row>
+<entry>foo</entry></row>
+<row><entry>bar</entry></row>
+</tbody>
+</tgroup>
+</informaltable>
+
+<table><title>bar</title>
+<tgroup cols="1">
+<tbody>
+<row><entry>bar</entry></row>
+</tbody>
+</tgroup>
+</table>
+
+</chapter>
+
+<glossary>
+<glossentry><glossterm>foo</glossterm>
+<indexterm><primary>foo</primary></indexterm>
+<glossdef>
+<para>
+Some appropriate definition goes here.
+</para>
+</glossdef>
+</glossentry>
+</glossary>
+
+</book>
--- docbook-xml-4.5.orig/debian/examples/test-4.5.xml
+++ docbook-xml-4.5/debian/examples/test-4.5.xml
@@ -0,0 +1,43 @@
+<?xml version='1.0'?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+               "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+<book><title>foo</title>
+
+<chapter><title>bar</title>
+
+<para>
+foo
+</para>
+
+<informaltable>
+<tgroup cols="1">
+<tbody>
+<row>
+<entry>foo</entry></row>
+<row><entry>bar</entry></row>
+</tbody>
+</tgroup>
+</informaltable>
+
+<table><title>bar</title>
+<tgroup cols="1">
+<tbody>
+<row><entry>bar</entry></row>
+</tbody>
+</tgroup>
+</table>
+
+</chapter>
+
+<glossary>
+<glossentry><glossterm>foo</glossterm>
+<indexterm><primary>foo</primary></indexterm>
+<glossdef>
+<para>
+Some appropriate definition goes here.  This is a <package>foo</package>, which is a new element in Docbook 4.4.
+</para>
+</glossdef>
+</glossentry>
+</glossary>
+
+</book>
--- docbook-xml-4.5.orig/debian/examples/test-bad-si-4.4.xml
+++ docbook-xml-4.5/debian/examples/test-bad-si-4.4.xml
@@ -0,0 +1,43 @@
+<?xml version='1.0'?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+               "docbookx.dtd">
+<book><title>foo</title>
+
+<chapter><title>bar</title>
+
+<para>
+foo
+</para>
+
+<informaltable>
+<tgroup cols="1">
+<tbody>
+<row>
+<entry>foo</entry></row>
+<row><entry>bar</entry></row>
+</tbody>
+</tgroup>
+</informaltable>
+
+<table><title>bar</title>
+<tgroup cols="1">
+<tbody>
+<row><entry>bar</entry></row>
+</tbody>
+</tgroup>
+</table>
+
+</chapter>
+
+<glossary>
+<glossentry><glossterm>foo</glossterm>
+<indexterm><primary>foo</primary></indexterm>
+<glossdef>
+<para>
+Some appropriate definition goes here.
+</para>
+</glossdef>
+</glossentry>
+</glossary>
+
+</book>
--- docbook-xml-4.5.orig/debian/examples/test-si-4.5.xml
+++ docbook-xml-4.5/debian/examples/test-si-4.5.xml
@@ -0,0 +1,42 @@
+<?xml version='1.0'?>
+<!DOCTYPE book SYSTEM "/usr/share/xml/docbook/schema/dtd/4.5/docbookx.dtd">
+<book><title>foo</title>
+
+<chapter><title>bar</title>
+
+<para>
+foo
+</para>
+
+<informaltable>
+<tgroup cols="1">
+<tbody>
+<row>
+<entry>foo</entry></row>
+<row><entry>bar</entry></row>
+</tbody>
+</tgroup>
+</informaltable>
+
+<table><title>bar</title>
+<tgroup cols="1">
+<tbody>
+<row><entry>bar</entry></row>
+</tbody>
+</tgroup>
+</table>
+
+</chapter>
+
+<glossary>
+<glossentry><glossterm>foo</glossterm>
+<indexterm><primary>foo</primary></indexterm>
+<glossdef>
+<para>
+Some appropriate definition goes here.
+</para>
+</glossdef>
+</glossentry>
+</glossary>
+
+</book>
--- docbook-xml-4.5.orig/debian/examples/test-si-url-docbook.org-4.2.xml
+++ docbook-xml-4.5/debian/examples/test-si-url-docbook.org-4.2.xml
@@ -0,0 +1,42 @@
+<?xml version='1.0'?>
+<!DOCTYPE book SYSTEM "http://docbook.org/xml/4.2/docbookx.dtd">
+<book><title>foo</title>
+
+<chapter><title>bar</title>
+
+<para>
+foo
+</para>
+
+<informaltable>
+<tgroup cols="1">
+<tbody>
+<row>
+<entry>foo</entry></row>
+<row><entry>bar</entry></row>
+</tbody>
+</tgroup>
+</informaltable>
+
+<table><title>bar</title>
+<tgroup cols="1">
+<tbody>
+<row><entry>bar</entry></row>
+</tbody>
+</tgroup>
+</table>
+
+</chapter>
+
+<glossary>
+<glossentry><glossterm>foo</glossterm>
+<indexterm><primary>foo</primary></indexterm>
+<glossdef>
+<para>
+Some appropriate definition goes here.
+</para>
+</glossdef>
+</glossentry>
+</glossary>
+
+</book>
--- docbook-xml-4.5.orig/debian/examples/test-legacy-si-4.1.xml
+++ docbook-xml-4.5/debian/examples/test-legacy-si-4.1.xml
@@ -0,0 +1,42 @@
+<?xml version='1.0'?>
+<!DOCTYPE book SYSTEM "/usr/share/sgml/docbook/dtd/xml/4.1/docbookx.dtd">
+<book><title>foo</title>
+
+<chapter><title>bar</title>
+
+<para>
+foo
+</para>
+
+<informaltable>
+<tgroup cols="1">
+<tbody>
+<row>
+<entry>foo</entry></row>
+<row><entry>bar</entry></row>
+</tbody>
+</tgroup>
+</informaltable>
+
+<table><title>bar</title>
+<tgroup cols="1">
+<tbody>
+<row><entry>bar</entry></row>
+</tbody>
+</tgroup>
+</table>
+
+</chapter>
+
+<glossary>
+<glossentry><glossterm>foo</glossterm>
+<indexterm><primary>foo</primary></indexterm>
+<glossdef>
+<para>
+Some appropriate definition goes here.
+</para>
+</glossdef>
+</glossentry>
+</glossary>
+
+</book>
--- docbook-xml-4.5.orig/debian/examples/README
+++ docbook-xml-4.5/debian/examples/README
@@ -0,0 +1,20 @@
+The purpose of these tests are to check on catalog resolution problems.
+
+All tests are set to run with 'xmllint' and 'nsgmls'.
+
+It is expected to see some warnings about the DTDs such as:
+  unused parameter entity "tbl.table.name"
+These are real problems in the upstream DocBook DTDs.
+
+The files "test-<VER>.xml" test the proper combination of formal
+public identifier (FPI) and system identifier (SI).
+
+The files "test-bad-si-<VER>.xml" test a proper FPI but a bad SI.
+
+The files "test-legacy-si-<VER>.xml" test the old location of the SI
+under /usr/share/sgml/dtd/docbook, with no FPI at all.  This is to
+ensure that we support people pointing to the old location.
+
+
+.....Adam Di Carlo....adam@debian.org.....<URL:http://www.debian.org/>
+
--- docbook-xml-4.5.orig/debian/examples/test-4.1.xml
+++ docbook-xml-4.5/debian/examples/test-4.1.xml
@@ -0,0 +1,43 @@
+<?xml version='1.0'?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1//EN"
+               "http://www.oasis-open.org/docbook/xml/4.1/docbookx.dtd">
+<book><title>foo</title>
+
+<chapter><title>bar</title>
+
+<para>
+foo
+</para>
+
+<informaltable>
+<tgroup cols="1">
+<tbody>
+<row>
+<entry>foo</entry></row>
+<row><entry>bar</entry></row>
+</tbody>
+</tgroup>
+</informaltable>
+
+<table><title>bar</title>
+<tgroup cols="1">
+<tbody>
+<row><entry>bar</entry></row>
+</tbody>
+</tgroup>
+</table>
+
+</chapter>
+
+<glossary>
+<glossentry><glossterm>foo</glossterm>
+<indexterm><primary>foo</primary></indexterm>
+<glossdef>
+<para>
+Some appropriate definition goes here.
+</para>
+</glossdef>
+</glossentry>
+</glossary>
+
+</book>
--- docbook-xml-4.5.orig/debian/examples/test-si-url-oasis-4.4.xml
+++ docbook-xml-4.5/debian/examples/test-si-url-oasis-4.4.xml
@@ -0,0 +1,42 @@
+<?xml version='1.0'?>
+<!DOCTYPE book SYSTEM "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
+<book><title>foo</title>
+
+<chapter><title>bar</title>
+
+<para>
+foo
+</para>
+
+<informaltable>
+<tgroup cols="1">
+<tbody>
+<row>
+<entry>foo</entry></row>
+<row><entry>bar</entry></row>
+</tbody>
+</tgroup>
+</informaltable>
+
+<table><title>bar</title>
+<tgroup cols="1">
+<tbody>
+<row><entry>bar</entry></row>
+</tbody>
+</tgroup>
+</table>
+
+</chapter>
+
+<glossary>
+<glossentry><glossterm>foo</glossterm>
+<indexterm><primary>foo</primary></indexterm>
+<glossdef>
+<para>
+Some appropriate definition goes here.
+</para>
+</glossdef>
+</glossentry>
+</glossary>
+
+</book>
--- docbook-xml-4.5.orig/debian/examples/test-4.3.xml
+++ docbook-xml-4.5/debian/examples/test-4.3.xml
@@ -0,0 +1,43 @@
+<?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">
+<book><title>foo</title>
+
+<chapter><title>bar</title>
+
+<para>
+foo
+</para>
+
+<informaltable>
+<tgroup cols="1">
+<tbody>
+<row>
+<entry>foo</entry></row>
+<row><entry>bar</entry></row>
+</tbody>
+</tgroup>
+</informaltable>
+
+<table><title>bar</title>
+<tgroup cols="1">
+<tbody>
+<row><entry>bar</entry></row>
+</tbody>
+</tgroup>
+</table>
+
+</chapter>
+
+<glossary>
+<glossentry><glossterm>foo</glossterm>
+<indexterm><primary>foo</primary></indexterm>
+<glossdef>
+<para>
+Some appropriate definition goes here.
+</para>
+</glossdef>
+</glossentry>
+</glossary>
+
+</book>
--- docbook-xml-4.5.orig/debian/examples/test-4.xml
+++ docbook-xml-4.5/debian/examples/test-4.xml
@@ -0,0 +1,44 @@
+<?xml version='1.0'?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4//EN"
+               "/usr/share/xml/docbook/schema/dtd/4/docbookx.dtd">
+<book><title>foo</title>
+
+<chapter><title>bar</title>
+
+<para>
+foo
+</para>
+
+<informaltable>
+<tgroup cols="1">
+<tbody>
+<row>
+<entry>foo</entry></row>
+<row><entry>bar</entry></row>
+</tbody>
+</tgroup>
+</informaltable>
+
+<table><title>bar</title>
+<tgroup cols="1">
+<tbody>
+<row><entry>bar</entry></row>
+</tbody>
+</tgroup>
+</table>
+
+</chapter>
+
+<glossary>
+<glossentry><glossterm>foo</glossterm>
+<indexterm><primary>foo</primary></indexterm>
+<glossdef>
+<para>
+Some appropriate definition goes here.
+This is a <package>foo</package>, which is a new element in Docbook 4.4.
+</para>
+</glossdef>
+</glossentry>
+</glossary>
+
+</book>
--- docbook-xml-4.5.orig/debian/examples/test-bad-si-4.3.xml
+++ docbook-xml-4.5/debian/examples/test-bad-si-4.3.xml
@@ -0,0 +1,43 @@
+<?xml version='1.0'?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+               "docbookx.dtd">
+<book><title>foo</title>
+
+<chapter><title>bar</title>
+
+<para>
+foo
+</para>
+
+<informaltable>
+<tgroup cols="1">
+<tbody>
+<row>
+<entry>foo</entry></row>
+<row><entry>bar</entry></row>
+</tbody>
+</tgroup>
+</informaltable>
+
+<table><title>bar</title>
+<tgroup cols="1">
+<tbody>
+<row><entry>bar</entry></row>
+</tbody>
+</tgroup>
+</table>
+
+</chapter>
+
+<glossary>
+<glossentry><glossterm>foo</glossterm>
+<indexterm><primary>foo</primary></indexterm>
+<glossdef>
+<para>
+Some appropriate definition goes here.
+</para>
+</glossdef>
+</glossentry>
+</glossary>
+
+</book>
--- docbook-xml-4.5.orig/debian/examples/test-bad-si-4.0.xml
+++ docbook-xml-4.5/debian/examples/test-bad-si-4.0.xml
@@ -0,0 +1,43 @@
+<?xml version='1.0'?>
+<!DOCTYPE book PUBLIC "-//Norman Walsh//DTD DocBk XML V4.0//EN"
+               "docbookx.dtd">
+<book><title>foo</title>
+
+<chapter><title>bar</title>
+
+<para>
+foo
+</para>
+
+<informaltable>
+<tgroup cols="1">
+<tbody>
+<row>
+<entry>foo</entry></row>
+<row><entry>bar</entry></row>
+</tbody>
+</tgroup>
+</informaltable>
+
+<table><title>bar</title>
+<tgroup cols="1">
+<tbody>
+<row><entry>bar</entry></row>
+</tbody>
+</tgroup>
+</table>
+
+</chapter>
+
+<glossary>
+<glossentry><glossterm>foo</glossterm>
+<indexterm><primary>foo</primary></indexterm>
+<glossdef>
+<para>
+Some appropriate definition goes here.
+</para>
+</glossdef>
+</glossentry>
+</glossary>
+
+</book>
--- docbook-xml-4.5.orig/debian/examples/test-si-url-oasis-4.1.2.xml
+++ docbook-xml-4.5/debian/examples/test-si-url-oasis-4.1.2.xml
@@ -0,0 +1,42 @@
+<?xml version='1.0'?>
+<!DOCTYPE book SYSTEM "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
+<book><title>foo</title>
+
+<chapter><title>bar</title>
+
+<para>
+foo
+</para>
+
+<informaltable>
+<tgroup cols="1">
+<tbody>
+<row>
+<entry>foo</entry></row>
+<row><entry>bar</entry></row>
+</tbody>
+</tgroup>
+</informaltable>
+
+<table><title>bar</title>
+<tgroup cols="1">
+<tbody>
+<row><entry>bar</entry></row>
+</tbody>
+</tgroup>
+</table>
+
+</chapter>
+
+<glossary>
+<glossentry><glossterm>foo</glossterm>
+<indexterm><primary>foo</primary></indexterm>
+<glossdef>
+<para>
+Some appropriate definition goes here.
+</para>
+</glossdef>
+</glossentry>
+</glossary>
+
+</book>
--- docbook-xml-4.5.orig/debian/examples/test-si-4.3.xml
+++ docbook-xml-4.5/debian/examples/test-si-4.3.xml
@@ -0,0 +1,42 @@
+<?xml version='1.0'?>
+<!DOCTYPE book SYSTEM "/usr/share/xml/docbook/schema/dtd/4.3/docbookx.dtd">
+<book><title>foo</title>
+
+<chapter><title>bar</title>
+
+<para>
+foo
+</para>
+
+<informaltable>
+<tgroup cols="1">
+<tbody>
+<row>
+<entry>foo</entry></row>
+<row><entry>bar</entry></row>
+</tbody>
+</tgroup>
+</informaltable>
+
+<table><title>bar</title>
+<tgroup cols="1">
+<tbody>
+<row><entry>bar</entry></row>
+</tbody>
+</tgroup>
+</table>
+
+</chapter>
+
+<glossary>
+<glossentry><glossterm>foo</glossterm>
+<indexterm><primary>foo</primary></indexterm>
+<glossdef>
+<para>
+Some appropriate definition goes here.
+</para>
+</glossdef>
+</glossentry>
+</glossary>
+
+</book>
--- docbook-xml-4.5.orig/debian/examples/test-si-url-oasis-4.2.xml
+++ docbook-xml-4.5/debian/examples/test-si-url-oasis-4.2.xml
@@ -0,0 +1,42 @@
+<?xml version='1.0'?>
+<!DOCTYPE book SYSTEM "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+<book><title>foo</title>
+
+<chapter><title>bar</title>
+
+<para>
+foo
+</para>
+
+<informaltable>
+<tgroup cols="1">
+<tbody>
+<row>
+<entry>foo</entry></row>
+<row><entry>bar</entry></row>
+</tbody>
+</tgroup>
+</informaltable>
+
+<table><title>bar</title>
+<tgroup cols="1">
+<tbody>
+<row><entry>bar</entry></row>
+</tbody>
+</tgroup>
+</table>
+
+</chapter>
+
+<glossary>
+<glossentry><glossterm>foo</glossterm>
+<indexterm><primary>foo</primary></indexterm>
+<glossdef>
+<para>
+Some appropriate definition goes here.
+</para>
+</glossdef>
+</glossentry>
+</glossary>
+
+</book>
--- docbook-xml-4.5.orig/debian/examples/test-4.4.xml
+++ docbook-xml-4.5/debian/examples/test-4.4.xml
@@ -0,0 +1,43 @@
+<?xml version='1.0'?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+               "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
+<book><title>foo</title>
+
+<chapter><title>bar</title>
+
+<para>
+foo
+</para>
+
+<informaltable>
+<tgroup cols="1">
+<tbody>
+<row>
+<entry>foo</entry></row>
+<row><entry>bar</entry></row>
+</tbody>
+</tgroup>
+</informaltable>
+
+<table><title>bar</title>
+<tgroup cols="1">
+<tbody>
+<row><entry>bar</entry></row>
+</tbody>
+</tgroup>
+</table>
+
+</chapter>
+
+<glossary>
+<glossentry><glossterm>foo</glossterm>
+<indexterm><primary>foo</primary></indexterm>
+<glossdef>
+<para>
+Some appropriate definition goes here.  This is a <package>foo</package>, which is a new element in Docbook 4.4.
+</para>
+</glossdef>
+</glossentry>
+</glossary>
+
+</book>
--- docbook-xml-4.5.orig/debian/examples/test-4.2.xml
+++ docbook-xml-4.5/debian/examples/test-4.2.xml
@@ -0,0 +1,43 @@
+<?xml version='1.0'?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+               "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+<book><title>foo</title>
+
+<chapter><title>bar</title>
+
+<para>
+foo
+</para>
+
+<informaltable>
+<tgroup cols="1">
+<tbody>
+<row>
+<entry>foo</entry></row>
+<row><entry>bar</entry></row>
+</tbody>
+</tgroup>
+</informaltable>
+
+<table><title>bar</title>
+<tgroup cols="1">
+<tbody>
+<row><entry>bar</entry></row>
+</tbody>
+</tgroup>
+</table>
+
+</chapter>
+
+<glossary>
+<glossentry><glossterm>foo</glossterm>
+<indexterm><primary>foo</primary></indexterm>
+<glossdef>
+<para>
+Some appropriate definition goes here.
+</para>
+</glossdef>
+</glossentry>
+</glossary>
+
+</book>
--- docbook-xml-4.5.orig/debian/examples/test-bad-si-4.5.xml
+++ docbook-xml-4.5/debian/examples/test-bad-si-4.5.xml
@@ -0,0 +1,43 @@
+<?xml version='1.0'?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+               "docbookx.dtd">
+<book><title>foo</title>
+
+<chapter><title>bar</title>
+
+<para>
+foo
+</para>
+
+<informaltable>
+<tgroup cols="1">
+<tbody>
+<row>
+<entry>foo</entry></row>
+<row><entry>bar</entry></row>
+</tbody>
+</tgroup>
+</informaltable>
+
+<table><title>bar</title>
+<tgroup cols="1">
+<tbody>
+<row><entry>bar</entry></row>
+</tbody>
+</tgroup>
+</table>
+
+</chapter>
+
+<glossary>
+<glossentry><glossterm>foo</glossterm>
+<indexterm><primary>foo</primary></indexterm>
+<glossdef>
+<para>
+Some appropriate definition goes here.
+</para>
+</glossdef>
+</glossentry>
+</glossary>
+
+</book>
--- docbook-xml-4.5.orig/debian/examples/test-si-url-docbook.org-4.5.xml
+++ docbook-xml-4.5/debian/examples/test-si-url-docbook.org-4.5.xml
@@ -0,0 +1,42 @@
+<?xml version='1.0'?>
+<!DOCTYPE book SYSTEM "http://docbook.org/xml/4.5/docbookx.dtd">
+<book><title>foo</title>
+
+<chapter><title>bar</title>
+
+<para>
+foo
+</para>
+
+<informaltable>
+<tgroup cols="1">
+<tbody>
+<row>
+<entry>foo</entry></row>
+<row><entry>bar</entry></row>
+</tbody>
+</tgroup>
+</informaltable>
+
+<table><title>bar</title>
+<tgroup cols="1">
+<tbody>
+<row><entry>bar</entry></row>
+</tbody>
+</tgroup>
+</table>
+
+</chapter>
+
+<glossary>
+<glossentry><glossterm>foo</glossterm>
+<indexterm><primary>foo</primary></indexterm>
+<glossdef>
+<para>
+Some appropriate definition goes here.
+</para>
+</glossdef>
+</glossentry>
+</glossary>
+
+</book>