[xml/sgml-commit] r1919 - in /packages/docbook/trunk: ./ debian/ debian/patches/
dleidert-guest at users.alioth.debian.org
dleidert-guest at users.alioth.debian.org
Sat May 5 13:37:59 UTC 2012
Author: dleidert-guest
Date: Sat May 5 13:37:58 2012
New Revision: 1919
URL: http://svn.debian.org/wsvn/debian-xml-sgml/?sc=1&rev=1919
Log:
* catalog: Moved into debian/patches/debian_root_catalog.patch.
* debian/compat: Raised to v7.
* debian/control (Build-Depends): Raised debhelper to v7.
(Conflicts): Turned into Breaks.
* debian/copyright: Point to GPL-2 license.
* debian/docbook.docs: Added.
* debian/README.source: Dropped.
* debian/rules: Rewritten for dh 7.
* debian/patches/01_remove_entity_sets_and_dcl_from_catalogs.dpatch renamed
to debian/patches/remove_entity_sets_and_dcl_from_catalogs.patch.
* debian/patches/10_fix_101779_mention_artheader_to_articleinfo_change.dpatch
renamed to
debian/patches/fix_101779_mention_artheader_to_articleinfo_change.patch
* debian/patches/11_fix_dbpoolx_mod_header_comment_pubid.dpatch renamed to
debian/patches/fix_dbpoolx_mod_header_comment_pubid.patch.
* debian/patches/12_fix_256119_and_turn_on_sgml_mode.dpatch renamed to
debian/patches/fix_256119_and_turn_on_sgml_mode.patch.
* debian/patches/debian_root_catalog.patch: Added.
- Create the root catalog via patch.
* debian/patches/series: Adjusted.
Added:
packages/docbook/trunk/debian/docbook.docs
packages/docbook/trunk/debian/patches/debian_root_catalog.patch
packages/docbook/trunk/debian/patches/fix_101779_mention_artheader_to_articleinfo_change.patch
- copied, changed from r1918, packages/docbook/trunk/debian/patches/10_fix_101779_mention_artheader_to_articleinfo_change.diff
packages/docbook/trunk/debian/patches/fix_256119_and_turn_on_sgml_mode.patch
- copied, changed from r1918, packages/docbook/trunk/debian/patches/12_fix_256119_and_turn_on_sgml_mode.diff
packages/docbook/trunk/debian/patches/fix_dbpoolx_mod_header_comment_pubid.patch
- copied, changed from r1918, packages/docbook/trunk/debian/patches/11_fix_dbpoolx_mod_header_comment_pubid.diff
packages/docbook/trunk/debian/patches/remove_entity_sets_and_dcl_from_catalogs.patch
- copied, changed from r1918, packages/docbook/trunk/debian/patches/01_remove_entity_sets_and_dcl_from_catalogs.diff
Removed:
packages/docbook/trunk/catalog
packages/docbook/trunk/debian/README.source
packages/docbook/trunk/debian/patches/01_remove_entity_sets_and_dcl_from_catalogs.diff
packages/docbook/trunk/debian/patches/10_fix_101779_mention_artheader_to_articleinfo_change.diff
packages/docbook/trunk/debian/patches/11_fix_dbpoolx_mod_header_comment_pubid.diff
packages/docbook/trunk/debian/patches/12_fix_256119_and_turn_on_sgml_mode.diff
Modified:
packages/docbook/trunk/debian/changelog
packages/docbook/trunk/debian/compat
packages/docbook/trunk/debian/control
packages/docbook/trunk/debian/copyright
packages/docbook/trunk/debian/patches/series
packages/docbook/trunk/debian/rules
Modified: packages/docbook/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook/trunk/debian/changelog?rev=1919&op=diff
==============================================================================
--- packages/docbook/trunk/debian/changelog (original)
+++ packages/docbook/trunk/debian/changelog Sat May 5 13:37:58 2012
@@ -1,18 +1,31 @@
docbook (4.5-5) UNRELEASED; urgency=low
- [ Daniel Leidert (dale) ]
+ [ Daniel Leidert ]
* NOT RELEASED YET
- * debian/compat: Raised to v5.
+ * catalog: Moved into debian/patches/debian_root_catalog.patch.
+ * debian/compat: Raised to v7.
* debian/control: Vcs fields transition. Added DM-Upload-Allowed.
(Vcs-Browser, Vcs-Svn): Fixed location.
(Standards-Version): Bumped to 3.8.3.
- (Build-Depends): Raised debhelper to v5.
+ (Build-Depends): Raised debhelper to v7.
(Uploaders): Removed Adam Di Carlo, who is probably MIA (closes: #554230).
Many thanks for your work!
- * debian/source.lintian-overrides: Added to override
- patch-system-but-direct-changes-in-diff warning, because file creation is
- intended.
- * debian/README.source: Added for policy compliance.
+ (Conflicts): Turned into Breaks.
+ * debian/copyright: Point to GPL-2 license.
+ * debian/docbook.docs: Added.
+ * debian/rules: Rewritten for dh 7.
+ * debian/patches/01_remove_entity_sets_and_dcl_from_catalogs.dpatch renamed
+ to debian/patches/remove_entity_sets_and_dcl_from_catalogs.patch.
+ * debian/patches/10_fix_101779_mention_artheader_to_articleinfo_change.dpatch
+ renamed to
+ debian/patches/fix_101779_mention_artheader_to_articleinfo_change.patch
+ * debian/patches/11_fix_dbpoolx_mod_header_comment_pubid.dpatch renamed to
+ debian/patches/fix_dbpoolx_mod_header_comment_pubid.patch.
+ * debian/patches/12_fix_256119_and_turn_on_sgml_mode.dpatch renamed to
+ debian/patches/fix_256119_and_turn_on_sgml_mode.patch.
+ * debian/patches/debian_root_catalog.patch: Added.
+ - Create the root catalog via patch.
+ * debian/patches/series: Adjusted.
[ Mathieu Malaterre ]
* Add myself as uploader
Modified: packages/docbook/trunk/debian/compat
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook/trunk/debian/compat?rev=1919&op=diff
==============================================================================
--- packages/docbook/trunk/debian/compat (original)
+++ packages/docbook/trunk/debian/compat Sat May 5 13:37:58 2012
@@ -1,1 +1,1 @@
-5
+7
Modified: packages/docbook/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook/trunk/debian/control?rev=1919&op=diff
==============================================================================
--- packages/docbook/trunk/debian/control (original)
+++ packages/docbook/trunk/debian/control Sat May 5 13:37:58 2012
@@ -2,8 +2,9 @@
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>, Mathieu Malaterre <malat at debian.org>
-Build-Depends: debhelper (>= 5), quilt
+Uploaders: Daniel Leidert (dale) <daniel.leidert at wgdd.de>,
+ Mathieu Malaterre <malat at debian.org>
+Build-Depends: debhelper (>> 7.0.50~)
Standards-Version: 3.9.3
Homepage: http://www.oasis-open.org/docbook/sgml/
Vcs-Browser: http://anonscm.debian.org/viewvc/debian-xml-sgml/packages/docbook/
@@ -14,8 +15,8 @@
Package: docbook
Architecture: all
Depends: sgml-data (>= 1.5.0), ${misc:Depends}
-Conflicts: docbook-xml (<= 4.4-4)
-Suggests: psgml, docbook-dsssl, docbook-xml, docbook-defguide
+Breaks: docbook-xml (<< 4.4-4~)
+Suggests: docbook-defguide, docbook-dsssl, docbook-xml, psgml
Description: standard SGML representation system for technical documents
DocBook is an SGML document type definition (DTD) that is well-suited
to books, articles, or reference documentation about technical
Modified: packages/docbook/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook/trunk/debian/copyright?rev=1919&op=diff
==============================================================================
--- packages/docbook/trunk/debian/copyright (original)
+++ packages/docbook/trunk/debian/copyright Sat May 5 13:37:58 2012
@@ -6,7 +6,7 @@
Open catalogs were trimmed or enhanced to suit Debian's SGML
infrastructure. All Debian integration scripts and packages are under
the GPL v2 or later, a copy of which can be found on Debian systems
-in '/usr/share/common-licenses/GPL'.
+in '/usr/share/common-licenses/GPL-2'.
Download:
Added: packages/docbook/trunk/debian/docbook.docs
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook/trunk/debian/docbook.docs?rev=1919&op=file
==============================================================================
--- packages/docbook/trunk/debian/docbook.docs (added)
+++ packages/docbook/trunk/debian/docbook.docs Sat May 5 13:37:58 2012
@@ -1,0 +1,1 @@
+debian/README.docbook.dcl
Added: packages/docbook/trunk/debian/patches/debian_root_catalog.patch
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook/trunk/debian/patches/debian_root_catalog.patch?rev=1919&op=file
==============================================================================
--- packages/docbook/trunk/debian/patches/debian_root_catalog.patch (added)
+++ packages/docbook/trunk/debian/patches/debian_root_catalog.patch Sat May 5 13:37:58 2012
@@ -1,0 +1,25 @@
+Author: Daniel Leidert
+Description: Root catalog
+
+--- /dev/null
++++ b/catalog
+@@ -0,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" --
++
Copied: packages/docbook/trunk/debian/patches/fix_101779_mention_artheader_to_articleinfo_change.patch (from r1918, 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/fix_101779_mention_artheader_to_articleinfo_change.patch?rev=1919&op=diff
==============================================================================
--- packages/docbook/trunk/debian/patches/10_fix_101779_mention_artheader_to_articleinfo_change.diff (original)
+++ packages/docbook/trunk/debian/patches/fix_101779_mention_artheader_to_articleinfo_change.patch Sat May 5 13:37:58 2012
@@ -1,17 +1,10 @@
-#! /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>
+Author: Adam Di Carlo <aph at debian.org>
+Description: The removal of ArtHeader in 4.0 is not documented in ChangeLog.
+ This patch fixes it.
+Bug-Debian: http://bugs.debian.org/bug=101779
- 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
+--- a/ChangeLog.upstream
++++ b/ChangeLog.upstream
@@ -475,6 +475,7 @@
- Added synopsis markup for modern programming languages (e.g, object
oriented languages like Java, C++, and IDL)
@@ -20,9 +13,8 @@
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
+--- a/docbook-4.1/40chg.txt
++++ b/docbook-4.1/40chg.txt
@@ -29,6 +29,7 @@
- Added synopsis markup for modern programming languages (e.g, object
oriented languages like Java, C++, and IDL)
Copied: packages/docbook/trunk/debian/patches/fix_256119_and_turn_on_sgml_mode.patch (from r1918, 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/fix_256119_and_turn_on_sgml_mode.patch?rev=1919&op=diff
==============================================================================
--- packages/docbook/trunk/debian/patches/12_fix_256119_and_turn_on_sgml_mode.diff (original)
+++ packages/docbook/trunk/debian/patches/fix_256119_and_turn_on_sgml_mode.patch Sat May 5 13:37:58 2012
@@ -1,17 +1,10 @@
-#! /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>
+Author: Daniel Leidert <daniel.leidert at wgdd.de>
+Description: Fixes broken element declarations by adding the tag omission
+ characters for SGML and enable SGML features.
+Bug-Debian: http://bugs.debian.org/256119
- 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
+--- a/docbook-4.3/dbpoolx.mod
++++ b/docbook-4.3/dbpoolx.mod
@@ -633,6 +633,9 @@
<!-- xml:base: base URI -->
@@ -22,9 +15,8 @@
<!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
+--- a/docbook-4.3/docbookx.dtd
++++ b/docbook-4.3/docbookx.dtd
@@ -59,7 +59,7 @@
<!-- ...................................................................... -->
<!-- Enable SGML features ................................................. -->
@@ -34,9 +26,8 @@
<![%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
+--- a/docbook-4.3/htmltblx.mod
++++ b/docbook-4.3/htmltblx.mod
@@ -63,6 +63,9 @@
>
@@ -73,9 +64,8 @@
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
+--- a/docbook-4.4/docbookx.dtd
++++ b/docbook-4.4/docbookx.dtd
@@ -61,7 +61,7 @@
<!-- ...................................................................... -->
<!-- Enable SGML features ................................................. -->
@@ -85,9 +75,8 @@
<![%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
+--- a/docbook-4.4/htmltblx.mod
++++ b/docbook-4.4/htmltblx.mod
@@ -63,6 +63,9 @@
>
Copied: packages/docbook/trunk/debian/patches/fix_dbpoolx_mod_header_comment_pubid.patch (from r1918, 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/fix_dbpoolx_mod_header_comment_pubid.patch?rev=1919&op=diff
==============================================================================
--- packages/docbook/trunk/debian/patches/11_fix_dbpoolx_mod_header_comment_pubid.diff (original)
+++ packages/docbook/trunk/debian/patches/fix_dbpoolx_mod_header_comment_pubid.patch Sat May 5 13:37:58 2012
@@ -1,18 +1,12 @@
-#! /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>
+Author: Adam Di Carlo <aph at debian.org>
+Author: Daniel Leidert <daniel.leidert at wgdd.de>
+Description: The header in dbpoolx.mod references a wrong Public-ID. This
+ patch simply fixes the header comment.
+Bug: http://sourceforge.net/tracker/index.php?func=detail&aid=1679712&group_id=21935&atid=384107
+Forwarded: yes
- 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
+--- a/docbook-4.2/dbpoolx.mod
++++ b/docbook-4.2/dbpoolx.mod
@@ -50,7 +50,7 @@
declaration that uses the public identifier shown below:
@@ -22,9 +16,8 @@
"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
+--- a/docbook-4.3/dbpoolx.mod
++++ b/docbook-4.3/dbpoolx.mod
@@ -50,7 +50,7 @@
declaration that uses the public identifier shown below:
@@ -34,9 +27,8 @@
"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
+--- a/docbook-4.4/dbpoolx.mod
++++ b/docbook-4.4/dbpoolx.mod
@@ -50,7 +50,7 @@
declaration that uses the public identifier shown below:
@@ -46,9 +38,8 @@
"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
+--- a/docbook-4.5/dbpoolx.mod
++++ b/docbook-4.5/dbpoolx.mod
@@ -50,7 +50,7 @@
declaration that uses the public identifier shown below:
Copied: packages/docbook/trunk/debian/patches/remove_entity_sets_and_dcl_from_catalogs.patch (from r1918, 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/remove_entity_sets_and_dcl_from_catalogs.patch?rev=1919&op=diff
==============================================================================
--- packages/docbook/trunk/debian/patches/01_remove_entity_sets_and_dcl_from_catalogs.diff (original)
+++ packages/docbook/trunk/debian/patches/remove_entity_sets_and_dcl_from_catalogs.patch Sat May 5 13:37:58 2012
@@ -1,25 +1,14 @@
-#! /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>
+Author: Mark Eichin <eichin at kitten.gen.ma.us>
+Reviewed-by: Adam Di Carlo <aph at debian.org>
+Description: Remove all SGML declarations from catalogs
+ Removes all SGML declarations from the catalogs, for more info, see
+ debian/README.docbook.dcl. Removes the ISO entity pointers since they are
+ supplied by sgml-data. Removes Public-IDs for DocBook XML. Forces Public-ID
+ rather than the System-ID in DTD declarations.
+Bug-Debian: http://bugs.debian.org/97330
- 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
+--- a/docbook-2.4.1/docbook.cat
++++ b/docbook-2.4.1/docbook.cat
@@ -27,8 +27,13 @@
-- ...................................................................... --
-- SGML declaration associated with DocBook ............................. --
@@ -65,9 +54,8 @@
-
-- 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
+--- a/docbook-3.0/docbook.cat
++++ b/docbook-3.0/docbook.cat
@@ -27,7 +27,12 @@
-- ...................................................................... --
-- SGML declaration associated with DocBook ............................. --
@@ -111,9 +99,8 @@
-
-- 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
+--- a/docbook-3.1/docbook.cat
++++ b/docbook-3.1/docbook.cat
@@ -19,7 +19,12 @@
-- ...................................................................... --
-- SGML declaration associated with DocBook ............................. --
@@ -157,9 +144,8 @@
-
-- 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
+--- a/docbook-4.0/docbook.cat
++++ b/docbook-4.0/docbook.cat
@@ -19,7 +19,12 @@
-- ...................................................................... --
-- SGML declaration associated with DocBook ............................. --
@@ -203,9 +189,8 @@
-
-- 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
+--- a/docbook-4.1/docbook.cat
++++ b/docbook-4.1/docbook.cat
@@ -19,7 +19,12 @@
-- ...................................................................... --
-- SGML declaration associated with DocBook ............................. --
@@ -249,9 +234,8 @@
-
-- 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
+--- a/docbook-4.2/docbook.cat
++++ b/docbook-4.2/docbook.cat
@@ -22,9 +22,6 @@
PUBLIC "-//OASIS//DTD DocBook V4.2//EN"
"docbook.dtd"
@@ -328,9 +312,8 @@
-
-- 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
+--- a/docbook-4.3/docbook.cat
++++ b/docbook-4.3/docbook.cat
@@ -22,9 +22,6 @@
PUBLIC "-//OASIS//DTD DocBook V4.3//EN"
"docbook.dtd"
@@ -407,9 +390,8 @@
-
-- 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
+--- a/docbook-4.4/docbook.cat
++++ b/docbook-4.4/docbook.cat
@@ -22,9 +22,6 @@
PUBLIC "-//OASIS//DTD DocBook V4.4//EN"
"docbook.dtd"
@@ -486,9 +468,8 @@
-
-- 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
+--- a/docbook-4.5/docbook.cat
++++ b/docbook-4.5/docbook.cat
@@ -22,9 +22,6 @@
PUBLIC "-//OASIS//DTD DocBook V4.5//EN"
"docbook.dtd"
Modified: packages/docbook/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook/trunk/debian/patches/series?rev=1919&op=diff
==============================================================================
--- packages/docbook/trunk/debian/patches/series (original)
+++ packages/docbook/trunk/debian/patches/series Sat May 5 13:37:58 2012
@@ -1,4 +1,5 @@
-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
+debian_root_catalog.patch
+remove_entity_sets_and_dcl_from_catalogs.patch
+fix_101779_mention_artheader_to_articleinfo_change.patch
+fix_dbpoolx_mod_header_comment_pubid.patch
+fix_256119_and_turn_on_sgml_mode.patch
Modified: packages/docbook/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook/trunk/debian/rules?rev=1919&op=diff
==============================================================================
--- packages/docbook/trunk/debian/rules (original)
+++ packages/docbook/trunk/debian/rules Sat May 5 13:37:58 2012
@@ -1,12 +1,19 @@
#!/usr/bin/make -f
-# Made with the aid of debmake, by Christoph Lameter,
-# based on the sample debian/rules file for GNU hello by Ian Jackson.
+
+#export DH_VERBOSE=1
PACKAGE := docbook
-include /usr/share/quilt/quilt.make
+%:
+ dh $@ --parallel
-patch-stamp: $(QUILT_STAMPFN)
+override_dh_clean:
+ dh_clean debian/docbook.install \
+ debian/docbook.links \
+ debian/docbook.sgmlcatalogs
+
+override_dh_install: debian/docbook.install
+ dh_install
debian/docbook.install:
set -ex ; \
@@ -22,6 +29,10 @@
done ; \
done
+override_dh_link: debian/docbook.links
+ dh_link
+ find $(CURDIR)/debian/$(PACKAGE) -type l -follow >/dev/null # exits 1 on broken links
+
debian/docbook.links:
set -ex ; \
touch $@ ; \
@@ -34,6 +45,9 @@
echo "usr/share/sgml/docbook/dtd/$${dbver}/catalog usr/share/sgml/docbook/dtd/$${dbver}/docbook.cat" >> $@ ; \
done
+override_dh_installcatalogs: debian/docbook.sgmlcatalogs
+ dh_installcatalogs
+
debian/docbook.sgmlcatalogs:
set -ex ; \
touch $@ ; \
@@ -44,52 +58,8 @@
echo "$${db}/docbook.cat /usr/share/sgml/docbook/dtd/$${dbver}/catalog" >> $@ ; \
done
-build: patch-stamp build-stamp
-
-build-stamp: debian/docbook.install debian/docbook.links debian/docbook.sgmlcatalogs
- dh_testdir
- touch build-stamp
-
-clean: unpatch
- dh_testdir
- dh_testroot
- rm -f build-stamp patch-stamp
- rm -f debian/docbook.install \
- debian/docbook.links \
- debian/docbook.sgmlcatalogs
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
-binary-indep: build
- dh_testdir
- dh_testroot
+override_dh_installchangelogs::
dh_installchangelogs ChangeLog.upstream
- dh_install
- dh_installdocs debian/README.docbook.dcl
- dh_installexamples
- dh_installcatalogs
- dh_link
- find $(CURDIR)/debian/$(PACKAGE) -type l -follow >/dev/null # exits 1 on broken links
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary-arch: build
-
-binary: binary-indep binary-arch
-
-.PHONY: build clean binary binary-arch binary-indep
-
-# This following code is used to create the .orig.tar.gz tarball.
-# Use it to prepare it for a new release.
version=$(shell dpkg-parsechangelog | sed -n -e 's/^Version: \(.*\)-[^-]*/\1/p')
More information about the debian-xml-sgml-commit
mailing list