[xml/sgml-commit] r660 - in packages/docbook-xml/trunk/debian: .
patches
Daniel Leidert
dleidert-guest at alioth.debian.org
Sun Mar 11 04:53:50 CET 2007
Author: dleidert-guest
Date: 2007-03-11 03:53:49 +0000 (Sun, 11 Mar 2007)
New Revision: 660
Added:
packages/docbook-xml/trunk/debian/docbook-xml.dirs
packages/docbook-xml/trunk/debian/docbook-xml.examples
packages/docbook-xml/trunk/debian/docbook-xml.links.in
packages/docbook-xml/trunk/debian/docbook-xml.postinst
packages/docbook-xml/trunk/debian/docbook-xml.preinst
packages/docbook-xml/trunk/debian/docbook-xml.xmlcatalogs.in
packages/docbook-xml/trunk/debian/patches/
packages/docbook-xml/trunk/debian/patches/00list
Removed:
packages/docbook-xml/trunk/debian/install-dtds
packages/docbook-xml/trunk/debian/postinst
packages/docbook-xml/trunk/debian/preinst
packages/docbook-xml/trunk/debian/xmlcatalogs
Modified:
packages/docbook-xml/trunk/debian/changelog
packages/docbook-xml/trunk/debian/compat
packages/docbook-xml/trunk/debian/control
packages/docbook-xml/trunk/debian/copyright
packages/docbook-xml/trunk/debian/rules
Log:
* debian/control: Added XS-Vcs-* fields.
(Uploaders): Added the Debian XML/SGML group and myself.
(Build-Depends-Indep): Moved debhelper to Build-Depends.
(Build-Depends): Added dpatch.
(Standards-Version): Bump to latest standards version 3.7.2.
(Description): Fixed libxml2-utils package reference.
* debian/compat: Added missing newline at file end.
* debian/copyright: Updated copyright information. Removed DocBook XML 3.1.7
relevant information.
* debian/rules: Added get-orig-source and dpatch targets. Cleaned the file.
Added targets to automatically walk through the source and create
.install, .links, .sgmlcatalogs and .xmlcatalogs debhelper template files.
* debian/docbook-xml.dirs: Added (removed relevant code from debian/rules,
added new code to create the final template file automatically).
* debian/docbook-xml.examples: Added.
* debian/docbook-xml.links.in: Added. This is a template, that holds the
static (keep-over-time) links. The final debhelper .xmlcatalogs template
is created via debian/rules.
* debian/xmlcatalogs: Renamed to debian/docbook-xml.xmlcatalogs.in and
removed the non-static stuff. The final debhelper .xmlcatalogs template is
created via debian/rules.
* debian/patches/00list: Added. Move all changes at the source into dpatch
patches.
* debian/postinst: Renamed to debian/docbook-xml.postinst.
* debian/preinst: Renamed to debian/docbook-xml.preinst.
* debian/install-dtds: Removed. Everything is done via debian/rules.
Modified: packages/docbook-xml/trunk/debian/changelog
===================================================================
--- packages/docbook-xml/trunk/debian/changelog 2007-03-10 16:45:03 UTC (rev 659)
+++ packages/docbook-xml/trunk/debian/changelog 2007-03-11 03:53:49 UTC (rev 660)
@@ -2,9 +2,35 @@
* NOT RELEASED YET
* New upstream release DocBook XML 4.5 added (closes: #413167).
+ * DocBook XML 3.1.7 was dropped from the package.
[ Daniel Leidert ]
- * debian/rules: Added get-orig-source target.
+ * debian/control: Added XS-Vcs-* fields.
+ (Uploaders): Added the Debian XML/SGML group and myself.
+ (Build-Depends-Indep): Moved debhelper to Build-Depends.
+ (Build-Depends): Added dpatch.
+ (Standards-Version): Bump to latest standards version 3.7.2.
+ (Description): Fixed libxml2-utils package reference.
+ * debian/compat: Added missing newline at file end.
+ * debian/copyright: Updated copyright information. Removed DocBook XML 3.1.7
+ relevant information.
+ * debian/rules: Added get-orig-source and dpatch targets. Cleaned the file.
+ Added targets to automatically walk through the source and create
+ .install, .links, .sgmlcatalogs and .xmlcatalogs debhelper template files.
+ * debian/docbook-xml.dirs: Added (removed relevant code from debian/rules,
+ added new code to create the final template file automatically).
+ * debian/docbook-xml.examples: Added.
+ * debian/docbook-xml.links.in: Added. This is a template, that holds the
+ static (keep-over-time) links. The final debhelper .xmlcatalogs template
+ is created via debian/rules.
+ * debian/xmlcatalogs: Renamed to debian/docbook-xml.xmlcatalogs.in and
+ removed the non-static stuff. The final debhelper .xmlcatalogs template is
+ created via debian/rules.
+ * debian/patches/00list: Added. Move all changes at the source into dpatch
+ patches.
+ * debian/postinst: Renamed to debian/docbook-xml.postinst.
+ * debian/preinst: Renamed to debian/docbook-xml.preinst.
+ * debian/install-dtds: Removed. Everything is done via debian/rules.
-- Daniel Leidert (dale) <daniel.leidert at wgdd.de> Sat, 10 Mar 2007 10:22:04 +0100
Modified: packages/docbook-xml/trunk/debian/compat
===================================================================
--- packages/docbook-xml/trunk/debian/compat 2007-03-10 16:45:03 UTC (rev 659)
+++ packages/docbook-xml/trunk/debian/compat 2007-03-11 03:53:49 UTC (rev 660)
@@ -1 +1 @@
-4
\ No newline at end of file
+4
Modified: packages/docbook-xml/trunk/debian/control
===================================================================
--- packages/docbook-xml/trunk/debian/control 2007-03-10 16:45:03 UTC (rev 659)
+++ packages/docbook-xml/trunk/debian/control 2007-03-11 03:53:49 UTC (rev 660)
@@ -2,8 +2,12 @@
Section: text
Priority: optional
Maintainer: Adam Di Carlo <aph at debian.org>
-Standards-Version: 3.6.1
-Build-Depends-Indep: debhelper (>= 4.1.31), xml-core (>= 0.6)
+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
+Build-Depends-Indep: xml-core (>= 0.6)
+Standards-Version: 3.7.2
+XS-Vcs-Browser: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xml/trunk/
+XS-Vcs-Svn: svn://svn.debian.org/svn/debian-xml-sgml/packages/docbook-xml/
Package: docbook-xml
Architecture: all
@@ -23,10 +27,11 @@
formal structure for documents following this format. If you wish to
author DocBook documents using SGML rather than XML, use the
'docbook' package. You will need other packages in order to edit
- (psgml), validate (opensp, libxml2) or format (docbook-xsl,
+ (psgml), validate (opensp, libxml2-utils) or format (docbook-xsl,
docbook-dsssl) DocBook documents.
.
This package ships with the latest DocBook XML DTD, as well as a
select set of legacy DTDs for use with older documents.
.
Homepage: http://www.oasis-open.org/docbook/xml/
+
Modified: packages/docbook-xml/trunk/debian/copyright
===================================================================
--- packages/docbook-xml/trunk/debian/copyright 2007-03-10 16:45:03 UTC (rev 659)
+++ packages/docbook-xml/trunk/debian/copyright 2007-03-11 03:53:49 UTC (rev 660)
@@ -1,63 +1,41 @@
-DocBook XML v4.x:
+The Debian package was created by Adam Di Carlo <aph at debian.org>, who
+is also the current maintainer. No changes, except bug-fixes were made
+to the upstream version of these materials. 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'.
- Copyright 1992-2000 HaL Computer Systems, Inc.,
- O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software
- Corporation, Norman Walsh, and the Organization for the Advancement
- of Structured Information Standards (OASIS).
+The package is currently maintained as part of the Debian XML/SGML group.
- 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.
+Download:
- 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.
+ The original upstream materials may be downloaded from
+ <URL:http://www.oasis-open.org/docbook/xml/>. This process is
+ transparent via the `get-orig-source' target in debian/rules.
- 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/.
+Copyright for DocBook XML v4.x:
-DocBook XML version 3.1.x:
-
- Copyright (C) 1998, 1999 Norman Walsh
- http://nwalsh.com/docbook/xml/
-
- You may distribute this DTD under the same terms as DocBook.
-
- Please direct all questions and comments about this DTD to
- Norman Walsh, <ndw at nwalsh.com>.
-
- This DTD is based on the DocBook V3.1 DTD from OASIS:
-
- [DocBook is] Copyright 1992, 1993, 1994, 1995, 1996, 1998,
- 1999 HaL Computer Systems, Inc., O'Reilly & Associates, Inc.,
- ArborText, Inc., Fujitsu Software Corporation, and the
+ Copyright 1992-2006 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).
- 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
-
+License and Warranty for DocBook XML v4.x:
---
+ 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.
-The Debian package was created by Adam Di Carlo <aph at debian.org>, who
-is also the current maintainer. No changes were made to the upstream
-version of these materials. 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'.
+ 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.
-The original upstream materials may be downloaded from
-<URL:http://www.oasis-open.org/docbook/xml/>.
+ 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/.
-
-
-
-
Added: packages/docbook-xml/trunk/debian/docbook-xml.dirs
===================================================================
--- packages/docbook-xml/trunk/debian/docbook-xml.dirs 2007-03-10 16:45:03 UTC (rev 659)
+++ packages/docbook-xml/trunk/debian/docbook-xml.dirs 2007-03-11 03:53:49 UTC (rev 660)
@@ -0,0 +1,2 @@
+usr/share/xml/docbook/schema/dtd
+etc/sgml/docbook-xml
Added: packages/docbook-xml/trunk/debian/docbook-xml.examples
===================================================================
--- packages/docbook-xml/trunk/debian/docbook-xml.examples 2007-03-10 16:45:03 UTC (rev 659)
+++ packages/docbook-xml/trunk/debian/docbook-xml.examples 2007-03-11 03:53:49 UTC (rev 660)
@@ -0,0 +1 @@
+examples/*
Added: packages/docbook-xml/trunk/debian/docbook-xml.links.in
===================================================================
--- packages/docbook-xml/trunk/debian/docbook-xml.links.in 2007-03-10 16:45:03 UTC (rev 659)
+++ packages/docbook-xml/trunk/debian/docbook-xml.links.in 2007-03-11 03:53:49 UTC (rev 660)
@@ -0,0 +1,6 @@
+usr/share/xml/docbook/schema/dtd/4.4 usr/share/xml/docbook/schema/dtd/4
+usr/share/sgml/docbook/dtd/xml/4.4 usr/share/sgml/docbook/dtd/xml/4
+
+usr/share/xml/docbook/schema/dtd/4.1.2 usr/share/xml/docbook/schema/dtd/4.1
+usr/share/sgml/docbook/dtd/xml/4.1.2 usr/share/sgml/docbook/dtd/xml/4.1
+
Copied: packages/docbook-xml/trunk/debian/docbook-xml.postinst (from rev 633, packages/docbook-xml/trunk/debian/postinst)
Copied: packages/docbook-xml/trunk/debian/docbook-xml.preinst (from rev 633, packages/docbook-xml/trunk/debian/preinst)
Added: packages/docbook-xml/trunk/debian/docbook-xml.xmlcatalogs.in
===================================================================
--- packages/docbook-xml/trunk/debian/docbook-xml.xmlcatalogs.in 2007-03-10 16:45:03 UTC (rev 659)
+++ packages/docbook-xml/trunk/debian/docbook-xml.xmlcatalogs.in 2007-03-11 03:53:49 UTC (rev 660)
@@ -0,0 +1,15 @@
+root;system;http://www.oasis-open.org/docbook/xml/
+root;system;http://docbook.org/xml/
+
+root;public;-//Norman Walsh//DTD DocBook XML
+root;public;-//Norman Walsh//DTD DocBk XML
+root;public;-//Norman Walsh//ENTITIES DocBk XML
+root;public;-//Norman Walsh//ELEMENTS DocBk XML
+root;public;-//Norman Walsh//DTD CALS Table Model XML
+root;public;-//Normal Walsh//Exchange Table Model 19960430
+
+root;public;-//OASIS//DTD DocBook XML
+root;public;-//OASIS//DTD DocBook CALS Table Model
+root;public;-//OASIS//ELEMENTS DocBook
+root;public;-//OASIS//ENTITIES DocBook
+
Deleted: packages/docbook-xml/trunk/debian/install-dtds
===================================================================
--- packages/docbook-xml/trunk/debian/install-dtds 2007-03-10 16:45:03 UTC (rev 659)
+++ packages/docbook-xml/trunk/debian/install-dtds 2007-03-11 03:53:49 UTC (rev 660)
@@ -1,77 +0,0 @@
-#!/bin/bash
-##
-## install docbook dtds and such
-## this is somewhat redundant with debian/rules but shell scripting
-## inside makefiles is painful
-
-set -e
-
-if [ $# -ne 2 ]; then
- echo "error: improper arguments" >&2
- exit 1
-fi
-prefix=$1
-dtddir=$2
-
-install_file="install -o root -g root -m 644 -p"
-make_dir="install -d -o root -g root -m 755"
-
-confdir=${prefix}/etc/sgml/docbook-xml
-docdir=${prefix}/usr/share/doc/docbook-xml
-# DTD dir without the prefix
-dtddirrel=${dtddir#${prefix}}
-
-echodo () {
- echo "$@"
- "$@"
-}
-
-for ver in `find * -type d -maxdepth 1 -name '[0-9]*'`; do
- ${make_dir} ${dtddir}/$ver
- for file in $ver/*.dtd $ver/*.mod $ver/*.ent; do
- if [ -f $file ]; then
- echodo ${install_file} $file ${dtddir}/$ver/
- fi
- done
-
- # install SGML open catalogs
- for cat in $ver/docbook.cat; do
- if [ -f $cat ]; then
- echo "adding $cat to debian/sgmlcatalogs"
- echo ${cat} ${dtddirrel}/${ver}/catalog >> debian/sgmlcatalogs
- fi
- done
-
- # cope with dbgenent.*
- for file in ${dtddir}/$ver/dbgenent.*; do
- if [ -f $file ]; then
- basefile=""
- basefile=`basename $file`
- ${make_dir} ${confdir}/$ver
- echodo mv $file ${confdir}/$ver/
- echodo ln -sf `echo ${confdir}| sed -e "s|^${prefix}||;"`/$ver/$basefile $file
- fi
- done
-
- # examples
- for file in $ver/*.xml; do
- if [ -f $file -a $file != $ver/catalog.xml ]; then
- ${make_dir} ${docdir}/examples/$ver
- echodo ${install_file} $file ${docdir}/examples/$ver/
- fi
- done
-
- # docs
- for file in $ver/README $ver/ChangeLog $ver/*.txt; do
- if [ -f $file ]; then
- ${make_dir} ${docdir}/$ver
- echodo ${install_file} $file ${docdir}/$ver/
- fi
- done
-
- # debian/links entry for legacy link from /usr/share/sgml
- echo $dtddirrel/$ver /usr/share/sgml/docbook/dtd/xml/$ver >> debian/links
- # debian/links entry for link from DTD dir to xml-iso-entities-8879.1986 dir
- echo /usr/share/xml/entities/xml-iso-entities-8879.1986 $dtddirrel/$ver/ent >> debian/links
-
-done
Added: packages/docbook-xml/trunk/debian/patches/00list
===================================================================
Deleted: packages/docbook-xml/trunk/debian/postinst
===================================================================
--- packages/docbook-xml/trunk/debian/postinst 2007-03-10 16:45:03 UTC (rev 659)
+++ packages/docbook-xml/trunk/debian/postinst 2007-03-11 03:53:49 UTC (rev 660)
@@ -1,31 +0,0 @@
-#!/bin/sh
-# docbook-xml postinst
-# jobs: remove old legacy catalogs
-
-set -e
-
-PACKAGE=docbook-xml
-CENTRALCAT=/etc/sgml/${PACKAGE}.cat
-DTDDIR=/usr/share/sgml/docbook/dtd/xml
-# old catalogs we need to remove, relative to DTDDIR
-OLDCATS="4.2.cr2/docbook.cat 4.2.cr1/docbook.cat 4.1/docbook.cat"
-
-if [ "$1" = configure ]; then
- # remove the old catalog
- install-sgmlcatalog --quiet --remove docbook-xml
-
- # remove the old ones
- for oldcat in ${OLDCATS}; do
- update-catalog --quiet --remove ${CENTRALCAT} ${DTDDIR}/${oldcat}
- done
-
- # old cruft lying around
- if [ -d /usr/share/sgml/docbook/dtd/xml/4.2.cr2 ]; then
- rm -rf /usr/share/sgml/docbook/dtd/xml/4.2.cr2 || true
- fi
-fi
-
-# automatically generated debhelper commands
-#DEBHELPER#
-
-exit 0
Deleted: packages/docbook-xml/trunk/debian/preinst
===================================================================
--- packages/docbook-xml/trunk/debian/preinst 2007-03-10 16:45:03 UTC (rev 659)
+++ packages/docbook-xml/trunk/debian/preinst 2007-03-11 03:53:49 UTC (rev 660)
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# converting a directory to symlinks during package upgrade doesn't work,
-# lets remove the junk in here by hand
-# bug 143780, problems caused by danging symlinks
-if [ "$1" = upgrade ]; then
- rm -r /usr/share/sgml/docbook/dtd/xml/[1-9]* || true
-fi
-
-# automatically generated debhelper commands
-#DEBHELPER#
-
-exit 0
Modified: packages/docbook-xml/trunk/debian/rules
===================================================================
--- packages/docbook-xml/trunk/debian/rules 2007-03-10 16:45:03 UTC (rev 659)
+++ packages/docbook-xml/trunk/debian/rules 2007-03-11 03:53:49 UTC (rev 660)
@@ -4,57 +4,124 @@
# Some bytes in this file may have been touched by Ian Jackson,
# so I can never remove his name from this file.
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+PACKAGE := docbook-xml
-PACKAGE := docbook-xml
+include /usr/share/dpatch/dpatch.make
-# directory abstraction
-prefix := debian/$(package)
-sgmldir := $(prefix)/usr/share/xml
-dtddir := $(sgmldir)/docbook/schema/dtd
-legacydtddir := $(prefix)/usr/share/sgml/docbook/dtd/xml
-docdir := $(prefix)/usr/share/doc/$(package)
-confdir := $(prefix)/etc/sgml/$(package)
-# tool abstraction
-install_file := install -o root -g root -m 644 -p
-install_script := install -o root -g root -m 755 -p
-make_dir := install -d -o root -g root -m 755
-compress := gzip -9f
+debian/docbook-xml.install:
+ set -ex ; \
+ touch $@ ; \
+ for dbx in docbook-* ; do \
+ dbxver=`echo $${dbx} | sed -e 's/docbook-//g'` ; \
+ for file in $${dbx}/*.{dtd,mod,ver} ; do \
+ if [ $${file} != $${dbx}/dbgenent.* ] ; then \
+ echo "$${file} usr/share/xml/docbook/schema/dtd/$${dbxver}" >> $@ ; \
+ else \
+ echo "$${file} etc/sgml/docbook-xml/$${dbxver}" >> $@ ; \
+ fi ; \
+ done ; \
+ [ -f $${dbx}/catalog.xml ] && \
+ echo "$${dbx}/catalog.xml usr/share/xml/docbook/schema/dtd/$${dbxver}" >> $@ ; \
+ done
-# determine our version numbers
-SRC_VERSION := $(shell LC_ALL=C dpkg-parsechangelog | grep ^Version: | sed 's/^Version: *//')
-UPSTREAM_VERSION:= $(shell echo $(SRC_VERSION) | sed -e 's/^\(.*\)-[^-]*$$/\1/')
-ifndef UPSTREAM_VERSION
- FOO:=$(error cannot determine upstream version)
-endif
+debian/docbook-xml.links:
+ set -ex ; \
+ touch $@ ; \
+ cat $@.in >> $@ ; \
+ for dbx in docbook-* ; do \
+ dbxver=`echo $${dbx} | sed -e 's/docbook-//g'` ; \
+ for file in $${dbx}/dbgenent.* ; do \
+ dbfile=`echo $${file} | sed -e 's/[^\/]*\///g'` ; \
+ echo -n "etc/sgml/docbook-xml/$${dbxver}/$${dbfile} " >> $@ && \
+ echo "usr/share/xml/docbook/schema/dtd/$${dbxver}/$${dbfile}" >> $@ ; \
+ done ; \
+ [ -f $${dbx}/docbook.cat ] && \
+ echo -n "usr/share/xml/docbook/schema/dtd/$${dbxver}/catalog " >> $@ && \
+ echo "usr/share/xml/docbook/schema/dtd/$${dbxver}/docbook.cat" >> $@ ; \
+ [ -d $${dbx}/ent ] && \
+ echo -n "usr/share/xml/entities/xml-iso-entities-8879.1986 " >> $@ && \
+ echo "usr/share/xml/docbook/schema/dtd/$${dbxver}/ent" >> $@ ; \
+ echo "usr/share/xml/docbook/schema/dtd/$${dbxver} usr/share/sgml/docbook/dtd/xml/$${dbxver}" >> $@ ; \
+ done
-# latest version of various DTDs
-3_VERSION := 3.1.7
-4_VERSION := $(UPSTREAM_VERSION)
-41_VERSION := 4.1.2
+debian/docbook-xml.sgmlcatalogs:
+ set -ex ; \
+ touch $@ ; \
+ for dbx in docbook-* ; do \
+ dbxver=`echo $${dbx} | sed -e 's/docbook-//g'` ; \
+ [ -f $${dbx}/docbook.cat ] && \
+ echo "$${dbx}/docbook.cat /usr/share/xml/docbook/schema/dtd/$${dbxver}/catalog" >> $@ ; \
+ done
-build:
-# nothing to be done
+debian/docbook-xml.xmlcatalogs:
+ set -ex ; \
+ touch $@ ; \
+ cat $@.in >> $@ ; \
+ for dbx in docbook-* ; do \
+ dbxver=`echo $${dbx} | sed -e 's/docbook-//g'` ; \
+ if [ -f $${dbx}/catalog.xml ] ; then \
+ echo "local;$${dbx}/catalog.xml;/usr/share/xml/docbook/schema/dtd/$${dbxver}/catalog.xml" >> $@ ; \
+ sysids=`egrep -e "<system systemId=\"[^\"]+\"" $${dbx}/catalog.xml | \
+ sed -e 's/<system systemId=\"\(.*\)\"/\1;/g'` IFS=';' ; \
+ echo $${sysids} | while read id ; do \
+ echo "package;system;$${id};/usr/share/xml/docbook/schema/dtd/$${dbxver}/catalog.xml" >> $@ ; \
+ done ; \
+ pubids=`egrep -e "<public publicId=\"[^\"]+\"" $${dbx}/catalog.xml | \
+ sed -e 's/<public publicId=\"\(.*\)\"/\1;/g'` IFS=';' ; \
+ echo $${pubids} | while read id ; do \
+ echo "package;public;$${id};/usr/share/xml/docbook/schema/dtd/$${dbxver}/catalog.xml" >> $@ ; \
+ done ; \
+ echo >> $@ ; \
+ fi ; \
+ done
-clean:
- $(checkdir)
-# be sure to remove specifically derived files
- dh_clean debian/sgmlcatalogs debian/links
+build: patch-stamp build-stamp
-test:
- $(checkdir)
-# check that maintainer scripts are good
- sh -n debian/preinst
- sh -n debian/postinst
+build-stamp: debian/docbook-xml.install debian/docbook-xml.links debian/docbook-xml.sgmlcatalogs debian/docbook-xml.xmlcatalogs
+ dh_testdir
+ touch build-stamp
-binary-indep: build test
- $(checkdir)
- $(checkroot)
+clean: unpatch
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp patch-stamp
+ rm -f debian/docbook-xml.install \
+ debian/docbook-xml.links \
+ debian/docbook-xml.sgmlcatalogs \
+ debian/docbook-xml.xmlcatalogs
+ dh_clean
+
+install: build
+ dh_testdir
+ dh_testroot
dh_clean -k
- $(make_dir) $(prefix)/DEBIAN $(dtddir) $(confdir)
+ dh_installdirs
+binary-indep: build
+ dh_testdir
+ dh_testroot
+ dh_installchangelogs ChangeLog.upstream
+ dh_install
+ dh_installdocs
+ dh_installexamples
+ dh_installcatalogs
+ dh_installxmlcatalogs
+ dh_link
+ find $(CURDIR)/debian/$(PACKAGE) -type l -follow >/dev/null # exits 1 on broken links
+ dh_compress
+ dh_fixperms
+ dh_installdeb
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+binary-arch: build
+
+binary: binary-indep binary-arch
+
+.PHONY: build clean binary binary-arch binary-indep
+
# note that throughout we have to be careful to try to retain
# the expected system entity names (dir and file names) as
# shipped, in the hope to accomodate XML tools that don't
@@ -64,59 +131,7 @@
:> debian/links
chmod a+x ./debian/install-dtds
./debian/install-dtds $(prefix) $(dtddir)
- dh_installcatalogs -i
- dh_link -i
- dh_installxmlcatalogs -i
-
-##
-## make "supported versions" symlinks, comitting to keep this over time
-##
- ln -sf $(4_VERSION) $(dtddir)/4
- ln -sf $(4_VERSION) $(legacydtddir)/4
- ln -sf $(41_VERSION) $(dtddir)/4.1
- ln -sf $(41_VERSION) $(legacydtddir)/4.1
- ln -sf $(3_VERSION) $(dtddir)/3
- ln -sf $(3_VERSION) $(legacydtddir)/3
- ln -sf $(3_VERSION) $(dtddir)/3.1
- ln -sf $(3_VERSION) $(legacydtddir)/3.1
-
-# install examples
- dh_installdocs -i
- dh_installchangelogs -i $(UPSTREAM_VERSION)/ChangeLog
- dh_installexamples -i debian/examples/*
- dh_fixperms -i
-
-# check for bad links
- for LINK in $$(find $(prefix) -type l); do \
- TARGET=$$(readlink $$LINK); \
- [ "$$TARGET" != "$${TARGET#/etc}" ] || [ -e $$LINK ] \
- || echo "dangling symlink: $$LINK -> $$TARGET"; \
- done
-
- dh_compress -i
-
- dh_installdeb -i
- dh_gencontrol -i
- dh_md5sums -i
- dh_builddeb -i
-
-binary-arch: build
-# nothing to be done
-
-define checkdir
- test -f 4.1.2/docbookx.dtd
- test -f debian/rules
-endef
-
-# Below here is fairly generic really
-
-binary: binary-indep binary-arch
-
-define checkroot
- test `id -u` = 0
-endef
-
.PHONY: binary binary-arch binary-indep clean test
# This following code is used to create the .orig.tar.gz tarball.
@@ -130,12 +145,13 @@
TMPDIR=`mktemp -d docbook-xml-$(version).XXXXXX` ; \
touch "$$TMPDIR"/ChangeLog.upstream ; \
for db in 4.5 4.4 4.3 4.2 ; do \
+ dbxver=`echo $${db} | sed -e 's/\.//g'` ; \
dbxzip=docbook-xml-$${db}.zip ; \
mkdir -p "$$TMPDIR"/docbook-$${db} ; \
wget -P "$$TMPDIR" http://www.oasis-open.org/docbook/xml/$${db}/"$$dbxzip" ; \
unzip -d "$$TMPDIR"/docbook-$${db} "$$TMPDIR"/"$$dbxzip" ; \
rm -f "$$TMPDIR"/"$$dbxzip" ; \
- [ -f "$$TMPDIR"/docbook-$${db}/ChangeLog ] && \
+ ([ -f "$$TMPDIR"/docbook-$${db}/ChangeLog ] && [ "$$dbxver" -ge 44 ] ) && \
cat "$$TMPDIR"/docbook-$${db}/ChangeLog >> "$$TMPDIR"/ChangeLog.upstream ; \
done; \
for db in 4.1.2 4.0 ; do \
Deleted: packages/docbook-xml/trunk/debian/xmlcatalogs
===================================================================
--- packages/docbook-xml/trunk/debian/xmlcatalogs 2007-03-10 16:45:03 UTC (rev 659)
+++ packages/docbook-xml/trunk/debian/xmlcatalogs 2007-03-11 03:53:49 UTC (rev 660)
@@ -1,84 +0,0 @@
-root;public;-//Norman Walsh//DTD DocBook XML
-root;public;-//Norman Walsh//DTD DocBk XML
-root;public;-//Norman Walsh//ENTITIES DocBk XML
-root;public;-//Norman Walsh//ELEMENTS DocBk XML
-root;public;-//Norman Walsh//DTD CALS Table Model XML
-root;public;-//Normal Walsh//Exchange Table Model 19960430
-
-root;system;http://www.oasis-open.org/docbook/xml/
-root;system;http://docbook.org/xml/
-
-local;3.1.7/catalog.xml;/usr/share/xml/docbook/schema/dtd/3.1.7/catalog.xml
-package;public;-//Norman Walsh//DTD DocBook XML V3;/usr/share/xml/docbook/schema/dtd/3.1.7/catalog.xml
-package;public;-//Norman Walsh//DTD DocBk XML V3;/usr/share/xml/docbook/schema/dtd/3.1.7/catalog.xml
-package;public;-//Norman Walsh//ENTITIES DocBk XML Notations V3.1.7//EN;/usr/share/xml/docbook/schema/dtd/3.1.7/catalog.xml
-package;public;-//Norman Walsh//ENTITIES DocBk XML Character Entities V3.1.7//EN;/usr/share/xml/docbook/schema/dtd/3.1.7/catalog.xml
-package;public;-//Norman Walsh//ELEMENTS DocBk XML Information Pool V3.1.7//EN;/usr/share/xml/docbook/schema/dtd/3.1.7/catalog.xml
-package;public;-//Norman Walsh//ELEMENTS DocBk XML Document Hierarchy V3.1.7//EN;/usr/share/xml/docbook/schema/dtd/3.1.7/catalog.xml
-package;public;-//Norman Walsh//ENTITIES DocBk XML Additional General Entities V3.1.7//EN;/usr/share/xml/docbook/schema/dtd/3.1.7/catalog.xml
-package;public;-//Norman Walsh//DTD CALS Table Model XML V3.1.7//EN;/usr/share/xml/docbook/schema/dtd/3.1.7/catalog.xml
-package;public;-//Normal Walsh//Exchange Table Model 19960430 XML V3.1.7//EN;/usr/share/xml/docbook/schema/dtd/3.1.7/catalog.xml
-root-and-package;public;-//OASIS//DTD XML Exchange Table Model 19990310//EN;/usr/share/xml/docbook/schema/dtd/3.1.7/catalog.xml
-
-local;4.0/catalog.xml;/usr/share/xml/docbook/schema/dtd/4.0/catalog.xml
-package;system;http://www.oasis-open.org/docbook/xml/4.0/;/usr/share/xml/docbook/schema/dtd/4.0/catalog.xml
-package;public;-//Norman Walsh//DTD DocBk XML V4.0//EN;/usr/share/xml/docbook/schema/dtd/4.0/catalog.xml
-package;public;-//Norman Walsh//DTD DocBook XML V4.0//EN;/usr/share/xml/docbook/schema/dtd/4.0/catalog.xml
-package;public;-//Norman Walsh//ENTITIES DocBk XML Notations V4.0//EN;/usr/share/xml/docbook/schema/dtd/4.0/catalog.xml
-package;public;-//Norman Walsh//ENTITIES DocBk XML Character Entities V4.0//EN;/usr/share/xml/docbook/schema/dtd/4.0/catalog.xml
-package;public;-//Norman Walsh//ELEMENTS DocBk XML Information Pool V4.0//EN;/usr/share/xml/docbook/schema/dtd/4.0/catalog.xml
-package;public;-//Norman Walsh//ELEMENTS DocBk XML Document Hierarchy V4.0//EN;/usr/share/xml/docbook/schema/dtd/4.0/catalog.xml
-package;public;-//Norman Walsh//ENTITIES DocBk XML Additional General Entities V4.0//EN;/usr/share/xml/docbook/schema/dtd/4.0/catalog.xml
-package;public;-//Norman Walsh//DTD CALS Table Model XML V4.0//EN;/usr/share/xml/docbook/schema/dtd/4.0/catalog.xml
-package;public;-//Normal Walsh//Exchange Table Model 19960430 XML V4.0//EN;/usr/share/xml/docbook/schema/dtd/4.0/catalog.xml
-
-root;public;-//OASIS//DTD DocBook XML
-root;public;-//OASIS//DTD DocBook CALS Table Model
-root;public;-//OASIS//ELEMENTS DocBook
-root;public;-//OASIS//ENTITIES DocBook
-
-local;4.1.2/catalog.xml;/usr/share/xml/docbook/schema/dtd/4.1.2/catalog.xml
-package;system;http://www.oasis-open.org/docbook/xml/4.1;/usr/share/xml/docbook/schema/dtd/4.1.2/catalog.xml
-package;system;http://docbook.org/xml/4.1;/usr/share/xml/docbook/schema/dtd/4.1.2/catalog.xml
-package;public;-//OASIS//DTD DocBook XML V4.1//EN;/usr/share/xml/docbook/schema/dtd/4.1.2/catalog.xml
-package;public;-//OASIS//DTD DocBook XML V4.1.2//EN;/usr/share/xml/docbook/schema/dtd/4.1.2/catalog.xml
-package;public;-//OASIS//DTD DocBook CALS Table Model V4.1.2//EN;/usr/share/xml/docbook/schema/dtd/4.1.2/catalog.xml
-package;public;-//OASIS//ELEMENTS DocBook Information Pool V4.1.2//EN;/usr/share/xml/docbook/schema/dtd/4.1.2/catalog.xml
-package;public;-//OASIS//ELEMENTS DocBook Document Hierarchy V4.1.2//EN;/usr/share/xml/docbook/schema/dtd/4.1.2/catalog.xml
-package;public;-//OASIS//ENTITIES DocBook Additional General Entities V4.1.2//EN;/usr/share/xml/docbook/schema/dtd/4.1.2/catalog.xml
-package;public;-//OASIS//ENTITIES DocBook Notations V4.1.2//EN;/usr/share/xml/docbook/schema/dtd/4.1.2/catalog.xml
-package;public;-//OASIS//ENTITIES DocBook Character Entities V4.1.2//EN;/usr/share/xml/docbook/schema/dtd/4.1.2/catalog.xml
-
-local;4.2/catalog.xml;/usr/share/xml/docbook/schema/dtd/4.2/catalog.xml
-package;system;http://www.oasis-open.org/docbook/xml/4.2/;/usr/share/xml/docbook/schema/dtd/4.2/catalog.xml
-package;system;http://docbook.org/xml/4.2/;/usr/share/xml/docbook/schema/dtd/4.2/catalog.xml
-package;public;-//OASIS//DTD DocBook XML V4.2//EN;/usr/share/xml/docbook/schema/dtd/4.2/catalog.xml
-package;public;-//OASIS//DTD DocBook CALS Table Model V4.2//EN;/usr/share/xml/docbook/schema/dtd/4.2/catalog.xml
-package;public;-//OASIS//ELEMENTS DocBook Information Pool V4.2//EN;/usr/share/xml/docbook/schema/dtd/4.2/catalog.xml
-package;public;-//OASIS//ELEMENTS DocBook Document Hierarchy V4.2//EN;/usr/share/xml/docbook/schema/dtd/4.2/catalog.xml
-package;public;-//OASIS//ENTITIES DocBook Additional General Entities V4.2//EN;/usr/share/xml/docbook/schema/dtd/4.2/catalog.xml
-package;public;-//OASIS//ENTITIES DocBook Notations V4.2//EN;/usr/share/xml/docbook/schema/dtd/4.2/catalog.xml
-package;public;-//OASIS//ENTITIES DocBook Character Entities V4.2//EN;/usr/share/xml/docbook/schema/dtd/4.2/catalog.xml
-
-local;4.3/catalog.xml;/usr/share/xml/docbook/schema/dtd/4.3/catalog.xml
-package;system;http://www.oasis-open.org/docbook/xml/4.3/;/usr/share/xml/docbook/schema/dtd/4.3/catalog.xml
-package;system;http://docbook.org/xml/4.3/;/usr/share/xml/docbook/schema/dtd/4.3/catalog.xml
-package;public;-//OASIS//DTD DocBook XML V4.3//EN;/usr/share/xml/docbook/schema/dtd/4.3/catalog.xml
-package;public;-//OASIS//DTD DocBook CALS Table Model V4.3//EN;/usr/share/xml/docbook/schema/dtd/4.3/catalog.xml
-package;public;-//OASIS//ELEMENTS DocBook Information Pool V4.3//EN;/usr/share/xml/docbook/schema/dtd/4.3/catalog.xml
-package;public;-//OASIS//ELEMENTS DocBook Document Hierarchy V4.3//EN;/usr/share/xml/docbook/schema/dtd/4.3/catalog.xml
-package;public;-//OASIS//ENTITIES DocBook Additional General Entities V4.3//EN;/usr/share/xml/docbook/schema/dtd/4.3/catalog.xml
-package;public;-//OASIS//ENTITIES DocBook Notations V4.3//EN;/usr/share/xml/docbook/schema/dtd/4.3/catalog.xml
-package;public;-//OASIS//ENTITIES DocBook Character Entities V4.3//EN;/usr/share/xml/docbook/schema/dtd/4.3/catalog.xml
-
-local;4.4/catalog.xml;/usr/share/xml/docbook/schema/dtd/4.4/catalog.xml
-package;system;http://www.oasis-open.org/docbook/xml/4.4/;/usr/share/xml/docbook/schema/dtd/4.4/catalog.xml
-package;system;http://docbook.org/xml/4.4/;/usr/share/xml/docbook/schema/dtd/4.4/catalog.xml
-package;public;-//OASIS//DTD DocBook XML V4.4//EN;/usr/share/xml/docbook/schema/dtd/4.4/catalog.xml
-package;public;-//OASIS//DTD DocBook CALS Table Model V4.4//EN;/usr/share/xml/docbook/schema/dtd/4.4/catalog.xml
-package;public;-//OASIS//DTD XML Exchange Table Model 19990315//EN;/usr/share/xml/docbook/schema/dtd/4.4/catalog.xml
-package;public;-//OASIS//ELEMENTS DocBook Information Pool V4.4//EN;/usr/share/xml/docbook/schema/dtd/4.4/catalog.xml
-package;public;-//OASIS//ELEMENTS DocBook Document Hierarchy V4.4//EN;/usr/share/xml/docbook/schema/dtd/4.4/catalog.xml
-package;public;-//OASIS//ENTITIES DocBook Additional General Entities V4.4//EN;/usr/share/xml/docbook/schema/dtd/4.4/catalog.xml
-package;public;-//OASIS//ENTITIES DocBook Notations V4.4//EN;/usr/share/xml/docbook/schema/dtd/4.4/catalog.xml
-package;public;-//OASIS//ENTITIES DocBook Character Entities V4.4//EN;/usr/share/xml/docbook/schema/dtd/4.4/catalog.xml
More information about the debian-xml-sgml-commit
mailing list