[xml/sgml-commit] r1939 - in /packages/docbook-xml/trunk/debian: ./ patches/ source/
malat at users.alioth.debian.org
malat at users.alioth.debian.org
Wed May 9 17:55:18 UTC 2012
Author: malat
Date: Wed May 9 17:55:17 2012
New Revision: 1939
URL: http://svn.debian.org/wsvn/debian-xml-sgml/?sc=1&rev=1939
Log:
Start work on docbook-xml
Added:
packages/docbook-xml/trunk/debian/patches/01_use_the_entities_from_sgml_data.diff
packages/docbook-xml/trunk/debian/patches/02_add_dtddecl_and_force_fpi_over_sysid.diff
packages/docbook-xml/trunk/debian/patches/03_fix_wrong_371_fpi_in_40.diff
packages/docbook-xml/trunk/debian/patches/05_add_doctype_to_catalog_xml.diff
packages/docbook-xml/trunk/debian/patches/06_add_system_identifiers_to_catalog.diff
packages/docbook-xml/trunk/debian/patches/07_add_fpi_for_htmltblx_mod_to_43_catalogs.diff
packages/docbook-xml/trunk/debian/patches/10_fix_101779_mention_artheader_to_articleinfo_change.diff
packages/docbook-xml/trunk/debian/patches/11_fix_dbpoolx_mod_header_comment_pubid.diff
packages/docbook-xml/trunk/debian/patches/12_fix_256119_and_turn_on_sgml_mode.diff
packages/docbook-xml/trunk/debian/patches/series
packages/docbook-xml/trunk/debian/source/
packages/docbook-xml/trunk/debian/source/format
Removed:
packages/docbook-xml/trunk/debian/patches/00list
packages/docbook-xml/trunk/debian/patches/01_use_the_entities_from_sgml_data.dpatch
packages/docbook-xml/trunk/debian/patches/02_add_dtddecl_and_force_fpi_over_sysid.dpatch
packages/docbook-xml/trunk/debian/patches/03_fix_wrong_371_fpi_in_40.dpatch
packages/docbook-xml/trunk/debian/patches/05_add_doctype_to_catalog_xml.dpatch
packages/docbook-xml/trunk/debian/patches/06_add_system_identifiers_to_catalog.dpatch
packages/docbook-xml/trunk/debian/patches/07_add_fpi_for_htmltblx_mod_to_43_catalogs.dpatch
packages/docbook-xml/trunk/debian/patches/10_fix_101779_mention_artheader_to_articleinfo_change.dpatch
packages/docbook-xml/trunk/debian/patches/11_fix_dbpoolx_mod_header_comment_pubid.dpatch
packages/docbook-xml/trunk/debian/patches/12_fix_256119_and_turn_on_sgml_mode.dpatch
Modified:
packages/docbook-xml/trunk/debian/changelog
packages/docbook-xml/trunk/debian/compat
packages/docbook-xml/trunk/debian/control
packages/docbook-xml/trunk/debian/rules
Modified: packages/docbook-xml/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xml/trunk/debian/changelog?rev=1939&op=diff
==============================================================================
--- packages/docbook-xml/trunk/debian/changelog (original)
+++ packages/docbook-xml/trunk/debian/changelog Wed May 9 17:55:17 2012
@@ -1,9 +1,17 @@
docbook-xml (4.5-8) UNRELEASED; urgency=low
+ [ Daniel Leidert (dale) ]
* NOT RELEASED YET
* debian/control (Vcs-Browser): Fixed location.
(Uploaders): Removed Adam Di Carlo, who is probably MIA (closes: #554231).
Many thanks for your work!
+
+ [ Mathieu Malaterre ]
+ * Add myself as Uploader
+ * Switch from dpatch to quilt
+ * Bump Std-Vers to 3.9.3, no changes needed
+ * Switch to dpkg-source 3.0 (quilt) format
+ * debian/rules: Rewritten for dh 7.
-- Daniel Leidert (dale) <daniel.leidert at wgdd.de> Tue, 08 Sep 2009 15:37:44 +0200
Modified: packages/docbook-xml/trunk/debian/compat
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xml/trunk/debian/compat?rev=1939&op=diff
==============================================================================
--- packages/docbook-xml/trunk/debian/compat (original)
+++ packages/docbook-xml/trunk/debian/compat Wed May 9 17:55:17 2012
@@ -1,1 +1,1 @@
-5
+7
Modified: packages/docbook-xml/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xml/trunk/debian/control?rev=1939&op=diff
==============================================================================
--- packages/docbook-xml/trunk/debian/control (original)
+++ packages/docbook-xml/trunk/debian/control Wed May 9 17:55:17 2012
@@ -2,13 +2,13 @@
Section: text
Priority: optional
Maintainer: Debian XML/SGML Group <debian-xml-sgml-pkgs at lists.alioth.debian.org>
-Uploaders: Daniel Leidert (dale) <daniel.leidert at wgdd.de>
-Build-Depends: debhelper (>= 5), dpatch
+Uploaders: Daniel Leidert (dale) <daniel.leidert at wgdd.de>, Mathieu Malaterre <malat at debian.org>
+Build-Depends: debhelper (>= 7)
Build-Depends-Indep: xml-core (>= 0.6)
-Standards-Version: 3.8.3
+Standards-Version: 3.9.3
Homepage: http://docbook.org/schemas/4x.html
Vcs-Browser: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xml/
-Vcs-Svn: svn://svn.debian.org/svn/debian-xml-sgml/packages/docbook-xml/trunk/
+Vcs-Svn: svn://svn.debian.org/debian-xml-sgml/packages/docbook-xml/trunk/
DM-Upload-Allowed: yes
Package: docbook-xml
Added: packages/docbook-xml/trunk/debian/patches/01_use_the_entities_from_sgml_data.diff
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xml/trunk/debian/patches/01_use_the_entities_from_sgml_data.diff?rev=1939&op=file
==============================================================================
--- packages/docbook-xml/trunk/debian/patches/01_use_the_entities_from_sgml_data.diff (added)
+++ packages/docbook-xml/trunk/debian/patches/01_use_the_entities_from_sgml_data.diff Wed May 9 17:55:17 2012
@@ -1,0 +1,1588 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_use_the_entities_from_sgml_data.dpatch by Adam Di Carlo <aph at debian.org>
+## and Daniel Leidert (dale) <daniel.leidert at 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
+
+ at 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 ............................. --
+ -- ...................................................................... --
Added: packages/docbook-xml/trunk/debian/patches/02_add_dtddecl_and_force_fpi_over_sysid.diff
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xml/trunk/debian/patches/02_add_dtddecl_and_force_fpi_over_sysid.diff?rev=1939&op=file
==============================================================================
--- packages/docbook-xml/trunk/debian/patches/02_add_dtddecl_and_force_fpi_over_sysid.diff (added)
+++ packages/docbook-xml/trunk/debian/patches/02_add_dtddecl_and_force_fpi_over_sysid.diff Wed May 9 17:55:17 2012
@@ -1,0 +1,110 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_add_dtddecl_and_force_fpi_over_sysid.dpatch by Adam Di Carlo <aph at 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>
+
+ at 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 ...................................................... --
Added: packages/docbook-xml/trunk/debian/patches/03_fix_wrong_371_fpi_in_40.diff
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xml/trunk/debian/patches/03_fix_wrong_371_fpi_in_40.diff?rev=1939&op=file
==============================================================================
--- packages/docbook-xml/trunk/debian/patches/03_fix_wrong_371_fpi_in_40.diff (added)
+++ packages/docbook-xml/trunk/debian/patches/03_fix_wrong_371_fpi_in_40.diff Wed May 9 17:55:17 2012
@@ -1,0 +1,33 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03_fix_wrong_table_model_fpi_in_40.dpatch by Adam Di Carlo <aph at debian.org>
+## and Daniel Leidert (dale) <daniel.leidert at 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>
+
+ at 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">
+ ]]>
+
Added: packages/docbook-xml/trunk/debian/patches/05_add_doctype_to_catalog_xml.diff
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xml/trunk/debian/patches/05_add_doctype_to_catalog_xml.diff?rev=1939&op=file
==============================================================================
--- packages/docbook-xml/trunk/debian/patches/05_add_doctype_to_catalog_xml.diff (added)
+++ packages/docbook-xml/trunk/debian/patches/05_add_doctype_to_catalog_xml.diff Wed May 9 17:55:17 2012
@@ -1,0 +1,55 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 05_add_doctype_to_catalog_xml.dpatch by Adam Di Carlo <aph at debian.org> and
+## and Daniel Leidert <daniel.leidert at 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>
+
+ at 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">
+
+ <!-- ...................................................................... -->
Added: packages/docbook-xml/trunk/debian/patches/06_add_system_identifiers_to_catalog.diff
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xml/trunk/debian/patches/06_add_system_identifiers_to_catalog.diff?rev=1939&op=file
==============================================================================
--- packages/docbook-xml/trunk/debian/patches/06_add_system_identifiers_to_catalog.diff (added)
+++ packages/docbook-xml/trunk/debian/patches/06_add_system_identifiers_to_catalog.diff Wed May 9 17:55:17 2012
@@ -1,0 +1,114 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 06_add_system_identifiers_to_catalog.dpatch by Adam Di Carlo <aph at 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>
+
+ at 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"
+
Added: packages/docbook-xml/trunk/debian/patches/07_add_fpi_for_htmltblx_mod_to_43_catalogs.diff
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xml/trunk/debian/patches/07_add_fpi_for_htmltblx_mod_to_43_catalogs.diff?rev=1939&op=file
==============================================================================
--- packages/docbook-xml/trunk/debian/patches/07_add_fpi_for_htmltblx_mod_to_43_catalogs.diff (added)
+++ packages/docbook-xml/trunk/debian/patches/07_add_fpi_for_htmltblx_mod_to_43_catalogs.diff Wed May 9 17:55:17 2012
@@ -1,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 at 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>
+
+ at 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"
+
Added: packages/docbook-xml/trunk/debian/patches/10_fix_101779_mention_artheader_to_articleinfo_change.diff
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xml/trunk/debian/patches/10_fix_101779_mention_artheader_to_articleinfo_change.diff?rev=1939&op=file
==============================================================================
--- packages/docbook-xml/trunk/debian/patches/10_fix_101779_mention_artheader_to_articleinfo_change.diff (added)
+++ packages/docbook-xml/trunk/debian/patches/10_fix_101779_mention_artheader_to_articleinfo_change.diff Wed May 9 17:55:17 2012
@@ -1,0 +1,33 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_fix_101779_mention_artheader_to_articleinfo_change.dpatch by Adam Di Carlo <aph at 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>
+
+ at 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
+
Added: packages/docbook-xml/trunk/debian/patches/11_fix_dbpoolx_mod_header_comment_pubid.diff
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xml/trunk/debian/patches/11_fix_dbpoolx_mod_header_comment_pubid.diff?rev=1939&op=file
==============================================================================
--- packages/docbook-xml/trunk/debian/patches/11_fix_dbpoolx_mod_header_comment_pubid.diff (added)
+++ packages/docbook-xml/trunk/debian/patches/11_fix_dbpoolx_mod_header_comment_pubid.diff Wed May 9 17:55:17 2012
@@ -1,0 +1,67 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 11_fix_dbpoolx_mod_header_comment_pubid.dpatch by Daniel Leidert (dale) <daniel.leidert at 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
+
+ at 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;
+
Added: packages/docbook-xml/trunk/debian/patches/12_fix_256119_and_turn_on_sgml_mode.diff
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xml/trunk/debian/patches/12_fix_256119_and_turn_on_sgml_mode.diff?rev=1939&op=file
==============================================================================
--- packages/docbook-xml/trunk/debian/patches/12_fix_256119_and_turn_on_sgml_mode.diff (added)
+++ packages/docbook-xml/trunk/debian/patches/12_fix_256119_and_turn_on_sgml_mode.diff Wed May 9 17:55:17 2012
@@ -1,0 +1,103 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 12_fix_256119_and_turn_on_sgml_mode.dpatch by Adam Di Carlo <aph at 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>
+
+ at 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;
Added: packages/docbook-xml/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xml/trunk/debian/patches/series?rev=1939&op=file
==============================================================================
--- packages/docbook-xml/trunk/debian/patches/series (added)
+++ packages/docbook-xml/trunk/debian/patches/series Wed May 9 17:55:17 2012
@@ -1,0 +1,9 @@
+01_use_the_entities_from_sgml_data.diff
+02_add_dtddecl_and_force_fpi_over_sysid.diff
+03_fix_wrong_371_fpi_in_40.diff
+05_add_doctype_to_catalog_xml.diff
+06_add_system_identifiers_to_catalog.diff
+07_add_fpi_for_htmltblx_mod_to_43_catalogs.diff
+10_fix_101779_mention_artheader_to_articleinfo_change.diff
+11_fix_dbpoolx_mod_header_comment_pubid.diff
+12_fix_256119_and_turn_on_sgml_mode.diff
Modified: packages/docbook-xml/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xml/trunk/debian/rules?rev=1939&op=diff
==============================================================================
--- packages/docbook-xml/trunk/debian/rules (original)
+++ packages/docbook-xml/trunk/debian/rules Wed May 9 17:55:17 2012
@@ -1,13 +1,20 @@
#!/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.
+
+#export DH_VERBOSE=1
PACKAGE := docbook-xml
-include /usr/share/dpatch/dpatch.make
+%:
+ dh $@ --parallel
+override_dh_clean:
+ dh_clean debian/docbook-xml.install \
+ debian/docbook-xml.links \
+ debian/docbook-xml.sgmlcatalogs \
+ debian/docbook-xml.xmlcatalogs \
+
+override_dh_install: debian/docbook-xml.install
+ dh_install
debian/docbook-xml.install:
set -ex ; \
@@ -26,6 +33,10 @@
[ -f $${dbx}/catalog.xml ] && \
echo "$${dbx}/catalog.xml usr/share/xml/docbook/schema/dtd/$${dbxver}" >> $@ ; \
done
+
+override_dh_link: debian/docbook-xml.links
+ dh_link
+ find $(CURDIR)/debian/$(PACKAGE) -type l -follow >/dev/null # exits 1 on broken links
debian/docbook-xml.links:
set -ex ; \
@@ -46,6 +57,9 @@
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
+
+override_dh_installcatalogs: debian/docbook-xml.sgmlcatalogs debian/docbook-xml.xmlcatalogs
+ dh_installcatalogs
debian/docbook-xml.sgmlcatalogs:
set -ex ; \
@@ -81,48 +95,8 @@
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
+override_dh_installchangelogs::
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:
@@ -159,7 +133,4 @@
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:
+.PHONY: get-orig-source
Added: packages/docbook-xml/trunk/debian/source/format
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xml/trunk/debian/source/format?rev=1939&op=file
==============================================================================
--- packages/docbook-xml/trunk/debian/source/format (added)
+++ packages/docbook-xml/trunk/debian/source/format Wed May 9 17:55:17 2012
@@ -1,0 +1,1 @@
+3.0 (quilt)
More information about the debian-xml-sgml-commit
mailing list