[xml/sgml-commit] r727 - in packages/docbook-simple/trunk: . debian
debian/examples debian/patches docbook-simple-1.0 docbook-simple-1.1
Daniel Leidert
dleidert-guest at alioth.debian.org
Sun Apr 15 17:41:55 UTC 2007
Author: dleidert-guest
Date: 2007-04-15 17:41:54 +0000 (Sun, 15 Apr 2007)
New Revision: 727
Added:
packages/docbook-simple/trunk/debian/docbook-simple.examples
packages/docbook-simple/trunk/debian/docbook-simple.links.in
packages/docbook-simple/trunk/debian/docbook-simple.preinst
packages/docbook-simple/trunk/debian/docbook-simple.xmlcatalogs.in
packages/docbook-simple/trunk/debian/examples/
packages/docbook-simple/trunk/debian/examples/Makefile
packages/docbook-simple/trunk/debian/examples/test-1.0.xml
packages/docbook-simple/trunk/debian/examples/test-1.1.xml
packages/docbook-simple/trunk/debian/examples/test-bad-si-1.0.xml
packages/docbook-simple/trunk/debian/examples/test-bad-si-1.1.xml
packages/docbook-simple/trunk/debian/examples/test-custom-1.0.xml
packages/docbook-simple/trunk/debian/examples/test-custom-1.1.xml
packages/docbook-simple/trunk/debian/examples/test-si-1.0.xml
packages/docbook-simple/trunk/debian/examples/test-si-1.1.xml
packages/docbook-simple/trunk/debian/examples/test-si-url-docbook.org-1.0.xml
packages/docbook-simple/trunk/debian/examples/test-si-url-docbook.org-1.1.xml
packages/docbook-simple/trunk/debian/examples/test-si-url-oasis-1.0.xml
packages/docbook-simple/trunk/debian/examples/test-si-url-oasis-1.1.xml
packages/docbook-simple/trunk/debian/patches/
packages/docbook-simple/trunk/debian/patches/00list
packages/docbook-simple/trunk/debian/patches/01_use_the_entities_from_sgml_data.dpatch
packages/docbook-simple/trunk/debian/patches/02_fix_custom_fpi_in_comments.dpatch
packages/docbook-simple/trunk/docbook-simple-1.0/
packages/docbook-simple/trunk/docbook-simple-1.0/catalog
packages/docbook-simple/trunk/docbook-simple-1.0/catalog.xml
packages/docbook-simple/trunk/docbook-simple-1.1/
packages/docbook-simple/trunk/docbook-simple-1.1/catalog
packages/docbook-simple/trunk/docbook-simple-1.1/catalog.xml
Removed:
packages/docbook-simple/trunk/debian/catalog
packages/docbook-simple/trunk/debian/catalog.xml
packages/docbook-simple/trunk/debian/docbook-simple.install
packages/docbook-simple/trunk/debian/docbook-simple.links
packages/docbook-simple/trunk/debian/docbook-simple.postinst
packages/docbook-simple/trunk/debian/docbook-simple.postrm
packages/docbook-simple/trunk/debian/docbook-simple.prerm
packages/docbook-simple/trunk/debian/docbook-simple.sgmlcatalogs
packages/docbook-simple/trunk/debian/docbook-simple.xmlcatalogs
Modified:
packages/docbook-simple/trunk/debian/README.Debian
packages/docbook-simple/trunk/debian/changelog
packages/docbook-simple/trunk/debian/control
packages/docbook-simple/trunk/debian/copyright
packages/docbook-simple/trunk/debian/docbook-simple.dirs
packages/docbook-simple/trunk/debian/rules
Log:
* New maintainer, because Mark seems MIA.
* Acknowledge NMU (closes: #232215). Thanks to Arnaud Vandyck.
* Added version 1.1 (closes: #414258).
* debian/catalog: Copied to docbook-simple-1.x and removed.
* debian/catalog.xml: Likewise.
* docbook-simple-1.0/catalog: Added and polished. Added docbook.org SYSTEM
IDs.
* docbook-simple-1.0/catalog.xml: Likewise.
* docbook-simple-1.1/catalog: Likewise.
* docbook-simple-1.1/catalog.xml: Likewise.
* debian/control: Added XS-Vcs-* fields.
(Maintainer): Hijacked the package, because Mark seems MIA.
(Uploaders): Added the Debian XML/SGML Group.
(Build-Depends): Added dpatch to apply changes.
(Build-Depends-Indep): Moved debheloper to Build-Depends.
(Standards-Version): Bump to latest standards version 3.7.2.
(Depends): Added sgml-data.
(Description): Fixed a lintian warning for the short description and
improved the wording of the long description. Removed the author
information, that's part of copyright.
* debian/copyright: Updated and polished.
* debian/docbook-simple.dirs: Removed directories created by dh_install.
Added customization directory.
* debian/docbook-simple.examples: Added. Installs the examples from
debian/examples/ to test the DTD and catalogs.
* debian/docbook-simple.install: Removed. Created by debian/rules now.
* debian/docbook-simple.links: Renamed to debian/docbook-simple.links.in.
Removed the 1.0CR2 symlinks.
* debian/docbook-simple.links.in: Added. Contains the static link
information. The non-static content is added by debian/rules. Added the
compatibility symlink from debian/docbook-simple.postinst.
* debian/docbook-simple.postinst: Removed. The interesting directory removal
was moved into debian/docbook-simple.preinst.
* debian/docbook-simple.preinst: Added. See above.
* debian/docbook-simple.postrm: Removed empty debhelper script.
* debian/docbook-simple.prerm: Likewise.
* debian/docbook-simple.sgmlcatalogs: Removed. Created by debian/rules now.
* debian/docbook-simple.xmlcatalogs: Renamed to
debian/docbook-simple.xmlcatalogs.in.
* debian/docbook-simple.xmlcatalogs.in: Added. Contains the static XML
catalog stuff. The non-static content is added by debian/rules.
* debian/README.Debian: Slightly updated.
* debian/rules: Added get-orig-source target to create the tarball. Added
targets to create debian/docbook-simple.install,
debian/docbook-simple.links, debian/docbook-simple.sgmlcatalogs and
debian/docbook-simple.xmlcatalogs. Added dpatch infrastructure.
* debian/examples/*: Added several examples to test the catalogs and DTDs.
The Makefile was taken from the docbook-xml package.
* debian/patches/01_use_the_entities_from_sgml_data.dpatch: Added.
- Uses the entity SYSTEM IDs when installed with sgml-data.
* debian/patches/02_fix_custom_fpi_in_comments.dpatch: Added.
- Fixes the comments in the custom DTD to suggest the csutom version FPIs.
* debian/patches/00list: Added.
Modified: packages/docbook-simple/trunk/debian/README.Debian
===================================================================
--- packages/docbook-simple/trunk/debian/README.Debian 2007-04-15 17:11:29 UTC (rev 726)
+++ packages/docbook-simple/trunk/debian/README.Debian 2007-04-15 17:41:54 UTC (rev 727)
@@ -20,9 +20,9 @@
EITHER --------------------------------------------------------------
<?xml version="1.0"?>
-<!DOCTYPE article
- PUBLIC "-//OASIS//DTD Simplified DocBook XML V1.0//EN"
- "http://www.oasis-open.org/docbook/xml/simple/1.0/sdocbook.dtd">
+<!DOCTYPE article PUBLIC
+ "-//OASIS//DTD Simplified DocBook XML V1.1//EN"
+ "http://www.oasis-open.org/docbook/xml/simple/1.1/sdocbook.dtd">
<article>
...
</article>
@@ -32,9 +32,9 @@
if you wish to customize the Simplified DocBook DTD...
<?xml version="1.0"?>
-<!DOCTYPE article
- PUBLIC "-//OASIS//DTD Simplified DocBook XML Customization V1.0//EN"
- "http://www.oasis-open.org/docbook/xml/simple/1.0/sdocbook-custom.dtd">
+<!DOCTYPE article PUBLIC
+ "-//OASIS//DTD Simplified DocBook XML Customization V1.1//EN"
+ "http://www.oasis-open.org/docbook/xml/simple/1.1/sdocbook-custom.dtd">
<article>
...
</article>
@@ -44,8 +44,8 @@
II. How to write a manual page that uses the Simplified DocBook DTDs:
======================================================================
-The sdocbookref.dtd (and sdocbookref-custom.dtd) provide a simplified subset of
-DocBook to support writing manual pages.
+The sdocbookref.dtd (and sdocbookref-custom.dtd) provide a simplified subset
+of DocBook to support writing manual pages.
Use one of the following two prologs in your XML file to use
the Simplified DocBook Document Type in your document prolog:
@@ -53,9 +53,9 @@
EITHER --------------------------------------------------------------
<?xml version="1.0"?>
-<!DOCTYPE refentry
- PUBLIC "-//OASIS//DTD Simplified DocBook RefEntry XML V1.0//EN"
- "http://www.oasis-open.org/docbook/xml/simple/1.0/sdocbookref.dtd">
+<!DOCTYPE refentry PUBLIC
+ "-//OASIS//DTD Simplified DocBook RefEntry XML V1.1//EN"
+ "http://www.oasis-open.org/docbook/xml/simple/1.1/sdocbookref.dtd">
<refentry>
...
</refentry>
@@ -66,16 +66,17 @@
if wish to customize the Simplified Refentry DTD...
<?xml version="1.0"?>
-<!DOCTYPE refentry
- PUBLIC "-//OASIS//DTD Simplified DocBook RefEntry XML Customization V1.0//EN"
- "http://www.oasis-open.org/docbook/xml/simple/1.0/sdocbookref-custom.dtd">
+<!DOCTYPE refentry PUBLIC
+ "-//OASIS//DTD Simplified DocBook RefEntry XML Customization V1.1//EN"
+ "http://www.oasis-open.org/docbook/xml/simple/1.1/sdocbookref-custom.dtd">
<refentry>
...
</refentry>
-III. How to validate a document that uses the Simplified Docbook DTD
+III. How to validate a document that uses the Simplified Docbook DTD:
+======================================================================
If you have the libxml2 package installed, then you can use the
command 'xmllint' to validate a document.
@@ -93,10 +94,11 @@
Then this document can be validated using:
SGML_CATALOG_FILES=/etc/sgml/catalog xmllint --valid --catalogs simple.xml
+See also the Makefile and examples in /usr/share/doc/docbook-simple/examples/.
+
Acknowledgement: This is revision of an extensive README originally written by
- Susan Kleinmann <sgk at debian.org>.
+ Susan Kleinmann <sgk at debian.org>. The revision was written by
+ Mark Johnson and edited by Daniel Leidert.
+ -- Daniel Leidert <daniel.leidert at wgdd.de>, Sun, 15 Apr 2007 02:01:35 +0200
- -- Mark Johnson <mrj at debian.org>, Mon, 26 Jan 2004 17:43:36 -0500
-
-
Deleted: packages/docbook-simple/trunk/debian/catalog
===================================================================
--- packages/docbook-simple/trunk/debian/catalog 2007-04-15 17:11:29 UTC (rev 726)
+++ packages/docbook-simple/trunk/debian/catalog 2007-04-15 17:41:54 UTC (rev 727)
@@ -1,15 +0,0 @@
--- catalog entry for docbook docbook-simple V1.0 --
-OVERRIDE YES
-
-PUBLIC "-//OASIS//DTD Simplified DocBook XML V1.0//EN" "sdocbook.dtd"
-SYSTEM "http://www.oasis-open.org/docbook/xml/simple/1.0/sdocbook.dtd" "sdocbook.dtd"
-
-PUBLIC "-//OASIS//DTD Simplified DocBook XML Customization V1.0//EN" "sdocbook-custom.dtd"
-SYSTEM "http://www.oasis-open.org/docbook/xml/simple/1.0/sdocbook-custom.dtd" "sdocbook-custom.dtd"
-
-
-PUBLIC "-//OASIS//DTD Simplified DocBook RefEntry XML V1.0//EN" "sdocbookref.dtd"
-SYSTEM "http://www.oasis-open.org/docbook/xml/simple/1.0/sdocbookref.dtd" "sdocbookref.dtd"
-
-PUBLIC "-//OASIS//DTD Simplified DocBook RefEntry XML Customization V1.0//EN" "sdocbookref-custom.dtd"
-SYSTEM "http://www.oasis-open.org/docbook/xml/simple/1.0/sdocbookref-custom.dtd" "sdocbookref-custom.dtd"
Deleted: packages/docbook-simple/trunk/debian/catalog.xml
===================================================================
--- packages/docbook-simple/trunk/debian/catalog.xml 2007-04-15 17:11:29 UTC (rev 726)
+++ packages/docbook-simple/trunk/debian/catalog.xml 2007-04-15 17:41:54 UTC (rev 727)
@@ -1,39 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE catalog PUBLIC "-//OASIS//DTD XML Catalogs V1.0//EN"
- "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
-
-<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog" prefer="public">
-
- <public publicId="-//OASIS//DTD Simplified DocBook XML V1.0//EN"
- uri="sdocbook.dtd"/>
-
- <system
- systemId="http://www.oasis-open.org/docbook/xml/simple/1.0/sdocbook.dtd"
- uri="sdocbook.dtd"/>
-
-
- <public publicId="-//OASIS//DTD Simplified DocBook XML Customization V1.0//EN"
- uri="sdocbook-custom.dtd"/>
-
- <system
- systemId="http://www.oasis-open.org/docbook/xml/simple/1.0/sdocbook-custom.dtd"
- uri="sdocbook-custom.dtd"/>
-
-
- <public publicId="-//OASIS//DTD Simplified DocBook RefEntry XML V1.0//EN"
- uri="sdocbookref.dtd"/>
-
- <system
- systemId="http://www.oasis-open.org/docbook/xml/simple/1.0/sdocbookref.dtd"
- uri="sdocbookref.dtd"/>
-
-
- <public publicId="-//OASIS//DTD Simplified DocBook RefEntry XML Customization V1.0//EN"
- uri="sdocbookref-custom.dtd"/>
-
- <system
- systemId="http://www.oasis-open.org/docbook/xml/simple/1.0/sdocbookref-custom.dtd"
- uri="sdocbookref-custom.dtd"/>
-
-
-</catalog>
Modified: packages/docbook-simple/trunk/debian/changelog
===================================================================
--- packages/docbook-simple/trunk/debian/changelog 2007-04-15 17:11:29 UTC (rev 726)
+++ packages/docbook-simple/trunk/debian/changelog 2007-04-15 17:41:54 UTC (rev 727)
@@ -1,7 +1,62 @@
docbook-simple (1.1-1) UNRELEASED; urgency=low
* "NOT RELEASED YET"
+ * New maintainer, because Mark seems MIA.
+ * Acknowledge NMU (closes: #232215). Thanks to Arnaud Vandyck.
+ * Added version 1.1 (closes: #414258).
+ [ Daniel Leidert ]
+ * debian/catalog: Copied to docbook-simple-1.x and removed.
+ * debian/catalog.xml: Likewise.
+ * docbook-simple-1.0/catalog: Added and polished. Added docbook.org SYSTEM
+ IDs.
+ * docbook-simple-1.0/catalog.xml: Likewise.
+ * docbook-simple-1.1/catalog: Likewise.
+ * docbook-simple-1.1/catalog.xml: Likewise.
+ * debian/control: Added XS-Vcs-* fields.
+ (Maintainer): Hijacked the package, because Mark seems MIA.
+ (Uploaders): Added the Debian XML/SGML Group.
+ (Build-Depends): Added dpatch to apply changes.
+ (Build-Depends-Indep): Moved debheloper to Build-Depends.
+ (Standards-Version): Bump to latest standards version 3.7.2.
+ (Depends): Added sgml-data.
+ (Description): Fixed a lintian warning for the short description and
+ improved the wording of the long description. Removed the author
+ information, that's part of copyright.
+ * debian/copyright: Updated and polished.
+ * debian/docbook-simple.dirs: Removed directories created by dh_install.
+ Added customization directory.
+ * debian/docbook-simple.examples: Added. Installs the examples from
+ debian/examples/ to test the DTD and catalogs.
+ * debian/docbook-simple.install: Removed. Created by debian/rules now.
+ * debian/docbook-simple.links: Renamed to debian/docbook-simple.links.in.
+ Removed the 1.0CR2 symlinks.
+ * debian/docbook-simple.links.in: Added. Contains the static link
+ information. The non-static content is added by debian/rules. Added the
+ compatibility symlink from debian/docbook-simple.postinst.
+ * debian/docbook-simple.postinst: Removed. The interesting directory removal
+ was moved into debian/docbook-simple.preinst.
+ * debian/docbook-simple.preinst: Added. See above.
+ * debian/docbook-simple.postrm: Removed empty debhelper script.
+ * debian/docbook-simple.prerm: Likewise.
+ * debian/docbook-simple.sgmlcatalogs: Removed. Created by debian/rules now.
+ * debian/docbook-simple.xmlcatalogs: Renamed to
+ debian/docbook-simple.xmlcatalogs.in.
+ * debian/docbook-simple.xmlcatalogs.in: Added. Contains the static XML
+ catalog stuff. The non-static content is added by debian/rules.
+ * debian/README.Debian: Slightly updated.
+ * debian/rules: Added get-orig-source target to create the tarball. Added
+ targets to create debian/docbook-simple.install,
+ debian/docbook-simple.links, debian/docbook-simple.sgmlcatalogs and
+ debian/docbook-simple.xmlcatalogs. Added dpatch infrastructure.
+ * debian/examples/*: Added several examples to test the catalogs and DTDs.
+ The Makefile was taken from the docbook-xml package.
+ * debian/patches/01_use_the_entities_from_sgml_data.dpatch: Added.
+ - Uses the entity SYSTEM IDs when installed with sgml-data.
+ * debian/patches/02_fix_custom_fpi_in_comments.dpatch: Added.
+ - Fixes the comments in the custom DTD to suggest the csutom version FPIs.
+ * debian/patches/00list: Added.
+
-- Daniel Leidert (dale) <daniel.leidert at wgdd.de> Sat, 14 Apr 2007 22:36:36 +0200
docbook-simple (1.0.0-6.1) unstable; urgency=low
Modified: packages/docbook-simple/trunk/debian/control
===================================================================
--- packages/docbook-simple/trunk/debian/control 2007-04-15 17:11:29 UTC (rev 726)
+++ packages/docbook-simple/trunk/debian/control 2007-04-15 17:41:54 UTC (rev 727)
@@ -1,20 +1,23 @@
Source: docbook-simple
Section: text
Priority: optional
-Maintainer: Mark Johnson <mrj at debian.org>
-Build-Depends-Indep: debhelper (>> 4.0.0), xml-core
-Standards-Version: 3.6.1.0
+Maintainer: Daniel Leidert (dale) <daniel.leidert at wgdd.de>
+Uploaders: Debian XML/SGML Group <debian-xml-sgml-pkgs at lists.alioth.debian.org>
+Build-Depends: debhelper (>> 4), dpatch
+Build-Depends-Indep: xml-core
+Standards-Version: 3.7.2
+XS-Vcs-Browser: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-simple/trunk/
+XS-Vcs-Svn: svn://svn.debian.org/svn/debian-xml-sgml/packages/docbook-simple/
Package: docbook-simple
Architecture: all
-Depends: ${misc:Depends}, docbook-xml (>= 4.2-7)
+Depends: ${misc:Depends}, sgml-data (>= 2.0.2), docbook-xml (>= 4.2-7)
Suggests: docbook-xsl
Replaces: docbook-xml-simple
-Description: Simplified DocBook XML Doctype and css stylesheets.
- This is a small subset of the DocBook XML DTD.
+Description: simplified DocBook XML Doctype and css stylesheets
+ The Simplified DocBook is a small subset of the DocBook DTD.
It has ~100 elements, rather than the >350 elements in the
full DocBook DTD. A good choice when full DocBook is overkill.
.
- Author: The DocBook Technical Committee <docbook-tc at lists.oasis-open.org>
- .
Homepage: http://www.oasis-open.org/docbook/xml/simple/
+
Modified: packages/docbook-simple/trunk/debian/copyright
===================================================================
--- packages/docbook-simple/trunk/debian/copyright 2007-04-15 17:11:29 UTC (rev 726)
+++ packages/docbook-simple/trunk/debian/copyright 2007-04-15 17:41:54 UTC (rev 727)
@@ -1,35 +1,42 @@
This package was debianized by Mark Johnson <mrj at debian.org> on
-Mon, 26 Jan 2004 17:46:39 -0500
+Mon, 26 Jan 2004 17:46:39 -0500. It is currently maintained by
+Daniel Leidert <daniel.leidert at wgdd.de> as part of the Debian XML/SGML group.
-It was downloaded from http://www.oasis-open.org/docbook/xml/simple/1.0/docbook-simple-1.0.zip
+It was downloaded from
-Upstream Author: The DocBook Technical Committee <docbook-tc at lists.oasis-open.org>
+ http://www.oasis-open.org/docbook/xml/simple/
-Copyright:
+ See the get-orig-source target in debian/rules for more information about
+ the assembling of this package source.
-<!-- Copyright 1992-2002 HaL Computer Systems, Inc.,
- O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software
- Corporation, Norman Walsh, Sun Microsystems, Inc., and the
- Organization for the Advancement of Structured Information
- Standards (OASIS).
+Upstream Author:
- $Id: copyright,v 1.3 2004/01/26 23:00:16 mrj Exp $
+ The DocBook Technical Committee <docbook-tc at lists.oasis-open.org>
- Permission to use, copy, modify and distribute the DocBook XML 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.
+Copyright:
- If you modify the Simplified 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.
+ Copyright 1992-2002 HaL Computer Systems, Inc.,
+ O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software
+ Corporation, Norman Walsh, Sun Microsystems, Inc., and the
+ Organization for the Advancement of Structured Information
+ Standards (OASIS).
- Please direct all questions, bug reports, or suggestions for
- changes to the docbook at lists.oasis-open.org mailing list. For more
- information, see http://www.oasis-open.org/docbook/.
--->
+License and Warranty:
+ Permission to use, copy, modify and distribute the DocBook XML 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 Simplified 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.
+
+ Please direct all questions, bug reports, or suggestions for
+ changes to the docbook at lists.oasis-open.org mailing list. For more
+ information, see http://www.oasis-open.org/docbook/.
+
Modified: packages/docbook-simple/trunk/debian/docbook-simple.dirs
===================================================================
--- packages/docbook-simple/trunk/debian/docbook-simple.dirs 2007-04-15 17:11:29 UTC (rev 726)
+++ packages/docbook-simple/trunk/debian/docbook-simple.dirs 2007-04-15 17:41:54 UTC (rev 727)
@@ -1,3 +1,2 @@
-usr/share/xml/docbook/custom/simple/1.0
-usr/share/xml/docbook/custom/simple/1.0/css
usr/share/sgml/docbook/custom
+etc/sgml/docbook-simple
Added: packages/docbook-simple/trunk/debian/docbook-simple.examples
===================================================================
--- packages/docbook-simple/trunk/debian/docbook-simple.examples 2007-04-15 17:11:29 UTC (rev 726)
+++ packages/docbook-simple/trunk/debian/docbook-simple.examples 2007-04-15 17:41:54 UTC (rev 727)
@@ -0,0 +1 @@
+debian/examples/*
Deleted: packages/docbook-simple/trunk/debian/docbook-simple.install
===================================================================
--- packages/docbook-simple/trunk/debian/docbook-simple.install 2007-04-15 17:11:29 UTC (rev 726)
+++ packages/docbook-simple/trunk/debian/docbook-simple.install 2007-04-15 17:41:54 UTC (rev 727)
@@ -1,3 +0,0 @@
-*.mod usr/share/xml/docbook/custom/simple/1.0
-*.dtd usr/share/xml/docbook/custom/simple/1.0
-*.css usr/share/xml/docbook/custom/simple/1.0/css
Deleted: packages/docbook-simple/trunk/debian/docbook-simple.links
===================================================================
--- packages/docbook-simple/trunk/debian/docbook-simple.links 2007-04-15 17:11:29 UTC (rev 726)
+++ packages/docbook-simple/trunk/debian/docbook-simple.links 2007-04-15 17:41:54 UTC (rev 727)
@@ -1,2 +0,0 @@
-usr/share/xml/docbook/custom/simple usr/share/sgml/docbook/custom/simple
-usr/share/xml/docbook/custom/simple/1.0 usr/share/xml/docbook/custom/simple/1.0CR2
Copied: packages/docbook-simple/trunk/debian/docbook-simple.links.in (from rev 723, packages/docbook-simple/trunk/debian/docbook-simple.links)
===================================================================
--- packages/docbook-simple/trunk/debian/docbook-simple.links 2007-04-14 19:52:08 UTC (rev 723)
+++ packages/docbook-simple/trunk/debian/docbook-simple.links.in 2007-04-15 17:41:54 UTC (rev 727)
@@ -0,0 +1 @@
+usr/share/xml/docbook/custom/simple usr/share/sgml/docbook/custom/simple
Deleted: packages/docbook-simple/trunk/debian/docbook-simple.postinst
===================================================================
--- packages/docbook-simple/trunk/debian/docbook-simple.postinst 2007-04-15 17:11:29 UTC (rev 726)
+++ packages/docbook-simple/trunk/debian/docbook-simple.postinst 2007-04-15 17:41:54 UTC (rev 727)
@@ -1,37 +0,0 @@
-#! /bin/sh
-# postinst script for docbook-simple
-# Maintainer: Mark Johnson <mrj at debian.org>
-
-set -e
-
-
-if [ "$1" = configure ]; then
-
- # Skip all this if compatibility symlink exists
- if [ ! -h /usr/share/sgml/docbook/custom/simple ]; then
-
- # Check if custom directory exists
- if [ -d /usr/share/sgml/docbook/custom ]; then
- # Remove simple directory, if it exists
- if [ -d /usr/share/sgml/docbook/custom/simple ]; then
- rm -rf /usr/share/sgml/docbook/custom/simple
- fi
- else
- # Create custom directory
- mkdir /usr/share/sgml/docbook/custom
- fi
-
- # Compatibility symlink doesn't exist, create it
- ln -s ../../../xml/docbook/custom/simple \
- /usr/share/sgml/docbook/custom/simple
- fi
- # End of symlink section
-
-
-fi
-
-
-#DEBHELPER#
-
-exit 0
-
Deleted: packages/docbook-simple/trunk/debian/docbook-simple.postrm
===================================================================
--- packages/docbook-simple/trunk/debian/docbook-simple.postrm 2007-04-15 17:11:29 UTC (rev 726)
+++ packages/docbook-simple/trunk/debian/docbook-simple.postrm 2007-04-15 17:41:54 UTC (rev 727)
@@ -1,10 +0,0 @@
-#! /bin/sh
-# postrm script for docbook-simple
-# Maintainer: Mark Johnson <mrj at debian.org>
-
-set -e
-
-
-#DEBHELPER#
-
-exit 0
Added: packages/docbook-simple/trunk/debian/docbook-simple.preinst
===================================================================
--- packages/docbook-simple/trunk/debian/docbook-simple.preinst 2007-04-15 17:11:29 UTC (rev 726)
+++ packages/docbook-simple/trunk/debian/docbook-simple.preinst 2007-04-15 17:41:54 UTC (rev 727)
@@ -0,0 +1,20 @@
+#! /bin/sh
+# preinst script for docbook-simple
+#
+# see: dh_installdeb(1)
+
+set -e
+
+if [ "$1" = configure ]; then
+
+ # Remove simple directory, if it exists
+ if [ -d /usr/share/sgml/docbook/custom/simple ] ; then
+ rm -rf /usr/share/sgml/docbook/custom/simple
+ fi
+
+fi
+
+#DEBHELPER#
+
+exit 0
+
Deleted: packages/docbook-simple/trunk/debian/docbook-simple.prerm
===================================================================
--- packages/docbook-simple/trunk/debian/docbook-simple.prerm 2007-04-15 17:11:29 UTC (rev 726)
+++ packages/docbook-simple/trunk/debian/docbook-simple.prerm 2007-04-15 17:41:54 UTC (rev 727)
@@ -1,9 +0,0 @@
-#! /bin/sh
-# prerm script for docbook-simple
-# Maintainer: Mark Johnson <mrj at debian.org>
-
-set -e
-
-#DEBHELPER#
-
-exit 0
Deleted: packages/docbook-simple/trunk/debian/docbook-simple.sgmlcatalogs
===================================================================
--- packages/docbook-simple/trunk/debian/docbook-simple.sgmlcatalogs 2007-04-15 17:11:29 UTC (rev 726)
+++ packages/docbook-simple/trunk/debian/docbook-simple.sgmlcatalogs 2007-04-15 17:41:54 UTC (rev 727)
@@ -1 +0,0 @@
-debian/catalog /usr/share/xml/docbook/custom/simple/1.0/catalog
Deleted: packages/docbook-simple/trunk/debian/docbook-simple.xmlcatalogs
===================================================================
--- packages/docbook-simple/trunk/debian/docbook-simple.xmlcatalogs 2007-04-15 17:11:29 UTC (rev 726)
+++ packages/docbook-simple/trunk/debian/docbook-simple.xmlcatalogs 2007-04-15 17:41:54 UTC (rev 727)
@@ -1,15 +0,0 @@
-local;debian/catalog.xml;/usr/share/xml/docbook/custom/simple/1.0/catalog.xml
-root-and-package;public;-//OASIS//DTD Simplified DocBook;/usr/share/xml/docbook/custom/simple/1.0/catalog.xml
-root-and-package;system;http://www.oasis-open.org/docbook/xml/simple/;/usr/share/xml/docbook/custom/simple/1.0/catalog.xml
-
-
-
-
-
-
-
-
-
-
-
-
Copied: packages/docbook-simple/trunk/debian/docbook-simple.xmlcatalogs.in (from rev 723, packages/docbook-simple/trunk/debian/docbook-simple.xmlcatalogs)
===================================================================
--- packages/docbook-simple/trunk/debian/docbook-simple.xmlcatalogs 2007-04-14 19:52:08 UTC (rev 723)
+++ packages/docbook-simple/trunk/debian/docbook-simple.xmlcatalogs.in 2007-04-15 17:41:54 UTC (rev 727)
@@ -0,0 +1,4 @@
+root;public;-//OASIS//DTD Simplified DocBook
+root;system;http://www.oasis-open.org/docbook/xml/simple/
+root;system;http://docbook.org/xml/simple/
+
Added: packages/docbook-simple/trunk/debian/examples/Makefile
===================================================================
--- packages/docbook-simple/trunk/debian/examples/Makefile 2007-04-15 17:11:29 UTC (rev 726)
+++ packages/docbook-simple/trunk/debian/examples/Makefile 2007-04-15 17:41:54 UTC (rev 727)
@@ -0,0 +1,29 @@
+
+SRCS := $(wildcard *.xml)
+NSGMLS := $(shell if command -v onsgmls 2>/dev/null; then \
+ : ;\
+ elif command -v nsgmls 2>/dev/null; then \
+ : ;\
+ else \
+ echo "false" ;\
+ echo "warning: no nsgmls found" >&2 ;\
+ fi)
+
+NSGMLSARGS := -m/usr/share/sgml/declaration/xml.soc
+
+# settings for XML files
+export SP_CHARSET_FIXED = YES
+export SP_ENCODING = XML
+
+.PHONY: validate
+validate: $(addsuffix .nsgmls,$(SRCS)) $(addsuffix .xmllint,$(SRCS))
+
+%.xmllint : %
+ xmllint --nonet --noout --valid $<
+
+%.nsgmls : %
+ $(NSGMLS) -E1 -wxml -wall $(NSGMLSARGS) -gues $<
+
+.PHONY: clean
+clean:
+ rm -f *.html *~
Added: packages/docbook-simple/trunk/debian/examples/test-1.0.xml
===================================================================
--- packages/docbook-simple/trunk/debian/examples/test-1.0.xml 2007-04-15 17:11:29 UTC (rev 726)
+++ packages/docbook-simple/trunk/debian/examples/test-1.0.xml 2007-04-15 17:41:54 UTC (rev 727)
@@ -0,0 +1,10 @@
+<?xml version='1.0'?>
+<!DOCTYPE article PUBLIC "-//OASIS//DTD Simplified DocBook XML V1.0//EN"
+ "http://www.oasis-open.org/docbook/xml/simple/1.0/sdocbook.dtd">
+<article>
+ <title>foo</title>
+ <section>
+ <title>bar</title>
+ <para>foo</para>
+ </section>
+</article>
Added: packages/docbook-simple/trunk/debian/examples/test-1.1.xml
===================================================================
--- packages/docbook-simple/trunk/debian/examples/test-1.1.xml 2007-04-15 17:11:29 UTC (rev 726)
+++ packages/docbook-simple/trunk/debian/examples/test-1.1.xml 2007-04-15 17:41:54 UTC (rev 727)
@@ -0,0 +1,10 @@
+<?xml version='1.0'?>
+<!DOCTYPE article PUBLIC "-//OASIS//DTD Simplified DocBook XML V1.1//EN"
+ "http://www.oasis-open.org/docbook/xml/simple/1.1/sdocbook.dtd">
+<article>
+ <title>foo</title>
+ <section>
+ <title>bar</title>
+ <para>foo</para>
+ </section>
+</article>
Added: packages/docbook-simple/trunk/debian/examples/test-bad-si-1.0.xml
===================================================================
--- packages/docbook-simple/trunk/debian/examples/test-bad-si-1.0.xml 2007-04-15 17:11:29 UTC (rev 726)
+++ packages/docbook-simple/trunk/debian/examples/test-bad-si-1.0.xml 2007-04-15 17:41:54 UTC (rev 727)
@@ -0,0 +1,10 @@
+<?xml version='1.0'?>
+<!DOCTYPE article PUBLIC "-//OASIS//DTD Simplified DocBook XML V1.0//EN"
+ "sdocbook.dtd">
+<article>
+ <title>foo</title>
+ <section>
+ <title>bar</title>
+ <para>foo</para>
+ </section>
+</article>
Added: packages/docbook-simple/trunk/debian/examples/test-bad-si-1.1.xml
===================================================================
--- packages/docbook-simple/trunk/debian/examples/test-bad-si-1.1.xml 2007-04-15 17:11:29 UTC (rev 726)
+++ packages/docbook-simple/trunk/debian/examples/test-bad-si-1.1.xml 2007-04-15 17:41:54 UTC (rev 727)
@@ -0,0 +1,10 @@
+<?xml version='1.0'?>
+<!DOCTYPE article PUBLIC "-//OASIS//DTD Simplified DocBook XML V1.1//EN"
+ "sdocbook.dtd">
+<article>
+ <title>foo</title>
+ <section>
+ <title>bar</title>
+ <para>foo</para>
+ </section>
+</article>
Added: packages/docbook-simple/trunk/debian/examples/test-custom-1.0.xml
===================================================================
--- packages/docbook-simple/trunk/debian/examples/test-custom-1.0.xml 2007-04-15 17:11:29 UTC (rev 726)
+++ packages/docbook-simple/trunk/debian/examples/test-custom-1.0.xml 2007-04-15 17:41:54 UTC (rev 727)
@@ -0,0 +1,10 @@
+<?xml version='1.0'?>
+<!DOCTYPE article PUBLIC "-//OASIS//DTD Simplified DocBook XML Customization V1.0//EN"
+ "http://www.oasis-open.org/docbook/xml/simple/1.0/sdocbook-custom.dtd">
+<article>
+ <title>foo</title>
+ <section>
+ <title>bar</title>
+ <para>foo</para>
+ </section>
+</article>
Added: packages/docbook-simple/trunk/debian/examples/test-custom-1.1.xml
===================================================================
--- packages/docbook-simple/trunk/debian/examples/test-custom-1.1.xml 2007-04-15 17:11:29 UTC (rev 726)
+++ packages/docbook-simple/trunk/debian/examples/test-custom-1.1.xml 2007-04-15 17:41:54 UTC (rev 727)
@@ -0,0 +1,10 @@
+<?xml version='1.0'?>
+<!DOCTYPE article PUBLIC "-//OASIS//DTD Simplified DocBook XML Customization V1.1//EN"
+ "http://www.oasis-open.org/docbook/xml/simple/1.1/sdocbook-custom.dtd">
+<article>
+ <title>foo</title>
+ <section>
+ <title>bar</title>
+ <para>foo</para>
+ </section>
+</article>
Added: packages/docbook-simple/trunk/debian/examples/test-si-1.0.xml
===================================================================
--- packages/docbook-simple/trunk/debian/examples/test-si-1.0.xml 2007-04-15 17:11:29 UTC (rev 726)
+++ packages/docbook-simple/trunk/debian/examples/test-si-1.0.xml 2007-04-15 17:41:54 UTC (rev 727)
@@ -0,0 +1,9 @@
+<?xml version='1.0'?>
+<!DOCTYPE article SYSTEM "/usr/share/xml/docbook/custom/simple/1.0/sdocbook.dtd">
+<article>
+ <title>foo</title>
+ <section>
+ <title>bar</title>
+ <para>foo</para>
+ </section>
+</article>
Added: packages/docbook-simple/trunk/debian/examples/test-si-1.1.xml
===================================================================
--- packages/docbook-simple/trunk/debian/examples/test-si-1.1.xml 2007-04-15 17:11:29 UTC (rev 726)
+++ packages/docbook-simple/trunk/debian/examples/test-si-1.1.xml 2007-04-15 17:41:54 UTC (rev 727)
@@ -0,0 +1,9 @@
+<?xml version='1.0'?>
+<!DOCTYPE article SYSTEM "/usr/share/xml/docbook/custom/simple/1.1/sdocbook.dtd">
+<article>
+ <title>foo</title>
+ <section>
+ <title>bar</title>
+ <para>foo</para>
+ </section>
+</article>
Added: packages/docbook-simple/trunk/debian/examples/test-si-url-docbook.org-1.0.xml
===================================================================
--- packages/docbook-simple/trunk/debian/examples/test-si-url-docbook.org-1.0.xml 2007-04-15 17:11:29 UTC (rev 726)
+++ packages/docbook-simple/trunk/debian/examples/test-si-url-docbook.org-1.0.xml 2007-04-15 17:41:54 UTC (rev 727)
@@ -0,0 +1,9 @@
+<?xml version='1.0'?>
+<!DOCTYPE article SYSTEM "http://docbook.org/xml/simple/1.0/sdocbook.dtd">
+<article>
+ <title>foo</title>
+ <section>
+ <title>bar</title>
+ <para>foo</para>
+ </section>
+</article>
Added: packages/docbook-simple/trunk/debian/examples/test-si-url-docbook.org-1.1.xml
===================================================================
--- packages/docbook-simple/trunk/debian/examples/test-si-url-docbook.org-1.1.xml 2007-04-15 17:11:29 UTC (rev 726)
+++ packages/docbook-simple/trunk/debian/examples/test-si-url-docbook.org-1.1.xml 2007-04-15 17:41:54 UTC (rev 727)
@@ -0,0 +1,9 @@
+<?xml version='1.0'?>
+<!DOCTYPE article SYSTEM "http://docbook.org/xml/simple/1.1/sdocbook.dtd">
+<article>
+ <title>foo</title>
+ <section>
+ <title>bar</title>
+ <para>foo</para>
+ </section>
+</article>
Added: packages/docbook-simple/trunk/debian/examples/test-si-url-oasis-1.0.xml
===================================================================
--- packages/docbook-simple/trunk/debian/examples/test-si-url-oasis-1.0.xml 2007-04-15 17:11:29 UTC (rev 726)
+++ packages/docbook-simple/trunk/debian/examples/test-si-url-oasis-1.0.xml 2007-04-15 17:41:54 UTC (rev 727)
@@ -0,0 +1,9 @@
+<?xml version='1.0'?>
+<!DOCTYPE article SYSTEM "http://www.oasis-open.org/docbook/xml/simple/1.0/sdocbook.dtd">
+<article>
+ <title>foo</title>
+ <section>
+ <title>bar</title>
+ <para>foo</para>
+ </section>
+</article>
Added: packages/docbook-simple/trunk/debian/examples/test-si-url-oasis-1.1.xml
===================================================================
--- packages/docbook-simple/trunk/debian/examples/test-si-url-oasis-1.1.xml 2007-04-15 17:11:29 UTC (rev 726)
+++ packages/docbook-simple/trunk/debian/examples/test-si-url-oasis-1.1.xml 2007-04-15 17:41:54 UTC (rev 727)
@@ -0,0 +1,9 @@
+<?xml version='1.0'?>
+<!DOCTYPE article SYSTEM "http://www.oasis-open.org/docbook/xml/simple/1.1/sdocbook.dtd">
+<article>
+ <title>foo</title>
+ <section>
+ <title>bar</title>
+ <para>foo</para>
+ </section>
+</article>
Added: packages/docbook-simple/trunk/debian/patches/00list
===================================================================
--- packages/docbook-simple/trunk/debian/patches/00list 2007-04-15 17:11:29 UTC (rev 726)
+++ packages/docbook-simple/trunk/debian/patches/00list 2007-04-15 17:41:54 UTC (rev 727)
@@ -0,0 +1,2 @@
+01_use_the_entities_from_sgml_data
+02_fix_custom_fpi_in_comments
Added: packages/docbook-simple/trunk/debian/patches/01_use_the_entities_from_sgml_data.dpatch
===================================================================
--- packages/docbook-simple/trunk/debian/patches/01_use_the_entities_from_sgml_data.dpatch 2007-04-15 17:11:29 UTC (rev 726)
+++ packages/docbook-simple/trunk/debian/patches/01_use_the_entities_from_sgml_data.dpatch 2007-04-15 17:41:54 UTC (rev 727)
@@ -0,0 +1,66 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_use_the_entities_from_sgml_data.dpatch by Daniel Leidert (dale) <daniel.leidert at wgdd.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: * docbook-simple-1.*/sdbcent.mod: Reference the SYSTEM-IDs of the
+## DP: entities, if installed with the sgml-data package. This should only
+## DP: be done as long as http://bugs.debian.org/383507 is not solved. Then
+## DP: we should use the online SYSTEM IDs.
+## DP:
+## DP: <URL:http://packages.debian.org/changelogs/pool/main/d/docbook-simple/current/changelog#versionversion1.1-1>
+## DP:
+## DP: for i in `find . -type f` ; do \
+## DP: sed -e 's/^\"..\/..\/xmlcharent\/iso-/\"\/usr\/share\/xml\/entities\/xml-iso-entities-8879\.1986\/ISO/g' \
+## DP: < $i > $i.new ; \
+## DP: mv $i.new $i ; \
+## DP: done
+
+ at DPATCH@
+diff -urNad docbook-simple-1.1~/docbook-simple-1.0/sdbcent.mod docbook-simple-1.1/docbook-simple-1.0/sdbcent.mod
+--- docbook-simple-1.1~/docbook-simple-1.0/sdbcent.mod 2003-01-15 23:46:24.000000000 +0100
++++ docbook-simple-1.1/docbook-simple-1.0/sdbcent.mod 2007-04-15 02:50:08.000000000 +0200
+@@ -50,17 +50,17 @@
+
+ <!ENTITY % ISOlat1 PUBLIC
+ "ISO 8879:1986//ENTITIES Added Latin 1//EN//XML"
+-"../../xmlcharent/iso-lat1.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOlat1.ent">
+ %ISOlat1;
+
+ <!ENTITY % ISOnum PUBLIC
+ "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN//XML"
+-"../../xmlcharent/iso-num.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOnum.ent">
+ %ISOnum;
+
+ <!ENTITY % ISOpub PUBLIC
+ "ISO 8879:1986//ENTITIES Publishing//EN//XML"
+-"../../xmlcharent/iso-pub.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOpub.ent">
+ %ISOpub;
+
+ <!-- End of Simplified DocBook Character Entity Module V1.0 ............... -->
+diff -urNad docbook-simple-1.1~/docbook-simple-1.1/sdbcent.mod docbook-simple-1.1/docbook-simple-1.1/sdbcent.mod
+--- docbook-simple-1.1~/docbook-simple-1.1/sdbcent.mod 2005-04-01 23:04:30.000000000 +0200
++++ docbook-simple-1.1/docbook-simple-1.1/sdbcent.mod 2007-04-15 02:51:03.000000000 +0200
+@@ -50,17 +50,17 @@
+
+ <!ENTITY % ISOlat1 PUBLIC
+ "ISO 8879:1986//ENTITIES Added Latin 1//EN//XML"
+-"http://www.w3.org/2003/entities/iso8879/isolat1.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOlat1.ent">
+ %ISOlat1;
+
+ <!ENTITY % ISOnum PUBLIC
+ "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN//XML"
+-"http://www.w3.org/2003/entities/iso8879/isonum.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOnum.ent">
+ %ISOnum;
+
+ <!ENTITY % ISOpub PUBLIC
+ "ISO 8879:1986//ENTITIES Publishing//EN//XML"
+-"http://www.w3.org/2003/entities/iso8879/isopub.ent">
++"/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOpub.ent">
+ %ISOpub;
+
+ <!-- End of Simplified DocBook Character Entity Module V1.1 ............... -->
Property changes on: packages/docbook-simple/trunk/debian/patches/01_use_the_entities_from_sgml_data.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: packages/docbook-simple/trunk/debian/patches/02_fix_custom_fpi_in_comments.dpatch
===================================================================
--- packages/docbook-simple/trunk/debian/patches/02_fix_custom_fpi_in_comments.dpatch 2007-04-15 17:11:29 UTC (rev 726)
+++ packages/docbook-simple/trunk/debian/patches/02_fix_custom_fpi_in_comments.dpatch 2007-04-15 17:41:54 UTC (rev 727)
@@ -0,0 +1,92 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_fix_custom_fpi_in_comments.dpatch by Daniel Leidert (dale) <daniel.leidert at wgdd.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: * docbook-simple-1.*/*-custom.dtd: If using a customized DTD version, a
+## DP: custom FPI should be used to not conflict with the original DTD. So
+## DP: this patch simply fixes the starting comment, so people (hopefully)
+## DP: do not try to use the same FPI for the customized and original DTD.
+## DP:
+## DP: <URL:http://packages.debian.org/changelogs/pool/main/d/docbook-simple/current/changelog#versionversion1.1-1>
+
+ at DPATCH@
+diff -urNad docbook-simple-1.1~/docbook-simple-1.0/sdocbook-custom.dtd docbook-simple-1.1/docbook-simple-1.0/sdocbook-custom.dtd
+--- docbook-simple-1.1~/docbook-simple-1.0/sdocbook-custom.dtd 2003-01-15 23:46:24.000000000 +0100
++++ docbook-simple-1.1/docbook-simple-1.0/sdocbook-custom.dtd 2007-04-15 03:07:53.000000000 +0200
+@@ -33,13 +33,13 @@
+ <!-- This is the driver file for V1.0 of the Simplified DocBook XML DTD.
+ Please use the following formal public identifier to identify it:
+
+- "-//OASIS//DTD Simplified DocBook XML V1.0//EN"
++ "-//OASIS//DTD Simplified DocBook XML Customization V1.0//EN"
+
+ For example:
+
+ <!DOCTYPE article
+- PUBLIC "-//OASIS//DTD Simplified DocBook XML V1.0//EN"
+- "http://www.oasis-open.org/docbook/xml/simple/1.0/sdocbook.dtd"
++ PUBLIC "-//OASIS//DTD Simplified DocBook XML Customization V1.0//EN"
++ "http://www.oasis-open.org/docbook/xml/simple/1.0/sdocbook-custom.dtd"
+ [...]>
+ -->
+
+diff -urNad docbook-simple-1.1~/docbook-simple-1.0/sdocbookref-custom.dtd docbook-simple-1.1/docbook-simple-1.0/sdocbookref-custom.dtd
+--- docbook-simple-1.1~/docbook-simple-1.0/sdocbookref-custom.dtd 2003-01-15 23:46:24.000000000 +0100
++++ docbook-simple-1.1/docbook-simple-1.0/sdocbookref-custom.dtd 2007-04-15 03:07:53.000000000 +0200
+@@ -34,13 +34,13 @@
+ RefEntry XML DTD. Please use the following formal public identifier
+ to identify it:
+
+- "-//OASIS//DTD Simplified DocBook RefEntry XML V1.0//EN"
++ "-//OASIS//DTD Simplified DocBook RefEntry XML Customization V1.0//EN"
+
+ For example:
+
+ <!DOCTYPE article
+- PUBLIC "-//OASIS//DTD Simplified DocBook RefEntry XML V1.0//EN"
+- "http://www.oasis-open.org/docbook/xml/simple/1.0/sdocbookref.dtd"
++ PUBLIC "-//OASIS//DTD Simplified DocBook RefEntry XML Customization V1.0//EN"
++ "http://www.oasis-open.org/docbook/xml/simple/1.0/sdocbookref-custom.dtd"
+ [...]>
+ -->
+
+diff -urNad docbook-simple-1.1~/docbook-simple-1.1/sdocbook-custom.dtd docbook-simple-1.1/docbook-simple-1.1/sdocbook-custom.dtd
+--- docbook-simple-1.1~/docbook-simple-1.1/sdocbook-custom.dtd 2005-04-01 23:04:30.000000000 +0200
++++ docbook-simple-1.1/docbook-simple-1.1/sdocbook-custom.dtd 2007-04-15 03:07:53.000000000 +0200
+@@ -33,13 +33,13 @@
+ <!-- This is the driver file for V1.1 of the Simplified DocBook XML DTD.
+ Please use the following formal public identifier to identify it:
+
+- "-//OASIS//DTD Simplified DocBook XML V1.1//EN"
++ "-//OASIS//DTD Simplified DocBook XML Customization V1.1//EN"
+
+ For example:
+
+ <!DOCTYPE article
+- PUBLIC "-//OASIS//DTD Simplified DocBook XML V1.1//EN"
+- "http://www.oasis-open.org/docbook/xml/simple/1.1/sdocbook.dtd"
++ PUBLIC "-//OASIS//DTD Simplified DocBook XML Customization V1.1//EN"
++ "http://www.oasis-open.org/docbook/xml/simple/1.1/sdocbook-custom.dtd"
+ [...]>
+ -->
+
+diff -urNad docbook-simple-1.1~/docbook-simple-1.1/sdocbookref-custom.dtd docbook-simple-1.1/docbook-simple-1.1/sdocbookref-custom.dtd
+--- docbook-simple-1.1~/docbook-simple-1.1/sdocbookref-custom.dtd 2005-04-01 23:04:30.000000000 +0200
++++ docbook-simple-1.1/docbook-simple-1.1/sdocbookref-custom.dtd 2007-04-15 03:07:53.000000000 +0200
+@@ -34,13 +34,13 @@
+ RefEntry XML DTD. Please use the following formal public identifier
+ to identify it:
+
+- "-//OASIS//DTD Simplified DocBook RefEntry XML V1.1//EN"
++ "-//OASIS//DTD Simplified DocBook RefEntry XML Customization V1.1//EN"
+
+ For example:
+
+ <!DOCTYPE article
+- PUBLIC "-//OASIS//DTD Simplified DocBook RefEntry XML V1.1//EN"
+- "http://www.oasis-open.org/docbook/xml/simple/1.1/sdocbookref.dtd"
++ PUBLIC "-//OASIS//DTD Simplified DocBook RefEntry XML Customization V1.1//EN"
++ "http://www.oasis-open.org/docbook/xml/simple/1.1/sdocbookref-custom.dtd"
+ [...]>
+ -->
+
Property changes on: packages/docbook-simple/trunk/debian/patches/02_fix_custom_fpi_in_comments.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Modified: packages/docbook-simple/trunk/debian/rules
===================================================================
--- packages/docbook-simple/trunk/debian/rules 2007-04-15 17:11:29 UTC (rev 726)
+++ packages/docbook-simple/trunk/debian/rules 2007-04-15 17:41:54 UTC (rev 727)
@@ -1,19 +1,82 @@
#!/usr/bin/make -f
# rules for docbook-simple
-# Maintainer: Mark Johnson <mrj at debian.org>
#export DH_VERBOSE=1
-build: build-stamp
+PACKAGE := docbook-simple
-build-stamp:
+include /usr/share/dpatch/dpatch.make
+
+
+debian/docbook-simple.install:
+ set -ex ; \
+ touch $@ ; \
+ for dbs in docbook-simple-* ; do \
+ dbsver=`echo $${dbs} | sed -e 's/docbook-simple-//g'` ; \
+ echo "$${dbs}/catalog.xml usr/share/xml/docbook/custom/simple/$${dbsver}" >> $@ ; \
+ echo "$${dbs}/*.mod usr/share/xml/docbook/custom/simple/$${dbsver}" >> $@ ; \
+ echo "$${dbs}/{sdocbook,sdocbookref}.dtd usr/share/xml/docbook/custom/simple/$${dbsver}" >> $@ ; \
+ echo "$${dbs}/*.css usr/share/xml/docbook/custom/simple/$${dbsver}/css" >> $@ ; \
+ echo "$${dbs}/{sdocbook,sdocbookref}-custom.dtd etc/sgml/docbook-simple/$${dbsver}" >> $@ ; \
+ echo >> $@ ; \
+ done
+
+debian/docbook-simple.links:
+ set -ex ; \
+ touch $@ ; \
+ cat $@.in >> $@ ; \
+ for dbs in docbook-simple-*/{sdocbook,sdocbookref}-custom.dtd ; do \
+ dbsdtd=`echo $${dbs} | sed -e 's/docbook-simple-//g'` ; \
+ echo -n "etc/sgml/docbook-simple/$${dbsdtd} " >> $@ && \
+ echo "usr/share/xml/docbook/custom/simple/$${dbsdtd}" >> $@ ; \
+ done
+
+debian/docbook-simple.sgmlcatalogs:
+ set -ex ; \
+ touch $@ ; \
+ for dbs in docbook-simple-* ; do \
+ dbsver=`echo $${dbs} | sed -e 's/docbook-simple-//g'` ; \
+ echo "$${dbs}/catalog /usr/share/xml/docbook/custom/simple/$${dbsver}/catalog" >> $@ ; \
+ done
+
+debian/docbook-simple.xmlcatalogs:
+ set -ex ; \
+ touch $@ $@.tmp ; \
+ cat $@.in >> $@.tmp ; \
+ for dbscat in docbook-simple-*/catalog.xml ; do \
+ dbsver=`echo $${dbscat} | sed -e 's/docbook-simple-//g' -e 's/\/catalog.xml//g'` ; \
+ echo "local;$${dbscat};/usr/share/xml/docbook/custom/simple/$${dbsver}/catalog.xml" >> $@.tmp ; \
+ sysids=`egrep -e "<system systemId=\"[^\"]+\"" $${dbscat} | \
+ sed -e 's/<system systemId=\"\(.*\)\"/\1;/g'` IFS=';' ; \
+ echo $${sysids} | while read id ; do \
+ echo "package;system;$${id};/usr/share/xml/docbook/custom/simple/$${dbsver}/catalog.xml" >> $@.tmp ; \
+ done ; \
+ pubids=`egrep -e "<public publicId=\"[^\"]+\"" $${dbscat} | \
+ sed -e 's/<public publicId=\"\(.*\)\"/\1;/g'` IFS=';' ; \
+ echo $${pubids} | while read id ; do \
+ echo "package;public;$${id};/usr/share/xml/docbook/custom/simple/$${dbsver}/catalog.xml" >> $@.tmp ; \
+ done ; \
+ echo >> $@.tmp ; \
+ done ; \
+ sed -e 's/\ ;\/usr/;\/usr/g' < $@.tmp > $@ && rm -f $@.tmp
+
+build: patch-stamp build-stamp
+
+build-stamp: debian/docbook-simple.install \
+ debian/docbook-simple.links \
+ debian/docbook-simple.sgmlcatalogs \
+ debian/docbook-simple.xmlcatalogs
dh_testdir
touch build-stamp
-clean:
+clean: unpatch
dh_testdir
dh_testroot
- rm -f build-stamp
+ rm -f build-stamp patch-stamp
+ rm -f debian/docbook-simple.install \
+ debian/docbook-simple.links \
+ debian/docbook-simple.sgmlcatalogs \
+ debian/docbook-simple.xmlcatalogs
dh_clean
install: build
@@ -46,3 +109,24 @@
binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary install
+
+# 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')
+
+.PHONY: get-orig-source
+get-orig-source:
+ set -ex ; \
+ TMPDIR=`mktemp -d docbook-simple-$(version).orig` ; \
+ mkdir -p "$$TMPDIR"/docbook-simple-{1.0,1.1} ; \
+ for dbs in 1.0 1.1 ; do \
+ dbszip=docbook-simple-$${dbs}.zip ; \
+ wget -P "$$TMPDIR" http://www.oasis-open.org/docbook/xml/simple/$${dbs}/"$$dbszip" ; \
+ unzip -d "$$TMPDIR"/docbook-simple-$${dbs} "$$TMPDIR"/"$$dbszip" ; \
+ rm -f "$$TMPDIR"/"$$dbszip" ; \
+ done; \
+ find "$$TMPDIR" -type f ! -perm 644 -exec chmod 644 "{}" ";" ; \
+ GZIP=-9 tar -czf $(CURDIR)/docbook-simple_${version}.orig.tar.gz "$$TMPDIR" ; \
+ rm -rf "$$TMPDIR"
+
Added: packages/docbook-simple/trunk/docbook-simple-1.0/catalog
===================================================================
--- packages/docbook-simple/trunk/docbook-simple-1.0/catalog 2007-04-15 17:11:29 UTC (rev 726)
+++ packages/docbook-simple/trunk/docbook-simple-1.0/catalog 2007-04-15 17:41:54 UTC (rev 727)
@@ -0,0 +1,38 @@
+ -- ...................................................................... --
+ -- This catalog was written for the Debian system ....................... --
+ -- ...................................................................... --
+
+ -- ...................................................................... --
+ -- Prefer PUBID to SYSID ................................................ --
+OVERRIDE YES
+
+ -- ...................................................................... --
+ -- catalog entry for docbook docbook-simple v1.0 ........................ --
+PUBLIC "-//OASIS//DTD Simplified DocBook XML V1.0//EN"
+ "sdocbook.dtd"
+SYSTEM "http://www.oasis-open.org/docbook/xml/simple/1.0/sdocbook.dtd"
+ "sdocbook.dtd"
+SYSTEM "http://docbook.org/xml/simple/1.0/sdocbook.dtd"
+ "sdocbook.dtd"
+
+PUBLIC "-//OASIS//DTD Simplified DocBook XML Customization V1.0//EN"
+ "sdocbook-custom.dtd"
+SYSTEM "http://www.oasis-open.org/docbook/xml/simple/1.0/sdocbook-custom.dtd"
+ "sdocbook-custom.dtd"
+SYSTEM "http://docbook.org/xml/simple/1.0/sdocbook-custom.dtd"
+ "sdocbook-custom.dtd"
+
+PUBLIC "-//OASIS//DTD Simplified DocBook RefEntry XML V1.0//EN"
+ "sdocbookref.dtd"
+SYSTEM "http://www.oasis-open.org/docbook/xml/simple/1.0/sdocbookref.dtd"
+ "sdocbookref.dtd"
+SYSTEM "http://docbook.org/xml/simple/1.0/sdocbookref.dtd"
+ "sdocbookref.dtd"
+
+PUBLIC "-//OASIS//DTD Simplified DocBook RefEntry XML Customization V1.0//EN"
+ "sdocbookref-custom.dtd"
+SYSTEM "http://www.oasis-open.org/docbook/xml/simple/1.0/sdocbookref-custom.dtd"
+ "sdocbookref-custom.dtd"
+SYSTEM "http://docbook.org/xml/simple/1.0/sdocbookref-custom.dtd"
+ "sdocbookref-custom.dtd"
+
Added: packages/docbook-simple/trunk/docbook-simple-1.0/catalog.xml
===================================================================
--- packages/docbook-simple/trunk/docbook-simple-1.0/catalog.xml 2007-04-15 17:11:29 UTC (rev 726)
+++ packages/docbook-simple/trunk/docbook-simple-1.0/catalog.xml 2007-04-15 17:41:54 UTC (rev 727)
@@ -0,0 +1,42 @@
+<?xml version="1.0"?>
+<!DOCTYPE catalog PUBLIC "-//OASIS//DTD XML Catalogs V1.0//EN"
+ "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
+
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog" prefer="public">
+
+<!-- ..................................................................... -->
+<!-- This catalog was written for the Debian system. ..................... -->
+<!-- ..................................................................... -->
+
+<!-- ..................................................................... -->
+<!-- catalog entry for docbook docbook-simple v1.0 ....................... -->
+<public publicId="-//OASIS//DTD Simplified DocBook XML V1.0//EN"
+ uri="sdocbook.dtd"/>
+<system systemId="http://www.oasis-open.org/docbook/xml/simple/1.0/sdocbook.dtd"
+ uri="sdocbook.dtd"/>
+<system systemId="http://docbook.org/xml/simple/1.0/sdocbook.dtd"
+ uri="sdocbook.dtd"/>
+
+<public publicId="-//OASIS//DTD Simplified DocBook XML Customization V1.0//EN"
+ uri="sdocbook-custom.dtd"/>
+<system systemId="http://www.oasis-open.org/docbook/xml/simple/1.0/sdocbook-custom.dtd"
+ uri="sdocbook-custom.dtd"/>
+<system systemId="http://docbook.org/xml/simple/1.0/sdocbook-custom.dtd"
+ uri="sdocbook-custom.dtd"/>
+
+<public publicId="-//OASIS//DTD Simplified DocBook RefEntry XML V1.0//EN"
+ uri="sdocbookref.dtd"/>
+<system systemId="http://www.oasis-open.org/docbook/xml/simple/1.0/sdocbookref.dtd"
+ uri="sdocbookref.dtd"/>
+<system systemId="http://docbook.org/xml/simple/1.0/sdocbookref.dtd"
+ uri="sdocbookref.dtd"/>
+
+<public publicId="-//OASIS//DTD Simplified DocBook RefEntry XML Customization V1.0//EN"
+ uri="sdocbookref-custom.dtd"/>
+<system systemId="http://www.oasis-open.org/docbook/xml/simple/1.0/sdocbookref-custom.dtd"
+ uri="sdocbookref-custom.dtd"/>
+<system systemId="http://docbook.org/xml/simple/1.0/sdocbookref-custom.dtd"
+ uri="sdocbookref.dtd"/>
+
+</catalog>
+
Added: packages/docbook-simple/trunk/docbook-simple-1.1/catalog
===================================================================
--- packages/docbook-simple/trunk/docbook-simple-1.1/catalog 2007-04-15 17:11:29 UTC (rev 726)
+++ packages/docbook-simple/trunk/docbook-simple-1.1/catalog 2007-04-15 17:41:54 UTC (rev 727)
@@ -0,0 +1,38 @@
+ -- ...................................................................... --
+ -- This catalog was written for the Debian system ....................... --
+ -- ...................................................................... --
+
+ -- ...................................................................... --
+ -- Prefer PUBID to SYSID ................................................ --
+OVERRIDE YES
+
+ -- ...................................................................... --
+ -- catalog entry for docbook docbook-simple v1.1 ........................ --
+PUBLIC "-//OASIS//DTD Simplified DocBook XML V1.1//EN"
+ "sdocbook.dtd"
+SYSTEM "http://www.oasis-open.org/docbook/xml/simple/1.1/sdocbook.dtd"
+ "sdocbook.dtd"
+SYSTEM "http://docbook.org/xml/simple/1.1/sdocbook.dtd"
+ "sdocbook.dtd"
+
+PUBLIC "-//OASIS//DTD Simplified DocBook XML Customization V1.1//EN"
+ "sdocbook-custom.dtd"
+SYSTEM "http://www.oasis-open.org/docbook/xml/simple/1.1/sdocbook-custom.dtd"
+ "sdocbook-custom.dtd"
+SYSTEM "http://docbook.org/xml/simple/1.1/sdocbook-custom.dtd"
+ "sdocbook-custom.dtd"
+
+PUBLIC "-//OASIS//DTD Simplified DocBook RefEntry XML V1.1//EN"
+ "sdocbookref.dtd"
+SYSTEM "http://www.oasis-open.org/docbook/xml/simple/1.1/sdocbookref.dtd"
+ "sdocbookref.dtd"
+SYSTEM "http://docbook.org/xml/simple/1.1/sdocbookref.dtd"
+ "sdocbookref.dtd"
+
+PUBLIC "-//OASIS//DTD Simplified DocBook RefEntry XML Customization V1.1//EN"
+ "sdocbookref-custom.dtd"
+SYSTEM "http://www.oasis-open.org/docbook/xml/simple/1.1/sdocbookref-custom.dtd"
+ "sdocbookref-custom.dtd"
+SYSTEM "http://docbook.org/xml/simple/1.1/sdocbookref-custom.dtd"
+ "sdocbookref-custom.dtd"
+
Added: packages/docbook-simple/trunk/docbook-simple-1.1/catalog.xml
===================================================================
--- packages/docbook-simple/trunk/docbook-simple-1.1/catalog.xml 2007-04-15 17:11:29 UTC (rev 726)
+++ packages/docbook-simple/trunk/docbook-simple-1.1/catalog.xml 2007-04-15 17:41:54 UTC (rev 727)
@@ -0,0 +1,42 @@
+<?xml version="1.0"?>
+<!DOCTYPE catalog PUBLIC "-//OASIS//DTD XML Catalogs V1.0//EN"
+ "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
+
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog" prefer="public">
+
+<!-- ..................................................................... -->
+<!-- This catalog was written for the Debian system. ..................... -->
+<!-- ..................................................................... -->
+
+<!-- ..................................................................... -->
+<!-- catalog entry for docbook docbook-simple v1.1 ....................... -->
+<public publicId="-//OASIS//DTD Simplified DocBook XML V1.1//EN"
+ uri="sdocbook.dtd"/>
+<system systemId="http://www.oasis-open.org/docbook/xml/simple/1.1/sdocbook.dtd"
+ uri="sdocbook.dtd"/>
+<system systemId="http://docbook.org/xml/simple/1.1/sdocbook.dtd"
+ uri="sdocbook.dtd"/>
+
+<public publicId="-//OASIS//DTD Simplified DocBook XML Customization V1.1//EN"
+ uri="sdocbook-custom.dtd"/>
+<system systemId="http://www.oasis-open.org/docbook/xml/simple/1.1/sdocbook-custom.dtd"
+ uri="sdocbook-custom.dtd"/>
+<system systemId="http://docbook.org/xml/simple/1.1/sdocbook-custom.dtd"
+ uri="sdocbook-custom.dtd"/>
+
+<public publicId="-//OASIS//DTD Simplified DocBook RefEntry XML V1.1//EN"
+ uri="sdocbookref.dtd"/>
+<system systemId="http://www.oasis-open.org/docbook/xml/simple/1.1/sdocbookref.dtd"
+ uri="sdocbookref.dtd"/>
+<system systemId="http://docbook.org/xml/simple/1.1/sdocbookref.dtd"
+ uri="sdocbookref.dtd"/>
+
+<public publicId="-//OASIS//DTD Simplified DocBook RefEntry XML Customization V1.1//EN"
+ uri="sdocbookref-custom.dtd"/>
+<system systemId="http://www.oasis-open.org/docbook/xml/simple/1.1/sdocbookref-custom.dtd"
+ uri="sdocbookref-custom.dtd"/>
+<system systemId="http://docbook.org/xml/simple/1.1/sdocbookref-custom.dtd"
+ uri="sdocbookref.dtd"/>
+
+</catalog>
+
More information about the debian-xml-sgml-commit
mailing list