From 605e1f38f4a4257987e03e35518ed720fed56bc2 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Wed, 9 Jul 2014 18:16:56 +0800 Subject: docbook-xml: add docbook-xml-dtd4 Refer debian, it shipped 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. About the config files (docbook-xml.xml and the update patch), we refered what Ubuntu 13.04 did, so the xmlto could correctly search among multible DTDs. [YOCTO #2416] (From OE-Core rev: 03bc6717482c07dde69edf96d1044d3c0016dbf6) Signed-off-by: Hongxu Jia Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- .../docbook-xml-update-catalog.xml.patch | 515 +++++++++++++++++++++ 1 file changed, 515 insertions(+) create mode 100644 meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/docbook-xml-update-catalog.xml.patch (limited to 'meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/docbook-xml-update-catalog.xml.patch') diff --git a/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/docbook-xml-update-catalog.xml.patch b/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/docbook-xml-update-catalog.xml.patch new file mode 100644 index 0000000000..59703609ca --- /dev/null +++ b/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/docbook-xml-update-catalog.xml.patch @@ -0,0 +1,515 @@ +docbook-xml: update catalog.xml + +Refer Ubuntu 13.04 to update catalog.xml + +Upstream-Status: Pending +Signed-off-by: Hongxu Jia +--- + 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 @@ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +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 @@ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +diff --git a/docbook-4.2/catalog.xml b/docbook-4.2/catalog.xml +--- a/docbook-4.2/catalog.xml ++++ b/docbook-4.2/catalog.xml +@@ -1,4 +1,7 @@ + ++ ++ + + + +@@ -25,6 +28,12 @@ + + ++ ++ ++ ++ + + + +@@ -49,66 +58,6 @@ + + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- + + + +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 @@ + ++ ++ + + + +@@ -25,12 +28,21 @@ + + ++ ++ ++ ++ + + + + + ++ ++ + + +@@ -49,66 +61,6 @@ + + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- + + + +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 @@ + ++ ++ + + + +@@ -58,66 +61,6 @@ + + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- + + + +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 @@ + ++ ++ + + + +@@ -58,66 +61,6 @@ + + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- + + + +-- +1.8.1.2 + -- cgit v1.2.3-54-g00ecf