[xml/sgml-commit] r1917 - in /packages/docbook/trunk/debian: ./ patches/ source/
malat at users.alioth.debian.org
malat at users.alioth.debian.org
Thu May 3 09:56:23 UTC 2012
Author: malat
Date: Thu May 3 09:56:22 2012
New Revision: 1917
URL: http://svn.debian.org/wsvn/debian-xml-sgml/?sc=1&rev=1917
Log:
Switch to quilt
Added:
packages/docbook/trunk/debian/catalog
packages/docbook/trunk/debian/patches/01_remove_entity_sets_and_dcl_from_catalogs.diff (with props)
packages/docbook/trunk/debian/patches/10_fix_101779_mention_artheader_to_articleinfo_change.diff (with props)
packages/docbook/trunk/debian/patches/11_fix_dbpoolx_mod_header_comment_pubid.diff (with props)
packages/docbook/trunk/debian/patches/12_fix_256119_and_turn_on_sgml_mode.diff (with props)
packages/docbook/trunk/debian/patches/series
packages/docbook/trunk/debian/source/
packages/docbook/trunk/debian/source/format
Removed:
packages/docbook/trunk/debian/patches/00list
packages/docbook/trunk/debian/patches/01_remove_entity_sets_and_dcl_from_catalogs.dpatch
packages/docbook/trunk/debian/patches/10_fix_101779_mention_artheader_to_articleinfo_change.dpatch
packages/docbook/trunk/debian/patches/11_fix_dbpoolx_mod_header_comment_pubid.dpatch
packages/docbook/trunk/debian/patches/12_fix_256119_and_turn_on_sgml_mode.dpatch
packages/docbook/trunk/debian/source.lintian-overrides
Modified:
packages/docbook/trunk/debian/changelog
packages/docbook/trunk/debian/control
packages/docbook/trunk/debian/rules
Added: packages/docbook/trunk/debian/catalog
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook/trunk/debian/catalog?rev=1917&op=file
==============================================================================
--- packages/docbook/trunk/debian/catalog (added)
+++ packages/docbook/trunk/debian/catalog Thu May 3 09:56:22 2012
@@ -1,0 +1,19 @@
+ -- ...................................................................... --
+ -- Prefer PUBID to SYSID ................................................ --
+OVERRIDE YES
+
+ -- latest DocBook --
+PUBLIC "-//OASIS//DTD DocBook//EN" "4.5/docbook.dtd"
+ -- disabled, see README.docbook.dcl --
+-- DTDDECL "-//OASIS//DTD DocBook//EN" "4.5/docbook.dcl" --
+
+ -- latest DocBook v4--
+PUBLIC "-//OASIS//DTD DocBook V4//EN" "4.5/docbook.dtd"
+ -- disabled, see README.docbook.dcl --
+-- DTDDECL "-//OASIS//DTD DocBook V4//EN" "4.5/docbook.dcl" --
+
+ -- latest DocBook v3--
+PUBLIC "-//OASIS//DTD DocBook V3//EN" "3.1/docbook.dtd"
+ -- disabled, see README.docbook.dcl --
+-- DTDDECL "-//OASIS//DTD DocBook V3//EN" "3.1/docbook.dcl" --
+
Modified: packages/docbook/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook/trunk/debian/changelog?rev=1917&op=diff
==============================================================================
--- packages/docbook/trunk/debian/changelog (original)
+++ packages/docbook/trunk/debian/changelog Thu May 3 09:56:22 2012
@@ -1,5 +1,6 @@
docbook (4.5-5) UNRELEASED; urgency=low
+ [ Daniel Leidert (dale) ]
* NOT RELEASED YET
* debian/compat: Raised to v5.
* debian/control: Vcs fields transition. Added DM-Upload-Allowed.
@@ -12,6 +13,13 @@
patch-system-but-direct-changes-in-diff warning, because file creation is
intended.
* debian/README.source: Added for policy compliance.
+
+ [ Mathieu Malaterre ]
+ * Add myself as uploader
+ * Bump Std-Vers to 3.9.3, no changes needed
+ * Add Multi-Arch: foreign. Closes: #665989
+ * Switch to dpkg-source 3.0 (quilt) format
+ * Switch from dpatch to quilt
-- Daniel Leidert (dale) <daniel.leidert at wgdd.de> Thu, 27 Sep 2007 00:24:33 +0200
Modified: packages/docbook/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook/trunk/debian/control?rev=1917&op=diff
==============================================================================
--- packages/docbook/trunk/debian/control (original)
+++ packages/docbook/trunk/debian/control Thu May 3 09:56:22 2012
@@ -2,13 +2,14 @@
Section: text
Priority: optional
Maintainer: Debian XML/SGML Group <debian-xml-sgml-pkgs at lists.alioth.debian.org>
-Uploaders: Daniel Leidert (dale) <daniel.leidert at wgdd.de>
-Build-Depends: debhelper (>= 5), dpatch
-Standards-Version: 3.8.3
+Uploaders: Daniel Leidert (dale) <daniel.leidert at wgdd.de>, Mathieu Malaterre <malat at debian.org>
+Build-Depends: debhelper (>= 5)
+Standards-Version: 3.9.3
Homepage: http://www.oasis-open.org/docbook/sgml/
-Vcs-Browser: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook/
-Vcs-Svn: svn://svn.debian.org/svn/debian-xml-sgml/packages/docbook/trunk/
+Vcs-Browser: http://anonscm.debian.org/viewvc/debian-xml-sgml/packages/docbook/
+Vcs-Svn: svn://svn.debian.org/debian-xml-sgml/packages/docbook/trunk/
DM-Upload-Allowed: yes
+Multi-Arch: foreign
Package: docbook
Architecture: all
Added: packages/docbook/trunk/debian/patches/01_remove_entity_sets_and_dcl_from_catalogs.diff
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook/trunk/debian/patches/01_remove_entity_sets_and_dcl_from_catalogs.diff?rev=1917&op=file
==============================================================================
--- packages/docbook/trunk/debian/patches/01_remove_entity_sets_and_dcl_from_catalogs.diff (added)
+++ packages/docbook/trunk/debian/patches/01_remove_entity_sets_and_dcl_from_catalogs.diff Thu May 3 09:56:22 2012
@@ -1,0 +1,567 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_remove_entity_sets_and_dcl_from_catalogs.dpatch by
+## Mark Eichin <eichin at kitten.gen.ma.us> and Adam Di Carlo <aph at debian.org>.
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: This patch:
+## DP: * removes all SGML declarations from the catalogs, for more info, see
+## DP: debian/README.docbook.dcl
+## DP: * removes the ISO entity pointers since they are supplied by sgml-data
+## DP: * removes Public-IDs for DocBook XML
+## DP: * forces Public-ID rather than the System-ID in DTD declarations
+## DP: (closes: <URL:http://bugs.debian.org/97330>)
+## DP:
+## DP: <URL:http://packages.debian.org/changelogs/pool/main/d/docbook/current/changelog#versionversion4.4-1>
+## DP: <URL:http://packages.debian.org/changelogs/pool/main/d/docbook/current/changelog#versionversion4.1-5>
+## DP: <URL:http://packages.debian.org/changelogs/pool/main/d/docbook/current/changelog#versionversion4.1-2>
+## DP: <URL:http://packages.debian.org/changelogs/pool/main/d/docbook/current/changelog#versionversion3.0-4>
+
+ at DPATCH@
+diff -urNad docbook-4.5~/docbook-2.4.1/docbook.cat docbook-4.5/docbook-2.4.1/docbook.cat
+--- docbook-4.5~/docbook-2.4.1/docbook.cat 1996-04-16 08:53:16.000000000 +0200
++++ docbook-4.5/docbook-2.4.1/docbook.cat 2007-03-09 16:39:46.000000000 +0100
+@@ -27,8 +27,13 @@
+ -- ...................................................................... --
+ -- SGML declaration associated with DocBook ............................. --
+
+-SGMLDECL "docbook.dcl"
+-DTDDECL "-//Davenport//DTD DocBook V2.4.1//EN" "docbook.dcl"
++-- disabled, see README.docbook.dcl --
++-- SGMLDECL "docbook.dcl" --
++-- DTDDECL "-//Davenport//DTD DocBook V2.4.1//EN" "docbook.dcl" --
++
++ -- ...................................................................... --
++ -- Prefer PUBID to SYSID ................................................ --
++OVERRIDE YES
+
+ -- ...................................................................... --
+ -- DocBook driver file .................................................. --
+@@ -43,28 +48,5 @@
+ PUBLIC "-//Davenport//ELEMENTS DocBook Document Hierarchy V2.4.1//EN" "dbhier.mod"
+ PUBLIC "-//Davenport//ELEMENTS DocBook Additional General Entities//EN" "dbgenent.mod"
+
+- -- ...................................................................... --
+- -- ISO entity sets ...................................................... --
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN" "iso-dia.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" "iso-num.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN" "iso-pub.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN" "iso-tech.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN" "iso-lat1.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN" "iso-lat2.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN" "iso-grk1.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" "iso-grk2.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN" "iso-grk3.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" "iso-grk4.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" "iso-amsa.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" "iso-amsb.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" "iso-amsc.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" "iso-amsn.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" "iso-amso.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" "iso-amsr.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" "iso-box.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" "iso-cyr1.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" "iso-cyr2.gml"
+-
+ -- End of DocBook catalog data V2.4.1 ................................... --
+ -- ...................................................................... --
+diff -urNad docbook-4.5~/docbook-3.0/docbook.cat docbook-4.5/docbook-3.0/docbook.cat
+--- docbook-4.5~/docbook-3.0/docbook.cat 1996-12-10 16:35:22.000000000 +0100
++++ docbook-4.5/docbook-3.0/docbook.cat 2007-03-09 16:44:17.000000000 +0100
+@@ -27,7 +27,12 @@
+ -- ...................................................................... --
+ -- SGML declaration associated with DocBook ............................. --
+
+-DTDDECL "-//Davenport//DTD DocBook V3.0//EN" "docbook.dcl"
++-- disabled, see README.docbook.dcl --
++-- DTDDECL "-//Davenport//DTD DocBook V3.0//EN" "docbook.dcl" --
++
++ -- ...................................................................... --
++ -- Prefer PUBID to SYSID ................................................ --
++OVERRIDE YES
+
+ -- ...................................................................... --
+ -- DocBook driver file .................................................. --
+@@ -42,28 +47,5 @@
+ PUBLIC "-//Davenport//ELEMENTS DocBook Document Hierarchy V3.0//EN" "dbhier.mod"
+ PUBLIC "-//Davenport//ENTITIES DocBook Additional General Entities V3.0//EN" "dbgenent.mod"
+
+- -- ...................................................................... --
+- -- ISO entity sets ...................................................... --
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN" "iso-dia.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" "iso-num.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN" "iso-pub.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN" "iso-tech.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN" "iso-lat1.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN" "iso-lat2.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN" "iso-grk1.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" "iso-grk2.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN" "iso-grk3.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" "iso-grk4.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" "iso-amsa.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" "iso-amsb.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" "iso-amsc.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" "iso-amsn.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" "iso-amso.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" "iso-amsr.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" "iso-box.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" "iso-cyr1.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" "iso-cyr2.gml"
+-
+ -- End of catalog data for DocBook V3.0 ................................. --
+ -- ...................................................................... --
+diff -urNad docbook-4.5~/docbook-3.1/docbook.cat docbook-4.5/docbook-3.1/docbook.cat
+--- docbook-4.5~/docbook-3.1/docbook.cat 1999-02-02 06:53:32.000000000 +0100
++++ docbook-4.5/docbook-3.1/docbook.cat 2007-03-09 16:44:12.000000000 +0100
+@@ -19,7 +19,12 @@
+ -- ...................................................................... --
+ -- SGML declaration associated with DocBook ............................. --
+
+-DTDDECL "-//OASIS//DTD DocBook V3.1//EN" "docbook.dcl"
++-- disabled, see README.docbook.dcl --
++-- DTDDECL "-//OASIS//DTD DocBook V3.1//EN" "docbook.dcl" --
++
++ -- ...................................................................... --
++ -- Prefer PUBID to SYSID ................................................ --
++OVERRIDE YES
+
+ -- ...................................................................... --
+ -- DocBook driver file .................................................. --
+@@ -36,28 +41,5 @@
+ PUBLIC "-//OASIS//ENTITIES DocBook Notations V3.1//EN" "dbnotn.mod"
+ PUBLIC "-//OASIS//ENTITIES DocBook Character Entities V3.1//EN" "dbcent.mod"
+
+- -- ...................................................................... --
+- -- ISO entity sets ...................................................... --
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN" "iso-dia.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" "iso-num.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN" "iso-pub.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN" "iso-tech.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN" "iso-lat1.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN" "iso-lat2.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN" "iso-grk1.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" "iso-grk2.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN" "iso-grk3.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" "iso-grk4.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" "iso-amsa.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" "iso-amsb.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" "iso-amsc.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" "iso-amsn.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" "iso-amso.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" "iso-amsr.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" "iso-box.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" "iso-cyr1.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" "iso-cyr2.gml"
+-
+ -- End of catalog data for DocBook V3.1 ................................. --
+ -- ...................................................................... --
+diff -urNad docbook-4.5~/docbook-4.0/docbook.cat docbook-4.5/docbook-4.0/docbook.cat
+--- docbook-4.5~/docbook-4.0/docbook.cat 2000-05-18 21:27:28.000000000 +0200
++++ docbook-4.5/docbook-4.0/docbook.cat 2007-03-09 16:45:08.000000000 +0100
+@@ -19,7 +19,12 @@
+ -- ...................................................................... --
+ -- SGML declaration associated with DocBook ............................. --
+
+-DTDDECL "-//OASIS//DTD DocBook V4.0//EN" "docbook.dcl"
++-- disabled, see README.docbook.dcl --
++-- DTDDECL "-//OASIS//DTD DocBook V4.0//EN" "docbook.dcl" --
++
++ -- ...................................................................... --
++ -- Prefer PUBID to SYSID ................................................ --
++OVERRIDE YES
+
+ -- ...................................................................... --
+ -- DocBook driver file .................................................. --
+@@ -36,28 +41,5 @@
+ PUBLIC "-//OASIS//ENTITIES DocBook Notations V4.0//EN" "dbnotn.mod"
+ PUBLIC "-//OASIS//ENTITIES DocBook Character Entities V4.0//EN" "dbcent.mod"
+
+- -- ...................................................................... --
+- -- ISO entity sets ...................................................... --
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN" "iso-dia.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" "iso-num.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN" "iso-pub.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN" "iso-tech.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN" "iso-lat1.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN" "iso-lat2.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN" "iso-grk1.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" "iso-grk2.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN" "iso-grk3.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" "iso-grk4.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" "iso-amsa.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" "iso-amsb.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" "iso-amsc.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" "iso-amsn.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" "iso-amso.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" "iso-amsr.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" "iso-box.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" "iso-cyr1.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" "iso-cyr2.gml"
+-
+ -- End of catalog data for DocBook V4.0 ................................. --
+ -- ...................................................................... --
+diff -urNad docbook-4.5~/docbook-4.1/docbook.cat docbook-4.5/docbook-4.1/docbook.cat
+--- docbook-4.5~/docbook-4.1/docbook.cat 2000-06-19 16:50:28.000000000 +0200
++++ docbook-4.5/docbook-4.1/docbook.cat 2007-03-09 16:53:00.000000000 +0100
+@@ -19,7 +19,12 @@
+ -- ...................................................................... --
+ -- SGML declaration associated with DocBook ............................. --
+
+-DTDDECL "-//OASIS//DTD DocBook V4.1//EN" "docbook.dcl"
++-- disabled, see README.docbook.dcl --
++-- DTDDECL "-//OASIS//DTD DocBook V4.1//EN" "docbook.dcl" --
++
++ -- ...................................................................... --
++ -- Prefer PUBID to SYSID ................................................ --
++OVERRIDE YES
+
+ -- ...................................................................... --
+ -- DocBook driver file .................................................. --
+@@ -36,28 +41,5 @@
+ PUBLIC "-//OASIS//ENTITIES DocBook Notations V4.1//EN" "dbnotn.mod"
+ PUBLIC "-//OASIS//ENTITIES DocBook Character Entities V4.1//EN" "dbcent.mod"
+
+- -- ...................................................................... --
+- -- ISO entity sets ...................................................... --
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN" "iso-dia.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" "iso-num.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN" "iso-pub.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN" "iso-tech.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN" "iso-lat1.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN" "iso-lat2.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN" "iso-grk1.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" "iso-grk2.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN" "iso-grk3.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" "iso-grk4.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" "iso-amsa.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" "iso-amsb.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" "iso-amsc.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" "iso-amsn.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" "iso-amso.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" "iso-amsr.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" "iso-box.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" "iso-cyr1.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" "iso-cyr2.gml"
+-
+ -- End of catalog data for DocBook V4.1 ................................. --
+ -- ...................................................................... --
+diff -urNad docbook-4.5~/docbook-4.2/docbook.cat docbook-4.5/docbook-4.2/docbook.cat
+--- docbook-4.5~/docbook-4.2/docbook.cat 2002-07-17 18:14:28.000000000 +0200
++++ docbook-4.5/docbook-4.2/docbook.cat 2007-03-09 16:42:30.000000000 +0100
+@@ -22,9 +22,6 @@
+ PUBLIC "-//OASIS//DTD DocBook V4.2//EN"
+ "docbook.dtd"
+
+-PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+- "docbookx.dtd"
+-
+ -- ...................................................................... --
+ -- DocBook modules ...................................................... --
+
+@@ -49,65 +46,5 @@
+ PUBLIC "-//OASIS//ENTITIES DocBook Character Entities V4.2//EN"
+ "dbcentx.mod"
+
+- -- ...................................................................... --
+- -- ISO entity sets ...................................................... --
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN"
+- "iso-dia.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN"
+- "iso-num.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN"
+- "iso-pub.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN"
+- "iso-tech.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN"
+- "iso-lat1.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN"
+- "iso-lat2.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN"
+- "iso-grk1.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN"
+- "iso-grk2.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN"
+- "iso-grk3.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN"
+- "iso-grk4.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN"
+- "iso-amsa.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN"
+- "iso-amsb.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN"
+- "iso-amsc.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN"
+- "iso-amsn.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN"
+- "iso-amso.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN"
+- "iso-amsr.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN"
+- "iso-box.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN"
+- "iso-cyr1.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN"
+- "iso-cyr2.gml"
+-
+ -- End of catalog data for DocBook V4.2 ................................. --
+ -- ...................................................................... --
+diff -urNad docbook-4.5~/docbook-4.3/docbook.cat docbook-4.5/docbook-4.3/docbook.cat
+--- docbook-4.5~/docbook-4.3/docbook.cat 2004-03-31 13:44:16.000000000 +0200
++++ docbook-4.5/docbook-4.3/docbook.cat 2007-03-09 16:53:47.000000000 +0100
+@@ -22,9 +22,6 @@
+ PUBLIC "-//OASIS//DTD DocBook V4.3//EN"
+ "docbook.dtd"
+
+-PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+- "docbookx.dtd"
+-
+ -- ...................................................................... --
+ -- DocBook modules ...................................................... --
+
+@@ -49,65 +46,5 @@
+ PUBLIC "-//OASIS//ENTITIES DocBook Character Entities V4.3//EN"
+ "dbcentx.mod"
+
+- -- ...................................................................... --
+- -- ISO entity sets ...................................................... --
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN"
+- "iso-dia.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN"
+- "iso-num.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN"
+- "iso-pub.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN"
+- "iso-tech.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN"
+- "iso-lat1.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN"
+- "iso-lat2.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN"
+- "iso-grk1.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN"
+- "iso-grk2.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN"
+- "iso-grk3.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN"
+- "iso-grk4.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN"
+- "iso-amsa.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN"
+- "iso-amsb.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN"
+- "iso-amsc.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN"
+- "iso-amsn.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN"
+- "iso-amso.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN"
+- "iso-amsr.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN"
+- "iso-box.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN"
+- "iso-cyr1.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN"
+- "iso-cyr2.gml"
+-
+ -- End of catalog data for DocBook V4.3 ................................. --
+ -- ...................................................................... --
+diff -urNad docbook-4.5~/docbook-4.4/docbook.cat docbook-4.5/docbook-4.4/docbook.cat
+--- docbook-4.5~/docbook-4.4/docbook.cat 2005-01-27 14:59:49.000000000 +0100
++++ docbook-4.5/docbook-4.4/docbook.cat 2007-03-09 16:54:12.000000000 +0100
+@@ -22,9 +22,6 @@
+ PUBLIC "-//OASIS//DTD DocBook V4.4//EN"
+ "docbook.dtd"
+
+-PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+- "docbookx.dtd"
+-
+ -- ...................................................................... --
+ -- DocBook modules ...................................................... --
+
+@@ -52,65 +49,5 @@
+ PUBLIC "-//OASIS//ENTITIES DocBook Character Entities V4.4//EN"
+ "dbcentx.mod"
+
+- -- ...................................................................... --
+- -- ISO entity sets ...................................................... --
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN"
+- "iso-dia.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN"
+- "iso-num.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN"
+- "iso-pub.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN"
+- "iso-tech.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN"
+- "iso-lat1.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN"
+- "iso-lat2.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN"
+- "iso-grk1.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN"
+- "iso-grk2.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN"
+- "iso-grk3.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN"
+- "iso-grk4.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN"
+- "iso-amsa.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN"
+- "iso-amsb.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN"
+- "iso-amsc.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN"
+- "iso-amsn.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN"
+- "iso-amso.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN"
+- "iso-amsr.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN"
+- "iso-box.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN"
+- "iso-cyr1.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN"
+- "iso-cyr2.gml"
+-
+ -- End of catalog data for DocBook V4.4 ................................. --
+ -- ...................................................................... --
+diff -urNad docbook-4.5~/docbook-4.5/docbook.cat docbook-4.5/docbook-4.5/docbook.cat
+--- docbook-4.5~/docbook-4.5/docbook.cat 2006-10-03 15:27:50.000000000 +0200
++++ docbook-4.5/docbook-4.5/docbook.cat 2007-03-09 16:54:41.000000000 +0100
+@@ -22,9 +22,6 @@
+ PUBLIC "-//OASIS//DTD DocBook V4.5//EN"
+ "docbook.dtd"
+
+-PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+- "docbookx.dtd"
+-
+ -- ...................................................................... --
+ -- DocBook modules ...................................................... --
+
+@@ -52,65 +49,5 @@
+ PUBLIC "-//OASIS//ENTITIES DocBook Character Entities V4.5//EN"
+ "dbcentx.mod"
+
+- -- ...................................................................... --
+- -- ISO entity sets ...................................................... --
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN"
+- "iso-dia.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN"
+- "iso-num.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN"
+- "iso-pub.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN"
+- "iso-tech.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN"
+- "iso-lat1.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN"
+- "iso-lat2.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN"
+- "iso-grk1.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN"
+- "iso-grk2.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN"
+- "iso-grk3.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN"
+- "iso-grk4.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN"
+- "iso-amsa.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN"
+- "iso-amsb.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN"
+- "iso-amsc.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN"
+- "iso-amsn.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN"
+- "iso-amso.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN"
+- "iso-amsr.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN"
+- "iso-box.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN"
+- "iso-cyr1.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN"
+- "iso-cyr2.gml"
+-
+ -- End of catalog data for DocBook V4.5 ................................. --
+ -- ...................................................................... --
Propchange: packages/docbook/trunk/debian/patches/01_remove_entity_sets_and_dcl_from_catalogs.diff
------------------------------------------------------------------------------
svn:executable = *
Added: packages/docbook/trunk/debian/patches/10_fix_101779_mention_artheader_to_articleinfo_change.diff
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook/trunk/debian/patches/10_fix_101779_mention_artheader_to_articleinfo_change.diff?rev=1917&op=file
==============================================================================
--- packages/docbook/trunk/debian/patches/10_fix_101779_mention_artheader_to_articleinfo_change.diff (added)
+++ packages/docbook/trunk/debian/patches/10_fix_101779_mention_artheader_to_articleinfo_change.diff Thu May 3 09:56:22 2012
@@ -1,0 +1,33 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_fix_101779_mention_artheader_to_articleinfo_change.dpatch by
+## Adam Di Carlo <aph at debian.org>.
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: The removal of ArtHeader in 4.0 is not documented in ChangeLog. This
+## DP: patch fixes it (closes: <URL:http://bugs.debian.org/bug=101779>).
+## DP:
+## DP: <URL:http://packages.debian.org/changelogs/pool/main/d/docbook/current/changelog#versionversion4.1-5>
+
+ at DPATCH@
+diff -urNad docbook-4.5~/ChangeLog.upstream docbook-4.5/ChangeLog.upstream
+--- docbook-4.5~/ChangeLog.upstream 2007-03-09 14:36:17.000000000 +0100
++++ docbook-4.5/ChangeLog.upstream 2007-03-14 19:35:01.000000000 +0100
+@@ -475,6 +475,7 @@
+ - Added synopsis markup for modern programming languages (e.g, object
+ oriented languages like Java, C++, and IDL)
+ - Renamed DocInfo to PrefaceInfo, ChapterInfo, AppendixInfo, etc.
++ (and ArtHeader to ArticleInfo)
+
+ Other:
+
+diff -urNad docbook-4.5~/docbook-4.1/40chg.txt docbook-4.5/docbook-4.1/40chg.txt
+--- docbook-4.5~/docbook-4.1/40chg.txt 2000-06-19 16:50:28.000000000 +0200
++++ docbook-4.5/docbook-4.1/40chg.txt 2007-03-14 19:34:21.000000000 +0100
+@@ -29,6 +29,7 @@
+ - Added synopsis markup for modern programming languages (e.g, object
+ oriented languages like Java, C++, and IDL)
+ - Renamed DocInfo to PrefaceInfo, ChapterInfo, AppendixInfo, etc.
++ (and ArtHeader to ArticleInfo)
+ - Comment was renamed Remark
+ - InterfaceDefinition was removed
+
Propchange: packages/docbook/trunk/debian/patches/10_fix_101779_mention_artheader_to_articleinfo_change.diff
------------------------------------------------------------------------------
svn:executable = *
Added: packages/docbook/trunk/debian/patches/11_fix_dbpoolx_mod_header_comment_pubid.diff
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook/trunk/debian/patches/11_fix_dbpoolx_mod_header_comment_pubid.diff?rev=1917&op=file
==============================================================================
--- packages/docbook/trunk/debian/patches/11_fix_dbpoolx_mod_header_comment_pubid.diff (added)
+++ packages/docbook/trunk/debian/patches/11_fix_dbpoolx_mod_header_comment_pubid.diff Thu May 3 09:56:22 2012
@@ -1,0 +1,60 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 11_fix_dbpoolx_mod_header_comment_pubid.dpatch by Adam Di Carlo <aph at debian.org>
+## and Daniel Leidert (dale) <daniel.leidert at wgdd.de>.
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: The header in dbpoolx.mod references a wrong Public-ID. This patch
+## DP: simply fixes the header comment.
+## DP:
+## DP: Reported upstream:
+## DP: <URL:http://sourceforge.net/tracker/index.php?func=detail&aid=1679712&group_id=21935&atid=384107>
+
+ at DPATCH@
+diff -urNad docbook-4.5~/docbook-4.2/dbpoolx.mod docbook-4.5/docbook-4.2/dbpoolx.mod
+--- docbook-4.5~/docbook-4.2/dbpoolx.mod 2002-07-17 18:14:25.000000000 +0200
++++ docbook-4.5/docbook-4.2/dbpoolx.mod 2007-03-10 08:31:23.000000000 +0100
+@@ -50,7 +50,7 @@
+ declaration that uses the public identifier shown below:
+
+ <!ENTITY % dbpool PUBLIC
+- "-//OASIS//ELEMENTS DocBook XML Information Pool V4.2//EN"
++ "-//OASIS//ELEMENTS DocBook Information Pool V4.2//EN"
+ "dbpoolx.mod">
+ %dbpool;
+
+diff -urNad docbook-4.5~/docbook-4.3/dbpoolx.mod docbook-4.5/docbook-4.3/dbpoolx.mod
+--- docbook-4.5~/docbook-4.3/dbpoolx.mod 2004-03-31 13:43:24.000000000 +0200
++++ docbook-4.5/docbook-4.3/dbpoolx.mod 2007-03-10 08:31:49.000000000 +0100
+@@ -50,7 +50,7 @@
+ declaration that uses the public identifier shown below:
+
+ <!ENTITY % dbpool PUBLIC
+- "-//OASIS//ELEMENTS DocBook XML Information Pool V4.3//EN"
++ "-//OASIS//ELEMENTS DocBook Information Pool V4.3//EN"
+ "dbpoolx.mod">
+ %dbpool;
+
+diff -urNad docbook-4.5~/docbook-4.4/dbpoolx.mod docbook-4.5/docbook-4.4/dbpoolx.mod
+--- docbook-4.5~/docbook-4.4/dbpoolx.mod 2005-01-27 14:59:45.000000000 +0100
++++ docbook-4.5/docbook-4.4/dbpoolx.mod 2007-03-10 08:32:00.000000000 +0100
+@@ -50,7 +50,7 @@
+ declaration that uses the public identifier shown below:
+
+ <!ENTITY % dbpool PUBLIC
+- "-//OASIS//ELEMENTS DocBook XML Information Pool V4.4//EN"
++ "-//OASIS//ELEMENTS DocBook Information Pool V4.4//EN"
+ "dbpoolx.mod">
+ %dbpool;
+
+diff -urNad docbook-4.5~/docbook-4.5/dbpoolx.mod docbook-4.5/docbook-4.5/dbpoolx.mod
+--- docbook-4.5~/docbook-4.5/dbpoolx.mod 2006-10-03 15:27:50.000000000 +0200
++++ docbook-4.5/docbook-4.5/dbpoolx.mod 2007-03-10 08:32:10.000000000 +0100
+@@ -50,7 +50,7 @@
+ declaration that uses the public identifier shown below:
+
+ <!ENTITY % dbpool PUBLIC
+- "-//OASIS//ELEMENTS DocBook XML Information Pool V4.5//EN"
++ "-//OASIS//ELEMENTS DocBook Information Pool V4.5//EN"
+ "dbpoolx.mod">
+ %dbpool;
+
Propchange: packages/docbook/trunk/debian/patches/11_fix_dbpoolx_mod_header_comment_pubid.diff
------------------------------------------------------------------------------
svn:executable = *
Added: packages/docbook/trunk/debian/patches/12_fix_256119_and_turn_on_sgml_mode.diff
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook/trunk/debian/patches/12_fix_256119_and_turn_on_sgml_mode.diff?rev=1917&op=file
==============================================================================
--- packages/docbook/trunk/debian/patches/12_fix_256119_and_turn_on_sgml_mode.diff (added)
+++ packages/docbook/trunk/debian/patches/12_fix_256119_and_turn_on_sgml_mode.diff Thu May 3 09:56:22 2012
@@ -1,0 +1,117 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 12_fix_256119_and_turn_on_sgml_mode.dpatch by Daniel Leidert (dale) <daniel.leidert at wgdd.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixes broken element declarations by adding the tag omission characters
+## DP: for SGML and enable SGML features
+## DP: (closes: <URL:http://bugs.debian.org/256119>).
+## DP:
+## DP: <URL:http://packages.debian.org/changelogs/pool/main/d/docbook/current/changelog#versionversion4.4-1>
+
+ at DPATCH@
+diff -urNad docbook-4.5~/docbook-4.3/dbpoolx.mod docbook-4.5/docbook-4.3/dbpoolx.mod
+--- docbook-4.5~/docbook-4.3/dbpoolx.mod 2007-03-10 09:01:12.000000000 +0100
++++ docbook-4.5/docbook-4.3/dbpoolx.mod 2007-03-10 09:01:13.000000000 +0100
+@@ -633,6 +633,9 @@
+
+ <!-- xml:base: base URI -->
+
++<![%sgml.features;[
++<!ENTITY % xml-base.attrib "">
++]]>
+ <!ENTITY % xml-base.attrib
+ "xml:base CDATA #IMPLIED">
+
+diff -urNad docbook-4.5~/docbook-4.3/docbookx.dtd docbook-4.5/docbook-4.3/docbookx.dtd
+--- docbook-4.5~/docbook-4.3/docbookx.dtd 2004-03-31 13:43:20.000000000 +0200
++++ docbook-4.5/docbook-4.3/docbookx.dtd 2007-03-10 09:01:13.000000000 +0100
+@@ -59,7 +59,7 @@
+ <!-- ...................................................................... -->
+ <!-- Enable SGML features ................................................. -->
+
+-<!ENTITY % sgml.features "IGNORE">
++<!ENTITY % sgml.features "INCLUDE">
+ <![%sgml.features;[
+ <!ENTITY % xml.features "IGNORE">
+ ]]>
+diff -urNad docbook-4.5~/docbook-4.3/htmltblx.mod docbook-4.5/docbook-4.3/htmltblx.mod
+--- docbook-4.5~/docbook-4.3/htmltblx.mod 2004-03-31 13:43:24.000000000 +0200
++++ docbook-4.5/docbook-4.3/htmltblx.mod 2007-03-10 09:01:13.000000000 +0100
+@@ -63,6 +63,9 @@
+ >
+
+ <!-- Does not contain lang or dir because they are in %common.attribs -->
++<![%sgml.features;[
++<!ENTITY % i18n "">
++]]>
+ <!ENTITY % i18n
+ "xml:lang NMTOKEN #IMPLIED"
+ >
+@@ -92,11 +95,11 @@
+ "valign (top|middle|bottom|baseline) #IMPLIED"
+ >
+
+-<!ELEMENT colgroup (col)*>
+-<!ELEMENT col EMPTY>
+-<!ELEMENT tr (th|td)+>
+-<!ELEMENT th (%para.char.mix; | %tabentry.mix;)*>
+-<!ELEMENT td (%para.char.mix; | %tabentry.mix;)*>
++<!ELEMENT colgroup %ho; (col)*>
++<!ELEMENT col %ho; EMPTY>
++<!ELEMENT tr %ho; (th|td)+>
++<!ELEMENT th %ho; (%para.char.mix; | %tabentry.mix;)*>
++<!ELEMENT td %ho; (%para.char.mix; | %tabentry.mix;)*>
+
+ <!ATTLIST colgroup
+ %attrs;
+@@ -206,7 +209,7 @@
+ summary CDATA #IMPLIED
+ width CDATA #IMPLIED
+ border CDATA #IMPLIED
+- rules (none | groups | rows | cols | all) #IMPLIED
++ rules CDATA #IMPLIED
+ cellspacing CDATA #IMPLIED
+ cellpadding CDATA #IMPLIED
+ align (left|center|right) #IMPLIED
+diff -urNad docbook-4.5~/docbook-4.4/docbookx.dtd docbook-4.5/docbook-4.4/docbookx.dtd
+--- docbook-4.5~/docbook-4.4/docbookx.dtd 2005-01-27 14:59:45.000000000 +0100
++++ docbook-4.5/docbook-4.4/docbookx.dtd 2007-03-10 09:01:13.000000000 +0100
+@@ -61,7 +61,7 @@
+ <!-- ...................................................................... -->
+ <!-- Enable SGML features ................................................. -->
+
+-<!ENTITY % sgml.features "IGNORE">
++<!ENTITY % sgml.features "INCLUDE">
+ <![%sgml.features;[
+ <!ENTITY % xml.features "IGNORE">
+ ]]>
+diff -urNad docbook-4.5~/docbook-4.4/htmltblx.mod docbook-4.5/docbook-4.4/htmltblx.mod
+--- docbook-4.5~/docbook-4.4/htmltblx.mod 2005-01-27 14:59:45.000000000 +0100
++++ docbook-4.5/docbook-4.4/htmltblx.mod 2007-03-10 09:01:13.000000000 +0100
+@@ -63,6 +63,9 @@
+ >
+
+ <!-- Does not contain lang or dir because they are in %common.attribs -->
++<![%sgml.features;[
++<!ENTITY % i18n "">
++]]>
+ <!ENTITY % i18n
+ "xml:lang NMTOKEN #IMPLIED"
+ >
+@@ -92,11 +95,11 @@
+ "valign (top|middle|bottom|baseline) #IMPLIED"
+ >
+
+-<!ELEMENT colgroup (col)*>
+-<!ELEMENT col EMPTY>
+-<!ELEMENT tr (th|td)+>
+-<!ELEMENT th (%para.char.mix; | %tabentry.mix; | table | informaltable)*>
+-<!ELEMENT td (%para.char.mix; | %tabentry.mix; | table | informaltable)*>
++<!ELEMENT colgroup %ho; (col)*>
++<!ELEMENT col %ho; EMPTY>
++<!ELEMENT tr %ho; (th|td)+>
++<!ELEMENT th %ho; (%para.char.mix; | %tabentry.mix; | table | informaltable)*>
++<!ELEMENT td %ho; (%para.char.mix; | %tabentry.mix; | table | informaltable)*>
+
+ <!ATTLIST colgroup
+ %attrs;
Propchange: packages/docbook/trunk/debian/patches/12_fix_256119_and_turn_on_sgml_mode.diff
------------------------------------------------------------------------------
svn:executable = *
Added: packages/docbook/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook/trunk/debian/patches/series?rev=1917&op=file
==============================================================================
--- packages/docbook/trunk/debian/patches/series (added)
+++ packages/docbook/trunk/debian/patches/series Thu May 3 09:56:22 2012
@@ -1,0 +1,4 @@
+01_remove_entity_sets_and_dcl_from_catalogs.diff
+10_fix_101779_mention_artheader_to_articleinfo_change.diff
+11_fix_dbpoolx_mod_header_comment_pubid.diff
+12_fix_256119_and_turn_on_sgml_mode.diff
Modified: packages/docbook/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook/trunk/debian/rules?rev=1917&op=diff
==============================================================================
--- packages/docbook/trunk/debian/rules (original)
+++ packages/docbook/trunk/debian/rules Thu May 3 09:56:22 2012
@@ -4,8 +4,9 @@
PACKAGE := docbook
-include /usr/share/dpatch/dpatch.make
+include /usr/share/quilt/quilt.make
+patch-stamp: $(QUILT_STAMPFN)
debian/docbook.install:
set -ex ; \
@@ -36,7 +37,7 @@
debian/docbook.sgmlcatalogs:
set -ex ; \
touch $@ ; \
- echo "catalog /usr/share/sgml/docbook/dtd/catalog" > $@ ; \
+ echo "debian/catalog /usr/share/sgml/docbook/dtd/catalog" > $@ ; \
for db in docbook-* ; do \
dbver=`echo $${db} | sed -e 's/docbook-//g'` ; \
[ -f $${db}/docbook.cat ] && \
Added: packages/docbook/trunk/debian/source/format
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook/trunk/debian/source/format?rev=1917&op=file
==============================================================================
--- packages/docbook/trunk/debian/source/format (added)
+++ packages/docbook/trunk/debian/source/format Thu May 3 09:56:22 2012
@@ -1,0 +1,1 @@
+3.0 (quilt)
More information about the debian-xml-sgml-commit
mailing list