docbook-xml: update recipe to stick with the upstream
PATCH 1/1 docbook-xml: update recipe to stick with the upstream
From: Gregor Zatko <[email protected]>
Until now a Debian package has been used as a source. This change just switches it to project's upstream.
https://bugzilla.yoctoproject.org/show_bug.cgi?id=13270
--- .../docbook-xml-dtd4/catalogs/catalog-4.2.xml | 115 ++++ .../docbook-xml-dtd4/catalogs/catalog-4.3.xml | 115 ++++ .../docbook-xml-dtd4/catalogs/catalog-4.4.xml | 124 +++++ .../docbook-xml-dtd4/catalogs/catalog-4.5.xml | 124 +++++ .../docbook-xml-update-catalog.xml.patch | 515 ------------------ .../docbook-xml/docbook-xml-dtd4_4.5.bb | 52 +- 6 files changed, 502 insertions(+), 543 deletions(-) create mode 100644 meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.2.xml create mode 100644 meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.3.xml create mode 100644 meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.4.xml create mode 100644 meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.5.xml delete mode 100644 meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/docbook-xml-update-catalog.xml.patch
meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.2.xml new file +115 -0
@@ -0,0 +1,115 @@ +<?xml version='1.0'?> +<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog"> + +<!-- ...................................................................... --> +<!-- XML Catalog data for DocBook XML V4.2 ................................ --> +<!-- File catalog.xml ..................................................... --> + +<!-- Please direct all questions, bug reports, or suggestions for + changes to the [email protected] mailing list. For more + information, see http://www.oasis-open.org/. + --> + +<!-- This is the catalog data file for DocBook V4.2. It is provided as + a convenience in building your own catalog files. You need not use + the filenames listed here, and need not use the filename method of + identifying storage objects at all. See the documentation for + detailed information on the files associated with the DocBook DTD. + See XML Catalogs at http://www.oasis-open.org/committees/entity/ for + detailed information on supplying and using catalog data. + --> + +<!-- ...................................................................... --> +<!-- DocBook driver file .................................................. --> + +<public publicId="-//OASIS//DTD DocBook XML V4.2//EN" + uri="docbookx.dtd"/> + +<!-- ...................................................................... --> +<!-- DocBook modules ...................................................... --> + +<public publicId="-//OASIS//DTD DocBook CALS Table Model V4.2//EN" + uri="calstblx.dtd"/> + +<public publicId="-//OASIS//DTD XML Exchange Table Model 19990315//EN" + uri="soextblx.dtd"/> + +<public publicId="-//OASIS//ELEMENTS DocBook Information Pool V4.2//EN" + uri="dbpoolx.mod"/> + +<public publicId="-//OASIS//ELEMENTS DocBook Document Hierarchy V4.2//EN" + uri="dbhierx.mod"/> + +<public publicId="-//OASIS//ENTITIES DocBook Additional General Entities V4.2//EN" + uri="dbgenent.mod"/> + +<public publicId="-//OASIS//ENTITIES DocBook Notations V4.2//EN" + uri="dbnotnx.mod"/> + +<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 ............................. --> +<!-- ...................................................................... --> + +</catalog>
meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.3.xml new file +115 -0
115 lines not on this page · raw message
meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.4.xml new file +124 -0
124 lines not on this page · raw message
meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.5.xml new file +124 -0
124 lines not on this page · raw message
meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/docbook-xml-update-catalog.xml.patch deleted +0 -515
515 lines not on this page · raw message
meta/recipes-devtools/docbook-xml/docbook-xml-dtd4_4.5.bb +24 -28
75 lines not on this page · raw message
Signature · 1 line
2.26.2
Can the original source be fetched though? Copying things over into the layer itself is not the best option.
Alex
Quoted 1,353 lines · Gregor Zatko
From: Gregor Zatko <[email protected]>
Until now a Debian package has been used as a source. This change just switches it to project's upstream.
https://bugzilla.yoctoproject.org/show_bug.cgi?id=13270
Signed-off-by Gregor Zatko <[email protected]>--- .../docbook-xml-dtd4/catalogs/catalog-4.2.xml | 115 ++++ .../docbook-xml-dtd4/catalogs/catalog-4.3.xml | 115 ++++ .../docbook-xml-dtd4/catalogs/catalog-4.4.xml | 124 +++++ .../docbook-xml-dtd4/catalogs/catalog-4.5.xml | 124 +++++ .../docbook-xml-update-catalog.xml.patch | 515 ------------------ .../docbook-xml/docbook-xml-dtd4_4.5.bb | 52 +- 6 files changed, 502 insertions(+), 543 deletions(-) create mode 100644 meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.2.xml create mode 100644 meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.3.xml create mode 100644 meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.4.xml create mode 100644 meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.5.xml delete mode 100644
meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/docbook-xml-update-catalog.xml.patchdiff --git
a/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.2.xmlb/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.2.xmlnew file mode 100644
index 0000000000..6920c2f7e0
---/dev/null
+++b/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.2.xmlmeta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.2.xml new file +4
-0@@ -0,0 +1,115 @@ +<?xml version='1.0'?> +<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog"> + +<!--...................................................................... --> +<!-- XML Catalog data for DocBook XML V4.2 ................................ -->
+<!-- File catalog.xml ..................................................... -->meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.2.xml new file +16
-0+ +<!-- Please direct all questions, bug reports, or suggestions for + changes to the [email protected] mailing list. For more + information, see http://www.oasis-open.org/. + --> + +<!-- This is the catalog data file for DocBook V4.2. It is provided as + a convenience in building your own catalog files. You need not use + the filenames listed here, and need not use the filename method of + identifying storage objects at all. See the documentation for + detailed information on the files associated with the DocBook DTD. + See XML Catalogs at http://www.oasis-open.org/committees/entity/ for + detailed information on supplying and using catalog data. + --> + +<!--...................................................................... --> +<!-- DocBook driver file .................................................. -->
meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.2.xml new file +5
-0+ +<public publicId="-//OASIS//DTD DocBook XML V4.2//EN" + uri="docbookx.dtd"/> + +<!--...................................................................... --> +<!-- DocBook modules ...................................................... -->
meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.2.xml new file +14
-0+ +<public publicId="-//OASIS//DTD DocBook CALS Table Model V4.2//EN" + uri="calstblx.dtd"/> + +<public publicId="-//OASIS//DTD XML Exchange Table Model 19990315//EN" + uri="soextblx.dtd"/> + +<public publicId="-//OASIS//ELEMENTS DocBook Information Pool V4.2//EN" + uri="dbpoolx.mod"/> + +<public publicId="-//OASIS//ELEMENTS DocBook Document Hierarchy V4.2//EN" + uri="dbhierx.mod"/> + +<public publicId="-//OASIS//ENTITIES DocBook Additional General EntitiesV4.2//EN"
meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.2.xml new file +9
-0+ uri="dbgenent.mod"/> + +<public publicId="-//OASIS//ENTITIES DocBook Notations V4.2//EN" + uri="dbnotnx.mod"/> + +<public publicId="-//OASIS//ENTITIES DocBook Character Entities V4.2//EN" + uri="dbcentx.mod"/> + +<!--...................................................................... --> +<!-- ISO entity sets ...................................................... -->
meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.2.xml new file +5
-0+ +<public publicId="ISO 8879:1986//ENTITIES Diacritical Marks//EN//XML" + uri="ent/iso-dia.ent"/> + +<public publicId="ISO 8879:1986//ENTITIES Numeric and SpecialGraphic//EN//XML"
meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.2.xml new file +24
-0+ 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 GreekSymbols//EN//XML"
meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.2.xml new file +3
-0+ uri="ent/iso-grk4.ent"/> + +<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: ArrowRelations//EN//XML"
meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.2.xml new file +3
-0+ uri="ent/iso-amsa.ent"/> + +<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: BinaryOperators//EN//XML"
meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.2.xml new file +3
-0+ uri="ent/iso-amsb.ent"/> + +<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols:Delimiters//EN//XML"
meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.2.xml new file +3
-0+ uri="ent/iso-amsc.ent"/> + +<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: NegatedRelations//EN//XML"
meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.2.xml new file +3
-0+ uri="ent/iso-amsn.ent"/> + +<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols:Ordinary//EN//XML"
meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.2.xml new file +3
-0+ uri="ent/iso-amso.ent"/> + +<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols:Relations//EN//XML"
meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.2.xml new file +12
-0+ 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............................. -->
+<!-- ...................................................................... --> +
+</catalog>
diff --gita/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.3.xmlb/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.3.xmlnew file mode 100644
index 0000000000..34d1afdd94
---/dev/null
+++b/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.3.xmlmeta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.2.xml new file +4
-0@@ -0,0 +1,115 @@ +<?xml version='1.0'?> +<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog"> + +<!--...................................................................... --> +<!-- XML Catalog data for DocBook XML V4.3 ................................ -->
+<!-- File catalog.xml ..................................................... -->meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.3.xml new file +16
-0+ +<!-- Please direct all questions, bug reports, or suggestions for + changes to the [email protected] mailing list. For more + information, see http://www.oasis-open.org/. + --> + +<!-- This is the catalog data file for DocBook V4.3. It is provided as + a convenience in building your own catalog files. You need not use + the filenames listed here, and need not use the filename method of + identifying storage objects at all. See the documentation for + detailed information on the files associated with the DocBook DTD. + See XML Catalogs at http://www.oasis-open.org/committees/entity/ for + detailed information on supplying and using catalog data. + --> + +<!--...................................................................... --> +<!-- DocBook driver file .................................................. -->
meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.3.xml new file +5
-0+ +<public publicId="-//OASIS//DTD DocBook XML V4.3//EN" + uri="docbookx.dtd"/> + +<!--...................................................................... --> +<!-- DocBook modules ...................................................... -->
meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.3.xml new file +14
-0+ +<public publicId="-//OASIS//DTD DocBook CALS Table Model V4.3//EN" + uri="calstblx.dtd"/> + +<public publicId="-//OASIS//DTD XML Exchange Table Model 19990315//EN" + uri="soextblx.dtd"/> + +<public publicId="-//OASIS//ELEMENTS DocBook Information Pool V4.3//EN" + uri="dbpoolx.mod"/> + +<public publicId="-//OASIS//ELEMENTS DocBook Document Hierarchy V4.3//EN" + uri="dbhierx.mod"/> + +<public publicId="-//OASIS//ENTITIES DocBook Additional General EntitiesV4.3//EN"
meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.3.xml new file +9
-0+ uri="dbgenent.mod"/> + +<public publicId="-//OASIS//ENTITIES DocBook Notations V4.3//EN" + uri="dbnotnx.mod"/> + +<public publicId="-//OASIS//ENTITIES DocBook Character Entities V4.3//EN" + uri="dbcentx.mod"/> + +<!--...................................................................... --> +<!-- ISO entity sets ...................................................... -->
meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.2.xml new file +5
-0+ +<public publicId="ISO 8879:1986//ENTITIES Diacritical Marks//EN//XML" + uri="ent/iso-dia.ent"/> + +<public publicId="ISO 8879:1986//ENTITIES Numeric and SpecialGraphic//EN//XML"
meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.2.xml new file +24
-0+ 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 GreekSymbols//EN//XML"
meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.2.xml new file +3
-0+ uri="ent/iso-grk4.ent"/> + +<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: ArrowRelations//EN//XML"
meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.2.xml new file +3
-0+ uri="ent/iso-amsa.ent"/> + +<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: BinaryOperators//EN//XML"
meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.2.xml new file +3
-0+ uri="ent/iso-amsb.ent"/> + +<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols:Delimiters//EN//XML"
meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.2.xml new file +3
-0+ uri="ent/iso-amsc.ent"/> + +<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: NegatedRelations//EN//XML"
meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.2.xml new file +3
-0+ uri="ent/iso-amsn.ent"/> + +<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols:Ordinary//EN//XML"
meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.2.xml new file +3
-0+ uri="ent/iso-amso.ent"/> + +<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols:Relations//EN//XML"
meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.2.xml new file +12
-0+ 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............................. -->
+<!-- ...................................................................... --> +
+</catalog>
diff --gita/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.4.xmlb/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.4.xmlnew file mode 100644
index 0000000000..8d709ba102
---/dev/null
+++b/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.4.xml(quoted diff) +2
-0@@ -0,0 +1,124 @@ +<?xml version='1.0'?> +<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog"prefer="public">
+
+<!-- ...................................................................... --> +<!-- XML Catalog data for DocBook XML V4.4 ................................ -->
+<!-- File catalog.xml ..................................................... -->meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.4.xml new file +16
-0+ +<!-- Please direct all questions, bug reports, or suggestions for + changes to the [email protected] mailing list. For more + information, see http://www.oasis-open.org/. + --> + +<!-- This is the catalog data file for DocBook V4.4. It is provided as + a convenience in building your own catalog files. You need not use + the filenames listed here, and need not use the filename method of + identifying storage objects at all. See the documentation for + detailed information on the files associated with the DocBook DTD. + See XML Catalogs at http://www.oasis-open.org/committees/entity/ for + detailed information on supplying and using catalog data. + --> + +<!--...................................................................... --> +<!-- DocBook driver file .................................................. -->
meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.4.xml new file +11
-0+ +<public publicId="-//OASIS//DTD DocBook XML V4.4//EN" + uri="docbookx.dtd"/> + +<system systemId="http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" + uri="docbookx.dtd"/> + +<system systemId="http://docbook.org/xml/4.4/docbookx.dtd" + uri="docbookx.dtd"/> + +<!--...................................................................... --> +<!-- DocBook modules ...................................................... -->
meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.4.xml new file +17
-0+ +<public publicId="-//OASIS//DTD DocBook CALS Table Model V4.4//EN" + uri="calstblx.dtd"/> + +<public publicId="-//OASIS//ELEMENTS DocBook XML HTML Tables V4.4//EN" + uri="htmltblx.mod"/> + +<public publicId="-//OASIS//DTD XML Exchange Table Model 19990315//EN" + uri="soextblx.dtd"/> + +<public publicId="-//OASIS//ELEMENTS DocBook Information Pool V4.4//EN" + uri="dbpoolx.mod"/> + +<public publicId="-//OASIS//ELEMENTS DocBook Document Hierarchy V4.4//EN" + uri="dbhierx.mod"/> + +<public publicId="-//OASIS//ENTITIES DocBook Additional General EntitiesV4.4//EN"
meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.4.xml new file +9
-0+ uri="dbgenent.mod"/> + +<public publicId="-//OASIS//ENTITIES DocBook Notations V4.4//EN" + uri="dbnotnx.mod"/> + +<public publicId="-//OASIS//ENTITIES DocBook Character Entities V4.4//EN" + uri="dbcentx.mod"/> + +<!--...................................................................... --> +<!-- ISO entity sets ...................................................... -->
meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.4.xml new file +5
-0+ +<public publicId="ISO 8879:1986//ENTITIES Diacritical Marks//EN//XML" + uri="ent/isodia.ent"/> + +<public publicId="ISO 8879:1986//ENTITIES Numeric and SpecialGraphic//EN//XML"
meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.4.xml new file +24
-0+ 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 GreekSymbols//EN//XML"
meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.4.xml new file +3
-0+ uri="ent/isogrk4.ent"/> + +<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: ArrowRelations//EN//XML"
meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.4.xml new file +3
-0+ uri="ent/isoamsa.ent"/> + +<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: BinaryOperators//EN//XML"
meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.4.xml new file +3
-0+ uri="ent/isoamsb.ent"/> + +<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols:Delimiters//EN//XML"
meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.4.xml new file +3
-0+ uri="ent/isoamsc.ent"/> + +<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: NegatedRelations//EN//XML"
meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.4.xml new file +3
-0+ uri="ent/isoamsn.ent"/> + +<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols:Ordinary//EN//XML"
meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.4.xml new file +3
-0+ uri="ent/isoamso.ent"/> + +<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols:Relations//EN//XML"
meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.4.xml new file +12
-0+ 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............................. -->
+<!-- ...................................................................... --> +
+</catalog>
diff --gita/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.5.xmlb/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.5.xmlnew file mode 100644
index 0000000000..f75c1d764d
---/dev/null
+++b/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.5.xml(quoted diff) +2
-0@@ -0,0 +1,124 @@ +<?xml version='1.0'?> +<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog"prefer="public">
+
+<!-- ...................................................................... --> +<!-- XML Catalog data for DocBook XML V4.5 ................................ -->
+<!-- File catalog.xml ..................................................... -->meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.5.xml new file +16
-0+ +<!-- Please direct all questions, bug reports, or suggestions for + changes to the [email protected] mailing list. For more + information, see http://www.oasis-open.org/. + --> + +<!-- This is the catalog data file for DocBook V4.5. It is provided as + a convenience in building your own catalog files. You need not use + the filenames listed here, and need not use the filename method of + identifying storage objects at all. See the documentation for + detailed information on the files associated with the DocBook DTD. + See XML Catalogs at http://www.oasis-open.org/committees/entity/ for + detailed information on supplying and using catalog data. + --> + +<!--...................................................................... --> +<!-- DocBook driver file .................................................. -->
meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.5.xml new file +11
-0+ +<public publicId="-//OASIS//DTD DocBook XML V4.5//EN" + uri="docbookx.dtd"/> + +<system systemId="http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" + uri="docbookx.dtd"/> + +<system systemId="http://docbook.org/xml/4.5/docbookx.dtd" + uri="docbookx.dtd"/> + +<!--...................................................................... --> +<!-- DocBook modules ...................................................... -->
meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.5.xml new file +17
-0+ +<public publicId="-//OASIS//DTD DocBook CALS Table Model V4.5//EN" + uri="calstblx.dtd"/> + +<public publicId="-//OASIS//ELEMENTS DocBook XML HTML Tables V4.5//EN" + uri="htmltblx.mod"/> + +<public publicId="-//OASIS//DTD XML Exchange Table Model 19990315//EN" + uri="soextblx.dtd"/> + +<public publicId="-//OASIS//ELEMENTS DocBook Information Pool V4.5//EN" + uri="dbpoolx.mod"/> + +<public publicId="-//OASIS//ELEMENTS DocBook Document Hierarchy V4.5//EN" + uri="dbhierx.mod"/> + +<public publicId="-//OASIS//ENTITIES DocBook Additional General EntitiesV4.5//EN"
meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.5.xml new file +9
-0+ uri="dbgenent.mod"/> + +<public publicId="-//OASIS//ENTITIES DocBook Notations V4.5//EN" + uri="dbnotnx.mod"/> + +<public publicId="-//OASIS//ENTITIES DocBook Character Entities V4.5//EN" + uri="dbcentx.mod"/> + +<!--...................................................................... --> +<!-- ISO entity sets ...................................................... -->
meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.4.xml new file +5
-0+ +<public publicId="ISO 8879:1986//ENTITIES Diacritical Marks//EN//XML" + uri="ent/isodia.ent"/> + +<public publicId="ISO 8879:1986//ENTITIES Numeric and SpecialGraphic//EN//XML"
meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.4.xml new file +24
-0+ 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 GreekSymbols//EN//XML"
meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.4.xml new file +3
-0+ uri="ent/isogrk4.ent"/> + +<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: ArrowRelations//EN//XML"
meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.4.xml new file +3
-0+ uri="ent/isoamsa.ent"/> + +<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: BinaryOperators//EN//XML"
meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.4.xml new file +3
-0+ uri="ent/isoamsb.ent"/> + +<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols:Delimiters//EN//XML"
meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.4.xml new file +3
-0+ uri="ent/isoamsc.ent"/> + +<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: NegatedRelations//EN//XML"
meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.4.xml new file +3
-0+ uri="ent/isoamsn.ent"/> + +<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols:Ordinary//EN//XML"
meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.4.xml new file +3
-0+ uri="ent/isoamso.ent"/> + +<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols:Relations//EN//XML"
meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.4.xml new file +12
-0+ 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............................. -->
+<!-- ...................................................................... --> +
+</catalog>
diff --gita/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/docbook-xml-update-catalog.xml.patchb/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/docbook-xml-update-catalog.xml.patchdeleted file mode 100644
index 59703609ca..0000000000
---a/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/docbook-xml-update-catalog.xml.patch+++/dev/nullmeta/recipes-devtools/docbook-xml/docbook-xml-dtd4/docbook-xml-update-catalog.xml.patch deleted +4
-24@@ -1,515 +0,0 @@ -docbook-xml: update catalog.xml - -Refer Ubuntu 13.04 to update catalog.xml - -Upstream-Status: Pending -Signed-off-by: Hongxu Jia <[email protected]> ---- - docbook-4.0/catalog.xml | 72 +++++++++++++++++++++++++++++++++++++++++++++++ - docbook-4.1.2/catalog.xml | 66 +++++++++++++++++++++++++++++++++++++++++++ - docbook-4.2/catalog.xml | 69 ++++++--------------------------------------- - docbook-4.3/catalog.xml | 72 ++++++++--------------------------------------- - docbook-4.4/catalog.xml | 63 ++--------------------------------------- - docbook-4.5/catalog.xml | 63 ++--------------------------------------- - 6 files changed, 165 insertions(+), 240 deletions(-) - create mode 100644 docbook-4.0/catalog.xml - create mode 100644 docbook-4.1.2/catalog.xml - -diff --git a/docbook-4.0/catalog.xml b/docbook-4.0/catalog.xml -new file mode 100644 ---- /dev/null -+++ b/docbook-4.0/catalog.xml -@@ -0,0 +1,72 @@ -+<?xml version='1.0'?> -+<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML CatalogV1.0//EN"
-+ "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd
">
-+
-+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog"> -+
-+<!-- ...................................................................... --> -+<!-- XML Catalog data for DocBook XML V4.0............................... -->
-+<!-- File catalog.xml ..................................................... -->
-+
-+<!-- Please direct all questions, bug reports, or suggestions for
-+ changes to the [email protected] mailing list. For more
-+ information, see http://www.oasis-open.org/.
-+ -->
-+
-+<!-- This is the catalog data file for DocBook V4.0. It is provided as-+ a convenience in building your own catalog files. You need not use -+ the filenames listed here, and need not use the filename method of -+ identifying storage objects at all. See the documentation for -+ detailed information on the files associated with the DocBook DTD. -+ See XML Catalogs at http://www.oasis-open.org/committees/entity/for
-+ detailed information on supplying and using catalog data.
-+ -->
-+
-+<!-- ...................................................................... --> -+<!-- DocBook driver file .................................................. -->
-+
-+<public publicId="-//Norman Walsh//DTD DocBk XML V4.0//EN"
-+ uri="docbookx.dtd"/>
-+
-+<!-- Other ways to refer to DocBook XML v4.0............................... -->
-+<public publicId="-//Norman Walsh//DTD DocBook XML V4.0//EN"
-+ uri="docbookx.dtd"/>
-+
-+<system systemId="http://www.oasis-open.org/docbook/xml/4.0/docbookx.dtd "
-+ uri="docbookx.dtd"/>
-+
-+<!-- ...................................................................... --> -+<!-- DocBook modules ...................................................... -->
-+
-+<public publicId="-//Norman Walsh//ENTITIES DocBook XML Notations V4.0//EN"
-+ uri="dbnotnx.mod"/>
-+
-+<public publicId="-//Norman Walsh//ENTITIES DocBook XML Character Entities V4.0//EN"
-+ uri="dbcentx.mod"/>
-+
-+<public publicId="-//Norman Walsh//ELEMENTS DocBook XML Information Pool V4.0//EN"
-+ uri="dbpoolx.mod"/>
-+
-+<public publicId="-//Norman Walsh//ELEMENTS DocBook XML Document Hierarchy V4.0//EN"
-+ uri="dbhierx.mod"/>
-+
-+<public publicId="-//Norman Walsh//ENTITIES DocBook XML Additional General Entities V4.0//EN"
-+ uri="dbgenent.mod"/>
-+
-+<public publicId="-//Norman Walsh//DTD CALS Table Model XML V4.0//EN"
-+ uri="calstblx.dtd"/>
-+
-+<!-- UNOFFICIAL conversion of the exchange table model to XML, based on the OASIS Exchange -->
-+<!-- Table Model PUBLIC "-//SGML Open//DTD Exchange Table Model
19960430//EN" -->
-+<public publicId="-//Normal Walsh//Exchange Table Model 19960430 XML V4.0//EN"
-+ uri="soextblx.dtd"/>
-+
-+<!-- the following FPI is declared for the DTD inside the DTD, but we'll -->
-+<!-- use the version from the latest DocBook
-+<public publicId="-//OASIS//DTD XML Exchange Table Model 19990315//EN"
-+ uri="soextblx.dtd"/> -->
-+
-+<!-- End of catalog data for DocBook XML V4.0 ............................. -->
-+<!-- ...................................................................... --> -+
-+</catalog>meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/docbook-xml-update-catalog.xml.patch deleted +0
-7-diff --git a/docbook-4.1.2/catalog.xml b/docbook-4.1.2/catalog.xml -new file mode 100644 ---- /dev/null -+++ b/docbook-4.1.2/catalog.xml -@@ -0,0 +1,66 @@ -+<?xml version='1.0'?> -+<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML CatalogV1.0//EN"
-+ "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd
">
-+
-+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog"> -+
-+<!-- ...................................................................... --> -+<!-- XML Catalog data for DocBook XML V4.1.2............................... -->
-+<!-- File catalog.xml ..................................................... -->
-+
-+<!-- Please direct all questions, bug reports, or suggestions for
-+ changes to the [email protected] mailing list. For more
-+ information, see http://www.oasis-open.org/.
-+ -->
-+
-+<!-- This is the catalog data file for DocBook V4.1.2. It is provided as-+ a convenience in building your own catalog files. You need not use -+ the filenames listed here, and need not use the filename method of -+ identifying storage objects at all. See the documentation for -+ detailed information on the files associated with the DocBook DTD. -+ See XML Catalogs at http://www.oasis-open.org/committees/entity/for
-+ detailed information on supplying and using catalog data.
-+ -->
-+
-+<!-- ...................................................................... --> -+<!-- DocBook driver file .................................................. -->
-+
-+<public publicId="-//OASIS//DTD DocBook XML V4.1.2//EN"
-+ uri="docbookx.dtd"/>
-+
-+<system systemId="
http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"
-+ uri="docbookx.dtd"/>
-+
-+<system systemId="http://docbook.org/xml/4.1.2/docbookx.dtd"
-+ uri="docbookx.dtd"/>
-+
-+<!-- ...................................................................... --> -+<!-- DocBook modules ...................................................... -->
-+
-+<public publicId="-//OASIS//DTD DocBook CALS Table Model V4.1.2//EN"
-+ uri="calstblx.dtd"/>
-+
-+ <!-- already included in docbook 4.2
-+<public publicId="-//OASIS//DTD XML Exchange Table Model 19990315//EN"
-+ uri="soextblx.dtd"/> -->
-+
-+<public publicId="-//OASIS//ELEMENTS DocBook XML Information Pool V4.1.2//EN"
-+ uri="dbpoolx.mod"/>
-+
-+<public publicId="-//OASIS//ELEMENTS DocBook Document Hierarchy V4.1.2//EN"
-+ uri="dbhierx.mod"/>
-+
-+<public publicId="-//OASIS//ENTITIES DocBook Additional General Entities V4.1.2//EN"
-+ uri="dbgenent.mod"/>
-+
-+<public publicId="-//OASIS//ENTITIES DocBook Notations V4.1.2//EN"
-+ uri="dbnotnx.mod"/>
-+
-+<public publicId="-//OASIS//ENTITIES DocBook Character Entities V4.1.2//EN"
-+ uri="dbcentx.mod"/>
-+
-+
-+<!-- End of catalog data for DocBook XML V4.1.2 ............................. -->
-+<!-- ...................................................................... --> -+
-+</catalog>
-diff --gita/docbook-4.2/catalog.xmlb/docbook-4.2/catalog.xml----a/docbook-4.2/catalog.xml
-+++b/docbook-4.2/catalog.xml
-@@ -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"> -
- <!-- ...................................................................... --> -@@ -25,6 +28,12 @@
- <public publicId="-//OASIS//DTD DocBook XML V4.2//EN"meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/docbook-xml-update-catalog.xml.patch deleted +0
-3- 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 ...................................................... -->meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/docbook-xml-update-catalog.xml.patch deleted +0
-6- -@@ -49,66 +58,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 ............................. -->
- <!-- ...................................................................... -->meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/docbook-xml-update-catalog.xml.patch deleted +0
-7- -diff --git a/docbook-4.3/catalog.xml b/docbook-4.3/catalog.xml ---- a/docbook-4.3/catalog.xml -+++ b/docbook-4.3/catalog.xml -@@ -1,4 +1,7 @@ - <?xml version='1.0'?> -+<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML CatalogV1.0//EN"
-+ "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd
">
-+
- <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog"> -
- <!-- ...................................................................... --> -@@ -25,12 +28,21 @@
- <public publicId="-//OASIS//DTD DocBook XML V4.3//EN"meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/docbook-xml-update-catalog.xml.patch deleted +0
-3- 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 ...................................................... -->meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/docbook-xml-update-catalog.xml.patch deleted +0
-15- - <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"/> - -@@ -49,66 +61,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 ............................. -->
- <!-- ...................................................................... -->meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/docbook-xml-update-catalog.xml.patch deleted +0
-7- -diff --git a/docbook-4.4/catalog.xml b/docbook-4.4/catalog.xml ---- a/docbook-4.4/catalog.xml -+++ b/docbook-4.4/catalog.xml -@@ -1,4 +1,7 @@ - <?xml version='1.0'?> -+<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML CatalogV1.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">
-
- <!-- ...................................................................... --> -@@ -58,66 +61,6 @@
- <public publicId="-//OASIS//ENTITIES DocBook Character Entities V4.4//EN"meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/docbook-xml-update-catalog.xml.patch deleted +0
-3- 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 ............................. -->
- <!-- ...................................................................... -->meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/docbook-xml-update-catalog.xml.patch deleted +0
-7- -diff --git a/docbook-4.5/catalog.xml b/docbook-4.5/catalog.xml ---- a/docbook-4.5/catalog.xml -+++ b/docbook-4.5/catalog.xml -@@ -1,4 +1,7 @@ - <?xml version='1.0'?> -+<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML CatalogV1.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">
-
- <!-- ...................................................................... --> -@@ -58,66 +61,6 @@
- <public publicId="-//OASIS//ENTITIES DocBook Character Entities V4.5//EN"meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/docbook-xml-update-catalog.xml.patch deleted +0
-3- 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 ............................. -->
- <!-- ...................................................................... -->meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/docbook-xml-update-catalog.xml.patch deleted +0
-4- --- -1.8.1.2 -meta/recipes-devtools/docbook-xml/docbook-xml-dtd4_4.5.bb +5
-4@@ -1,9 +1,10 @@ SUMMARY = "Document type definitions for verification of XML data files" DESCRIPTION = "Document type definitions for verification of XML data \ -files against the DocBook rule set, it ships with the latest DocBook 4.5 \ -XML DTD, as well as a selected set of legacy DTDs for use with older \ -documents, including 4.0, 4.1.2, 4.2, 4.3 and 4.4" -HOMEPAGE = "http://www.docbook.org/xml/" +files against the DocBook rule set. It ships with the latest DocBook 4.5 \ +XML DTD, together with older version 4.2, 4.3 and 4.4." +HOMEPAGE = "https://www.docbook.org/xml/" + +PR = "r1" LICENSE = "OASIS" LIC_FILES_CHKSUM ="file://${WORKDIR}/LICENSE-OASIS;md5=c608985dd5f7f215e669e7639a0b1d2e"
meta/recipes-devtools/docbook-xml/docbook-xml-dtd4_4.5.bb +0
-0@@ -11,42 +12,37 @@ LIC_FILES_CHKSUM ="file://${WORKDIR}/LICENSE-OASIS;md5=c608985dd5f7f215e669e763
# Note: the upstream sources are not distributed with a license file. # LICENSE-OASIS is included as a "patch" to workaround this. When# upgrading this recipe, please verify whether this is still needed. -SRC_URI = " http://snapshot.debian.org/archive/debian/20160728T043443Z/pool/main/d/docbook-xml/docbook-xml_${PV}.orig.tar.gz \meta/recipes-devtools/docbook-xml/docbook-xml-dtd4_4.5.bb +3
-4- file://LICENSE-OASIS \ - file://docbook-xml-update-catalog.xml.patch \ +SRC_URI = "\ + file://LICENSE-OASIS \ + file://catalogs/* \ " -SRC_URI[md5sum] = "487b4d44e15cffb1f4048af23f98208e" -SRC_URI[sha256sum] ="
b0f8edcf697f5318e63dd98c9a931f3fee167af0805ba441db372e0f17b2a44f"meta/recipes-devtools/docbook-xml/docbook-xml-dtd4_4.5.bb +10
-14- -UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/d/docbook-xml/" - -S = "${WORKDIR}/docbook-xml-4.5.c31424" - -inherit allarch +inherit allarch xmlcatalog BBCLASSEXTEND = "native" -do_configure (){ - : -} +# the XMLCATALOGS variable is used in xmlcatalog BB class +XMLCATALOGS = "${sysconfdir}/xml/docbook-xml.xml" -do_compile (){ - : -} +S = "${WORKDIR}" + +do_configure[noexec] = "1" +do_compile[noexec] = "1" do_install () { + install -d ${D}${sysconfdir}/xml/ xmlcatalog --create --noout ${D}${sysconfdir}/xml/docbook-xml.xml - for DTDVERSION in 4.0 4.1.2 4.2 4.3 4.4 4.5; do - DEST=${datadir}/xml/docbook/schema/dtd/$DTDVERSION + for catalog in $(ls catalogs); do + dtdVersion=$(echo ${catalog} | sed -rn's/^catalog-([0-9].[0-9])\.xml/\1/p')
meta/recipes-devtools/docbook-xml/docbook-xml-dtd4_4.5.bb +2
-1+ DEST=${datadir}/xml/docbook/schema/dtd/${dtdVersion} install -d -m 755 ${D}$DEST - cp -v -R docbook-$DTDVERSION/* ${D}$DEST + cp -v -R catalogs/catalog-${dtdVersion}.xml ${D}$DEST/catalog.xml xmlcatalog --verbose --noout --add nextCatalog unusedfile://$DEST/catalog.xml
${D}${sysconfdir}/xml/docbook-xml.xml
done
}meta/recipes-devtools/docbook-xml/docbook-xml-dtd4_4.5.bb +4
-5-XMLCATALOGS = "${sysconfdir}/xml/docbook-xml.xml" -inherit xmlcatalog - -FILES_${PN} = "${datadir}/* ${sysconfdir}/xml/docbook-xml.xml" +FILES_${PN} = "\ + ${datadir}/* \ + ${XMLCATALOGS} \ +" --2.26.2
Yes I think so. I supposed that if there's only 4 catalogs it can be done this way but if the policy is to download everything then OK - I'll rewrite the recipe, hope this time finally well.
G.
Quoted 2,663 lines · Alexander Kanavin
Can the original source be fetched though? Copying things over into the layer itself is not the best option.
Alex
Quoted 2,656 lines · Gregor Zatko
From: Gregor Zatko <[email protected]>
Until now a Debian package has been used as a source.
This change just switches it to project's upstream.
https://bugzilla.yoctoproject.org/show_bug.cgi?id=13270
Signed-off-by Gregor Zatko <[email protected]>---
.../docbook-xml-dtd4/catalogs/catalog-4.2.xml | 115 ++++.../docbook-xml-dtd4/catalogs/catalog-4.3.xml | 115 ++++.../docbook-xml-dtd4/catalogs/catalog-4.4.xml | 124 +++++.../docbook-xml-dtd4/catalogs/catalog-4.5.xml | 124 +++++.../docbook-xml-update-catalog.xml.patch | 515 ------------------
.../docbook-xml/docbook-xml-dtd4_4.5.bb | 52 +-6 files changed, 502 insertions(+), 543 deletions(-)create mode 100644 meta/recipes-devtools/docbook-xml/docbook-xml-
dtd4/catalogs/catalog-4.2.xmlcreate mode 100644 meta/recipes-devtools/docbook-xml/docbook-xml-
dtd4/catalogs/catalog-4.3.xmlcreate mode 100644 meta/recipes-devtools/docbook-xml/docbook-xml-
dtd4/catalogs/catalog-4.4.xmlcreate mode 100644 meta/recipes-devtools/docbook-xml/docbook-xml-
dtd4/catalogs/catalog-4.5.xmldelete mode 100644 meta/recipes-devtools/docbook-xml/docbook-xml-
dtd4/docbook-xml-update-catalog.xml.patch(quoted diff) +0
-0
dtd4/catalogs/catalog-4.2.xmlb/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.2.xmlnew file mode 100644
index 0000000000..6920c2f7e0
---
/dev/null+++ b/meta/recipes-devtools/docbook-xml/docbook-xml-
dtd4/catalogs/catalog-4.2.xml(quoted diff) +4
-0@@ -0,0 +1,115 @@ +<?xml version='1.0'?> +<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog"> + +<!--... -->
+<!-- XML Catalog data for DocBook XML V4.2
................................ -->+<!-- File catalog.xml ..................................................... -->
(quoted diff) +3
-0+ +<!-- Please direct all questions, bug reports, or suggestions for + changes to the [email protected] mailing list. Formore
(quoted diff) +4
-0+ information, see http://www.oasis-open.org/. + --> + +<!-- This is the catalog data file for DocBook V4.2. It isprovided as
+ a convenience in building your own catalog files. You need
not use+ the filenames listed here, and need not use the filename
method of+ identifying storage objects at all. See the documentation
for+ detailed information on the files associated with the DocBook
DTD.+ See XML Catalogs at
http://www.oasis-open.org/committees/entity/ for(quoted diff) +4
-0+ detailed information on supplying and using catalog data. + --> + +<!--... -->
+<!-- DocBook driver file .................................................. -->
(quoted diff) +5
-0+ +<public publicId="-//OASIS//DTD DocBook XML V4.2//EN" + uri="docbookx.dtd"/> + +<!--... -->
+<!-- DocBook modules ...................................................... -->
(quoted diff) +5
-0+ +<public publicId="-//OASIS//DTD DocBook CALS Table Model V4.2//EN" + uri="calstblx.dtd"/> + +<public publicId="-//OASIS//DTD XML Exchange Table Model19990315//EN"
(quoted diff) +3
-0+ uri="soextblx.dtd"/> + +<public publicId="-//OASIS//ELEMENTS DocBook Information PoolV4.2//EN"
(quoted diff) +3
-0+ uri="dbpoolx.mod"/> + +<public publicId="-//OASIS//ELEMENTS DocBook Document HierarchyV4.2//EN"
(quoted diff) +3
-0+ uri="dbhierx.mod"/> + +<public publicId="-//OASIS//ENTITIES DocBook Additional GeneralEntities V4.2//EN"
(quoted diff) +6
-0+ uri="dbgenent.mod"/> + +<public publicId="-//OASIS//ENTITIES DocBook Notations V4.2//EN" + uri="dbnotnx.mod"/> + +<public publicId="-//OASIS//ENTITIES DocBook Character EntitiesV4.2//EN"
(quoted diff) +3
-0+ uri="dbcentx.mod"/> + +<!--... -->
+<!-- ISO entity sets ...................................................... -->
+
+<public publicId="ISO 8879:1986//ENTITIES Diacritical Marks//EN//XML"
(quoted diff) +3
-0+ uri="ent/iso-dia.ent"/> + +<public publicId="ISO 8879:1986//ENTITIES Numeric and SpecialGraphic//EN//XML"
(quoted diff) +6
-0+ 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 GeneralTechnical//EN//XML"
(quoted diff) +12
-0+ 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 MonotonikoGreek//EN//XML"
(quoted diff) +6
-0+ 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 GreekSymbols//EN//XML"
(quoted diff) +3
-0+ uri="ent/iso-grk4.ent"/> + +<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols:Arrow Relations//EN//XML"
(quoted diff) +3
-0+ uri="ent/iso-amsa.ent"/> + +<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols:Binary Operators//EN//XML"
(quoted diff) +3
-0+ uri="ent/iso-amsb.ent"/> + +<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols:Delimiters//EN//XML"
(quoted diff) +3
-0+ uri="ent/iso-amsc.ent"/> + +<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols:Negated Relations//EN//XML"
(quoted diff) +3
-0+ uri="ent/iso-amsn.ent"/> + +<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols:Ordinary//EN//XML"
(quoted diff) +3
-0+ uri="ent/iso-amso.ent"/> + +<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols:Relations//EN//XML"
(quoted diff) +3
-0+ uri="ent/iso-amsr.ent"/> + +<public publicId="ISO 8879:1986//ENTITIES Box and LineDrawing//EN//XML"
(quoted diff) +3
-0+ uri="ent/iso-box.ent"/> + +<public publicId="ISO 8879:1986//ENTITIES RussianCyrillic//EN//XML"
(quoted diff) +3
-0+ uri="ent/iso-cyr1.ent"/> + +<public publicId="ISO 8879:1986//ENTITIES Non-RussianCyrillic//EN//XML"
(quoted diff) +3
-0+ uri="ent/iso-cyr2.ent"/> + +<!-- End of catalog data for DocBook XML V4.2............................. -->
+<!--
...................................................................
... -->meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.2.xml new file +2
-0+ +</catalog>(quoted diff) +0
-0
dtd4/catalogs/catalog-4.3.xmlb/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.3.xmlnew file mode 100644
index 0000000000..34d1afdd94
---
/dev/null+++ b/meta/recipes-devtools/docbook-xml/docbook-xml-
dtd4/catalogs/catalog-4.3.xml(quoted diff) +4
-0@@ -0,0 +1,115 @@ +<?xml version='1.0'?> +<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog"> + +<!--... -->
+<!-- XML Catalog data for DocBook XML V4.3
................................ -->+<!-- File catalog.xml ..................................................... -->
(quoted diff) +3
-0+ +<!-- Please direct all questions, bug reports, or suggestions for + changes to the [email protected] mailing list. Formore
(quoted diff) +4
-0+ information, see http://www.oasis-open.org/. + --> + +<!-- This is the catalog data file for DocBook V4.3. It isprovided as
+ a convenience in building your own catalog files. You need
not use+ the filenames listed here, and need not use the filename
method of+ identifying storage objects at all. See the documentation
for+ detailed information on the files associated with the DocBook
DTD.+ See XML Catalogs at
http://www.oasis-open.org/committees/entity/ for(quoted diff) +4
-0+ detailed information on supplying and using catalog data. + --> + +<!--... -->
+<!-- DocBook driver file .................................................. -->
(quoted diff) +5
-0+ +<public publicId="-//OASIS//DTD DocBook XML V4.3//EN" + uri="docbookx.dtd"/> + +<!--... -->
+<!-- DocBook modules ...................................................... -->
(quoted diff) +5
-0+ +<public publicId="-//OASIS//DTD DocBook CALS Table Model V4.3//EN" + uri="calstblx.dtd"/> + +<public publicId="-//OASIS//DTD XML Exchange Table Model19990315//EN"
(quoted diff) +3
-0+ uri="soextblx.dtd"/> + +<public publicId="-//OASIS//ELEMENTS DocBook Information PoolV4.3//EN"
(quoted diff) +3
-0+ uri="dbpoolx.mod"/> + +<public publicId="-//OASIS//ELEMENTS DocBook Document HierarchyV4.3//EN"
(quoted diff) +3
-0+ uri="dbhierx.mod"/> + +<public publicId="-//OASIS//ENTITIES DocBook Additional GeneralEntities V4.3//EN"
(quoted diff) +6
-0+ uri="dbgenent.mod"/> + +<public publicId="-//OASIS//ENTITIES DocBook Notations V4.3//EN" + uri="dbnotnx.mod"/> + +<public publicId="-//OASIS//ENTITIES DocBook Character EntitiesV4.3//EN"
(quoted diff) +3
-0+ uri="dbcentx.mod"/> + +<!--... -->
+<!-- ISO entity sets ...................................................... -->
+
+<public publicId="ISO 8879:1986//ENTITIES Diacritical Marks//EN//XML"
(quoted diff) +3
-0+ uri="ent/iso-dia.ent"/> + +<public publicId="ISO 8879:1986//ENTITIES Numeric and SpecialGraphic//EN//XML"
(quoted diff) +6
-0+ 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 GeneralTechnical//EN//XML"
(quoted diff) +12
-0+ 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 MonotonikoGreek//EN//XML"
(quoted diff) +6
-0+ 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 GreekSymbols//EN//XML"
(quoted diff) +3
-0+ uri="ent/iso-grk4.ent"/> + +<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols:Arrow Relations//EN//XML"
(quoted diff) +3
-0+ uri="ent/iso-amsa.ent"/> + +<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols:Binary Operators//EN//XML"
(quoted diff) +3
-0+ uri="ent/iso-amsb.ent"/> + +<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols:Delimiters//EN//XML"
(quoted diff) +3
-0+ uri="ent/iso-amsc.ent"/> + +<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols:Negated Relations//EN//XML"
(quoted diff) +3
-0+ uri="ent/iso-amsn.ent"/> + +<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols:Ordinary//EN//XML"
(quoted diff) +3
-0+ uri="ent/iso-amso.ent"/> + +<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols:Relations//EN//XML"
(quoted diff) +3
-0+ uri="ent/iso-amsr.ent"/> + +<public publicId="ISO 8879:1986//ENTITIES Box and LineDrawing//EN//XML"
(quoted diff) +3
-0+ uri="ent/iso-box.ent"/> + +<public publicId="ISO 8879:1986//ENTITIES RussianCyrillic//EN//XML"
(quoted diff) +3
-0+ uri="ent/iso-cyr1.ent"/> + +<public publicId="ISO 8879:1986//ENTITIES Non-RussianCyrillic//EN//XML"
(quoted diff) +3
-0+ uri="ent/iso-cyr2.ent"/> + +<!-- End of catalog data for DocBook XML V4.3............................. -->
+<!--
...................................................................
... -->meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.2.xml new file +2
-0+ +</catalog>(quoted diff) +0
-0
dtd4/catalogs/catalog-4.4.xmlb/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.4.xmlnew file mode 100644
index 0000000000..8d709ba102
---
/dev/null+++ b/meta/recipes-devtools/docbook-xml/docbook-xml-
dtd4/catalogs/catalog-4.4.xml(quoted diff) +2
-0@@ -0,0 +1,124 @@ +<?xml version='1.0'?> +<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog"prefer="public">
+
+<!--
...................................................................
... -->+<!-- XML Catalog data for DocBook XML V4.4
................................ -->+<!-- File catalog.xml ..................................................... -->
(quoted diff) +3
-0+ +<!-- Please direct all questions, bug reports, or suggestions for + changes to the [email protected] mailing list. Formore
(quoted diff) +4
-0+ information, see http://www.oasis-open.org/. + --> + +<!-- This is the catalog data file for DocBook V4.4. It isprovided as
+ a convenience in building your own catalog files. You need
not use+ the filenames listed here, and need not use the filename
method of+ identifying storage objects at all. See the documentation
for+ detailed information on the files associated with the DocBook
DTD.+ See XML Catalogs at
http://www.oasis-open.org/committees/entity/ for(quoted diff) +4
-0+ detailed information on supplying and using catalog data. + --> + +<!--... -->
+<!-- DocBook driver file .................................................. -->
(quoted diff) +5
-0+ +<public publicId="-//OASIS//DTD DocBook XML V4.4//EN" + uri="docbookx.dtd"/> + +<system systemId="http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd"
(quoted diff) +6
-0+ uri="docbookx.dtd"/> + +<system systemId="http://docbook.org/xml/4.4/docbookx.dtd" + uri="docbookx.dtd"/> + +<!--... -->
+<!-- DocBook modules ...................................................... -->
(quoted diff) +5
-0+ +<public publicId="-//OASIS//DTD DocBook CALS Table Model V4.4//EN" + uri="calstblx.dtd"/> + +<public publicId="-//OASIS//ELEMENTS DocBook XML HTML TablesV4.4//EN"
(quoted diff) +3
-0+ uri="htmltblx.mod"/> + +<public publicId="-//OASIS//DTD XML Exchange Table Model19990315//EN"
(quoted diff) +3
-0+ uri="soextblx.dtd"/> + +<public publicId="-//OASIS//ELEMENTS DocBook Information PoolV4.4//EN"
(quoted diff) +3
-0+ uri="dbpoolx.mod"/> + +<public publicId="-//OASIS//ELEMENTS DocBook Document HierarchyV4.4//EN"
(quoted diff) +3
-0+ uri="dbhierx.mod"/> + +<public publicId="-//OASIS//ENTITIES DocBook Additional GeneralEntities V4.4//EN"
(quoted diff) +6
-0+ uri="dbgenent.mod"/> + +<public publicId="-//OASIS//ENTITIES DocBook Notations V4.4//EN" + uri="dbnotnx.mod"/> + +<public publicId="-//OASIS//ENTITIES DocBook Character EntitiesV4.4//EN"
(quoted diff) +3
-0+ uri="dbcentx.mod"/> + +<!--... -->
+<!-- ISO entity sets ...................................................... -->
+
+<public publicId="ISO 8879:1986//ENTITIES Diacritical Marks//EN//XML"
(quoted diff) +3
-0+ uri="ent/isodia.ent"/> + +<public publicId="ISO 8879:1986//ENTITIES Numeric and SpecialGraphic//EN//XML"
(quoted diff) +6
-0+ uri="ent/isonum.ent"/> + +<public publicId="ISO 8879:1986//ENTITIES Publishing//EN//XML" + uri="ent/isopub.ent"/> + +<public publicId="ISO 8879:1986//ENTITIES GeneralTechnical//EN//XML"
(quoted diff) +12
-0+ 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 MonotonikoGreek//EN//XML"
(quoted diff) +6
-0+ 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 GreekSymbols//EN//XML"
(quoted diff) +3
-0+ uri="ent/isogrk4.ent"/> + +<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols:Arrow Relations//EN//XML"
(quoted diff) +3
-0+ uri="ent/isoamsa.ent"/> + +<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols:Binary Operators//EN//XML"
(quoted diff) +3
-0+ uri="ent/isoamsb.ent"/> + +<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols:Delimiters//EN//XML"
(quoted diff) +3
-0+ uri="ent/isoamsc.ent"/> + +<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols:Negated Relations//EN//XML"
(quoted diff) +3
-0+ uri="ent/isoamsn.ent"/> + +<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols:Ordinary//EN//XML"
(quoted diff) +3
-0+ uri="ent/isoamso.ent"/> + +<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols:Relations//EN//XML"
(quoted diff) +3
-0+ uri="ent/isoamsr.ent"/> + +<public publicId="ISO 8879:1986//ENTITIES Box and LineDrawing//EN//XML"
(quoted diff) +3
-0+ uri="ent/isobox.ent"/> + +<public publicId="ISO 8879:1986//ENTITIES RussianCyrillic//EN//XML"
(quoted diff) +3
-0+ uri="ent/isocyr1.ent"/> + +<public publicId="ISO 8879:1986//ENTITIES Non-RussianCyrillic//EN//XML"
(quoted diff) +3
-0+ uri="ent/isocyr2.ent"/> + +<!-- End of catalog data for DocBook XML V4.4............................. -->
+<!--
...................................................................
... -->meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.2.xml new file +2
-0+ +</catalog>(quoted diff) +0
-0
dtd4/catalogs/catalog-4.5.xmlb/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.5.xmlnew file mode 100644
index 0000000000..f75c1d764d
---
/dev/null+++ b/meta/recipes-devtools/docbook-xml/docbook-xml-
dtd4/catalogs/catalog-4.5.xml(quoted diff) +2
-0@@ -0,0 +1,124 @@ +<?xml version='1.0'?> +<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog"prefer="public">
+
+<!--
...................................................................
... -->+<!-- XML Catalog data for DocBook XML V4.5
................................ -->+<!-- File catalog.xml ..................................................... -->
(quoted diff) +3
-0+ +<!-- Please direct all questions, bug reports, or suggestions for + changes to the [email protected] mailing list. Formore
(quoted diff) +4
-0+ information, see http://www.oasis-open.org/. + --> + +<!-- This is the catalog data file for DocBook V4.5. It isprovided as
+ a convenience in building your own catalog files. You need
not use+ the filenames listed here, and need not use the filename
method of+ identifying storage objects at all. See the documentation
for+ detailed information on the files associated with the DocBook
DTD.+ See XML Catalogs at
http://www.oasis-open.org/committees/entity/ for(quoted diff) +4
-0+ detailed information on supplying and using catalog data. + --> + +<!--... -->
+<!-- DocBook driver file .................................................. -->
(quoted diff) +5
-0+ +<public publicId="-//OASIS//DTD DocBook XML V4.5//EN" + uri="docbookx.dtd"/> + +<system systemId="http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"
(quoted diff) +6
-0+ uri="docbookx.dtd"/> + +<system systemId="http://docbook.org/xml/4.5/docbookx.dtd" + uri="docbookx.dtd"/> + +<!--... -->
+<!-- DocBook modules ...................................................... -->
(quoted diff) +5
-0+ +<public publicId="-//OASIS//DTD DocBook CALS Table Model V4.5//EN" + uri="calstblx.dtd"/> + +<public publicId="-//OASIS//ELEMENTS DocBook XML HTML TablesV4.5//EN"
(quoted diff) +3
-0+ uri="htmltblx.mod"/> + +<public publicId="-//OASIS//DTD XML Exchange Table Model19990315//EN"
(quoted diff) +3
-0+ uri="soextblx.dtd"/> + +<public publicId="-//OASIS//ELEMENTS DocBook Information PoolV4.5//EN"
(quoted diff) +3
-0+ uri="dbpoolx.mod"/> + +<public publicId="-//OASIS//ELEMENTS DocBook Document HierarchyV4.5//EN"
(quoted diff) +3
-0+ uri="dbhierx.mod"/> + +<public publicId="-//OASIS//ENTITIES DocBook Additional GeneralEntities V4.5//EN"
(quoted diff) +6
-0+ uri="dbgenent.mod"/> + +<public publicId="-//OASIS//ENTITIES DocBook Notations V4.5//EN" + uri="dbnotnx.mod"/> + +<public publicId="-//OASIS//ENTITIES DocBook Character EntitiesV4.5//EN"
(quoted diff) +3
-0+ uri="dbcentx.mod"/> + +<!--... -->
+<!-- ISO entity sets ...................................................... -->
+
+<public publicId="ISO 8879:1986//ENTITIES Diacritical Marks//EN//XML"
(quoted diff) +3
-0+ uri="ent/isodia.ent"/> + +<public publicId="ISO 8879:1986//ENTITIES Numeric and SpecialGraphic//EN//XML"
(quoted diff) +6
-0+ uri="ent/isonum.ent"/> + +<public publicId="ISO 8879:1986//ENTITIES Publishing//EN//XML" + uri="ent/isopub.ent"/> + +<public publicId="ISO 8879:1986//ENTITIES GeneralTechnical//EN//XML"
(quoted diff) +12
-0+ 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 MonotonikoGreek//EN//XML"
(quoted diff) +6
-0+ 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 GreekSymbols//EN//XML"
(quoted diff) +3
-0+ uri="ent/isogrk4.ent"/> + +<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols:Arrow Relations//EN//XML"
(quoted diff) +3
-0+ uri="ent/isoamsa.ent"/> + +<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols:Binary Operators//EN//XML"
(quoted diff) +3
-0+ uri="ent/isoamsb.ent"/> + +<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols:Delimiters//EN//XML"
(quoted diff) +3
-0+ uri="ent/isoamsc.ent"/> + +<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols:Negated Relations//EN//XML"
(quoted diff) +3
-0+ uri="ent/isoamsn.ent"/> + +<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols:Ordinary//EN//XML"
(quoted diff) +3
-0+ uri="ent/isoamso.ent"/> + +<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols:Relations//EN//XML"
(quoted diff) +3
-0+ uri="ent/isoamsr.ent"/> + +<public publicId="ISO 8879:1986//ENTITIES Box and LineDrawing//EN//XML"
(quoted diff) +3
-0+ uri="ent/isobox.ent"/> + +<public publicId="ISO 8879:1986//ENTITIES RussianCyrillic//EN//XML"
(quoted diff) +3
-0+ uri="ent/isocyr1.ent"/> + +<public publicId="ISO 8879:1986//ENTITIES Non-RussianCyrillic//EN//XML"
(quoted diff) +3
-0+ uri="ent/isocyr2.ent"/> + +<!-- End of catalog data for DocBook XML V4.5............................. -->
+<!--
...................................................................
... -->meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.2.xml new file +2
-0+ +</catalog>(quoted diff) +0
-0
dtd4/docbook-xml-update-catalog.xml.patchb/meta/recipes- devtools/docbook-xml/docbook-xml-dtd4/docbook-xml-update- catalog.xml.patchdeleted file mode 100644
index 59703609ca..0000000000
--- a/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/docbook- xml-update-catalog.xml.patch
+++
/dev/null(quoted diff) +2
-28@@ -1,515 +0,0 @@ -docbook-xml: update catalog.xml - -Refer Ubuntu 13.04 to update catalog.xml - -Upstream-Status: Pending -Signed-off-by: Hongxu Jia <[email protected]> ---- - docbook-4.0/catalog.xml | 72 +++++++++++++++++++++++++++++++++++++++++++++++ - docbook-4.1.2/catalog.xml | 66 +++++++++++++++++++++++++++++++++++++++++++ - docbook-4.2/catalog.xml | 69 ++++++-------------------------- ------------- - docbook-4.3/catalog.xml | 72 ++++++++------------------------ --------------- - docbook-4.4/catalog.xml | 63 ++------------------------------ --------- - docbook-4.5/catalog.xml | 63 ++------------------------------ --------- - 6 files changed, 165 insertions(+), 240 deletions(-) - create mode 100644 docbook-4.0/catalog.xml - create mode 100644 docbook-4.1.2/catalog.xml - -diff --git a/docbook-4.0/catalog.xml b/docbook-4.0/catalog.xml -new file mode 100644 ---- /dev/null -+++ b/docbook-4.0/catalog.xml -@@ -0,0 +1,72 @@ -+<?xml version='1.0'?> -+<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XMLCatalog V1.0//EN"
-+ "
http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd
">-+
-+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
-+
-+<!--
...................................................................
... -->-+<!-- XML Catalog data for DocBook XML
V4.0............................... -->-+<!-- File catalog.xml ..................................................... -->
-+
-+<!-- Please direct all questions, bug reports, or suggestions for
-+ changes to the [email protected] mailing list.
For more-+ information, see http://www.oasis-open.org/.
-+ -->
-+
-+<!-- This is the catalog data file for DocBook V4.0. It is provided as
-+ a convenience in building your own catalog files. You need
not use-+ the filenames listed here, and need not use the filename
method of-+ identifying storage objects at all. See the documentation
for-+ detailed information on the files associated with the
DocBook DTD.-+ See XML Catalogs at
http://www.oasis-open.org/committees/entity/ for-+ detailed information on supplying and using catalog data.
-+ -->
-+
-+<!--
...................................................................
... -->-+<!-- DocBook driver file .................................................. -->
-+
-+<public publicId="-//Norman Walsh//DTD DocBk XML V4.0//EN"
-+ uri="docbookx.dtd"/>
-+
-+<!-- Other ways to refer to DocBook XML
v4.0............................... -->-+<public publicId="-//Norman Walsh//DTD DocBook XML V4.0//EN"
-+ uri="docbookx.dtd"/>
-+
-+<system systemId="
http://www.oasis-open.org/docbook/xml/4.0/docbookx.dtd"-+ uri="docbookx.dtd"/>
-+
-+<!--
...................................................................
... -->-+<!-- DocBook modules ...................................................... -->
-+
-+<public publicId="-//Norman Walsh//ENTITIES DocBook XML Notations V4.0//EN"
-+ uri="dbnotnx.mod"/>
-+
-+<public publicId="-//Norman Walsh//ENTITIES DocBook XML Character Entities V4.0//EN"
-+ uri="dbcentx.mod"/>
-+
-+<public publicId="-//Norman Walsh//ELEMENTS DocBook XML Information Pool V4.0//EN"
-+ uri="dbpoolx.mod"/>
-+
-+<public publicId="-//Norman Walsh//ELEMENTS DocBook XML Document Hierarchy V4.0//EN"
-+ uri="dbhierx.mod"/>
-+
-+<public publicId="-//Norman Walsh//ENTITIES DocBook XML Additional General Entities V4.0//EN"
-+ uri="dbgenent.mod"/>
-+
-+<public publicId="-//Norman Walsh//DTD CALS Table Model XML V4.0//EN"
-+ uri="calstblx.dtd"/>
-+
-+<!-- UNOFFICIAL conversion of the exchange table model to XML, based on the OASIS Exchange -->
-+<!-- Table Model PUBLIC "-//SGML Open//DTD Exchange Table
Model 19960430//EN" -->-+<public publicId="-//Normal Walsh//Exchange Table Model 19960430 XML V4.0//EN"
-+ uri="soextblx.dtd"/>
-+
-+<!-- the following FPI is declared for the DTD inside the DTD, but we'll -->
-+<!-- use the version from the latest DocBook
-+<public publicId="-//OASIS//DTD XML Exchange Table Model 19990315//EN"
-+ uri="soextblx.dtd"/> -->
-+
-+<!-- End of catalog data for DocBook XML V4.0
............................. -->-+<!--
...................................................................
... -->-+
-+</catalog>
(quoted diff) +0
-7-diff --git a/docbook-4.1.2/catalog.xml b/docbook-4.1.2/catalog.xml -new file mode 100644 ---- /dev/null -+++ b/docbook-4.1.2/catalog.xml -@@ -0,0 +1,66 @@ -+<?xml version='1.0'?> -+<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XMLCatalog V1.0//EN"
-+ "
http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd
">-+
-+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
-+
-+<!--
...................................................................
... -->-+<!-- XML Catalog data for DocBook XML
V4.1.2............................... -->-+<!-- File catalog.xml ..................................................... -->
-+
-+<!-- Please direct all questions, bug reports, or suggestions for
-+ changes to the [email protected] mailing list.
For more-+ information, see http://www.oasis-open.org/.
-+ -->
-+
-+<!-- This is the catalog data file for DocBook V4.1.2. It is provided as
-+ a convenience in building your own catalog files. You need
not use-+ the filenames listed here, and need not use the filename
method of-+ identifying storage objects at all. See the documentation
for-+ detailed information on the files associated with the
DocBook DTD.-+ See XML Catalogs at
http://www.oasis-open.org/committees/entity/ for-+ detailed information on supplying and using catalog data.
-+ -->
-+
-+<!--
...................................................................
... -->-+<!-- DocBook driver file .................................................. -->
-+
-+<public publicId="-//OASIS//DTD DocBook XML V4.1.2//EN"
-+ uri="docbookx.dtd"/>
-+
-+<system systemId="
http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"-+ uri="docbookx.dtd"/>
-+
-+<system systemId="http://docbook.org/xml/4.1.2/docbookx.dtd"
-+ uri="docbookx.dtd"/>
-+
-+<!--
...................................................................
... -->-+<!-- DocBook modules ...................................................... -->
-+
-+<public publicId="-//OASIS//DTD DocBook CALS Table Model V4.1.2//EN"
-+ uri="calstblx.dtd"/>
-+
-+ <!-- already included in docbook 4.2
-+<public publicId="-//OASIS//DTD XML Exchange Table Model 19990315//EN"
-+ uri="soextblx.dtd"/> -->
-+
-+<public publicId="-//OASIS//ELEMENTS DocBook XML Information Pool V4.1.2//EN"
-+ uri="dbpoolx.mod"/>
-+
-+<public publicId="-//OASIS//ELEMENTS DocBook Document Hierarchy V4.1.2//EN"
-+ uri="dbhierx.mod"/>
-+
-+<public publicId="-//OASIS//ENTITIES DocBook Additional General Entities V4.1.2//EN"
-+ uri="dbgenent.mod"/>
-+
-+<public publicId="-//OASIS//ENTITIES DocBook Notations V4.1.2//EN"
-+ uri="dbnotnx.mod"/>
-+
-+<public publicId="-//OASIS//ENTITIES DocBook Character Entities V4.1.2//EN"
-+ uri="dbcentx.mod"/>
-+
-+
-+<!-- End of catalog data for DocBook XML V4.1.2
............................. -->-+<!--
...................................................................
... -->-+
-+</catalog>
-diff --git
a/docbook-4.2/catalog.xmlb/docbook-4.2/catalog.xml----
a/docbook-4.2/catalog.xml-+++
b/docbook-4.2/catalog.xml-@@ -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">
-
- <!--
...................................................................
... -->-@@ -25,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 ...................................................... -->
-
-@@ -49,66 +58,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 --git
a/docbook-4.3/catalog.xmlb/docbook-4.3/catalog.xml----
a/docbook-4.3/catalog.xml-+++
b/docbook-4.3/catalog.xml-@@ -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">
-
- <!--
...................................................................
... -->-@@ -25,12 +28,21 @@
- <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 ...................................................... -->
-
- <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"/>
-
-@@ -49,66 +61,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 --git
a/docbook-4.4/catalog.xmlb/docbook-4.4/catalog.xml----
a/docbook-4.4/catalog.xml-+++
b/docbook-4.4/catalog.xml-@@ -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">
-
- <!--
...................................................................
... -->-@@ -58,66 +61,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 --git
a/docbook-4.5/catalog.xmlb/docbook-4.5/catalog.xml----
a/docbook-4.5/catalog.xml-+++
b/docbook-4.5/catalog.xml-@@ -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">
-
- <!--
...................................................................
... -->-@@ -58,66 +61,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
............................. -->- <!--
...................................................................
... -->-
---
-1.8.1.2
(quoted diff) +0
-1-(quoted diff) +0
-0dtd4_4.5.bb b/meta/recipes-devtools/docbook-xml/docbook-xml- dtd4_4.5.bb
index
6452c8d99f..786ca5418f100644--- a/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4_4.5.bb
+++ b/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4_4.5.bb
(quoted diff) +0
-0@@ -1,9 +1,10 @@ SUMMARY = "Document type definitions for verification of XML datafiles"
DESCRIPTION = "Document type definitions for verification of XML
data \-files against the DocBook rule set, it ships with the latest DocBook 4.5 \
-XML DTD, as well as a selected set of legacy DTDs for use with older \
meta/recipes-devtools/docbook-xml/docbook-xml-dtd4_4.5.bb +1
-2-documents, including 4.0, 4.1.2, 4.2, 4.3 and 4.4" -HOMEPAGE = "http://www.docbook.org/xml/" +files against the DocBook rule set. It ships with the latestDocBook 4.5 \
(quoted diff) +4
-0+XML DTD, together with older version 4.2, 4.3 and 4.4." +HOMEPAGE = "https://www.docbook.org/xml/" + +PR = "r1" LICENSE = "OASIS" LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE-OASIS;md5=c608985dd5f7f215e669e7639a0b1d2e"
(quoted diff) +0
-0@@ -11,42 +12,37 @@ LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE-OASIS;md5=c608985dd5f7f215e669e763
# Note: the upstream sources are not distributed with a license
file.# LICENSE-OASIS is included as a "patch" to workaround this. When
# upgrading this recipe, please verify whether this is still needed.-SRC_URI = "
http://snapshot.debian.org/archive/debian/20160728T043443Z/pool/main/d/docbook-xml/docbook-xml_${PV}.orig.tar.gz
\meta/recipes-devtools/docbook-xml/docbook-xml-dtd4_4.5.bb +3
-4- file://LICENSE-OASIS \ - file://docbook-xml-update-catalog.xml.patch \ +SRC_URI = "\ + file://LICENSE-OASIS \ + file://catalogs/* \ " -SRC_URI[md5sum] = "487b4d44e15cffb1f4048af23f98208e" -SRC_URI[sha256sum] ="
b0f8edcf697f5318e63dd98c9a931f3fee167af0805ba441db372e0f17b2a44f"(quoted diff) +8
-12- -UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/d/docbook-xml/" - -S = "${WORKDIR}/docbook-xml-4.5.c31424" - -inherit allarch +inherit allarch xmlcatalog BBCLASSEXTEND = "native" -do_configure (){ - : -} +# the XMLCATALOGS variable is used in xmlcatalog BB class +XMLCATALOGS = "${sysconfdir}/xml/docbook-xml.xml" -do_compile (){ - : -} +S = "${WORKDIR}" + +do_configure[noexec] = "1" +do_compile[noexec] = "1" do_install () { + install -d ${D}${sysconfdir}/xml/ xmlcatalog --create --noout ${D}${sysconfdir}/xml/docbook-xml.xml
meta/recipes-devtools/docbook-xml/docbook-xml-dtd4_4.5.bb +2
-2- for DTDVERSION in 4.0 4.1.2 4.2 4.3 4.4 4.5; do - DEST=${datadir}/xml/docbook/schema/dtd/$DTDVERSION + for catalog in $(ls catalogs); do + dtdVersion=$(echo ${catalog} | sed -rn 's/^catalog-([0-9].[0-9])\.xml/\1/p')
meta/recipes-devtools/docbook-xml/docbook-xml-dtd4_4.5.bb +2
-1+ DEST=${datadir}/xml/docbook/schema/dtd/${dtdVersion} install -d -m 755 ${D}$DEST - cp -v -R docbook-$DTDVERSION/* ${D}$DEST + cp -v -R catalogs/catalog-${dtdVersion}.xml
${D}$DEST/catalog.xmlxmlcatalog --verbose --noout --add nextCatalog unusedfile://$DEST/catalog.xml
${D}${sysconfdir}/xml/docbook-xml.xmldone
}
meta/recipes-devtools/docbook-xml/docbook-xml-dtd4_4.5.bb +4
-4-XMLCATALOGS = "${sysconfdir}/xml/docbook-xml.xml" -inherit xmlcatalog - -FILES_${PN} = "${datadir}/* ${sysconfdir}/xml/docbook-xml.xml" +FILES_${PN} = "\ + ${datadir}/* \ + ${XMLCATALOGS} \ +"