[xml/sgml-commit] r754 - in packages/docbook-xml/trunk: . debian
debian/patches docbook-4.0
Daniel Leidert
dleidert-guest at alioth.debian.org
Wed Apr 18 18:53:41 UTC 2007
Author: dleidert-guest
Date: 2007-04-18 18:53:40 +0000 (Wed, 18 Apr 2007)
New Revision: 754
Modified:
packages/docbook-xml/trunk/catalog
packages/docbook-xml/trunk/debian/changelog
packages/docbook-xml/trunk/debian/docbook-xml.xmlcatalogs.in
packages/docbook-xml/trunk/debian/patches/06_add_system_identifiers_to_catalog.dpatch
packages/docbook-xml/trunk/docbook-4.0/docbook.cat
Log:
* Adding the Debian XML/SGML group and myself as co-maintainers should
close: #358520. Simply forgot to close it.
* catalog: Added system IDs too for DOCTYPE declarations only containing a
system ID.
* docbook-4.0/docbook.cat: Likewise.
* debian/patches/06_add_system_identifiers_to_catalog.dpatch: Likewise.
* debian/docbook-xml.examples: Fixed examples location: will re-add them
back to the package.
* debian/docbook-xml.xmlcatalogs.in: Added entry for "-//OASIS//DTD XML
Exchange Table Model 19990315//EN" FPI to the root catalog.
Modified: packages/docbook-xml/trunk/catalog
===================================================================
--- packages/docbook-xml/trunk/catalog 2007-04-18 16:27:45 UTC (rev 753)
+++ packages/docbook-xml/trunk/catalog 2007-04-18 18:53:40 UTC (rev 754)
@@ -11,6 +11,10 @@
-- <URL:http://bugs.debian.org/189129> .................................. --
PUBLIC "-//OASIS//DTD DocBook XML V4.1//EN"
"4.1/docbookx.dtd"
+SYSTEM "http://www.oasis-open.org/docbook/xml/4.1/docbookx.dtd"
+ "4.1/docbookx.dtd"
+SYSTEM "http://docbook.org/xml/4.1/docbookx.dtd"
+ "4.1/docbookx.dtd"
DTDDECL "-//OASIS//DTD DocBook XML V4.1//EN"
"/usr/share/xml/declaration/xml.dcl"
@@ -18,6 +22,10 @@
-- Register FPI "-//OASIS//DTD DocBook XML V4//EN" for latest DocBook ... --
PUBLIC "-//OASIS//DTD DocBook XML V4//EN"
"4/docbookx.dtd"
+SYSTEM "http://www.oasis-open.org/docbook/xml/4/docbookx.dtd"
+ "4/docbookx.dtd"
+SYSTEM "http://docbook.org/xml/4/docbookx.dtd"
+ "4/docbookx.dtd"
DTDDECL "-//OASIS//DTD DocBook XML V4//EN"
"/usr/share/xml/declaration/xml.dcl"
Modified: packages/docbook-xml/trunk/debian/changelog
===================================================================
--- packages/docbook-xml/trunk/debian/changelog 2007-04-18 16:27:45 UTC (rev 753)
+++ packages/docbook-xml/trunk/debian/changelog 2007-04-18 18:53:40 UTC (rev 754)
@@ -1,10 +1,18 @@
docbook-xml (4.5-2) UNRELEASED; urgency=low
* NOT RELEASED YET
+ * Adding the Debian XML/SGML group and myself as co-maintainers should
+ close: #358520. Simply forgot to close it.
[ Daniel Leidert ]
- * debian/docbook-xml.examples: Fixed examples location: will re-added them
+ * catalog: Added system IDs too for DOCTYPE declarations only containing a
+ system ID.
+ * docbook-4.0/docbook.cat: Likewise.
+ * debian/patches/06_add_system_identifiers_to_catalog.dpatch: Likewise.
+ * debian/docbook-xml.examples: Fixed examples location: will re-add them
back to the package.
+ * debian/docbook-xml.xmlcatalogs.in: Added entry for "-//OASIS//DTD XML
+ Exchange Table Model 19990315//EN" FPI to the root catalog.
-- Daniel Leidert (dale) <daniel.leidert at wgdd.de> Wed, 18 Apr 2007 18:21:47 +0200
Modified: packages/docbook-xml/trunk/debian/docbook-xml.xmlcatalogs.in
===================================================================
--- packages/docbook-xml/trunk/debian/docbook-xml.xmlcatalogs.in 2007-04-18 16:27:45 UTC (rev 753)
+++ packages/docbook-xml/trunk/debian/docbook-xml.xmlcatalogs.in 2007-04-18 18:53:40 UTC (rev 754)
@@ -10,6 +10,7 @@
root;public;-//OASIS//DTD DocBook XML
root;public;-//OASIS//DTD DocBook CALS Table Model
+root;public;-//OASIS//DTD XML Exchange Table Model 19990315
root;public;-//OASIS//ELEMENTS DocBook
root;public;-//OASIS//ENTITIES DocBook
Modified: packages/docbook-xml/trunk/debian/patches/06_add_system_identifiers_to_catalog.dpatch
===================================================================
--- packages/docbook-xml/trunk/debian/patches/06_add_system_identifiers_to_catalog.dpatch 2007-04-18 16:27:45 UTC (rev 753)
+++ packages/docbook-xml/trunk/debian/patches/06_add_system_identifiers_to_catalog.dpatch 2007-04-18 18:53:40 UTC (rev 754)
@@ -3,16 +3,30 @@
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: * docbook-4.{2,3}/catalog.xml: Adds system identifiers to the catalog.
+## DP: * docbook-4.x/docbook.cat: Likewise.
## DP:
## DP: <URL:http://bugs.debian.org/301157>
## DP: <URL:http://bugs.debian.org/304057>
## DP: <URL:http://packages.debian.org/changelogs/pool/main/d/docbook-xml/current/changelog#versionversion4.2-8>
## DP: <URL:http://packages.debian.org/changelogs/pool/main/d/docbook-xml/current/changelog#versionversion4.4-1>
+## DP: <URL:http://packages.debian.org/changelogs/pool/main/d/docbook-xml/current/changelog#versionversion4.5-2>
@DPATCH@
+diff -urNad docbook-xml-4.5~/docbook-4.1.2/docbook.cat docbook-xml-4.5/docbook-4.1.2/docbook.cat
+--- docbook-xml-4.5~/docbook-4.1.2/docbook.cat 2007-04-18 20:35:45.000000000 +0200
++++ docbook-xml-4.5/docbook-4.1.2/docbook.cat 2007-04-18 20:37:36.000000000 +0200
+@@ -23,6 +23,8 @@
+ -- DocBook driver file .................................................. --
+
+ PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "docbookx.dtd"
++SYSTEM "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" "docbookx.dtd"
++SYSTEM "http://docbook.org/xml/4.1.2/docbookx.dtd" "docbookx.dtd"
+ DTDDECL "-//OASIS//DTD DocBook XML V4.1.2//EN" "/usr/share/xml/declaration/xml.dcl"
+
+ -- ...................................................................... --
diff -urNad docbook-xml-4.5~/docbook-4.2/catalog.xml docbook-xml-4.5/docbook-4.2/catalog.xml
---- docbook-xml-4.5~/docbook-4.2/catalog.xml 2007-03-25 23:44:19.000000000 +0200
-+++ docbook-xml-4.5/docbook-4.2/catalog.xml 2007-03-25 23:44:19.000000000 +0200
+--- 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"/>
@@ -26,9 +40,23 @@
<!-- ...................................................................... -->
<!-- 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-03-25 23:44:19.000000000 +0200
-+++ docbook-xml-4.5/docbook-4.3/catalog.xml 2007-03-25 23:44:19.000000000 +0200
+--- 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"/>
@@ -42,3 +70,45 @@
<!-- ...................................................................... -->
<!-- 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"
+
Modified: packages/docbook-xml/trunk/docbook-4.0/docbook.cat
===================================================================
--- packages/docbook-xml/trunk/docbook-4.0/docbook.cat 2007-04-18 16:27:45 UTC (rev 753)
+++ packages/docbook-xml/trunk/docbook-4.0/docbook.cat 2007-04-18 18:53:40 UTC (rev 754)
@@ -8,30 +8,32 @@
-- ...................................................................... --
-- DocBook driver file .................................................. --
-PUBLIC "-//Norman Walsh//DTD DocBk XML V4.0//EN" "docbookx.dtd"
-DTDDECL "-//Norman Walsh//DTD DocBk XML V4.0//EN" "/usr/share/xml/declaration/xml.dcl"
+PUBLIC "-//Norman Walsh//DTD DocBk XML V4.0//EN" "docbookx.dtd"
+SYSTEM "http://www.oasis-open.org/docbook/xml/4.0/docbookx.dtd" "docbookx.dtd"
+SYSTEM "http://docbook.org/xml/4.0/docbookx.dtd" "docbookx.dtd"
+DTDDECL "-//Norman Walsh//DTD DocBk XML V4.0//EN" "/usr/share/xml/declaration/xml.dcl"
-- ...................................................................... --
-- Other ways to refer to DocBook XML v4.0............................... --
-PUBLIC "-//Norman Walsh//DTD DocBook XML V4.0//EN" "docbookx.dtd"
+PUBLIC "-//Norman Walsh//DTD DocBook XML V4.0//EN" "docbookx.dtd"
DTDDECL "-//Norman Walsh//DTD DocBook XML V4.0//EN" "/usr/share/xml/declaration/xml.dcl"
-- ...................................................................... --
-- DocBook modules ...................................................... --
-PUBLIC "-//Norman Walsh//ENTITIES DocBook XML Notations V4.0//EN" "dbnotnx.mod"
-PUBLIC "-//Norman Walsh//ENTITIES DocBook XML Character Entities V4.0//EN" "dbcentx.mod"
-PUBLIC "-//Norman Walsh//ELEMENTS DocBook XML Information Pool V4.0//EN" "dbpoolx.mod"
-PUBLIC "-//Norman Walsh//ELEMENTS DocBook XML Document Hierarchy V4.0//EN" "dbhierx.mod"
+PUBLIC "-//Norman Walsh//ENTITIES DocBook XML Notations V4.0//EN" "dbnotnx.mod"
+PUBLIC "-//Norman Walsh//ENTITIES DocBook XML Character Entities V4.0//EN" "dbcentx.mod"
+PUBLIC "-//Norman Walsh//ELEMENTS DocBook XML Information Pool V4.0//EN" "dbpoolx.mod"
+PUBLIC "-//Norman Walsh//ELEMENTS DocBook XML Document Hierarchy V4.0//EN" "dbhierx.mod"
PUBLIC "-//Norman Walsh//ENTITIES DocBook XML Additional General Entities V4.0//EN" "dbgenent.ent"
-- Unofficial XML version of the CALS Table Model, publicly known as --
-- PUBLIC "-//USA-DOD//DTD Table Model 951010//EN" --
-PUBLIC "-//Norman Walsh//DTD CALS Table Model XML V4.0//EN" "calstblx.dtd"
+PUBLIC "-//Norman Walsh//DTD CALS Table Model XML V4.0//EN" "calstblx.dtd"
-- UNOFFICIAL conversion of the exchange table model to XML, based on the OASIS Exchange --
-- Table Model PUBLIC "-//SGML Open//DTD Exchange Table Model 19960430//EN" --
-PUBLIC "-//Norman Walsh//DTD Exchange Table Model 19960430 XML V4.0//EN" "soextblx.dtd"
+PUBLIC "-//Norman Walsh//DTD Exchange Table Model 19960430 XML V4.0//EN" "soextblx.dtd"
-- the following FPI is declared for the DTD inside the DTD, so I include it --
-PUBLIC "-//OASIS//DTD XML Exchange Table Model 19990315//EN" "soextblx.dtd"
+PUBLIC "-//OASIS//DTD XML Exchange Table Model 19990315//EN" "soextblx.dtd"
More information about the debian-xml-sgml-commit
mailing list