Initial commitHEADsubmit/trunk/20120918.211810submit/trunk/20120904.210202accepted/trunk/20120918.210621accepted/trunk/20120904.2046111.0_branch2.0alpha1.0

23 files changed, 22 insertions, 731 deletions

diff --git a/packaging/docbk30.zip b/packaging/docbk30.zip
deleted file mode 100644
index 66678b1..0000000
--- a/packaging/docbk30.zip
+++ /dev/null
diff --git a/packaging/docbk31.zip b/packaging/docbk31.zip
deleted file mode 100644
index ea05f3e..0000000
--- a/packaging/docbk31.zip
+++ /dev/null
diff --git a/packaging/docbk40.zip b/packaging/docbk40.zip
deleted file mode 100644
index f38246d..0000000
--- a/packaging/docbk40.zip
+++ /dev/null
diff --git a/packaging/docbk41.zip b/packaging/docbk41.zip
deleted file mode 100644
index 7553fac..0000000
--- a/packaging/docbk41.zip
+++ /dev/null
diff --git a/packaging/docbkx412.zip b/packaging/docbkx412.zip
deleted file mode 100644
index 70b6775..0000000
--- a/packaging/docbkx412.zip
+++ /dev/null
diff --git a/packaging/docbook-4.2-euro.patch b/packaging/docbook-4.2-euro.patch
deleted file mode 100644
index bbace5d..0000000
--- a/packaging/docbook-4.2-euro.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- docbook-dtds-1.0/4.2-sgml/docbookx.dtd.euro	2003-07-15 09:07:58.000000000 +0100
-+++ docbook-dtds-1.0/4.2-sgml/docbookx.dtd	2003-07-15 09:08:12.000000000 +0100
-@@ -106,7 +106,7 @@
- <![%dbcent.module;[
- 
- <![%sgml.features;[
--<!ENTITY euro "[euro  ]"><!-- euro sign, U+20AC NEW -->
-+<!ENTITY euro SDATA "[euro  ]"><!-- euro sign, U+20AC NEW -->
- ]]>
- <![%xml.features;[
- <!ENTITY euro "&#x20AC;"><!-- euro sign, U+20AC NEW -->
---- docbook-dtds-1.0/4.2-xml/docbookx.dtd.euro	2003-07-15 09:08:02.000000000 +0100
-+++ docbook-dtds-1.0/4.2-xml/docbookx.dtd	2003-07-15 09:08:21.000000000 +0100
-@@ -106,7 +106,7 @@
- <![%dbcent.module;[
- 
- <![%sgml.features;[
--<!ENTITY euro "[euro  ]"><!-- euro sign, U+20AC NEW -->
-+<!ENTITY euro SDATA "[euro  ]"><!-- euro sign, U+20AC NEW -->
- ]]>
- <![%xml.features;[
- <!ENTITY euro "&#x20AC;"><!-- euro sign, U+20AC NEW -->
diff --git a/packaging/docbook-4.2.zip b/packaging/docbook-4.2.zip
deleted file mode 100644
index f50bcb4..0000000
--- a/packaging/docbook-4.2.zip
+++ /dev/null
diff --git a/packaging/docbook-4.3.zip b/packaging/docbook-4.3.zip
deleted file mode 100644
index 586ed37..0000000
--- a/packaging/docbook-4.3.zip
+++ /dev/null
diff --git a/packaging/docbook-4.4.zip b/packaging/docbook-4.4.zip
deleted file mode 100644
index 94c4bb3..0000000
--- a/packaging/docbook-4.4.zip
+++ /dev/null
diff --git a/packaging/docbook-4.5.zip b/packaging/docbook-4.5.zip
deleted file mode 100644
index c1fda44..0000000
--- a/packaging/docbook-4.5.zip
+++ /dev/null
diff --git a/packaging/docbook-dtd30-sgml-1.0.catalog.patch b/packaging/docbook-dtd30-sgml-1.0.catalog.patch
deleted file mode 100644
index 6319fec..0000000
--- a/packaging/docbook-dtd30-sgml-1.0.catalog.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- docbook.cat	Tue Dec 10 16:35:22 1996
-+++ catalog	Mon Jun  5 11:08:34 2000
-@@ -27,7 +27,7 @@
-   -- ...................................................................... --

-   -- SGML declaration associated with DocBook ............................. --

- 

--DTDDECL "-//Davenport//DTD DocBook V3.0//EN" "docbook.dcl"

-+SGMLDECL "docbook.dcl"

- 

-   -- ...................................................................... --

-   -- DocBook driver file .................................................. --

-@@ -41,29 +41,6 @@
- PUBLIC "-//Davenport//ELEMENTS DocBook Information Pool V3.0//EN" "dbpool.mod"

- PUBLIC "-//Davenport//ELEMENTS DocBook Document Hierarchy V3.0//EN" "dbhier.mod"

- PUBLIC "-//Davenport//ENTITIES DocBook Additional General Entities V3.0//EN" "dbgenent.mod"

--

--  -- ...................................................................... --

--  -- ISO entity sets ...................................................... --

--

--PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN" "iso-dia.gml"

--PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" "iso-num.gml"

--PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN" "iso-pub.gml"

--PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN" "iso-tech.gml"

--PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN" "iso-lat1.gml"

--PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN" "iso-lat2.gml"

--PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN" "iso-grk1.gml"

--PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" "iso-grk2.gml"

--PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN" "iso-grk3.gml"

--PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" "iso-grk4.gml"

--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" "iso-amsa.gml"

--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" "iso-amsb.gml"

--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" "iso-amsc.gml"

--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" "iso-amsn.gml"

--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" "iso-amso.gml"

--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" "iso-amsr.gml"

--PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" "iso-box.gml"

--PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" "iso-cyr1.gml"

--PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" "iso-cyr2.gml"

- 

-   -- End of catalog data for DocBook V3.0 ................................. --

-   -- ...................................................................... --

diff --git a/packaging/docbook-dtd31-sgml-1.0.catalog.patch b/packaging/docbook-dtd31-sgml-1.0.catalog.patch
deleted file mode 100644
index 7e52e89..0000000
--- a/packaging/docbook-dtd31-sgml-1.0.catalog.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- docbook.cat	Tue Feb  2 06:53:32 1999
-+++ catalog	Thu May 25 11:45:01 2000
-@@ -19,7 +19,7 @@
-   -- ...................................................................... --

-   -- SGML declaration associated with DocBook ............................. --

- 

--DTDDECL "-//OASIS//DTD DocBook V3.1//EN" "docbook.dcl"

-+SGMLDECL "docbook.dcl"

- 

-   -- ...................................................................... --

-   -- DocBook driver file .................................................. --

-@@ -35,29 +35,6 @@
- PUBLIC "-//OASIS//ENTITIES DocBook Additional General Entities V3.1//EN" "dbgenent.mod"

- PUBLIC "-//OASIS//ENTITIES DocBook Notations V3.1//EN" "dbnotn.mod"

- PUBLIC "-//OASIS//ENTITIES DocBook Character Entities V3.1//EN" "dbcent.mod"

--

--  -- ...................................................................... --

--  -- ISO entity sets ...................................................... --

--

--PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN" "iso-dia.gml"

--PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" "iso-num.gml"

--PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN" "iso-pub.gml"

--PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN" "iso-tech.gml"

--PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN" "iso-lat1.gml"

--PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN" "iso-lat2.gml"

--PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN" "iso-grk1.gml"

--PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" "iso-grk2.gml"

--PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN" "iso-grk3.gml"

--PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" "iso-grk4.gml"

--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" "iso-amsa.gml"

--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" "iso-amsb.gml"

--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" "iso-amsc.gml"

--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" "iso-amsn.gml"

--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" "iso-amso.gml"

--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" "iso-amsr.gml"

--PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" "iso-box.gml"

--PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" "iso-cyr1.gml"

--PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" "iso-cyr2.gml"

- 

-   -- End of catalog data for DocBook V3.1 ................................. --

-   -- ...................................................................... --

diff --git a/packaging/docbook-dtd40-sgml-1.0.catalog.patch b/packaging/docbook-dtd40-sgml-1.0.catalog.patch
deleted file mode 100644
index d8125b7..0000000
--- a/packaging/docbook-dtd40-sgml-1.0.catalog.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- docbook.cat	Mon May 22 22:38:05 2000
-+++ catalog	Mon May 22 22:12:36 2000
-@@ -19,7 +19,7 @@
-   -- ...................................................................... --
-   -- SGML declaration associated with DocBook ............................. --
- 
--DTDDECL "-//OASIS//DTD DocBook V4.0//EN" "docbook.dcl"
-+SGMLDECL "docbook.dcl"
- 
-   -- ...................................................................... --
-   -- DocBook driver file .................................................. --
-@@ -35,29 +35,6 @@
- PUBLIC "-//OASIS//ENTITIES DocBook Additional General Entities V4.0//EN" "dbgenent.mod"
- PUBLIC "-//OASIS//ENTITIES DocBook Notations V4.0//EN" "dbnotn.mod"
- PUBLIC "-//OASIS//ENTITIES DocBook Character Entities V4.0//EN" "dbcent.mod"
--
--  -- ...................................................................... --
--  -- ISO entity sets ...................................................... --
--
--PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN" "iso-dia.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" "iso-num.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN" "iso-pub.gml"
--PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN" "iso-tech.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN" "iso-lat1.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN" "iso-lat2.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN" "iso-grk1.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" "iso-grk2.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN" "iso-grk3.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" "iso-grk4.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" "iso-amsa.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" "iso-amsb.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" "iso-amsc.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" "iso-amsn.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" "iso-amso.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" "iso-amsr.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" "iso-box.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" "iso-cyr1.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" "iso-cyr2.gml"
- 
-   -- End of catalog data for DocBook V4.0 ................................. --
-   -- ...................................................................... --
diff --git a/packaging/docbook-dtd41-sgml-1.0.catalog.patch b/packaging/docbook-dtd41-sgml-1.0.catalog.patch
deleted file mode 100644
index c08243a..0000000
--- a/packaging/docbook-dtd41-sgml-1.0.catalog.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- docbook.cat	Mon May 22 22:38:05 2000
-+++ catalog	Mon May 22 22:12:36 2000
-@@ -19,7 +19,7 @@
-   -- ...................................................................... --
-   -- SGML declaration associated with DocBook ............................. --
- 
--DTDDECL "-//OASIS//DTD DocBook V4.1//EN" "docbook.dcl"
-+SGMLDECL "docbook.dcl"
- 
-   -- ...................................................................... --
-   -- DocBook driver file .................................................. --
-@@ -35,29 +35,6 @@
- PUBLIC "-//OASIS//ENTITIES DocBook Additional General Entities V4.1//EN" "dbgenent.mod"
- PUBLIC "-//OASIS//ENTITIES DocBook Notations V4.1//EN" "dbnotn.mod"
- PUBLIC "-//OASIS//ENTITIES DocBook Character Entities V4.1//EN" "dbcent.mod"
--
--  -- ...................................................................... --
--  -- ISO entity sets ...................................................... --
--
--PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN" "iso-dia.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" "iso-num.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN" "iso-pub.gml"
--PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN" "iso-tech.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN" "iso-lat1.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN" "iso-lat2.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN" "iso-grk1.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" "iso-grk2.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN" "iso-grk3.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" "iso-grk4.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" "iso-amsa.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" "iso-amsb.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" "iso-amsc.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" "iso-amsn.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" "iso-amso.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" "iso-amsr.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" "iso-box.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" "iso-cyr1.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" "iso-cyr2.gml"
- 
-   -- End of catalog data for DocBook V4.1 ................................. --
-   -- ...................................................................... --
diff --git a/packaging/docbook-dtd412-entities.patch b/packaging/docbook-dtd412-entities.patch
deleted file mode 100644
index 39a7bb2..0000000
--- a/packaging/docbook-dtd412-entities.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -urNp docbook-dtds-1.0-orig/4.1.2-xml/docbook.cat docbook-dtds-1.0/4.1.2-xml/docbook.cat
---- docbook-dtds-1.0-orig/4.1.2-xml/docbook.cat	2009-02-19 13:49:08.000000000 +0100
-+++ docbook-dtds-1.0/4.1.2-xml/docbook.cat	2009-02-19 13:50:59.000000000 +0100
-@@ -41,25 +41,25 @@ PUBLIC "-//OASIS//ENTITIES DocBook XML C
-   -- ...................................................................... --
-   -- ISO entity sets ...................................................... --
- 
--PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN" "ent/iso-dia.ent"
--PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" "ent/iso-num.ent"
--PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN" "ent/iso-pub.ent"
--PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN" "ent/iso-tech.ent"
--PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN" "ent/iso-lat1.ent"
--PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN" "ent/iso-lat2.ent"
--PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN" "ent/iso-grk1.ent"
--PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" "ent/iso-grk2.ent"
--PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN" "ent/iso-grk3.ent"
--PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" "ent/iso-grk4.ent"
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" "ent/iso-amsa.ent"
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" "ent/iso-amsb.ent"
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" "ent/iso-amsc.ent"
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" "ent/iso-amsn.ent"
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" "ent/iso-amso.ent"
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" "ent/iso-amsr.ent"
--PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" "ent/iso-box.ent"
--PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" "ent/iso-cyr1.ent"
--PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" "ent/iso-cyr2.ent"
-+PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN//XML" "ent/iso-dia.ent"
-+PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN//XML" "ent/iso-num.ent"
-+PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN//XML" "ent/iso-pub.ent"
-+PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN//XML" "ent/iso-tech.ent"
-+PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN//XML" "ent/iso-lat1.ent"
-+PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN//XML" "ent/iso-lat2.ent"
-+PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN//XML" "ent/iso-grk1.ent"
-+PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN//XML" "ent/iso-grk2.ent"
-+PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN//XML" "ent/iso-grk3.ent"
-+PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN//XML" "ent/iso-grk4.ent"
-+PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN//XML" "ent/iso-amsa.ent"
-+PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN//XML" "ent/iso-amsb.ent"
-+PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN//XML" "ent/iso-amsc.ent"
-+PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN//XML" "ent/iso-amsn.ent"
-+PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN//XML" "ent/iso-amso.ent"
-+PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN//XML" "ent/iso-amsr.ent"
-+PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN//XML" "ent/iso-box.ent"
-+PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN//XML" "ent/iso-cyr1.ent"
-+PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN//XML" "ent/iso-cyr2.ent"
- 
-   -- End of catalog data for DocBook XML V4.1.2 ............................. --
-   -- ...................................................................... --
diff --git a/packaging/docbook-dtd42-sgml-1.0.catalog.patch b/packaging/docbook-dtd42-sgml-1.0.catalog.patch
deleted file mode 100644
index ca421df..0000000
--- a/packaging/docbook-dtd42-sgml-1.0.catalog.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- docbook.cat.orig	2002-07-17 17:14:28.000000000 +0100
-+++ docbook.cat	2002-07-17 21:58:24.000000000 +0100
-@@ -49,65 +49,5 @@
- PUBLIC "-//OASIS//ENTITIES DocBook Character Entities V4.2//EN"
-        "dbcentx.mod"
- 
--  -- ...................................................................... --
--  -- ISO entity sets ...................................................... --
--
--PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN"
--       "iso-dia.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN"
--       "iso-num.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN"
--       "iso-pub.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN"
--       "iso-tech.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN"
--       "iso-lat1.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN"
--       "iso-lat2.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN"
--       "iso-grk1.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN"
--       "iso-grk2.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN"
--       "iso-grk3.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN"
--       "iso-grk4.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN"
--       "iso-amsa.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN"
--       "iso-amsb.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN"
--       "iso-amsc.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN"
--       "iso-amsn.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN"
--       "iso-amso.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN"
--       "iso-amsr.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN"
--       "iso-box.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN"
--       "iso-cyr1.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN"
--       "iso-cyr2.gml"
--
-   -- End of catalog data for DocBook V4.2 ................................. --
-   -- ...................................................................... --
diff --git a/packaging/docbook-dtds-ents.patch b/packaging/docbook-dtds-ents.patch
deleted file mode 100644
index bc45628..0000000
--- a/packaging/docbook-dtds-ents.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- docbook-dtds-1.0/4.3-sgml/docbook.cat.ents	2005-12-13 13:14:24.000000000 +0000
-+++ docbook-dtds-1.0/4.3-sgml/docbook.cat	2005-12-13 13:14:38.000000000 +0000
-@@ -51,6 +51,7 @@
- 
-   -- ...................................................................... --
-   -- ISO entity sets ...................................................... --
-+--
- 
- PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN"
-        "iso-dia.gml"
-@@ -109,5 +110,6 @@
- PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN"
-        "iso-cyr2.gml"
- 
-+--
-   -- End of catalog data for DocBook V4.3 ................................. --
-   -- ...................................................................... --
---- docbook-dtds-1.0/4.4-sgml/docbook.cat.ents	2005-12-13 13:14:51.000000000 +0000
-+++ docbook-dtds-1.0/4.4-sgml/docbook.cat	2005-12-13 13:14:59.000000000 +0000
-@@ -54,6 +54,7 @@
- 
-   -- ...................................................................... --
-   -- ISO entity sets ...................................................... --
-+--
- 
- PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN"
-        "iso-dia.gml"
-@@ -112,5 +113,6 @@
- PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN"
-        "iso-cyr2.gml"
- 
-+--
-   -- End of catalog data for DocBook V4.4 ................................. --
-   -- ...................................................................... --
-diff -urNp docbook-dtds-1.0-orig/4.5-sgml/docbook.cat docbook-dtds-1.0/4.5-sgml/docbook.cat
---- docbook-dtds-1.0-orig/4.5-sgml/docbook.cat	2009-02-19 13:45:22.000000000 +0100
-+++ docbook-dtds-1.0/4.5-sgml/docbook.cat	2009-02-19 13:47:31.000000000 +0100
-@@ -60,6 +60,7 @@ PUBLIC "-//OASIS//ENTITIES DocBook Chara
- 
-   -- ...................................................................... --
-   -- ISO entity sets ...................................................... --
-+--
- 
- PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN"
-        "iso-dia.gml"
-@@ -118,5 +119,7 @@ PUBLIC "ISO 8879:1986//ENTITIES Russian 
- PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN"
-        "iso-cyr2.gml"
- 
-+--
-+
-   -- End of catalog data for DocBook V4.5 ................................. --
-   -- ...................................................................... --
diff --git a/packaging/docbook-dtds.spec b/packaging/docbook-dtds.spec
index 7fafbef..1895d09 100644
--- a/packaging/docbook-dtds.spec
+++ b/packaging/docbook-dtds.spec
@@ -10,7 +10,13 @@ Summary: SGML and XML document type definitions for DocBook
 
 License: Freely redistributable without restriction
 URL: http://www.oasis-open.org/docbook/
-
+Source0: %{name}-%{version}.tar.bz2
+BuildArch: noarch
+Requires(post): libxml2 >= 2.4.8
+Requires(post): /bin/chmod
+Requires(postun): libxml2 >= 2.4.8
+Requires: sgml-common >= 0.6.3
+Requires: xml-common >= 0.6.3
 
 Provides: docbook-dtd-xml = %{version}-%{release}
 Provides: docbook-dtd-sgml = %{version}-%{release}
@@ -28,46 +34,6 @@ Provides: docbook-dtd44-xml = %{version}-%{release}
 Provides: docbook-dtd45-sgml = %{version}-%{release}
 Provides: docbook-dtd45-xml = %{version}-%{release}
 
-Requires(post): libxml2 >= 2.4.8
-Requires(postun): libxml2 >= 2.4.8
-# If upgrading, the old package's postun scriptlet may use install-catalog
-# to remove its entries.  xmlcatalog (which this package uses) adds quotes
-# to the catalog files, and install-catalog only handles this in 0.6.3-4 or
-# later.
-Requires(post): /bin/chmod
-Requires: sgml-common >= 0.6.3-4
-# We provide the directory layout expected by 0.6.3-5 or later of
-# xml-common.  Earlier versions won't understand. Additionally
-# require xml-common >= 0.6.3-24 to workaround issue with F9
-# install+update and empty xmlcatalog
-Requires: xml-common >= 0.6.3-24
-
-BuildRoot: %{_tmppath}/%{name}-%{version}
-
-BuildArch: noarch
-Source0: http://www.oasis-open.org/docbook/sgml/3.0/docbk30.zip
-Source1: http://www.oasis-open.org/docbook/sgml/3.1/docbk31.zip
-Source2: http://www.oasis-open.org/docbook/sgml/4.0/docbk40.zip
-Source3: http://www.oasis-open.org/docbook/sgml/4.1/docbk41.zip
-Source4: http://www.oasis-open.org/docbook/xml/4.1.2/docbkx412.zip
-Source5: http://www.oasis-open.org/docbook/sgml/4.2/docbook-4.2.zip
-Source6: http://www.oasis-open.org/docbook/xml/4.2/docbook-xml-4.2.zip
-Source7: http://www.docbook.org/sgml/4.3/docbook-4.3.zip
-Source8: http://www.docbook.org/xml/4.3/docbook-xml-4.3.zip
-Source9: http://www.docbook.org/sgml/4.4/docbook-4.4.zip
-Source10: http://www.docbook.org/xml/4.4/docbook-xml-4.4.zip
-Source11: http://www.docbook.org/sgml/4.5/docbook-4.5.zip
-Source12: http://www.docbook.org/xml/4.5/docbook-xml-4.5.zip
-Patch0: docbook-dtd30-sgml-1.0.catalog.patch
-Patch1: docbook-dtd31-sgml-1.0.catalog.patch
-Patch2: docbook-dtd40-sgml-1.0.catalog.patch
-Patch3: docbook-dtd41-sgml-1.0.catalog.patch
-Patch4: docbook-dtd42-sgml-1.0.catalog.patch
-Patch5: docbook-4.2-euro.patch
-Patch6: docbook-dtds-ents.patch
-Patch7: docbook-sgml-systemrewrite.patch
-Patch8: docbook-dtd412-entities.patch
-BuildRequires: unzip
 
 %description
 The DocBook Document Type Definition (DTD) describes the syntax of
@@ -77,96 +43,7 @@ This package contains SGML and XML versions of the DocBook DTD.
 
 
 %prep
-%setup -c -T
-eval mkdir %{version_list}
-# DocBook V3.0
-cd 3.0-sgml
-unzip %{SOURCE0}
-patch -b docbook.cat %{PATCH0}
-cd ..
-
-# DocBook V3.1
-cd 3.1-sgml
-unzip %{SOURCE1}
-patch -b docbook.cat %{PATCH1}
-cd ..
-
-# DocBook V4.0
-cd 4.0-sgml
-unzip %{SOURCE2}
-patch -b docbook.cat %{PATCH2}
-cd ..
-
-# DocBook V4.1
-cd 4.1-sgml
-unzip %{SOURCE3}
-patch -b docbook.cat %{PATCH3}
-cd ..
-
-# DocBook XML V4.1.2
-cd 4.1.2-xml
-unzip %{SOURCE4}
-cd ..
-
-# DocBook V4.2
-cd 4.2-sgml
-unzip %{SOURCE5}
-patch -b docbook.cat %{PATCH4}
-cd ..
-
-# DocBook XML V4.2
-cd 4.2-xml
-unzip %{SOURCE6}
-cd ..
-
-# DocBook V4.3
-cd 4.3-sgml
-unzip %{SOURCE7}
-cd ..
-
-# DocBook XML V4.3
-cd 4.3-xml
-unzip %{SOURCE8}
-cd ..
-
-# DocBook V4.4
-cd 4.4-sgml
-unzip %{SOURCE9}
-cd ..
-
-# DocBook XML V4.4
-cd 4.4-xml
-unzip %{SOURCE10}
-cd ..
-
-# DocBook v4.5
-cd 4.5-sgml
-unzip %{SOURCE11}
-cd ..
-
-# DocBook XML v4.5
-cd 4.5-xml
-unzip %{SOURCE12}
-cd ..
-
-# Fix &euro; in SGML.
-%patch5 -p1
-
-# Fix ISO entities in 4.3/4.4/4.5 SGML
-%patch6 -p1
-
-# Rewrite SYSTEM to use local catalog instead web ones (#478680)
-%patch7 -p1
-
-# Add XML to the end of public identificators of 4.1.2 XML entities
-%patch8 -p1
-
-# Increase NAMELEN (bug #36058, bug #159382).
-sed -e's,\(NAMELEN\s\+\)44\(\s\*\)\?,\1256,' -i.namelen */docbook.dcl
-
-# fix of \r\n issue from rpmlint
-sed -i 's/\r//' */*.txt
-
+%setup -q
 
 if [ `id -u` -eq 0 ]; then
   chown -R root:root .
@@ -178,13 +55,13 @@ fi
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+
 
 # Symlinks
-mkdir -p $RPM_BUILD_ROOT/etc/sgml
+mkdir -p %{buildroot}/etc/sgml
 for fmt in sgml xml; do
   ln -s $fmt-docbook-4.5-%{version}-%{release}.cat \
-     $RPM_BUILD_ROOT/etc/sgml/$fmt-docbook.cat
+     %{buildroot}/etc/sgml/$fmt-docbook.cat
 done
 
 eval set %{version_list}
@@ -192,7 +69,7 @@ for dir
 do
   cd $dir
   fmt=${dir#*-} vvr=${dir%%-*}-%{version}-%{release}
-  DESTDIR=$RPM_BUILD_ROOT/usr/share/sgml/docbook/$fmt-dtd-$vvr
+  DESTDIR=%{buildroot}/usr/share/sgml/docbook/$fmt-dtd-$vvr
   case $fmt in
     sgml)   mkdir -p $DESTDIR ; install *.dcl $DESTDIR ;;
     xml)    mkdir -p $DESTDIR/ent ; install ent/* $DESTDIR/ent ;;
@@ -201,23 +78,10 @@ do
   install docbook.cat $DESTDIR/catalog
   cd ..
   # File for %%ghost
-  touch $RPM_BUILD_ROOT/etc/sgml/$fmt-docbook-$vvr.cat
+  touch %{buildroot}/etc/sgml/$fmt-docbook-$vvr.cat
 done
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
-%files
-%defattr (0644,root,root,0755)
-#in upstream tarballs there is a lot of files with 0755 permissions
-#but they don't need to be, 0644 is enough for every file in tarball
-%doc --parents 3.1-sgml/ChangeLog 4.1-sgml/ChangeLog */*.txt
-%config(noreplace) /etc/sgml/sgml-docbook.cat
-%config(noreplace) /etc/sgml/xml-docbook.cat
-/usr/share/sgml/docbook/*ml-dtd-*-%{version}-%{release}
-%ghost %config(noreplace) /etc/sgml/*ml-docbook-*-%{version}-%{release}.cat
 
 
 %post
@@ -378,22 +242,14 @@ sed -ni '
   }
   ' /etc/sgml/catalog
 
-%triggerin -- openjade >= %{openjadever}
-eval set %{version_list}
-for dir
-do
-  fmt=${dir#*-} ver=${dir%%-*} vvr=$ver-%{version}-%{release}
-  /usr/bin/xmlcatalog --sgml --noout --add /etc/sgml/$fmt-docbook-$vvr.cat \
-    /usr/share/sgml/openjade-%{openjadever}/catalog
-done
 
-%triggerun -- openjade >= %{openjadever}
-[ $2 = 0 ] || exit 0
-eval set %{version_list}
-for dir
-do
-  fmt=${dir#*-} ver=${dir%%-*} vvr=$ver-%{version}-%{release}
-  /usr/bin/xmlcatalog --sgml --noout --del /etc/sgml/$fmt-docbook-$vvr.cat \
-    /usr/share/sgml/openjade-%{openjadever}/catalog
-done
+%files
+%defattr (0644,root,root,0755)
+# in upstream tarballs there are a lot of files with 0755 permissions
+# but they don't need to be; 0644 is enough for every file in tarball
+%doc --parents 3.1-sgml/ChangeLog 4.1-sgml/ChangeLog */*.txt
+%config(noreplace) /etc/sgml/sgml-docbook.cat
+%config(noreplace) /etc/sgml/xml-docbook.cat
+%{_datadir}/sgml/docbook/*ml-dtd-*-%{version}-%{release}
+%ghost %config(noreplace) /etc/sgml/*ml-docbook-*-%{version}-%{release}.cat
 
diff --git a/packaging/docbook-sgml-systemrewrite.patch b/packaging/docbook-sgml-systemrewrite.patch
deleted file mode 100644
index 35b56d1..0000000
--- a/packaging/docbook-sgml-systemrewrite.patch
+++ /dev/null
@@ -1,210 +0,0 @@
-diff -urNp docbook-dtds-1.0-orig/3.0-sgml/docbook.cat docbook-dtds-1.0/3.0-sgml/docbook.cat
---- docbook-dtds-1.0-orig/3.0-sgml/docbook.cat	2009-02-05 16:44:15.000000000 +0100
-+++ docbook-dtds-1.0/3.0-sgml/docbook.cat	2009-02-05 16:48:58.000000000 +0100
-@@ -30,6 +30,12 @@
- SGMLDECL "docbook.dcl"

- 

-   -- ...................................................................... --

-+  -- SYSTEM rewrite of web URL .............. ............................. --

-+

-+SYSTEM "http://www.oasis-open.org/docbook/sgml/3.0/docbook.dtd"

-+       "docbook.dtd"

-+

-+  -- ...................................................................... --

-   -- DocBook driver file .................................................. --

- 

- PUBLIC "-//Davenport//DTD DocBook V3.0//EN" "docbook.dtd"

-diff -urNp docbook-dtds-1.0-orig/3.1-sgml/docbook.cat docbook-dtds-1.0/3.1-sgml/docbook.cat
---- docbook-dtds-1.0-orig/3.1-sgml/docbook.cat	2009-02-05 16:44:15.000000000 +0100
-+++ docbook-dtds-1.0/3.1-sgml/docbook.cat	2009-02-05 16:56:51.000000000 +0100
-@@ -22,6 +22,12 @@
- SGMLDECL "docbook.dcl"

- 

-   -- ...................................................................... --

-+  -- SYSTEM rewrite of web URL .............. ............................. --

-+

-+SYSTEM "http://www.oasis-open.org/docbook/sgml/3.0/docbook.dtd"

-+       "docbook.dtd"

-+

-+  -- ...................................................................... --

-   -- DocBook driver file .................................................. --

- 

- PUBLIC "-//OASIS//DTD DocBook V3.1//EN" "docbook.dtd"

-diff -urNp docbook-dtds-1.0-orig/4.0-sgml/docbook.cat docbook-dtds-1.0/4.0-sgml/docbook.cat
---- docbook-dtds-1.0-orig/4.0-sgml/docbook.cat	2009-02-05 16:44:16.000000000 +0100
-+++ docbook-dtds-1.0/4.0-sgml/docbook.cat	2009-02-05 16:49:06.000000000 +0100
-@@ -22,6 +22,12 @@
- SGMLDECL "docbook.dcl"
- 
-   -- ...................................................................... --
-+  -- SYSTEM rewrite of web URL .............. ............................. --
-+
-+SYSTEM "http://www.oasis-open.org/docbook/sgml/4.0/docbook.dtd"
-+       "docbook.dtd"
-+
-+  -- ...................................................................... --
-   -- DocBook driver file .................................................. --
- 
- PUBLIC "-//OASIS//DTD DocBook V4.0//EN" "docbook.dtd"
-Binární soubory docbook-dtds-1.0-orig/4.0-sgml/.docbook.cat.swp a docbook-dtds-1.0/4.0-sgml/.docbook.cat.swp jsou různé
-diff -urNp docbook-dtds-1.0-orig/4.1-sgml/docbook.cat docbook-dtds-1.0/4.1-sgml/docbook.cat
---- docbook-dtds-1.0-orig/4.1-sgml/docbook.cat	2009-02-05 16:44:16.000000000 +0100
-+++ docbook-dtds-1.0/4.1-sgml/docbook.cat	2009-02-05 16:49:27.000000000 +0100
-@@ -22,6 +22,12 @@
- SGMLDECL "docbook.dcl"
- 
-   -- ...................................................................... --
-+  -- SYSTEM rewrite of web URL .............. ............................. --
-+SYSTEM "http://www.oasis-open.org/docbook/sgml/4.1/docbook.dtd"
-+       "docbook.dtd"
-+
-+
-+  -- ...................................................................... --
-   -- DocBook driver file .................................................. --
- 
- PUBLIC "-//OASIS//DTD DocBook V4.1//EN" "docbook.dtd"
-diff -urNp docbook-dtds-1.0-orig/4.1.2-xml/docbook.cat docbook-dtds-1.0/4.1.2-xml/docbook.cat
---- docbook-dtds-1.0-orig/4.1.2-xml/docbook.cat	2000-08-27 17:19:42.000000000 +0200
-+++ docbook-dtds-1.0/4.1.2-xml/docbook.cat	2009-02-05 16:52:16.000000000 +0100
-@@ -17,6 +17,12 @@
-   --
- 
-   -- ...................................................................... --
-+  -- SYSTEM rewrite of web URL .............. ............................. --
-+
-+SYSTEM "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"
-+       "docbookx.dtd"
-+
-+  -- ...................................................................... --
-   -- DocBook driver file .................................................. --
- 
- PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "docbookx.dtd"
-diff -urNp docbook-dtds-1.0-orig/4.2-sgml/docbook.cat docbook-dtds-1.0/4.2-sgml/docbook.cat
---- docbook-dtds-1.0-orig/4.2-sgml/docbook.cat	2009-02-05 16:44:17.000000000 +0100
-+++ docbook-dtds-1.0/4.2-sgml/docbook.cat	2009-02-05 16:50:10.000000000 +0100
-@@ -17,6 +17,12 @@
-   --
- 
-   -- ...................................................................... --
-+  -- SYSTEM rewrite of web URL .............. ............................. --
-+
-+SYSTEM "http://www.oasis-open.org/docbook/sgml/4.2/docbook.dtd"
-+       "docbook.dtd"
-+
-+  -- ...................................................................... --
-   -- DocBook driver file .................................................. --
- 
- PUBLIC "-//OASIS//DTD DocBook V4.2//EN"
-diff -urNp docbook-dtds-1.0-orig/4.2-xml/docbook.cat docbook-dtds-1.0/4.2-xml/docbook.cat
---- docbook-dtds-1.0-orig/4.2-xml/docbook.cat	2002-07-17 18:14:41.000000000 +0200
-+++ docbook-dtds-1.0/4.2-xml/docbook.cat	2009-02-05 16:52:53.000000000 +0100
-@@ -17,6 +17,12 @@
-   --
- 
-   -- ...................................................................... --
-+  -- SYSTEM rewrite of web URL .............. ............................. --
-+
-+SYSTEM "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
-+       "docbookx.dtd"
-+
-+  -- ...................................................................... --
-   -- DocBook driver file .................................................. --
- 
- PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-diff -urNp docbook-dtds-1.0-orig/4.3-sgml/docbook.cat docbook-dtds-1.0/4.3-sgml/docbook.cat
---- docbook-dtds-1.0-orig/4.3-sgml/docbook.cat	2009-02-05 16:44:18.000000000 +0100
-+++ docbook-dtds-1.0/4.3-sgml/docbook.cat	2009-02-05 16:50:37.000000000 +0100
-@@ -17,6 +17,13 @@
-   --
- 
-   -- ...................................................................... --
-+  -- SYSTEM rewrite of web URL .............. ............................. --
-+
-+SYSTEM "http://www.oasis-open.org/docbook/sgml/4.3/docbook.dtd"
-+       "docbook.dtd"
-+
-+
-+  -- ...................................................................... --
-   -- DocBook driver file .................................................. --
- 
- PUBLIC "-//OASIS//DTD DocBook V4.3//EN"
-diff -urNp docbook-dtds-1.0-orig/4.3-xml/docbook.cat docbook-dtds-1.0/4.3-xml/docbook.cat
---- docbook-dtds-1.0-orig/4.3-xml/docbook.cat	2004-03-31 13:22:18.000000000 +0200
-+++ docbook-dtds-1.0/4.3-xml/docbook.cat	2009-02-05 16:53:12.000000000 +0100
-@@ -17,6 +17,12 @@
-   --
- 
-   -- ...................................................................... --
-+  -- SYSTEM rewrite of web URL .............. ............................. --
-+
-+SYSTEM "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
-+       "docbookx.dtd"
-+
-+  -- ...................................................................... --
-   -- DocBook driver file .................................................. --
- 
- PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-diff -urNp docbook-dtds-1.0-orig/4.4-sgml/docbook.cat docbook-dtds-1.0/4.4-sgml/docbook.cat
---- docbook-dtds-1.0-orig/4.4-sgml/docbook.cat	2009-02-05 16:44:18.000000000 +0100
-+++ docbook-dtds-1.0/4.4-sgml/docbook.cat	2009-02-05 16:50:57.000000000 +0100
-@@ -17,6 +17,12 @@
-   --
- 
-   -- ...................................................................... --
-+  -- SYSTEM rewrite of web URL .............. ............................. --
-+
-+SYSTEM "http://www.oasis-open.org/docbook/sgml/4.4/docbook.dtd"
-+       "docbook.dtd"
-+
-+  -- ...................................................................... --
-   -- DocBook driver file .................................................. --
- 
- PUBLIC "-//OASIS//DTD DocBook V4.4//EN"
-diff -urNp docbook-dtds-1.0-orig/4.4-xml/docbook.cat docbook-dtds-1.0/4.4-xml/docbook.cat
---- docbook-dtds-1.0-orig/4.4-xml/docbook.cat	2005-01-27 14:57:19.000000000 +0100
-+++ docbook-dtds-1.0/4.4-xml/docbook.cat	2009-02-05 16:53:30.000000000 +0100
-@@ -17,6 +17,12 @@
-   --
- 
-   -- ...................................................................... --
-+  -- SYSTEM rewrite of web URL .............. ............................. --
-+
-+SYSTEM "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd"
-+       "docbookx.dtd"
-+
-+  -- ...................................................................... --
-   -- DocBook driver file .................................................. --
- 
- PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-diff -urNp docbook-dtds-1.0-orig/4.5-sgml/docbook.cat docbook-dtds-1.0/4.5-sgml/docbook.cat
---- docbook-dtds-1.0-orig/4.5-sgml/docbook.cat	2006-10-03 15:27:50.000000000 +0200
-+++ docbook-dtds-1.0/4.5-sgml/docbook.cat	2009-02-05 16:51:22.000000000 +0100
-@@ -17,6 +17,12 @@
-   --
- 
-   -- ...................................................................... --
-+  -- SYSTEM rewrite of web URL .............. ............................. --
-+
-+SYSTEM "http://www.oasis-open.org/docbook/sgml/4.5/docbook.dtd"
-+       "docbook.dtd"
-+
-+  -- ...................................................................... --
-   -- DocBook driver file .................................................. --
- 
- PUBLIC "-//OASIS//DTD DocBook V4.5//EN"
-diff -urNp docbook-dtds-1.0-orig/4.5-xml/docbook.cat docbook-dtds-1.0/4.5-xml/docbook.cat
---- docbook-dtds-1.0-orig/4.5-xml/docbook.cat	2006-10-03 15:26:00.000000000 +0200
-+++ docbook-dtds-1.0/4.5-xml/docbook.cat	2009-02-05 16:55:45.000000000 +0100
-@@ -17,6 +17,12 @@
-   --
- 
-   -- ...................................................................... --
-+  -- SYSTEM rewrite of web URL .............. ............................. --
-+
-+SYSTEM "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd"
-+       "docbookx.dtd"
-+
-+  -- ...................................................................... --
-   -- DocBook driver file .................................................. --
- 
- PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
diff --git a/packaging/docbook-xml-4.2.zip b/packaging/docbook-xml-4.2.zip
deleted file mode 100644
index a74bc2b..0000000
--- a/packaging/docbook-xml-4.2.zip
+++ /dev/null
diff --git a/packaging/docbook-xml-4.3.zip b/packaging/docbook-xml-4.3.zip
deleted file mode 100644
index bbefa2a..0000000
--- a/packaging/docbook-xml-4.3.zip
+++ /dev/null
diff --git a/packaging/docbook-xml-4.4.zip b/packaging/docbook-xml-4.4.zip
deleted file mode 100644
index abbcd3a..0000000
--- a/packaging/docbook-xml-4.4.zip
+++ /dev/null
diff --git a/packaging/docbook-xml-4.5.zip b/packaging/docbook-xml-4.5.zip
deleted file mode 100644
index cb510f6..0000000
--- a/packaging/docbook-xml-4.5.zip
+++ /dev/null