[xml/sgml-commit] r648 - in packages/docbook-ebnf/trunk/debian: .
contrib
Daniel Leidert
dleidert-guest at alioth.debian.org
Sat Mar 10 17:17:31 CET 2007
Author: dleidert-guest
Date: 2007-03-10 16:17:30 +0000 (Sat, 10 Mar 2007)
New Revision: 648
Added:
packages/docbook-ebnf/trunk/debian/contrib/
packages/docbook-ebnf/trunk/debian/contrib/catalog.end
packages/docbook-ebnf/trunk/debian/contrib/catalog.start
packages/docbook-ebnf/trunk/debian/contrib/catalog.xml.end
packages/docbook-ebnf/trunk/debian/contrib/catalog.xml.start
packages/docbook-ebnf/trunk/debian/docbook-ebnf.dirs
packages/docbook-ebnf/trunk/debian/docbook-ebnf.links
Removed:
packages/docbook-ebnf/trunk/debian/docbook-ebnf.sgmlcatalogs
packages/docbook-ebnf/trunk/debian/docbook-ebnf.xmlcatalogs
packages/docbook-ebnf/trunk/debian/watch
Modified:
packages/docbook-ebnf/trunk/debian/changelog
packages/docbook-ebnf/trunk/debian/compat
packages/docbook-ebnf/trunk/debian/control
packages/docbook-ebnf/trunk/debian/copyright
packages/docbook-ebnf/trunk/debian/rules
Log:
* New maintainer (closes: #295580).
* debian/compat: Increased debhelper compatibility level to v4.
* debian/contrib/catalog.*: Added. They are templates to create the real SGML and XML catalogs via debian/rules.
* debian/control: Added XS-Vcs-Browser and XS-Vcs-Svn fields.
(Maintainer): I'm the new maintainer.
(Uploaders): Added the Debian XML/SGML group.
(Build-Depends-Indep): Moved debhelper to Build-Depends and adjusted version dependency (see debian/compat).
(Standards-Version): Bump to latest standards version.
(Description): Fixed package reference and added Homepage field.
* debian/copyright: Updated. Added copyright information found in DTDs.
* debian/docbook-ebnf.dirs: Added. Removed the related part in debian/rules.
* debian/docbook-ebnf.links: Ditto.
* debian/docbook-ebnf.sgmlcatalogs: Removed. It's created by debian/rules automatically.
* debian/docbook-ebnf.xmlcatalogs: Ditto. But the created file does not longer miss to register the entries in the root catalog (closes: #299692).
* debian/rules: Cleaned the file a lot. Moved stuff to be done via debhelper scripts out of debian/rules into debhelper template files. Added rules to automatically walk through the source(s) and create catalogs and related debhelper templates. Added get-orig-source target to document the way, the upstream tarball is created.
* debian/watch: Removed (useless, because it doesn't work).
Modified: packages/docbook-ebnf/trunk/debian/changelog
===================================================================
--- packages/docbook-ebnf/trunk/debian/changelog 2007-03-10 14:17:15 UTC (rev 647)
+++ packages/docbook-ebnf/trunk/debian/changelog 2007-03-10 16:17:30 UTC (rev 648)
@@ -1,3 +1,39 @@
+docbook-ebnf (1.2~cr1-1) UNRELEASED; urgency=low
+
+ * NOT RELEASED YET
+ * New maintainer (closes: #295580).
+ * This is not really a new upstream version, just an update of the packaging
+ files along with a bug-fix. It further lets me create a new .orig.tar.gz
+ tarbll based on the new rules in the get-orig-source target, so the
+ tarball creation is more transparent.
+
+ [ Daniel Leidert ]
+ * debian/compat: Increased debhelper compatibility level to v4.
+ * debian/contrib/catalog.*: Added. They are templates to create the real
+ SGML and XML catalogs via debian/rules.
+ * debian/control: Added XS-Vcs-Browser and XS-Vcs-Svn fields.
+ (Maintainer): I'm the new maintainer.
+ (Uploaders): Added the Debian XML/SGML group.
+ (Build-Depends-Indep): Moved debhelper to Build-Depends and adjusted
+ version dependency (see debian/compat).
+ (Standards-Version): Bump to latest standards version.
+ (Description): Fixed package reference and added Homepage field.
+ * debian/copyright: Updated. Added copyright information found in DTDs.
+ * debian/docbook-ebnf.dirs: Added. Removed the related part in debian/rules.
+ * debian/docbook-ebnf.links: Ditto.
+ * debian/docbook-ebnf.sgmlcatalogs: Removed. It's created by debian/rules
+ automatically.
+ * debian/docbook-ebnf.xmlcatalogs: Ditto. But the created file does not
+ longer miss to register the entries in the root catalog (closes: #299692).
+ * debian/rules: Cleaned the file a lot. Moved stuff to be done via debhelper
+ scripts out of debian/rules into debhelper template files. Added rules to
+ automatically walk through the source(s) and create catalogs and related
+ debhelper templates. Added get-orig-source target to document the way, the
+ upstream tarball is created.
+ * debian/watch: Removed (useless, because it doesn't work).
+
+ -- Daniel Leidert (dale) <daniel.leidert at wgdd.de> Sat, 10 Mar 2007 14:56:26 +0100
+
docbook-ebnf (1.0+really1.2cr1-2) unstable; urgency=low
* QA Group upload orphaning this package
Modified: packages/docbook-ebnf/trunk/debian/compat
===================================================================
--- packages/docbook-ebnf/trunk/debian/compat 2007-03-10 14:17:15 UTC (rev 647)
+++ packages/docbook-ebnf/trunk/debian/compat 2007-03-10 16:17:30 UTC (rev 648)
@@ -1 +1 @@
-3
+4
Added: packages/docbook-ebnf/trunk/debian/contrib/catalog.end
===================================================================
--- packages/docbook-ebnf/trunk/debian/contrib/catalog.end 2007-03-10 14:17:15 UTC (rev 647)
+++ packages/docbook-ebnf/trunk/debian/contrib/catalog.end 2007-03-10 16:17:30 UTC (rev 648)
@@ -0,0 +1,2 @@
+
+-- * End of catalog. ...................................................... --
Added: packages/docbook-ebnf/trunk/debian/contrib/catalog.start
===================================================================
--- packages/docbook-ebnf/trunk/debian/contrib/catalog.start 2007-03-10 14:17:15 UTC (rev 647)
+++ packages/docbook-ebnf/trunk/debian/contrib/catalog.start 2007-03-10 16:17:30 UTC (rev 648)
@@ -0,0 +1,3 @@
+-- * This catalog was written for the Debian package because upstream ..... --
+-- * does not ship one. ................................................... --
+
Added: packages/docbook-ebnf/trunk/debian/contrib/catalog.xml.end
===================================================================
--- packages/docbook-ebnf/trunk/debian/contrib/catalog.xml.end 2007-03-10 14:17:15 UTC (rev 647)
+++ packages/docbook-ebnf/trunk/debian/contrib/catalog.xml.end 2007-03-10 16:17:30 UTC (rev 648)
@@ -0,0 +1,2 @@
+
+</catalog>
Added: packages/docbook-ebnf/trunk/debian/contrib/catalog.xml.start
===================================================================
--- packages/docbook-ebnf/trunk/debian/contrib/catalog.xml.start 2007-03-10 14:17:15 UTC (rev 647)
+++ packages/docbook-ebnf/trunk/debian/contrib/catalog.xml.start 2007-03-10 16:17:30 UTC (rev 648)
@@ -0,0 +1,9 @@
+<?xml version='1.0'?>
+<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN"
+ "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
+
+<!-- * This catalog was written for the Debian package because upstream -->
+<!-- * does not ship one. -->
+
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+
Modified: packages/docbook-ebnf/trunk/debian/control
===================================================================
--- packages/docbook-ebnf/trunk/debian/control 2007-03-10 14:17:15 UTC (rev 647)
+++ packages/docbook-ebnf/trunk/debian/control 2007-03-10 16:17:30 UTC (rev 648)
@@ -1,9 +1,13 @@
Source: docbook-ebnf
Section: text
Priority: optional
-Maintainer: Debian QA Group <packages at qa.debian.org>
-Build-Depends-Indep: debhelper (>> 3.0.0), xml-core
-Standards-Version: 3.5.2
+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)
+Build-Depends-Indep: xml-core
+Standards-Version: 3.7.2
+XS-Vcs-Browser: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-ebnf/trunk/
+XS-Vcs-Svn: svn://svn.debian.org/svn/debian-xml-sgml/packages/docbook-ebnf/
Package: docbook-ebnf
Architecture: all
@@ -11,8 +15,11 @@
Suggests: docbook-defguide
Description: EBNF module for the XML version of the DocBook DTD
DocBook is a general-purpose and modular SGML and XML Document-Type
- Definition. This is a module that adds to DocBook elements for the
+ Definition. This is a module that adds to DocBook elements for the
markup of EBNF grammar rules.
.
It is fully documented in "DocBook - The Definitive Guide", available
- in the docbook-book package.
+ in the docbook-defguide package.
+ .
+ Homepage: http://www.oasis-open.org/docbook/xml/ebnf/
+
Modified: packages/docbook-ebnf/trunk/debian/copyright
===================================================================
--- packages/docbook-ebnf/trunk/debian/copyright 2007-03-10 14:17:15 UTC (rev 647)
+++ packages/docbook-ebnf/trunk/debian/copyright 2007-03-10 16:17:30 UTC (rev 648)
@@ -1,24 +1,34 @@
This package was debianized by Yann Dirson <dirson at debian.org> in
-April 2002.
+April 2002. 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://docbook.org/xml/ebnf/1.0/index.html
+Download location:
+ http://www.oasis-open.org/docbook/xml/ebnf/
-Upstream Authors: Norman Walsh <ndw at nwalsh.com>
+Upstream Author:
+
+ Norman Walsh <ndw at nwalsh.com>
Copyright:
- Permission to use, copy, modify and distribute the DocBook EBNF
- Module 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 (C) 2000, 2001, 2002, 2003, 2004 Organization for the Advancement
+ of Structured Information Standards (OASIS).
- If you modify the DocBook EBNF Module in any way, label your DTD
- as a variant of DocBook. See the maintenance documentation for
- more information.
+License and warranty:
- 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/.
+ Permission to use, copy, modify and distribute the DocBook EBNF
+ Module 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 EBNF Module in any way, 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/.
+
Added: packages/docbook-ebnf/trunk/debian/docbook-ebnf.dirs
===================================================================
--- packages/docbook-ebnf/trunk/debian/docbook-ebnf.dirs 2007-03-10 14:17:15 UTC (rev 647)
+++ packages/docbook-ebnf/trunk/debian/docbook-ebnf.dirs 2007-03-10 16:17:30 UTC (rev 648)
@@ -0,0 +1 @@
+usr/share/sgml/docbook/custom
Added: packages/docbook-ebnf/trunk/debian/docbook-ebnf.links
===================================================================
--- packages/docbook-ebnf/trunk/debian/docbook-ebnf.links 2007-03-10 14:17:15 UTC (rev 647)
+++ packages/docbook-ebnf/trunk/debian/docbook-ebnf.links 2007-03-10 16:17:30 UTC (rev 648)
@@ -0,0 +1 @@
+usr/share/xml/docbook/custom/ebnf usr/share/sgml/docbook/custom/ebnf
Deleted: packages/docbook-ebnf/trunk/debian/docbook-ebnf.sgmlcatalogs
===================================================================
--- packages/docbook-ebnf/trunk/debian/docbook-ebnf.sgmlcatalogs 2007-03-10 14:17:15 UTC (rev 647)
+++ packages/docbook-ebnf/trunk/debian/docbook-ebnf.sgmlcatalogs 2007-03-10 16:17:30 UTC (rev 648)
@@ -1 +0,0 @@
-catalog /usr/share/sgml/docbook/custom/ebnf/catalog
Deleted: packages/docbook-ebnf/trunk/debian/docbook-ebnf.xmlcatalogs
===================================================================
--- packages/docbook-ebnf/trunk/debian/docbook-ebnf.xmlcatalogs 2007-03-10 14:17:15 UTC (rev 647)
+++ packages/docbook-ebnf/trunk/debian/docbook-ebnf.xmlcatalogs 2007-03-10 16:17:30 UTC (rev 648)
@@ -1,4 +0,0 @@
-local;catalog.xml;/usr/share/xml/docbook/custom/ebnf/catalog.xml
-package;public;-//OASIS//DTD DocBook EBNF Module V1.0//EN;/usr/share/xml/docbook/custom/ebnf/catalog.xml
-package;public;-//OASIS//DTD DocBook EBNF Module V1.1CR1//EN;/usr/share/xml/docbook/custom/ebnf/catalog.xml
-package;public;-//OASIS//DTD DocBook EBNF Module V1.2b1//EN;/usr/share/xml/docbook/custom/ebnf/catalog.xml
Modified: packages/docbook-ebnf/trunk/debian/rules
===================================================================
--- packages/docbook-ebnf/trunk/debian/rules 2007-03-10 14:17:15 UTC (rev 647)
+++ packages/docbook-ebnf/trunk/debian/rules 2007-03-10 16:17:30 UTC (rev 648)
@@ -3,17 +3,74 @@
# GNU copyright 1997 to 1999 by Joey Hess.
# Copyright 2002 by Yann Dirson.
-versions = $(wildcard [0-9].*)
+PACKAGE := docbook-ebnf
-ebnfdir=/usr/share/xml/docbook/custom/ebnf
-exampledir=debian/docbook-ebnf/usr/share/doc/docbook-ebnf/examples
+debian/contrib/catalog: debian/contrib/catalog.start debian/contrib/catalog.end
+ set -ex ; \
+ touch $@ ; \
+ cat $@.start >> $@ ; \
+ for dbebnf in ebnf-* ; do \
+ dbebnfver=`echo $${dbebnf} | sed -e 's/ebnf-//g'` ; \
+ [ -f $${dbebnf}/dbebnf.dtd ] && \
+ echo "PUBLIC \"-//OASIS//DTD DocBook EBNF Module V$${dbebnfver}//EN\"" >> $@ && \
+ echo " \"$${dbebnfver}/dbebnf.dtd\"" >> $@ ; \
+ done ; \
+ cat $@.end >> $@
-build:
+debian/contrib/catalog.xml: debian/contrib/catalog.xml.start debian/contrib/catalog.xml.end
+ set -ex ; \
+ touch $@ ; \
+ cat $@.start >> $@ ; \
+ for dbebnf in ebnf-* ; do \
+ dbebnfver=`echo $${dbebnf} | sed -e 's/ebnf-//g'` ; \
+ [ -f $${dbebnf}/dbebnf.dtd ] && \
+ echo "<public publicId=\"-//OASIS//DTD DocBook EBNF Module V$${dbebnfver}//EN\"" >> $@ && \
+ echo " \"$${dbebnfver}/dbebnf.dtd\"" >> $@ ; \
+ done ; \
+ cat $@.end >> $@
+
+.PHONY: catalogs
+catalogs: debian/docbook-ebnf.sgmlcatalogs debian/docbook-ebnf.xmlcatalogs
+
+debian/docbook-ebnf.install:
+ set -ex ; \
+ touch $@ ; \
+ for dbebnf in ebnf-* ; do \
+ dbebnfver=`echo $${dbebnf} | sed -e 's/ebnf-//g'` ; \
+ [ -f $${dbebnf}/dbebnf.dtd ] && \
+ echo "$${dbebnf}/dbebnf.dtd usr/share/xml/docbook/custom/ebnf/$${dbebnfver}" >> $@ ; \
+ [ -f $${dbebnf}/testebnf.xml ] && \
+ echo "$${dbebnf}/testebnf.xml usr/share/doc/docbook-ebnf/examples/$${dbebnf}" >> $@ ; \
+ done
+
+debian/docbook-ebnf.sgmlcatalogs: debian/contrib/catalog
+ set -ex ; \
+ touch $@ ; \
+ echo "$< /usr/share/sgml/docbook/custom/ebnf/catalog" >> $@
+
+debian/docbook-ebnf.xmlcatalogs: debian/contrib/catalog.xml
+ set -ex ; \
+ touch $@ ; \
+ echo "local;$<;/usr/share/xml/docbook/custom/ebnf/catalog.xml" >> $@ ; \
+ for dbebnf in ebnf-* ; do \
+ dbebnfver=`echo $${dbebnf} | sed -e 's/ebnf-//g'` ; \
+ [ -f $${dbebnf}/dbebnf.dtd ] && \
+ echo -n "root-and-package;public;" >> $@ && \
+ echo -n "-//OASIS//DTD DocBook EBNF Module V$${dbebnfver}//EN;" >> $@ && \
+ echo /usr/share/xml/docbook/custom/ebnf/catalog.xml >> $@ ; \
+ done
+
+
+build-stamp: catalogs debian/docbook-ebnf.install
dh_testdir
+ touch build-stamp
+build: build-stamp
+
clean:
dh_testdir
dh_testroot
+ rm -f build-stamp
dh_clean
install:
@@ -22,32 +79,15 @@
dh_clean -k
dh_installdirs
-# workaround for debhelper bug
- install -d debian/docbook-ebnf/${ebnfdir}
- install -d debian/docbook-ebnf/usr/share/sgml/docbook/custom
- cd debian/docbook-ebnf/usr/share/sgml/docbook/custom && ln -s ../../../xml/docbook/custom/ebnf .
-
- dh_installcatalogs
- dh_installxmlcatalogs
-
- for v in ${versions}; do \
- install -d debian/docbook-ebnf/${ebnfdir}/$$v; \
- install -m644 $$v/dbebnf.dtd \
- debian/docbook-ebnf/${ebnfdir}/$$v/; \
- done
-
-# Build architecture-independent files here.
-binary-indep: install
+binary-indep: build
dh_testdir
dh_testroot
-# dh_installdebconf
+ dh_installchangelogs
dh_installdocs
- for v in ${versions}; do \
- mkdir -p ${exampledir}/$$v; \
- cp $$v/testebnf.xml ${exampledir}/$$v; \
- done
- dh_installchangelogs
-# dh_link
+ dh_install
+ dh_link
+ dh_installcatalogs
+ dh_installxmlcatalogs
dh_compress
dh_fixperms
dh_installdeb
@@ -55,8 +95,26 @@
dh_md5sums
dh_builddeb
-binary-arch: install
- :
+binary-arch: build
binary: binary-indep binary-arch
+
.PHONY: 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-ebnf-$(version).XXXXXX` ; \
+ for dbebnf in 1.0 1.1CR1 1.2b1 1.2CR1 ; do \
+ mkdir -p "$$TMPDIR"/ebnf-$${dbebnf} ; \
+ wget -P "$$TMPDIR"/ebnf-$${dbebnf} \
+ http://www.oasis-open.org/docbook/xml/ebnf/$${dbebnf}/{dbebnf.dtd,testebnf.xml} ; \
+ done; \
+ GZIP=-9 tar -czf $(CURDIR)/docbook-ebnf_${version}.orig.tar.gz "$$TMPDIR" ; \
+ rm -rf "$$TMPDIR"
+
Deleted: packages/docbook-ebnf/trunk/debian/watch
===================================================================
--- packages/docbook-ebnf/trunk/debian/watch 2007-03-10 14:17:15 UTC (rev 647)
+++ packages/docbook-ebnf/trunk/debian/watch 2007-03-10 16:17:30 UTC (rev 648)
@@ -1,2 +0,0 @@
-version=2
-http://docbook.org/xml/ebnf/ .*/ebnf/(.+)/index.html
More information about the debian-xml-sgml-commit
mailing list