[xml/sgml-commit] r623 - in packages/docbook/trunk/debian: . patches

Daniel Leidert dleidert-guest at alioth.debian.org
Sat Mar 10 09:05:51 CET 2007 

Author: dleidert-guest
Date: 2007-03-10 08:05:51 +0000 (Sat, 10 Mar 2007)
New Revision: 623

Added:
   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
Modified:
   packages/docbook/trunk/debian/changelog
   packages/docbook/trunk/debian/patches/00list
   packages/docbook/trunk/debian/patches/10_fix_101779_mention_artheader_to_articleinfo_change.dpatch
Log:
* debian/patches/00list: Added. Moved all existing changes to dpatch patches and enabled them here.
* debian/patches/11_fix_dbpoolx_mod_header_comment_pubid.dpatch: Added.
* debian/patches/12_fix_256119_and_turn_on_sgml_mode.dpatch: Added.



Modified: packages/docbook/trunk/debian/changelog
===================================================================
--- packages/docbook/trunk/debian/changelog	2007-03-09 17:34:14 UTC (rev 622)
+++ packages/docbook/trunk/debian/changelog	2007-03-10 08:05:51 UTC (rev 623)
@@ -24,8 +24,10 @@
     - catalog: Made latest DocBook SGML version 4.5 the default
       (closes: #413304).
   * debian/patches/02_remove_entity_sets_and_dcl_from_catalogs.dpatch: Added.
-  * patches/10_fix_101779_mention_artheader_to_articleinfo_change.dpatch:
+  * debian/patches/10_fix_101779_mention_artheader_to_articleinfo_change.dpatch:
     Added.
+  * debian/patches/11_fix_dbpoolx_mod_header_comment_pubid.dpatch: Added.
+  * debian/patches/12_fix_256119_and_turn_on_sgml_mode.dpatch: Added.
   * debian/docbook.examples: Added.
   * debian/postinst: Renamed to docbook.postinst.
   * debian/README.debian: Renamed to README.Debian.

Modified: packages/docbook/trunk/debian/patches/00list
===================================================================
--- packages/docbook/trunk/debian/patches/00list	2007-03-09 17:34:14 UTC (rev 622)
+++ packages/docbook/trunk/debian/patches/00list	2007-03-10 08:05:51 UTC (rev 623)
@@ -1,3 +1,5 @@
 01_create_main_catalog
 02_remove_entity_sets_and_dcl_from_catalogs
 10_fix_101779_mention_artheader_to_articleinfo_change
+11_fix_dbpoolx_mod_header_comment_pubid
+12_fix_256119_and_turn_on_sgml_mode

Modified: packages/docbook/trunk/debian/patches/10_fix_101779_mention_artheader_to_articleinfo_change.dpatch
===================================================================
--- packages/docbook/trunk/debian/patches/10_fix_101779_mention_artheader_to_articleinfo_change.dpatch	2007-03-09 17:34:14 UTC (rev 622)
+++ packages/docbook/trunk/debian/patches/10_fix_101779_mention_artheader_to_articleinfo_change.dpatch	2007-03-10 08:05:51 UTC (rev 623)
@@ -1,5 +1,5 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
-## 1_fix_101779_mention_artheader_to_articleinfo_change.dpatch by
+## 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.

Added: packages/docbook/trunk/debian/patches/11_fix_dbpoolx_mod_header_comment_pubid.dpatch
===================================================================
--- packages/docbook/trunk/debian/patches/11_fix_dbpoolx_mod_header_comment_pubid.dpatch	2007-03-09 17:34:14 UTC (rev 622)
+++ packages/docbook/trunk/debian/patches/11_fix_dbpoolx_mod_header_comment_pubid.dpatch	2007-03-10 08:05:51 UTC (rev 623)
@@ -0,0 +1,56 @@
+#! /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: 
+
+ 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;
+ 


Property changes on: packages/docbook/trunk/debian/patches/11_fix_dbpoolx_mod_header_comment_pubid.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: packages/docbook/trunk/debian/patches/12_fix_256119_and_turn_on_sgml_mode.dpatch
===================================================================
--- packages/docbook/trunk/debian/patches/12_fix_256119_and_turn_on_sgml_mode.dpatch	2007-03-09 17:34:14 UTC (rev 622)
+++ packages/docbook/trunk/debian/patches/12_fix_256119_and_turn_on_sgml_mode.dpatch	2007-03-10 08:05:51 UTC (rev 623)
@@ -0,0 +1,113 @@
+#! /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: No description.
+
+ 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;


Property changes on: packages/docbook/trunk/debian/patches/12_fix_256119_and_turn_on_sgml_mode.dpatch
___________________________________________________________________
Name: svn:executable
   + *

More information about the debian-xml-sgml-commit mailing list