[xml/sgml-commit] r679 - in packages/docbook/trunk: . debian
debian/patches
Daniel Leidert
dleidert-guest at alioth.debian.org
Wed Mar 14 19:11:17 CET 2007
Author: dleidert-guest
Date: 2007-03-14 18:11:17 +0000 (Wed, 14 Mar 2007)
New Revision: 679
Added:
packages/docbook/trunk/catalog
packages/docbook/trunk/debian/patches/01_remove_entity_sets_and_dcl_from_catalogs.dpatch
Removed:
packages/docbook/trunk/debian/TODO
packages/docbook/trunk/debian/patches/01_create_main_catalog.dpatch
packages/docbook/trunk/debian/patches/02_remove_entity_sets_and_dcl_from_catalogs.dpatch
Modified:
packages/docbook/trunk/debian/changelog
packages/docbook/trunk/debian/patches/00list
packages/docbook/trunk/debian/patches/10_fix_101779_mention_artheader_to_articleinfo_change.dpatch
packages/docbook/trunk/debian/patches/11_fix_dbpoolx_mod_header_comment_pubid.dpatch
packages/docbook/trunk/debian/patches/12_fix_256119_and_turn_on_sgml_mode.dpatch
packages/docbook/trunk/debian/rules
Log:
* catalog: Made latest DocBook SGML 4.5 the default (closes: #413304).
* debian/rules (debian/docbook.install, debian/docbook.links): Made the
dbgenent.mod files config-files.
* debian/TODO: Removed (implemented the only item).
- Removed debian/patches/01_create_main_catalog.dpatch and re-added
catalog. I think, this is more intentional (and easy with
svn-buildpackage/mergeWithUpstream=1). To have a new 01_ patch,
debian/patches/02_remove_entity_sets_and_dcl_from_catalogs.dpatch has been
renamed to debian/patches/01_remove_entity_sets_and_dcl_from_catalogs.dpatch.
- Added header comments/patch explanations for
debian/patches/11_fix_dbpoolx_mod_header_comment_pubid.dpatch and
debian/patches/12_fix_256119_and_turn_on_sgml_mode.dpatch.
- All URLS have been masked "<URL:...>", as done by Adam earlier too.
Added: packages/docbook/trunk/catalog
===================================================================
--- packages/docbook/trunk/catalog 2007-03-11 05:44:15 UTC (rev 678)
+++ packages/docbook/trunk/catalog 2007-03-14 18:11:17 UTC (rev 679)
@@ -0,0 +1,19 @@
+ -- ...................................................................... --
+ -- Prefer PUBID to SYSID ................................................ --
+OVERRIDE YES
+
+ -- latest DocBook --
+PUBLIC "-//OASIS//DTD DocBook//EN" "4.5/docbook.dtd"
+ -- disabled, see README.docbook.dcl --
+-- DTDDECL "-//OASIS//DTD DocBook//EN" "4.5/docbook.dcl" --
+
+ -- latest DocBook v4--
+PUBLIC "-//OASIS//DTD DocBook V4//EN" "4.5/docbook.dtd"
+ -- disabled, see README.docbook.dcl --
+-- DTDDECL "-//OASIS//DTD DocBook V4//EN" "4.5/docbook.dcl" --
+
+ -- latest DocBook v3--
+PUBLIC "-//OASIS//DTD DocBook V3//EN" "3.1/docbook.dtd"
+ -- disabled, see README.docbook.dcl --
+-- DTDDECL "-//OASIS//DTD DocBook V3//EN" "3.1/docbook.dcl" --
+
Deleted: packages/docbook/trunk/debian/TODO
===================================================================
--- packages/docbook/trunk/debian/TODO 2007-03-11 05:44:15 UTC (rev 678)
+++ packages/docbook/trunk/debian/TODO 2007-03-14 18:11:17 UTC (rev 679)
@@ -1,13 +0,0 @@
-docbook-TODO (0.0)
-
- * Just because somethings on this list, that doesn't mean you can't go
- ahead and submit a wishlist bug against it. Please feel free, it lets
- me know what people want the most.
-
- * for all versions, dbgenent.mod should be a conffile
-
- --
-
-Local variables:
-mode: debian-changelog
-End:
Modified: packages/docbook/trunk/debian/changelog
===================================================================
--- packages/docbook/trunk/debian/changelog 2007-03-11 05:44:15 UTC (rev 678)
+++ packages/docbook/trunk/debian/changelog 2007-03-14 18:11:17 UTC (rev 679)
@@ -3,6 +3,7 @@
* New upstream release DocBook SGML 4.5 added (closes: #413166).
[ Daniel Leidert ]
+ * catalog: Made latest DocBook SGML 4.5 the default (closes: #413304).
* debian/control: Added XS-Vcs-Browser and XS-Vcs-Svn fields.
(Build-Depends-Indep): Fixed debhelper build dependency to be listed in
Build-Depends.
@@ -18,12 +19,11 @@
don't remove them in the clean target).
(binary-indep): Fixed the dh_installdocs call to include Adams
README.docbook.dcl, that was not included in the package.
+ (debian/docbook.install, debian/docbook.links): Made the dbgenent.mod
+ files config-files.
* debian/patches/00list: Added. Moved all existing changes to dpatch patches
and enabled them here.
- * debian/patches/01_create_main_catalog.dpatch: Added.
- - catalog: Made latest DocBook SGML version 4.5 the default
- (closes: #413304).
- * debian/patches/02_remove_entity_sets_and_dcl_from_catalogs.dpatch: Added.
+ * debian/patches/01_remove_entity_sets_and_dcl_from_catalogs.dpatch: Added.
* debian/patches/10_fix_101779_mention_artheader_to_articleinfo_change.dpatch:
Added.
* debian/patches/11_fix_dbpoolx_mod_header_comment_pubid.dpatch: Added.
@@ -34,6 +34,7 @@
* debian/postinst: Renamed to docbook.postinst.
* debian/README.debian: Renamed to README.Debian.
* debian/install_docbook.sh: Removed. See debian/rules changes.
+ * debian/TODO: Removed (implemented the only item).
* debian/watch: Removed (empty).
-- Daniel Leidert (dale) <daniel.leidert at wgdd.de> Sat, 10 Mar 2007 09:32:33 +0100
Modified: packages/docbook/trunk/debian/patches/00list
===================================================================
--- packages/docbook/trunk/debian/patches/00list 2007-03-11 05:44:15 UTC (rev 678)
+++ packages/docbook/trunk/debian/patches/00list 2007-03-14 18:11:17 UTC (rev 679)
@@ -1,5 +1,4 @@
-01_create_main_catalog
-02_remove_entity_sets_and_dcl_from_catalogs
+01_remove_entity_sets_and_dcl_from_catalogs
10_fix_101779_mention_artheader_to_articleinfo_change
11_fix_dbpoolx_mod_header_comment_pubid
12_fix_256119_and_turn_on_sgml_mode
Deleted: packages/docbook/trunk/debian/patches/01_create_main_catalog.dpatch
===================================================================
--- packages/docbook/trunk/debian/patches/01_create_main_catalog.dpatch 2007-03-11 05:44:15 UTC (rev 678)
+++ packages/docbook/trunk/debian/patches/01_create_main_catalog.dpatch 2007-03-14 18:11:17 UTC (rev 679)
@@ -1,31 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_create_main_catalog.dpatch by Adam Di Carlo.
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Determine the latest DocBook SGML versions: (a) general, (b) latest v4
-## DP: and (c) v3.
-
- at DPATCH@
-diff -urNad trunk~/catalog trunk/catalog
---- trunk~/catalog 1970-01-01 01:00:00.000000000 +0100
-+++ trunk/catalog 2007-03-09 16:12:23.000000000 +0100
-@@ -0,0 +1,19 @@
-+ -- ...................................................................... --
-+ -- Prefer PUBID to SYSID ................................................ --
-+OVERRIDE YES
-+
-+ -- latest DocBook --
-+PUBLIC "-//OASIS//DTD DocBook//EN" "4.5/docbook.dtd"
-+ -- disabled, see README.docbook.dcl --
-+-- DTDDECL "-//OASIS//DTD DocBook//EN" "4.5/docbook.dcl" --
-+
-+ -- latest DocBook v4--
-+PUBLIC "-//OASIS//DTD DocBook V4//EN" "4.5/docbook.dtd"
-+ -- disabled, see README.docbook.dcl --
-+-- DTDDECL "-//OASIS//DTD DocBook V4//EN" "4.5/docbook.dcl" --
-+
-+ -- latest DocBook v3--
-+PUBLIC "-//OASIS//DTD DocBook V3//EN" "3.1/docbook.dtd"
-+ -- disabled, see README.docbook.dcl --
-+-- DTDDECL "-//OASIS//DTD DocBook V3//EN" "3.1/docbook.dcl" --
-+
Copied: packages/docbook/trunk/debian/patches/01_remove_entity_sets_and_dcl_from_catalogs.dpatch (from rev 678, packages/docbook/trunk/debian/patches/02_remove_entity_sets_and_dcl_from_catalogs.dpatch)
===================================================================
--- packages/docbook/trunk/debian/patches/02_remove_entity_sets_and_dcl_from_catalogs.dpatch 2007-03-11 05:44:15 UTC (rev 678)
+++ packages/docbook/trunk/debian/patches/01_remove_entity_sets_and_dcl_from_catalogs.dpatch 2007-03-14 18:11:17 UTC (rev 679)
@@ -0,0 +1,567 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_remove_entity_sets_and_dcl_from_catalogs.dpatch by
+## Mark Eichin <eichin at kitten.gen.ma.us> and Adam Di Carlo <aph at debian.org>.
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: This patch:
+## DP: * removes all SGML declarations from the catalogs, for more info, see
+## DP: debian/README.docbook.dcl
+## DP: * removes the ISO entity pointers since they are supplied by sgml-data
+## DP: * removes Public-IDs for DocBook XML
+## DP: * forces Public-ID rather than the System-ID in DTD declarations
+## DP: (closes: <URL:http://bugs.debian.org/97330>)
+## DP:
+## 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/current/changelog#versionversion4.1-5>
+## DP: <URL:http://packages.debian.org/changelogs/pool/main/d/docbook/current/changelog#versionversion4.1-2>
+## DP: <URL:http://packages.debian.org/changelogs/pool/main/d/docbook/current/changelog#versionversion3.0-4>
+
+ at DPATCH@
+diff -urNad docbook-4.5~/docbook-2.4.1/docbook.cat docbook-4.5/docbook-2.4.1/docbook.cat
+--- docbook-4.5~/docbook-2.4.1/docbook.cat 1996-04-16 08:53:16.000000000 +0200
++++ docbook-4.5/docbook-2.4.1/docbook.cat 2007-03-09 16:39:46.000000000 +0100
+@@ -27,8 +27,13 @@
+ -- ...................................................................... --
+ -- SGML declaration associated with DocBook ............................. --
+
+-SGMLDECL "docbook.dcl"
+-DTDDECL "-//Davenport//DTD DocBook V2.4.1//EN" "docbook.dcl"
++-- disabled, see README.docbook.dcl --
++-- SGMLDECL "docbook.dcl" --
++-- DTDDECL "-//Davenport//DTD DocBook V2.4.1//EN" "docbook.dcl" --
++
++ -- ...................................................................... --
++ -- Prefer PUBID to SYSID ................................................ --
++OVERRIDE YES
+
+ -- ...................................................................... --
+ -- DocBook driver file .................................................. --
+@@ -43,28 +48,5 @@
+ PUBLIC "-//Davenport//ELEMENTS DocBook Document Hierarchy V2.4.1//EN" "dbhier.mod"
+ PUBLIC "-//Davenport//ELEMENTS DocBook Additional General Entities//EN" "dbgenent.mod"
+
+- -- ...................................................................... --
+- -- ISO entity sets ...................................................... --
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN" "iso-dia.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" "iso-num.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN" "iso-pub.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN" "iso-tech.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN" "iso-lat1.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN" "iso-lat2.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN" "iso-grk1.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" "iso-grk2.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN" "iso-grk3.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" "iso-grk4.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" "iso-amsa.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" "iso-amsb.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" "iso-amsc.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" "iso-amsn.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" "iso-amso.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" "iso-amsr.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" "iso-box.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" "iso-cyr1.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" "iso-cyr2.gml"
+-
+ -- End of DocBook catalog data V2.4.1 ................................... --
+ -- ...................................................................... --
+diff -urNad docbook-4.5~/docbook-3.0/docbook.cat docbook-4.5/docbook-3.0/docbook.cat
+--- docbook-4.5~/docbook-3.0/docbook.cat 1996-12-10 16:35:22.000000000 +0100
++++ docbook-4.5/docbook-3.0/docbook.cat 2007-03-09 16:44:17.000000000 +0100
+@@ -27,7 +27,12 @@
+ -- ...................................................................... --
+ -- SGML declaration associated with DocBook ............................. --
+
+-DTDDECL "-//Davenport//DTD DocBook V3.0//EN" "docbook.dcl"
++-- disabled, see README.docbook.dcl --
++-- DTDDECL "-//Davenport//DTD DocBook V3.0//EN" "docbook.dcl" --
++
++ -- ...................................................................... --
++ -- Prefer PUBID to SYSID ................................................ --
++OVERRIDE YES
+
+ -- ...................................................................... --
+ -- DocBook driver file .................................................. --
+@@ -42,28 +47,5 @@
+ PUBLIC "-//Davenport//ELEMENTS DocBook Document Hierarchy V3.0//EN" "dbhier.mod"
+ PUBLIC "-//Davenport//ENTITIES DocBook Additional General Entities V3.0//EN" "dbgenent.mod"
+
+- -- ...................................................................... --
+- -- ISO entity sets ...................................................... --
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN" "iso-dia.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" "iso-num.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN" "iso-pub.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN" "iso-tech.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN" "iso-lat1.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN" "iso-lat2.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN" "iso-grk1.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" "iso-grk2.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN" "iso-grk3.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" "iso-grk4.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" "iso-amsa.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" "iso-amsb.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" "iso-amsc.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" "iso-amsn.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" "iso-amso.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" "iso-amsr.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" "iso-box.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" "iso-cyr1.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" "iso-cyr2.gml"
+-
+ -- End of catalog data for DocBook V3.0 ................................. --
+ -- ...................................................................... --
+diff -urNad docbook-4.5~/docbook-3.1/docbook.cat docbook-4.5/docbook-3.1/docbook.cat
+--- docbook-4.5~/docbook-3.1/docbook.cat 1999-02-02 06:53:32.000000000 +0100
++++ docbook-4.5/docbook-3.1/docbook.cat 2007-03-09 16:44:12.000000000 +0100
+@@ -19,7 +19,12 @@
+ -- ...................................................................... --
+ -- SGML declaration associated with DocBook ............................. --
+
+-DTDDECL "-//OASIS//DTD DocBook V3.1//EN" "docbook.dcl"
++-- disabled, see README.docbook.dcl --
++-- DTDDECL "-//OASIS//DTD DocBook V3.1//EN" "docbook.dcl" --
++
++ -- ...................................................................... --
++ -- Prefer PUBID to SYSID ................................................ --
++OVERRIDE YES
+
+ -- ...................................................................... --
+ -- DocBook driver file .................................................. --
+@@ -36,28 +41,5 @@
+ PUBLIC "-//OASIS//ENTITIES DocBook Notations V3.1//EN" "dbnotn.mod"
+ PUBLIC "-//OASIS//ENTITIES DocBook Character Entities V3.1//EN" "dbcent.mod"
+
+- -- ...................................................................... --
+- -- ISO entity sets ...................................................... --
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN" "iso-dia.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" "iso-num.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN" "iso-pub.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN" "iso-tech.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN" "iso-lat1.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN" "iso-lat2.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN" "iso-grk1.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" "iso-grk2.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN" "iso-grk3.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" "iso-grk4.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" "iso-amsa.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" "iso-amsb.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" "iso-amsc.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" "iso-amsn.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" "iso-amso.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" "iso-amsr.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" "iso-box.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" "iso-cyr1.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" "iso-cyr2.gml"
+-
+ -- End of catalog data for DocBook V3.1 ................................. --
+ -- ...................................................................... --
+diff -urNad docbook-4.5~/docbook-4.0/docbook.cat docbook-4.5/docbook-4.0/docbook.cat
+--- docbook-4.5~/docbook-4.0/docbook.cat 2000-05-18 21:27:28.000000000 +0200
++++ docbook-4.5/docbook-4.0/docbook.cat 2007-03-09 16:45:08.000000000 +0100
+@@ -19,7 +19,12 @@
+ -- ...................................................................... --
+ -- SGML declaration associated with DocBook ............................. --
+
+-DTDDECL "-//OASIS//DTD DocBook V4.0//EN" "docbook.dcl"
++-- disabled, see README.docbook.dcl --
++-- DTDDECL "-//OASIS//DTD DocBook V4.0//EN" "docbook.dcl" --
++
++ -- ...................................................................... --
++ -- Prefer PUBID to SYSID ................................................ --
++OVERRIDE YES
+
+ -- ...................................................................... --
+ -- DocBook driver file .................................................. --
+@@ -36,28 +41,5 @@
+ PUBLIC "-//OASIS//ENTITIES DocBook Notations V4.0//EN" "dbnotn.mod"
+ PUBLIC "-//OASIS//ENTITIES DocBook Character Entities V4.0//EN" "dbcent.mod"
+
+- -- ...................................................................... --
+- -- ISO entity sets ...................................................... --
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN" "iso-dia.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" "iso-num.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN" "iso-pub.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN" "iso-tech.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN" "iso-lat1.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN" "iso-lat2.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN" "iso-grk1.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" "iso-grk2.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN" "iso-grk3.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" "iso-grk4.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" "iso-amsa.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" "iso-amsb.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" "iso-amsc.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" "iso-amsn.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" "iso-amso.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" "iso-amsr.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" "iso-box.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" "iso-cyr1.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" "iso-cyr2.gml"
+-
+ -- End of catalog data for DocBook V4.0 ................................. --
+ -- ...................................................................... --
+diff -urNad docbook-4.5~/docbook-4.1/docbook.cat docbook-4.5/docbook-4.1/docbook.cat
+--- docbook-4.5~/docbook-4.1/docbook.cat 2000-06-19 16:50:28.000000000 +0200
++++ docbook-4.5/docbook-4.1/docbook.cat 2007-03-09 16:53:00.000000000 +0100
+@@ -19,7 +19,12 @@
+ -- ...................................................................... --
+ -- SGML declaration associated with DocBook ............................. --
+
+-DTDDECL "-//OASIS//DTD DocBook V4.1//EN" "docbook.dcl"
++-- disabled, see README.docbook.dcl --
++-- DTDDECL "-//OASIS//DTD DocBook V4.1//EN" "docbook.dcl" --
++
++ -- ...................................................................... --
++ -- Prefer PUBID to SYSID ................................................ --
++OVERRIDE YES
+
+ -- ...................................................................... --
+ -- DocBook driver file .................................................. --
+@@ -36,28 +41,5 @@
+ PUBLIC "-//OASIS//ENTITIES DocBook Notations V4.1//EN" "dbnotn.mod"
+ PUBLIC "-//OASIS//ENTITIES DocBook Character Entities V4.1//EN" "dbcent.mod"
+
+- -- ...................................................................... --
+- -- ISO entity sets ...................................................... --
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN" "iso-dia.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" "iso-num.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN" "iso-pub.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN" "iso-tech.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN" "iso-lat1.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN" "iso-lat2.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN" "iso-grk1.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" "iso-grk2.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN" "iso-grk3.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" "iso-grk4.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" "iso-amsa.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" "iso-amsb.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" "iso-amsc.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" "iso-amsn.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" "iso-amso.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" "iso-amsr.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" "iso-box.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" "iso-cyr1.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" "iso-cyr2.gml"
+-
+ -- End of catalog data for DocBook V4.1 ................................. --
+ -- ...................................................................... --
+diff -urNad docbook-4.5~/docbook-4.2/docbook.cat docbook-4.5/docbook-4.2/docbook.cat
+--- docbook-4.5~/docbook-4.2/docbook.cat 2002-07-17 18:14:28.000000000 +0200
++++ docbook-4.5/docbook-4.2/docbook.cat 2007-03-09 16:42:30.000000000 +0100
+@@ -22,9 +22,6 @@
+ PUBLIC "-//OASIS//DTD DocBook V4.2//EN"
+ "docbook.dtd"
+
+-PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+- "docbookx.dtd"
+-
+ -- ...................................................................... --
+ -- DocBook modules ...................................................... --
+
+@@ -49,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"
+- "iso-dia.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN"
+- "iso-num.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN"
+- "iso-pub.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN"
+- "iso-tech.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN"
+- "iso-lat1.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN"
+- "iso-lat2.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN"
+- "iso-grk1.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN"
+- "iso-grk2.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN"
+- "iso-grk3.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN"
+- "iso-grk4.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN"
+- "iso-amsa.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN"
+- "iso-amsb.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN"
+- "iso-amsc.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN"
+- "iso-amsn.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN"
+- "iso-amso.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN"
+- "iso-amsr.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN"
+- "iso-box.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN"
+- "iso-cyr1.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN"
+- "iso-cyr2.gml"
+-
+ -- End of catalog data for DocBook V4.2 ................................. --
+ -- ...................................................................... --
+diff -urNad docbook-4.5~/docbook-4.3/docbook.cat docbook-4.5/docbook-4.3/docbook.cat
+--- docbook-4.5~/docbook-4.3/docbook.cat 2004-03-31 13:44:16.000000000 +0200
++++ docbook-4.5/docbook-4.3/docbook.cat 2007-03-09 16:53:47.000000000 +0100
+@@ -22,9 +22,6 @@
+ PUBLIC "-//OASIS//DTD DocBook V4.3//EN"
+ "docbook.dtd"
+
+-PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+- "docbookx.dtd"
+-
+ -- ...................................................................... --
+ -- DocBook modules ...................................................... --
+
+@@ -49,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"
+- "iso-dia.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN"
+- "iso-num.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN"
+- "iso-pub.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN"
+- "iso-tech.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN"
+- "iso-lat1.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN"
+- "iso-lat2.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN"
+- "iso-grk1.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN"
+- "iso-grk2.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN"
+- "iso-grk3.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN"
+- "iso-grk4.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN"
+- "iso-amsa.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN"
+- "iso-amsb.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN"
+- "iso-amsc.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN"
+- "iso-amsn.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN"
+- "iso-amso.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN"
+- "iso-amsr.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN"
+- "iso-box.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN"
+- "iso-cyr1.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN"
+- "iso-cyr2.gml"
+-
+ -- End of catalog data for DocBook V4.3 ................................. --
+ -- ...................................................................... --
+diff -urNad docbook-4.5~/docbook-4.4/docbook.cat docbook-4.5/docbook-4.4/docbook.cat
+--- docbook-4.5~/docbook-4.4/docbook.cat 2005-01-27 14:59:49.000000000 +0100
++++ docbook-4.5/docbook-4.4/docbook.cat 2007-03-09 16:54:12.000000000 +0100
+@@ -22,9 +22,6 @@
+ PUBLIC "-//OASIS//DTD DocBook V4.4//EN"
+ "docbook.dtd"
+
+-PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+- "docbookx.dtd"
+-
+ -- ...................................................................... --
+ -- DocBook modules ...................................................... --
+
+@@ -52,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"
+- "iso-dia.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN"
+- "iso-num.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN"
+- "iso-pub.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN"
+- "iso-tech.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN"
+- "iso-lat1.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN"
+- "iso-lat2.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN"
+- "iso-grk1.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN"
+- "iso-grk2.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN"
+- "iso-grk3.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN"
+- "iso-grk4.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN"
+- "iso-amsa.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN"
+- "iso-amsb.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN"
+- "iso-amsc.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN"
+- "iso-amsn.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN"
+- "iso-amso.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN"
+- "iso-amsr.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN"
+- "iso-box.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN"
+- "iso-cyr1.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN"
+- "iso-cyr2.gml"
+-
+ -- End of catalog data for DocBook V4.4 ................................. --
+ -- ...................................................................... --
+diff -urNad docbook-4.5~/docbook-4.5/docbook.cat docbook-4.5/docbook-4.5/docbook.cat
+--- docbook-4.5~/docbook-4.5/docbook.cat 2006-10-03 15:27:50.000000000 +0200
++++ docbook-4.5/docbook-4.5/docbook.cat 2007-03-09 16:54:41.000000000 +0100
+@@ -22,9 +22,6 @@
+ PUBLIC "-//OASIS//DTD DocBook V4.5//EN"
+ "docbook.dtd"
+
+-PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+- "docbookx.dtd"
+-
+ -- ...................................................................... --
+ -- DocBook modules ...................................................... --
+
+@@ -52,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"
+- "iso-dia.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN"
+- "iso-num.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN"
+- "iso-pub.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN"
+- "iso-tech.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN"
+- "iso-lat1.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN"
+- "iso-lat2.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN"
+- "iso-grk1.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN"
+- "iso-grk2.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN"
+- "iso-grk3.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN"
+- "iso-grk4.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN"
+- "iso-amsa.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN"
+- "iso-amsb.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN"
+- "iso-amsc.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN"
+- "iso-amsn.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN"
+- "iso-amso.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN"
+- "iso-amsr.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN"
+- "iso-box.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN"
+- "iso-cyr1.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN"
+- "iso-cyr2.gml"
+-
+ -- End of catalog data for DocBook V4.5 ................................. --
+ -- ...................................................................... --
Deleted: packages/docbook/trunk/debian/patches/02_remove_entity_sets_and_dcl_from_catalogs.dpatch
===================================================================
--- packages/docbook/trunk/debian/patches/02_remove_entity_sets_and_dcl_from_catalogs.dpatch 2007-03-11 05:44:15 UTC (rev 678)
+++ packages/docbook/trunk/debian/patches/02_remove_entity_sets_and_dcl_from_catalogs.dpatch 2007-03-14 18:11:17 UTC (rev 679)
@@ -1,567 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_remove_entity_sets_and_dcl_from_catalogs.dpatch by
-## Mark Eichin <eichin at kitten.gen.ma.us> and Adam Di Carlo <aph at debian.org>.
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: This patch:
-## DP: * removes all SGML declarations from the catalogs, for more info, see
-## DP: debian/README.docbook.dcl
-## DP: * removes the ISO entity pointers since they are supplied by sgml-data
-## DP: * removes Public-IDs for DocBook XML
-## DP: * forces Public-ID rather than the System-ID in DTD declarations
-## DP: (closes: http://bugs.debian.org/97330)
-## DP:
-## DP: http://packages.debian.org/changelogs/pool/main/d/docbook/current/changelog#versionversion4.4-1
-## DP: http://packages.debian.org/changelogs/pool/main/d/docbook/current/changelog#versionversion4.1-5
-## DP: http://packages.debian.org/changelogs/pool/main/d/docbook/current/changelog#versionversion4.1-2
-## DP: http://packages.debian.org/changelogs/pool/main/d/docbook/current/changelog#versionversion3.0-4
-
- at DPATCH@
-diff -urNad docbook-4.5~/docbook-2.4.1/docbook.cat docbook-4.5/docbook-2.4.1/docbook.cat
---- docbook-4.5~/docbook-2.4.1/docbook.cat 1996-04-16 08:53:16.000000000 +0200
-+++ docbook-4.5/docbook-2.4.1/docbook.cat 2007-03-09 16:39:46.000000000 +0100
-@@ -27,8 +27,13 @@
- -- ...................................................................... --
- -- SGML declaration associated with DocBook ............................. --
-
--SGMLDECL "docbook.dcl"
--DTDDECL "-//Davenport//DTD DocBook V2.4.1//EN" "docbook.dcl"
-+-- disabled, see README.docbook.dcl --
-+-- SGMLDECL "docbook.dcl" --
-+-- DTDDECL "-//Davenport//DTD DocBook V2.4.1//EN" "docbook.dcl" --
-+
-+ -- ...................................................................... --
-+ -- Prefer PUBID to SYSID ................................................ --
-+OVERRIDE YES
-
- -- ...................................................................... --
- -- DocBook driver file .................................................. --
-@@ -43,28 +48,5 @@
- PUBLIC "-//Davenport//ELEMENTS DocBook Document Hierarchy V2.4.1//EN" "dbhier.mod"
- PUBLIC "-//Davenport//ELEMENTS DocBook Additional General Entities//EN" "dbgenent.mod"
-
-- -- ...................................................................... --
-- -- ISO entity sets ...................................................... --
--
--PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN" "iso-dia.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" "iso-num.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN" "iso-pub.gml"
--PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN" "iso-tech.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN" "iso-lat1.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN" "iso-lat2.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN" "iso-grk1.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" "iso-grk2.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN" "iso-grk3.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" "iso-grk4.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" "iso-amsa.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" "iso-amsb.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" "iso-amsc.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" "iso-amsn.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" "iso-amso.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" "iso-amsr.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" "iso-box.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" "iso-cyr1.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" "iso-cyr2.gml"
--
- -- End of DocBook catalog data V2.4.1 ................................... --
- -- ...................................................................... --
-diff -urNad docbook-4.5~/docbook-3.0/docbook.cat docbook-4.5/docbook-3.0/docbook.cat
---- docbook-4.5~/docbook-3.0/docbook.cat 1996-12-10 16:35:22.000000000 +0100
-+++ docbook-4.5/docbook-3.0/docbook.cat 2007-03-09 16:44:17.000000000 +0100
-@@ -27,7 +27,12 @@
- -- ...................................................................... --
- -- SGML declaration associated with DocBook ............................. --
-
--DTDDECL "-//Davenport//DTD DocBook V3.0//EN" "docbook.dcl"
-+-- disabled, see README.docbook.dcl --
-+-- DTDDECL "-//Davenport//DTD DocBook V3.0//EN" "docbook.dcl" --
-+
-+ -- ...................................................................... --
-+ -- Prefer PUBID to SYSID ................................................ --
-+OVERRIDE YES
-
- -- ...................................................................... --
- -- DocBook driver file .................................................. --
-@@ -42,28 +47,5 @@
- PUBLIC "-//Davenport//ELEMENTS DocBook Document Hierarchy V3.0//EN" "dbhier.mod"
- PUBLIC "-//Davenport//ENTITIES DocBook Additional General Entities V3.0//EN" "dbgenent.mod"
-
-- -- ...................................................................... --
-- -- ISO entity sets ...................................................... --
--
--PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN" "iso-dia.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" "iso-num.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN" "iso-pub.gml"
--PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN" "iso-tech.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN" "iso-lat1.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN" "iso-lat2.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN" "iso-grk1.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" "iso-grk2.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN" "iso-grk3.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" "iso-grk4.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" "iso-amsa.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" "iso-amsb.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" "iso-amsc.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" "iso-amsn.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" "iso-amso.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" "iso-amsr.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" "iso-box.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" "iso-cyr1.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" "iso-cyr2.gml"
--
- -- End of catalog data for DocBook V3.0 ................................. --
- -- ...................................................................... --
-diff -urNad docbook-4.5~/docbook-3.1/docbook.cat docbook-4.5/docbook-3.1/docbook.cat
---- docbook-4.5~/docbook-3.1/docbook.cat 1999-02-02 06:53:32.000000000 +0100
-+++ docbook-4.5/docbook-3.1/docbook.cat 2007-03-09 16:44:12.000000000 +0100
-@@ -19,7 +19,12 @@
- -- ...................................................................... --
- -- SGML declaration associated with DocBook ............................. --
-
--DTDDECL "-//OASIS//DTD DocBook V3.1//EN" "docbook.dcl"
-+-- disabled, see README.docbook.dcl --
-+-- DTDDECL "-//OASIS//DTD DocBook V3.1//EN" "docbook.dcl" --
-+
-+ -- ...................................................................... --
-+ -- Prefer PUBID to SYSID ................................................ --
-+OVERRIDE YES
-
- -- ...................................................................... --
- -- DocBook driver file .................................................. --
-@@ -36,28 +41,5 @@
- PUBLIC "-//OASIS//ENTITIES DocBook Notations V3.1//EN" "dbnotn.mod"
- PUBLIC "-//OASIS//ENTITIES DocBook Character Entities V3.1//EN" "dbcent.mod"
-
-- -- ...................................................................... --
-- -- ISO entity sets ...................................................... --
--
--PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN" "iso-dia.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" "iso-num.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN" "iso-pub.gml"
--PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN" "iso-tech.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN" "iso-lat1.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN" "iso-lat2.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN" "iso-grk1.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" "iso-grk2.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN" "iso-grk3.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" "iso-grk4.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" "iso-amsa.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" "iso-amsb.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" "iso-amsc.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" "iso-amsn.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" "iso-amso.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" "iso-amsr.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" "iso-box.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" "iso-cyr1.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" "iso-cyr2.gml"
--
- -- End of catalog data for DocBook V3.1 ................................. --
- -- ...................................................................... --
-diff -urNad docbook-4.5~/docbook-4.0/docbook.cat docbook-4.5/docbook-4.0/docbook.cat
---- docbook-4.5~/docbook-4.0/docbook.cat 2000-05-18 21:27:28.000000000 +0200
-+++ docbook-4.5/docbook-4.0/docbook.cat 2007-03-09 16:45:08.000000000 +0100
-@@ -19,7 +19,12 @@
- -- ...................................................................... --
- -- SGML declaration associated with DocBook ............................. --
-
--DTDDECL "-//OASIS//DTD DocBook V4.0//EN" "docbook.dcl"
-+-- disabled, see README.docbook.dcl --
-+-- DTDDECL "-//OASIS//DTD DocBook V4.0//EN" "docbook.dcl" --
-+
-+ -- ...................................................................... --
-+ -- Prefer PUBID to SYSID ................................................ --
-+OVERRIDE YES
-
- -- ...................................................................... --
- -- DocBook driver file .................................................. --
-@@ -36,28 +41,5 @@
- PUBLIC "-//OASIS//ENTITIES DocBook Notations V4.0//EN" "dbnotn.mod"
- PUBLIC "-//OASIS//ENTITIES DocBook Character Entities V4.0//EN" "dbcent.mod"
-
-- -- ...................................................................... --
-- -- ISO entity sets ...................................................... --
--
--PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN" "iso-dia.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" "iso-num.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN" "iso-pub.gml"
--PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN" "iso-tech.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN" "iso-lat1.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN" "iso-lat2.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN" "iso-grk1.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" "iso-grk2.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN" "iso-grk3.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" "iso-grk4.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" "iso-amsa.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" "iso-amsb.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" "iso-amsc.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" "iso-amsn.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" "iso-amso.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" "iso-amsr.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" "iso-box.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" "iso-cyr1.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" "iso-cyr2.gml"
--
- -- End of catalog data for DocBook V4.0 ................................. --
- -- ...................................................................... --
-diff -urNad docbook-4.5~/docbook-4.1/docbook.cat docbook-4.5/docbook-4.1/docbook.cat
---- docbook-4.5~/docbook-4.1/docbook.cat 2000-06-19 16:50:28.000000000 +0200
-+++ docbook-4.5/docbook-4.1/docbook.cat 2007-03-09 16:53:00.000000000 +0100
-@@ -19,7 +19,12 @@
- -- ...................................................................... --
- -- SGML declaration associated with DocBook ............................. --
-
--DTDDECL "-//OASIS//DTD DocBook V4.1//EN" "docbook.dcl"
-+-- disabled, see README.docbook.dcl --
-+-- DTDDECL "-//OASIS//DTD DocBook V4.1//EN" "docbook.dcl" --
-+
-+ -- ...................................................................... --
-+ -- Prefer PUBID to SYSID ................................................ --
-+OVERRIDE YES
-
- -- ...................................................................... --
- -- DocBook driver file .................................................. --
-@@ -36,28 +41,5 @@
- PUBLIC "-//OASIS//ENTITIES DocBook Notations V4.1//EN" "dbnotn.mod"
- PUBLIC "-//OASIS//ENTITIES DocBook Character Entities V4.1//EN" "dbcent.mod"
-
-- -- ...................................................................... --
-- -- ISO entity sets ...................................................... --
--
--PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN" "iso-dia.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" "iso-num.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN" "iso-pub.gml"
--PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN" "iso-tech.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN" "iso-lat1.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN" "iso-lat2.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN" "iso-grk1.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" "iso-grk2.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN" "iso-grk3.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" "iso-grk4.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" "iso-amsa.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" "iso-amsb.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" "iso-amsc.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" "iso-amsn.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" "iso-amso.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" "iso-amsr.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" "iso-box.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" "iso-cyr1.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" "iso-cyr2.gml"
--
- -- End of catalog data for DocBook V4.1 ................................. --
- -- ...................................................................... --
-diff -urNad docbook-4.5~/docbook-4.2/docbook.cat docbook-4.5/docbook-4.2/docbook.cat
---- docbook-4.5~/docbook-4.2/docbook.cat 2002-07-17 18:14:28.000000000 +0200
-+++ docbook-4.5/docbook-4.2/docbook.cat 2007-03-09 16:42:30.000000000 +0100
-@@ -22,9 +22,6 @@
- PUBLIC "-//OASIS//DTD DocBook V4.2//EN"
- "docbook.dtd"
-
--PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-- "docbookx.dtd"
--
- -- ...................................................................... --
- -- DocBook modules ...................................................... --
-
-@@ -49,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"
-- "iso-dia.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN"
-- "iso-num.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN"
-- "iso-pub.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN"
-- "iso-tech.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN"
-- "iso-lat1.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN"
-- "iso-lat2.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN"
-- "iso-grk1.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN"
-- "iso-grk2.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN"
-- "iso-grk3.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN"
-- "iso-grk4.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN"
-- "iso-amsa.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN"
-- "iso-amsb.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN"
-- "iso-amsc.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN"
-- "iso-amsn.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN"
-- "iso-amso.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN"
-- "iso-amsr.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN"
-- "iso-box.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN"
-- "iso-cyr1.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN"
-- "iso-cyr2.gml"
--
- -- End of catalog data for DocBook V4.2 ................................. --
- -- ...................................................................... --
-diff -urNad docbook-4.5~/docbook-4.3/docbook.cat docbook-4.5/docbook-4.3/docbook.cat
---- docbook-4.5~/docbook-4.3/docbook.cat 2004-03-31 13:44:16.000000000 +0200
-+++ docbook-4.5/docbook-4.3/docbook.cat 2007-03-09 16:53:47.000000000 +0100
-@@ -22,9 +22,6 @@
- PUBLIC "-//OASIS//DTD DocBook V4.3//EN"
- "docbook.dtd"
-
--PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-- "docbookx.dtd"
--
- -- ...................................................................... --
- -- DocBook modules ...................................................... --
-
-@@ -49,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"
-- "iso-dia.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN"
-- "iso-num.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN"
-- "iso-pub.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN"
-- "iso-tech.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN"
-- "iso-lat1.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN"
-- "iso-lat2.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN"
-- "iso-grk1.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN"
-- "iso-grk2.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN"
-- "iso-grk3.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN"
-- "iso-grk4.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN"
-- "iso-amsa.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN"
-- "iso-amsb.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN"
-- "iso-amsc.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN"
-- "iso-amsn.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN"
-- "iso-amso.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN"
-- "iso-amsr.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN"
-- "iso-box.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN"
-- "iso-cyr1.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN"
-- "iso-cyr2.gml"
--
- -- End of catalog data for DocBook V4.3 ................................. --
- -- ...................................................................... --
-diff -urNad docbook-4.5~/docbook-4.4/docbook.cat docbook-4.5/docbook-4.4/docbook.cat
---- docbook-4.5~/docbook-4.4/docbook.cat 2005-01-27 14:59:49.000000000 +0100
-+++ docbook-4.5/docbook-4.4/docbook.cat 2007-03-09 16:54:12.000000000 +0100
-@@ -22,9 +22,6 @@
- PUBLIC "-//OASIS//DTD DocBook V4.4//EN"
- "docbook.dtd"
-
--PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-- "docbookx.dtd"
--
- -- ...................................................................... --
- -- DocBook modules ...................................................... --
-
-@@ -52,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"
-- "iso-dia.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN"
-- "iso-num.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN"
-- "iso-pub.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN"
-- "iso-tech.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN"
-- "iso-lat1.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN"
-- "iso-lat2.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN"
-- "iso-grk1.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN"
-- "iso-grk2.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN"
-- "iso-grk3.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN"
-- "iso-grk4.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN"
-- "iso-amsa.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN"
-- "iso-amsb.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN"
-- "iso-amsc.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN"
-- "iso-amsn.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN"
-- "iso-amso.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN"
-- "iso-amsr.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN"
-- "iso-box.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN"
-- "iso-cyr1.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN"
-- "iso-cyr2.gml"
--
- -- End of catalog data for DocBook V4.4 ................................. --
- -- ...................................................................... --
-diff -urNad docbook-4.5~/docbook-4.5/docbook.cat docbook-4.5/docbook-4.5/docbook.cat
---- docbook-4.5~/docbook-4.5/docbook.cat 2006-10-03 15:27:50.000000000 +0200
-+++ docbook-4.5/docbook-4.5/docbook.cat 2007-03-09 16:54:41.000000000 +0100
-@@ -22,9 +22,6 @@
- PUBLIC "-//OASIS//DTD DocBook V4.5//EN"
- "docbook.dtd"
-
--PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-- "docbookx.dtd"
--
- -- ...................................................................... --
- -- DocBook modules ...................................................... --
-
-@@ -52,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"
-- "iso-dia.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN"
-- "iso-num.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN"
-- "iso-pub.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN"
-- "iso-tech.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN"
-- "iso-lat1.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN"
-- "iso-lat2.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN"
-- "iso-grk1.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN"
-- "iso-grk2.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN"
-- "iso-grk3.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN"
-- "iso-grk4.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN"
-- "iso-amsa.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN"
-- "iso-amsb.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN"
-- "iso-amsc.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN"
-- "iso-amsn.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN"
-- "iso-amso.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN"
-- "iso-amsr.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN"
-- "iso-box.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN"
-- "iso-cyr1.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN"
-- "iso-cyr2.gml"
--
- -- End of catalog data for DocBook V4.5 ................................. --
- -- ...................................................................... --
Modified: packages/docbook/trunk/debian/patches/10_fix_101779_mention_artheader_to_articleinfo_change.dpatch
===================================================================
--- packages/docbook/trunk/debian/patches/10_fix_101779_mention_artheader_to_articleinfo_change.dpatch 2007-03-11 05:44:15 UTC (rev 678)
+++ packages/docbook/trunk/debian/patches/10_fix_101779_mention_artheader_to_articleinfo_change.dpatch 2007-03-14 18:11:17 UTC (rev 679)
@@ -4,9 +4,9 @@
##
## 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 (closes: http://bugs.debian.org/bug=101779).
+## DP: patch fixes it (closes: <URL:http://bugs.debian.org/bug=101779>).
## DP:
-## DP: http://packages.debian.org/changelogs/pool/main/d/docbook/current/changelog#versionversion4.1-5
+## DP: <URL:http://packages.debian.org/changelogs/pool/main/d/docbook/current/changelog#versionversion4.1-5>
@DPATCH@
diff -urNad docbook-4.5~/docbook-4.1/40chg.txt docbook-4.5/docbook-4.1/40chg.txt
Modified: packages/docbook/trunk/debian/patches/11_fix_dbpoolx_mod_header_comment_pubid.dpatch
===================================================================
--- packages/docbook/trunk/debian/patches/11_fix_dbpoolx_mod_header_comment_pubid.dpatch 2007-03-11 05:44:15 UTC (rev 678)
+++ packages/docbook/trunk/debian/patches/11_fix_dbpoolx_mod_header_comment_pubid.dpatch 2007-03-14 18:11:17 UTC (rev 679)
@@ -3,7 +3,11 @@
## and Daniel Leidert (dale) <daniel.leidert at wgdd.de>.
##
## All lines beginning with `## DP:' are a description of the patch.
-## DP:
+## DP: The header in dbpoolx.mod references a wrong Public-ID. This patch
+## DP: simply fixes the header comment.
+## DP:
+## DP: Reported upstream:
+## DP: <URL:http://sourceforge.net/tracker/index.php?func=detail&aid=1679712&group_id=21935&atid=384107>
@DPATCH@
diff -urNad docbook-4.5~/docbook-4.2/dbpoolx.mod docbook-4.5/docbook-4.2/dbpoolx.mod
Modified: packages/docbook/trunk/debian/patches/12_fix_256119_and_turn_on_sgml_mode.dpatch
===================================================================
--- packages/docbook/trunk/debian/patches/12_fix_256119_and_turn_on_sgml_mode.dpatch 2007-03-11 05:44:15 UTC (rev 678)
+++ packages/docbook/trunk/debian/patches/12_fix_256119_and_turn_on_sgml_mode.dpatch 2007-03-14 18:11:17 UTC (rev 679)
@@ -2,7 +2,11 @@
## 12_fix_256119_and_turn_on_sgml_mode.dpatch by Daniel Leidert (dale) <daniel.leidert at wgdd.de>
##
## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: Fixes broken element declarations by adding the tag omission characters
+## DP: for SGML and enable SGML features
+## DP: (closes: <URL:http://bugs.debian.org/256119>).
+## DP:
+## DP: <URL:http://packages.debian.org/changelogs/pool/main/d/docbook/current/changelog#versionversion4.4-1>
@DPATCH@
diff -urNad docbook-4.5~/docbook-4.3/dbpoolx.mod docbook-4.5/docbook-4.3/dbpoolx.mod
Modified: packages/docbook/trunk/debian/rules
===================================================================
--- packages/docbook/trunk/debian/rules 2007-03-11 05:44:15 UTC (rev 678)
+++ packages/docbook/trunk/debian/rules 2007-03-14 18:11:17 UTC (rev 679)
@@ -10,17 +10,26 @@
debian/docbook.install:
set -ex ; \
touch $@ ; \
- for dbcat in docbook-* ; do \
- dbver=`echo $${dbcat} | sed -e 's/docbook-//g'` ; \
- echo "$${dbcat}/*.{mod,dtd,dcl} usr/share/sgml/docbook/dtd/$${dbver}" >> $@ ; \
+ for db in docbook-* ; do \
+ dbver=`echo $${db} | sed -e 's/docbook-//g'` ; \
+ for file in $${db}/*.{dcl,dtd,mod} ; do \
+ if [ $${file} != $${db}/dbgenent.mod ] ; then \
+ echo "$${file} usr/share/sgml/docbook/dtd/$${dbver}" >> $@ ; \
+ else \
+ echo "$${file} etc/sgml/docbook/$${dbver}" >> $@ ; \
+ fi ; \
+ done ; \
done
debian/docbook.links:
set -ex ; \
touch $@ ; \
- for dbcat in docbook-* ; do \
- dbver=`echo $${dbcat} | sed -e 's/docbook-//g'` ; \
- [ -f $${dbcat}/docbook.cat ] && \
+ for db in docbook-* ; do \
+ dbver=`echo $${db} | sed -e 's/docbook-//g'` ; \
+ [ -f $${db}/dbgenent.mod ] && \
+ echo -n "etc/sgml/docbook/$${dbver}/dbgenent.mod " >> $@ && \
+ echo "usr/share/sgml/docbook/dtd/$${dbver}/dbgenent.mod" >> $@ ; \
+ [ -f $${db}/docbook.cat ] && \
echo "usr/share/sgml/docbook/dtd/$${dbver}/catalog usr/share/sgml/docbook/dtd/$${dbver}/docbook.cat" >> $@ ; \
done
@@ -28,10 +37,10 @@
set -ex ; \
touch $@ ; \
echo "catalog /usr/share/sgml/docbook/dtd/catalog" > $@ ; \
- for dbcat in docbook-* ; do \
- dbver=`echo $${dbcat} | sed -e 's/docbook-//g'` ; \
- [ -f $${dbcat}/docbook.cat ] && \
- echo "$${dbcat}/docbook.cat /usr/share/sgml/docbook/dtd/$${dbver}/catalog" >> $@ ; \
+ for db in docbook-* ; do \
+ dbver=`echo $${db} | sed -e 's/docbook-//g'` ; \
+ [ -f $${db}/docbook.cat ] && \
+ echo "$${db}/docbook.cat /usr/share/sgml/docbook/dtd/$${dbver}/catalog" >> $@ ; \
done
build: patch-stamp build-stamp
More information about the debian-xml-sgml-commit
mailing list