[xml/sgml-commit] r620 - in packages/docbook/trunk/debian: . patches
Daniel Leidert
dleidert-guest at alioth.debian.org
Fri Mar 9 17:55:21 CET 2007
Author: dleidert-guest
Date: 2007-03-09 16:55:20 +0000 (Fri, 09 Mar 2007)
New Revision: 620
Added:
packages/docbook/trunk/debian/README.Debian
packages/docbook/trunk/debian/docbook.examples
packages/docbook/trunk/debian/docbook.postinst
packages/docbook/trunk/debian/patches/
packages/docbook/trunk/debian/patches/00list
packages/docbook/trunk/debian/patches/01_create_main_catalog.dpatch
packages/docbook/trunk/debian/patches/02_remove_entity_sets_and_dcl_from_catalogs.dpatch
packages/docbook/trunk/debian/patches/10_fix_101779_mention_artheader_to_articleinfo_change.dpatch
Removed:
packages/docbook/trunk/debian/README.debian
packages/docbook/trunk/debian/install_docbook.sh
packages/docbook/trunk/debian/postinst
packages/docbook/trunk/debian/watch
Modified:
packages/docbook/trunk/debian/changelog
packages/docbook/trunk/debian/control
packages/docbook/trunk/debian/copyright
packages/docbook/trunk/debian/rules
Log:
* New upstream release DocBook SGML 4.5 added (closes: #413166).
* debian/control (Build-Depends): Added dpatch.
(Uploaders): Added the Debian XML/SGML group and myself (closes: #358522).
* debian/copyright: Updated the packaging and copyright information.
* debian/rules: Added dpatch targets. Cleaned the file a lot. The installation of files was moved from the external install_docbook.sh script to dh_install calls. The .links, .install and .sgmlcatalogs debhelper files are created by debian/rules itself (atm I don't remove them in the clean target).
* debian/patches/00list: Added. Moved all existing changes to dpatch patches and enabled them here.
* debian/patches/01_create_main_catalog.dpatch: Added.
- 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: Added.
* debian/docbook.examples: Added.
* debian/postinst: Renamed to docbook.postinst.
* debian/README.debian: Renamed to README.Debian.
* debian/install_docbook.sh: Removed. See debian/rules changes.
* debian/watch: Removed (empty).
Copied: packages/docbook/trunk/debian/README.Debian (from rev 617, packages/docbook/trunk/debian/README.debian)
Deleted: packages/docbook/trunk/debian/README.debian
===================================================================
--- packages/docbook/trunk/debian/README.debian 2007-03-09 13:40:31 UTC (rev 619)
+++ packages/docbook/trunk/debian/README.debian 2007-03-09 16:55:20 UTC (rev 620)
@@ -1,36 +0,0 @@
- DocBook DTDs for Debian GNU/Linux
- ---------------------------------
-
-DocBook is an SGML DTD for software documentation. It is very
-thorough, and is used by many different organization to produce books,
-articles, references, and even manual pages.
-
-The home page for DocBook is <URL:http://www.oasis-open.org/docbook/>.
-
-The docbook-doc package contains reference documentation on DocBook.
-A wonderful introduction and reference is available in the
-docbook-book package, which can also be read online at
-<URL:http://www.docbook.org/>.
-
-To format DocBook documents, you'll need a style-sheet package, either
-docbook-dsssl or docbook-xsl, depending on what styling language you
-would like to use.
-
-There are far too many other packages to describe here, both for
-authors, editors, stylers, or information architects. A list of such
-packages may be perused, for instance, using 'apt-cache search
-docbook'.
-
-If you have a question about how to work with DocBook, there are many
-mailing lists available; see <URL:http://www.docbook.org/>.
-
-If you have suggestions or questions regarding debian-specific issues,
-please consult the debian-sgml at lists.debian.org mailing list,
-<URL:http://lists.debian.org/>.
-
---
-.....Adam Di Carlo....adam at onshore.com.....<URL:http://www.onshored.com/>
-(previously, Mark Eichin <eichin at thok.org>, Mon, 30 Jun 1997 14:11:38 -0400)
-
-
-
Modified: packages/docbook/trunk/debian/changelog
===================================================================
--- packages/docbook/trunk/debian/changelog 2007-03-09 13:40:31 UTC (rev 619)
+++ packages/docbook/trunk/debian/changelog 2007-03-09 16:55:20 UTC (rev 620)
@@ -1,14 +1,34 @@
docbook (4.5-1) UNRELEASED; urgency=low
- * NOT RELEASED YET (REMOVE THIS ENTRA AT LAST
- * New upstream release DocBook SGML 4.5 added.
+ * NOT RELEASED YET
+ * New upstream release DocBook SGML 4.5 added (closes: #413166).
[ Daniel Leidert ]
* debian/control (Build-Depends-Indep): Fixed debhelper build dependency to
be listed in Build-Depends.
+ (Build-Depends): Added dpatch.
+ (Uploaders): Added the Debian XML/SGML group and myself (closes: #358522).
(Standards-Version): Bump to latest standards version 3.7.2.
(Description): Added newly added DocBook version.
- * debian/rules: Added get-orig-source target.
+ * debian/copyright: Updated the packaging and copyright information.
+ * debian/rules: Added get-orig-source and dpatch targets. Cleaned the file a
+ lot. The installation of files was moved from the external
+ install_docbook.sh script to dh_install calls. The .links, .install and
+ .sgmlcatalogs debhelper files are created by debian/rules itself (atm I
+ don't remove them in the clean target).
+ * debian/patches/00list: Added. Moved all existing changes to dpatch patches
+ and enabled them here.
+ * debian/patches/01_create_main_catalog.dpatch: Added.
+ - 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:
+ Added.
+ * debian/docbook.examples: Added.
+ * debian/postinst: Renamed to docbook.postinst.
+ * debian/README.debian: Renamed to README.Debian.
+ * debian/install_docbook.sh: Removed. See debian/rules changes.
+ * debian/watch: Removed (empty).
-- Daniel Leidert (dale) <daniel.leidert at wgdd.de> Fri, 9 Mar 2007 14:26:03 +0100
Modified: packages/docbook/trunk/debian/control
===================================================================
--- packages/docbook/trunk/debian/control 2007-03-09 13:40:31 UTC (rev 619)
+++ packages/docbook/trunk/debian/control 2007-03-09 16:55:20 UTC (rev 620)
@@ -2,7 +2,8 @@
Section: text
Priority: optional
Maintainer: Adam Di Carlo <aph at debian.org>
-Build-Depends: debhelper (>= 4.1.31)
+Uploaders: Debian XML/SGML Group <debian-xml-sgml-pkgs at lists.alioth.debian.org>, Daniel Leidert (dale) <daniel.leidert at wgdd.de>
+Build-Depends: debhelper (>= 4.1.31), dpatch
Standards-Version: 3.7.2
Package: docbook
Modified: packages/docbook/trunk/debian/copyright
===================================================================
--- packages/docbook/trunk/debian/copyright 2007-03-09 13:40:31 UTC (rev 619)
+++ packages/docbook/trunk/debian/copyright 2007-03-09 16:55:20 UTC (rev 620)
@@ -1,33 +1,39 @@
This package was debianized by Mark Eichin <eichin at thok.org> on Mon,
30 Jun 1997 14:11:38 -0400. It is currently maintained by Adam Di
-Carlo <aph at debian.org>. No changes were made to the upstream version
-of these materials, although the provided SGML Open catalogs were
-trimmed or enhanced to suit Debian's SGML infrastructure. All Debian
-integration scripts and packages are under the GPL v2 or better, a
-copy of which can be found on Debian systems in
-'/usr/share/common-licenses/GPL'.
+Carlo <aph at debian.org> and the Debian XML/SGML group
+<debian-xml-sgml-devel at lists.alioth.debian.org>. No changes were made
+to the upstream version of these materials, although the provided SGML
+Open catalogs were trimmed or enhanced to suit Debian's SGML
+infrastructure. All Debian integration scripts and packages are under
+the GPL v2 or better, a copy of which can be found on Debian systems
+in '/usr/share/common-licenses/GPL'.
-The original upstream materials may be downloaded from
-<URL:http://www.oasis-open.org/docbook/sgml/>
+Download:
+ The original upstream materials may be downloaded from
+ <URL:http://www.oasis-open.org/docbook/sgml/>. This process is
+ transparent via the `get-orig-source' target in debian/rules.
+
Copyright:
-<!-- Copyright 1992-2000 HaL Computer Systems, Inc.,
- O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software
- Corporation, and the Organization for the Advancement of
- Structured Information Standards (OASIS).
+ Copyright 1992-2006 HaL Computer Systems, Inc.,
+ O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software
+ Corporation, orman Walsh, un Microsystems, Inc., and the
+ Organization for the Advancement of Structured Information
+ Standards (OASIS).
- Permission to use, copy, modify and distribute the DocBook DTD and
- its accompanying documentation for any purpose and without fee is
- hereby granted in perpetuity, provided that the above copyright
- notice and this paragraph appear in all copies. The copyright
- holders make no representation about the suitability of the DTD for
- any purpose. It is provided "as is" without expressed or implied
- warranty.
+License and Warranty:
- If you modify the DocBook DTD in any way, except for declaring and
- referencing additional sets of general entities and declaring
- additional notations, label your DTD as a variant of DocBook. See
- the maintenance documentation for more information.
+ Permission to use, copy, modify and distribute the DocBook DTD and
+ its accompanying documentation for any purpose and without fee is
+ hereby granted in perpetuity, provided that the above copyright
+ notice and this paragraph appear in all copies. The copyright
+ holders make no representation about the suitability of the DTD for
+ any purpose. It is provided "as is" without expressed or implied
+ warranty.
--->
+ If you modify the DocBook DTD in any way, except for declaring and
+ referencing additional sets of general entities and declaring
+ additional notations, label your DTD as a variant of DocBook. See
+ the maintenance documentation for more information.
+
Added: packages/docbook/trunk/debian/docbook.examples
===================================================================
--- packages/docbook/trunk/debian/docbook.examples 2007-03-09 13:40:31 UTC (rev 619)
+++ packages/docbook/trunk/debian/docbook.examples 2007-03-09 16:55:20 UTC (rev 620)
@@ -0,0 +1 @@
+examples/*
Copied: packages/docbook/trunk/debian/docbook.postinst (from rev 617, packages/docbook/trunk/debian/postinst)
Deleted: packages/docbook/trunk/debian/install_docbook.sh
===================================================================
--- packages/docbook/trunk/debian/install_docbook.sh 2007-03-09 13:40:31 UTC (rev 619)
+++ packages/docbook/trunk/debian/install_docbook.sh 2007-03-09 16:55:20 UTC (rev 620)
@@ -1,66 +0,0 @@
-#!/bin/bash
-# given a docbook directory $1, install the files
-
-set -e
-
-install_file="install -o root -g root -m 644 --preserve-timestamps"
-make_dir="install -d -o root -g root -m 755"
-
-me=`basename $0`
-verbose=true
-numargs=3
-
-usage () {
- cat <<EOU
-Usage: $me <directory> <prefix> <dtddir>
-EOU
-}
-
-infomsg () {
- if $verbose; then
- echo "$*"
- fi
-}
-
-if [ "$#" -lt $numargs ]; then
- echo "$me: not enough arguments" 1>&2
- usage
- exit 1
-elif [ "$#" -gt $numargs ]; then
- echo "$me: too many arguments" 1>&2
- usage
- exit 1
-fi
-
-if [ ! -d $1 ]; then
- echo "$me: no such directory '$1'" 1>&2
- exit 1
-fi
-
-srcdir=$1
-prefix=$2
-dtddir=$3
-
-ver=$(echo $srcdir | sed -e 's/docbk\(.\)\(.*\)/\1.\2/; s/\(...\)\(.\)/\1.\2/;')
-# DTD dir without the prefix
-dtddirrel=${dtddir#${prefix}}
-
-$make_dir $dtddir/$ver
-
-infomsg "installing from '$srcdir' into $dtddir/$ver"
-
-for file in $srcdir/*.{mod,dtd,dcl}; do
- [ -f $file ]
- infomsg " $file"
- $install_file ${file} ${dtddir}/${ver}/
-done
-
-# catalogs, named docbook.cat and installed using dh_installcatalog
-file=$srcdir/docbook.cat
-[ -f $file ]
-infomsg " $file -> $ver/catalog (debian/sgmlcatalogs)"
-echo ${file} ${dtddirrel}/${ver}/catalog >> debian/sgmlcatalogs
-ln -sf catalog ${dtddir}/${ver}/$(basename ${file})
-
-exit 0
-
Added: packages/docbook/trunk/debian/patches/00list
===================================================================
--- packages/docbook/trunk/debian/patches/00list 2007-03-09 13:40:31 UTC (rev 619)
+++ packages/docbook/trunk/debian/patches/00list 2007-03-09 16:55:20 UTC (rev 620)
@@ -0,0 +1,3 @@
+01_create_main_catalog
+02_remove_entity_sets_and_dcl_from_catalogs
+10_fix_101779_mention_artheader_to_articleinfo_change
Added: packages/docbook/trunk/debian/patches/01_create_main_catalog.dpatch
===================================================================
--- packages/docbook/trunk/debian/patches/01_create_main_catalog.dpatch 2007-03-09 13:40:31 UTC (rev 619)
+++ packages/docbook/trunk/debian/patches/01_create_main_catalog.dpatch 2007-03-09 16:55:20 UTC (rev 620)
@@ -0,0 +1,31 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_create_main_catalog.dpatch by Adam Di Carlo.
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Determine the latest DocBook SGML versions: (a) general, (b) latest v4
+## DP: and (c) v3.
+
+ at DPATCH@
+diff -urNad trunk~/catalog trunk/catalog
+--- trunk~/catalog 1970-01-01 01:00:00.000000000 +0100
++++ trunk/catalog 2007-03-09 16:12:23.000000000 +0100
+@@ -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" --
++
Property changes on: packages/docbook/trunk/debian/patches/01_create_main_catalog.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: packages/docbook/trunk/debian/patches/02_remove_entity_sets_and_dcl_from_catalogs.dpatch
===================================================================
--- packages/docbook/trunk/debian/patches/02_remove_entity_sets_and_dcl_from_catalogs.dpatch 2007-03-09 13:40:31 UTC (rev 619)
+++ packages/docbook/trunk/debian/patches/02_remove_entity_sets_and_dcl_from_catalogs.dpatch 2007-03-09 16:55:20 UTC (rev 620)
@@ -0,0 +1,567 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_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: http://bugs.debian.org/97330)
+## DP:
+## DP: http://packages.debian.org/changelogs/pool/main/d/docbook/current/changelog#versionversion4.4-1
+## DP: http://packages.debian.org/changelogs/pool/main/d/docbook/current/changelog#versionversion4.1-5
+## DP: http://packages.debian.org/changelogs/pool/main/d/docbook/current/changelog#versionversion4.1-2
+## DP: 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 ................................. --
+ -- ...................................................................... --
Property changes on: packages/docbook/trunk/debian/patches/02_remove_entity_sets_and_dcl_from_catalogs.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: 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 13:40:31 UTC (rev 619)
+++ packages/docbook/trunk/debian/patches/10_fix_101779_mention_artheader_to_articleinfo_change.dpatch 2007-03-09 16:55:20 UTC (rev 620)
@@ -0,0 +1,22 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 1_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: http://bugs.debian.org/bug=101779).
+## DP:
+## DP: http://packages.debian.org/changelogs/pool/main/d/docbook/current/changelog#versionversion4.1-5
+
+ at DPATCH@
+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-09 17:09:59.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
+
Property changes on: packages/docbook/trunk/debian/patches/10_fix_101779_mention_artheader_to_articleinfo_change.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Deleted: packages/docbook/trunk/debian/postinst
===================================================================
--- packages/docbook/trunk/debian/postinst 2007-03-09 13:40:31 UTC (rev 619)
+++ packages/docbook/trunk/debian/postinst 2007-03-09 16:55:20 UTC (rev 620)
@@ -1,50 +0,0 @@
-#!/bin/sh
-# docbook postinst
-# jobs: install SGML catalog
-# remove old catalog cruft
-
-set -e
-
-# cleaning out legacy stuff
-clean_legacy ( ) {
- SIG="d8642a455eaf7d28d7432401694ccc1e"
- SBEG="-- SGML BEGIN docbook.cat"
- SEND="-- SGML END docbook.cat"
- SIGNBEG="$SBEG $SIG --"
- SIGNEND="$SEND $SIG --"
- # md5sum of docbook.cat, in an SGML comment
- OLDSIGNBEG='-- SGML BEGIN d8642a455eaf7d28d7432401694ccc1e docbook.cat --'
- OLDSIGNEND='-- SGML END d8642a455eaf7d28d7432401694ccc1e docbook.cat --'
-
- # remove entries from transitional.cat
- if [ -f /usr/lib/sgml/transitional.cat ]; then
- install-sgmlcatalog --quiet --remove docbook || true
- fi
-
- # look for old legacy crap
- for CAT in /etc/sgml.catalog /etc/sgml/transitional.cat /usr/lib/sgml/transitional.cat; do
- if [ -f $CAT -a ! -h $CAT ]; then
- if grep -q "^$OLDSIGNBEG" $CAT && grep -q "^$OLDSIGNEND" $CAT; then
- echo "cleaning out legacy docbook DTD entries from $CAT (OLDSIGN)"
- sed -e "/$OLDSIGNBEG/,/$OLDSIGNEND/d" < $CAT > ${CAT}.new
- mv ${CAT}.new ${CAT}
- fi
- if grep -q "^$SBEG" $CAT && grep -q "^$SEND" $CAT; then
- echo "cleaning out legacy docbook DTD entries from $CAT (SBEG)"
- sed -e "/$SBEG/,/$SEND/d" < $CAT > ${CAT}.new
- mv ${CAT}.new ${CAT}
- fi
- break
- fi
- done
-}
-
-if [ "$1" = configure ]; then
- # remove any legacy junk from old versions
- clean_legacy
-fi
-
-# automatically generated debhelper commands
-#DEBHELPER#
-
-exit 0
Modified: packages/docbook/trunk/debian/rules
===================================================================
--- packages/docbook/trunk/debian/rules 2007-03-09 13:40:31 UTC (rev 619)
+++ packages/docbook/trunk/debian/rules 2007-03-09 16:55:20 UTC (rev 620)
@@ -2,85 +2,82 @@
# Made with the aid of debmake, by Christoph Lameter,
# based on the sample debian/rules file for GNU hello by Ian Jackson.
-package := docbook
+PACKAGE := docbook
-PREFIX := debian/$(package)
-SGMLDIR := $(PREFIX)/usr/share/sgml
-DTDDIR := $(SGMLDIR)/docbook/dtd
+include /usr/share/dpatch/dpatch.make
-newestdbdir := docbk44
-install_file := install -o root -g root -m 644 --preserve-timestamps
-make_dir := install -d -o root -g root -m 755
+debian/docbook.install:
+ set -ex ; \
+ touch $@ ; \
+ for dbcat in docbook-* ; do \
+ dbver=`echo $${dbcat} | sed -e 's/docbook-//g'` ; \
+ echo "$${dbcat}/*.{mod,dtd,dcl} usr/share/sgml/docbook/dtd/$${dbver}" >> $@ ; \
+ done
-build:
-# nothing to be done
+debian/docbook.links:
+ set -ex ; \
+ touch $@ ; \
+ for dbcat in docbook-* ; do \
+ dbver=`echo $${dbcat} | sed -e 's/docbook-//g'` ; \
+ [ -f $${dbcat}/docbook.cat ] && \
+ echo "catalog usr/share/sgml/docbook/dtd/$${dbver}/docbook.cat" >> $@ ; \
+ done
-clean:
- $(checkdir)
- rm -f `find . -name "*~"`
+debian/docbook.sgmlcatalogs:
+ set -ex ; \
+ touch $@ ; \
+ echo "catalog usr/share/sgml/docbook/dtd/catalog" > $@ ; \
+ for dbcat in docbook-* ; do \
+ dbver=`echo $${dbcat} | sed -e 's/docbook-//g'` ; \
+ [ -f $${dbcat}/docbook.cat ] && \
+ echo "$${dbcat}/docbook.cat usr/share/sgml/docbook/dtd/$${dbver}/catalog" >> $@ ; \
+ done
+
+build: patch-stamp build-stamp
+
+build-stamp: 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/sgmlcatalogs
dh_clean
-.PHONY: test
-test:
- $(checkdir)
- sh -n debian/postinst
- sh -n debian/install_docbook.sh
-
-binary-indep: build test
- $(checkdir)
- $(checkroot)
+install: build
+ dh_testdir
+ dh_testroot
dh_clean -k
- $(make_dir) $(DTDDIR)
+ dh_installdirs
-# reset our dh_installcatalog file with the generalized catalog
- echo "catalog /usr/share/sgml/docbook/dtd/catalog" > debian/sgmlcatalogs
-
- chmod a+x debian/install_docbook.sh
-# for each docbk* dir, we walk through and install the appropriate files
- set -e; for dir in docbk*; do \
- ./debian/install_docbook.sh $$dir $(PREFIX) $(DTDDIR) ;\
- done
-
+binary-indep: build
+ dh_testdir
+ dh_testroot
+ dh_installchangelogs ChangeLog.upstream
+ dh_install
+ dh_installdocs docbook-*/*.txt
+ 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
-# install the newest docbook's ChangeLog as our upstream changelog
- dh_installchangelogs $(newestdbdir)/ChangeLog
+binary-arch: build
-# install documentation
- find docbk* -name '*.txt' | xargs dh_installdocs
- dh_installexamples -i debian/examples/*
+binary: binary-indep binary-arch
-# check for bad links
- find $(PREFIX) -type l -follow >/dev/null # exits 1 on broken links
- dh_compress -i
+# This following code is used to create the .orig.tar.gz tarball.
+# Use it to prepare it for a new release.
- dh_installdeb -i
- dh_gencontrol -i
- dh_md5sums -i
- dh_builddeb -i
-
-binary-arch: build
- $(checkdir)
-# There are no architecture-dependent files to be uploaded
-# generated by this package. If there were any they would be
-# made here.
-
-define checkdir
- test -f debian/rules
- test -f catalog
-endef
-
-# Below here is fairly generic really
-
-binary: binary-indep binary-arch
-
-define checkroot
- test `id -u` = 0
-endef
-
version=$(shell dpkg-parsechangelog | sed -n -e 's/^Version: \(.*\)-[^-]*/\1/p')
get-orig-source:
Deleted: packages/docbook/trunk/debian/watch
===================================================================
--- packages/docbook/trunk/debian/watch 2007-03-09 13:40:31 UTC (rev 619)
+++ packages/docbook/trunk/debian/watch 2007-03-09 16:55:20 UTC (rev 620)
@@ -1,5 +0,0 @@
-# Example watch control file for uscan
-# Rename this file to "watch" and then you can run the "uscan" command
-# to check for upstream updates and more.
-# Site Directory Pattern Version Script
-#ftp.ora.com /pub/davenport/docbook docbk*.tar.Z debian uupdate
More information about the debian-xml-sgml-commit
mailing list