[xml/sgml-commit] r949 - in /packages/docbook-defguide/trunk: buildtools/ buildtools/Makefile.incl buildtools/saxon.sh debian/changelog debian/compat debian/control debian/rules

dleidert-guest at users.alioth.debian.org dleidert-guest at users.alioth.debian.org
Sat Dec 15 01:21:28 UTC 2007 

Author: dleidert-guest
Date: Sat Dec 15 01:21:27 2007
New Revision: 949

URL: http://svn.debian.org/wsvn/debian-xml-sgml/?sc=1&rev=949
Log:
* New upstream release 2.0.17 (finally closes: #257715).
  - Creates missing pages (closes: #208031).
  - Fixes several broken links (closes: #248364, #280740).
  - Drops printing glyphs via external URIs (closes: #173710).
  - Norman Walsh relicensed the TDG as of version 2.0.17 without the
    back-cover text clause (closes: #280485). Many thanks to you, Norm!

* buildtools/Makefile.incl: Added my own small and custom build system to
  not rely on upstreams one. This should also reduce the size of necessary
  changes to the build system.
* buildtools/saxon.sh: Ditto.

* debian/compat: Update to newer compatibility level 5.
* debian/control: Added Homepage field.
  (Maintainer): New maintainer (closes: #295579).
  (Standards-Version): Updated to latest 3.7.3.
  (Build-Depends, Build-Depends-Indep): Updated/adjusted (NOT COMPLETE YET).
  (Description): Updated.
* debian/rules: Added get-orig-source target to retreive the source via SVN.


Added:
    packages/docbook-defguide/trunk/buildtools/
    packages/docbook-defguide/trunk/buildtools/Makefile.incl
    packages/docbook-defguide/trunk/buildtools/saxon.sh   (with props)
Modified:
    packages/docbook-defguide/trunk/debian/changelog
    packages/docbook-defguide/trunk/debian/compat
    packages/docbook-defguide/trunk/debian/control
    packages/docbook-defguide/trunk/debian/rules

Added: packages/docbook-defguide/trunk/buildtools/Makefile.incl
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-defguide/trunk/buildtools/Makefile.incl?rev=949&op=file
==============================================================================
--- packages/docbook-defguide/trunk/buildtools/Makefile.incl (added)
+++ packages/docbook-defguide/trunk/buildtools/Makefile.incl Sat Dec 15 01:21:27 2007
@@ -1,0 +1,8 @@
+# Written for the Debian distribution by Daniel Leidert, 2007.
+# Released under GPL v2.
+#
+# This is a small and custom Makefile.incl so we don't need upstreams build
+# environment. Further this shall help to decrease the number of changes we
+# need to make to upstreams build process.
+
+XSLT = JAVA="$(JAVA)" CLASSPATH="$(CLASSPATH)" /bin/sh ../../buildtools/saxon.sh

Added: packages/docbook-defguide/trunk/buildtools/saxon.sh
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-defguide/trunk/buildtools/saxon.sh?rev=949&op=file
==============================================================================
--- packages/docbook-defguide/trunk/buildtools/saxon.sh (added)
+++ packages/docbook-defguide/trunk/buildtools/saxon.sh Sat Dec 15 01:21:27 2007
@@ -1,0 +1,41 @@
+#!/bin/sh
+#
+# Written for the Debian distribution by Daniel Leidert, 2007.
+# Released under GPL v2.
+#
+# This is a small and custom script so we don't need upstreams build
+# environment. Further this shall help to decrease the number of changes we
+# need to make to upstreams build process.
+
+set -e
+
+JAVA=${JAVA:-java}
+
+DEFAULT_CLASSPATH="/usr/share/java/saxon.jar:/usr/share/java/docbook-xsl-saxon.jar:/usr/share/java/xml-commons-resolver-1.1.jar:/usr/share/java/xercesImpl.jar:/etc/xml/resolver/"
+
+CLASSPATH=${CLASSPATH:-$DEFAULT_CLASSPATH}
+
+JAVA=${JAVA:-java}
+
+MY_XML=$1
+shift
+MY_XSL=$1
+shift
+MY_OUT=$1
+shift
+
+MY_OPT=$*
+
+$JAVA -cp $CLASSPATH -Xms64m -Xmx512m \
+      -Djavax.xml.parsers.DocumentBuilderFactory=org.apache.xerces.jaxp.DocumentBuilderFactoryImpl \
+      -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl \
+      com.icl.saxon.StyleSheet \
+      -x org.apache.xml.resolver.tools.ResolvingXMLReader \
+      -y org.apache.xml.resolver.tools.ResolvingXMLReader \
+      -r org.apache.xml.resolver.tools.CatalogResolver \
+      -u \
+      -o $MY_OUT $MY_XML $MY_XSL $MY_OPT \
+      use.extensions=1 \
+      graphicsize.extension=0
+
+exit 0

Propchange: packages/docbook-defguide/trunk/buildtools/saxon.sh
------------------------------------------------------------------------------
    svn:executable = *

Modified: packages/docbook-defguide/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-defguide/trunk/debian/changelog?rev=949&op=diff
==============================================================================
--- packages/docbook-defguide/trunk/debian/changelog (original)
+++ packages/docbook-defguide/trunk/debian/changelog Sat Dec 15 01:21:27 2007
@@ -1,6 +1,24 @@
 docbook-defguide (2.0.17+svn7549-1) UNRELEASED; urgency=low
 
-  * New upstream release.
+  * New upstream release 2.0.17 (finally closes: #257715).
+    - Creates missing pages (closes: #208031).
+    - Fixes several broken links (closes: #248364, #280740).
+    - Drops printing glyphs via external URIs (closes: #173710).
+    - Norman Walsh relicensed the TDG as of version 2.0.17 without the
+      back-cover text clause (closes: #280485). Many thanks to you, Norm!
+
+  * buildtools/Makefile.incl: Added my own small and custom build system to
+    not rely on upstreams one. This should also reduce the size of necessary
+    changes to the build system.
+  * buildtools/saxon.sh: Ditto.
+  
+  * debian/compat: Update to newer compatibility level 5.
+  * debian/control: Added Homepage field.
+    (Maintainer): New maintainer (closes: #295579).
+    (Standards-Version): Updated to latest 3.7.3.
+    (Build-Depends, Build-Depends-Indep): Updated/adjusted (NOT COMPLETE YET)..
+    (Description): Updated.
+  * debian/rules: Added get-orig-source target to retreive the source via SVN.
 
  -- Daniel Leidert (dale) <daniel.leidert at wgdd.de>  Sat, 15 Dec 2007 00:56:41 +0100
 

Modified: packages/docbook-defguide/trunk/debian/compat
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-defguide/trunk/debian/compat?rev=949&op=diff
==============================================================================
--- packages/docbook-defguide/trunk/debian/compat (original)
+++ packages/docbook-defguide/trunk/debian/compat Sat Dec 15 01:21:27 2007
@@ -1,1 +1,1 @@
-4
+5

Modified: packages/docbook-defguide/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-defguide/trunk/debian/control?rev=949&op=diff
==============================================================================
--- packages/docbook-defguide/trunk/debian/control (original)
+++ packages/docbook-defguide/trunk/debian/control Sat Dec 15 01:21:27 2007
@@ -1,9 +1,13 @@
 Source: docbook-defguide
 Section: doc
 Priority: optional
-Maintainer: Debian QA Group <packages at qa.debian.org>
-Build-Depends-Indep: debhelper (>> 4), sgml2x (>= 0.99.4), openjade1.3, docbook-dsssl, tidy, docbook-ebnf (>> 1.0+really1.1cr1)
-Standards-Version: 3.5.2
+Maintainer: Daniel Leidert (dale) <daniel.leidert at wgdd.de>
+Build-Depends: debhelper (>= 5)
+Build-Depends-Indep: docbook-ebnf, docbook-xsl,
+ libsaxon-java (>> 1:6.5), libxml-commons-resolver1.1-java,
+ sun-java5-jre, xml-core
+Standards-Version: 3.7.3
+Homepage: http://docbook.org/tdg/
 
 Package: docbook-defguide
 Architecture: all
@@ -17,8 +21,5 @@
  an evolution of the book of the same name published by O'Reilly
  (which documented DocBook 3.1).
  .
- This is a work in progress, which attempts to fully document DocBook
- 4.1, but may be inconsistent in some places.
- .
- The HTML rendering is a work in progress as well.  Suggestions
- welcomed via the Debian bug-tracking system.
+ There is no active work anymore on this book nor Docbook 4.x, so this
+ book should almost be the complete reference to DocBook 4.x.

Modified: packages/docbook-defguide/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-defguide/trunk/debian/rules?rev=949&op=diff
==============================================================================
--- packages/docbook-defguide/trunk/debian/rules (original)
+++ packages/docbook-defguide/trunk/debian/rules Sat Dec 15 01:21:27 2007
@@ -53,4 +53,19 @@
 binary-arch:
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+
+# TODO: create WhatsNew from svn2cl instead to touch it
+# TODO: the Russian TDG needs it
+
+version=$(shell dpkg-parsechangelog | sed -n -e 's/^Version: \(.*\)-[^-+]*/\1/p' | sed -n -e 's/\+svn.*$$//p ')
+
+get-orig-source:
+	set -ex ; \
+	TDGVERSION=`LANG=C svn info https://docbook.svn.sourceforge.net/svnroot/docbook/trunk/defguide | sed -n -e 's/^Last Changed Rev: //p'` ; \
+	TMPDIR=`mktemp -d docbook-defguide-$(version)+svn"$$TDGVERSION".orig` ; \
+	svn export https://docbook.svn.sourceforge.net/svnroot/docbook/trunk/defguide "$$TMPDIR"/defguide ; \
+	find "$$TMPDIR" -name .cvsignore -delete ; \
+	GZIP=-9 tar -czf $(CURDIR)/docbook-defguide_${version}+svn"$$TDGVERSION".orig.tar.gz "$$TMPDIR" ; \
+	rm -rf "$$TMPDIR"
+
+.PHONY: build clean binary-indep binary-arch binary install get-orig-source

More information about the debian-xml-sgml-commit mailing list