On Tue, Oct 17, 2006 at 08:46:07PM +0200, Andreas Barth wrote: > > Well, thanks for the work you did and for sharing it! I think, we > > should drop db2latex-xsl from Debian in the long run and promote > > dblatex (http://packages.debian.org/dblatex) as alternative. The > > new version of dblatex is based on Python instead of Perl :-) > > Is anyone able to change the build-dependency from cdbs to db2ldatex? If > so, I'm happy to remove dblatex-xsl again.
Using just dblatex in doc/Makefile is easy, but there is a minor problem: The PS output does not build (not needed nor used, but still...). Patch to cdbs attached. Btw: In the XML file, db2latex-xsl is mentioned, this should be changed as well. Cheers, -- W. Borgert <[EMAIL PROTECTED]>, http://people.debian.org/~debacle/
diff -uraN cdbs-0.4.46.orig/debian/control cdbs-0.4.46/debian/control --- cdbs-0.4.46.orig/debian/control 2006-07-13 20:35:07.000000000 +0000 +++ cdbs-0.4.46/debian/control 2006-10-17 22:45:54.000000000 +0000 @@ -2,7 +2,7 @@ Section: devel Priority: optional Maintainer: CDBS Hackers <[EMAIL PROTECTED]> -Build-Depends-Indep: debhelper (>= 5), graphviz, realpath, fakeroot, python-dev, python2.3, python2.4, libxml2-utils, xsltproc, docbook-xml, docbook-xsl, db2latex-xsl, tetex-extra, ant, kaffe, sharutils, gs-common +Build-Depends-Indep: debhelper (>= 5), graphviz, realpath, fakeroot, python-dev, python2.3, python2.4, libxml2-utils, xsltproc, docbook-xml, docbook-xsl, dblatex, ant, kaffe, sharutils, gs-common Uploaders: Jeff Bailey <[EMAIL PROTECTED]>, Jonas Smedegaard <[EMAIL PROTECTED]>, Marc Dequènes (Duck) <[EMAIL PROTECTED]>, Peter Eisentraut <[EMAIL PROTECTED]> Standards-Version: 3.7.2 diff -uraN cdbs-0.4.46.orig/doc/cdbs-doc-latex.xsl cdbs-0.4.46/doc/cdbs-doc-latex.xsl --- cdbs-0.4.46.orig/doc/cdbs-doc-latex.xsl 2006-06-13 21:28:26.000000000 +0000 +++ cdbs-0.4.46/doc/cdbs-doc-latex.xsl 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; - version='1.0' - xmlns="http://www.w3.org/TR/xhtml1/transitional"; - exclude-result-prefixes="#default"> - -<xsl:import href="http://db2latex.sourceforge.net/xsl/docbook.xsl"/> - -<xsl:variable name="use.extentions">1</xsl:variable> -<xsl:variable name="latex.use.parskip">1</xsl:variable> -<xsl:variable name="admon.graphics.path">/usr/share/xml/docbook/stylesheet/db2latex/latex/figures</xsl:variable> -<xsl:variable name="l10n.gentext.default.language">en</xsl:variable> -<xsl:variable name="latex.documentclass.common"></xsl:variable> -<xsl:variable name="latex.babel.language"></xsl:variable> -<xsl:template name="latex.float.preamble" /> - -</xsl:stylesheet> diff -uraN cdbs-0.4.46.orig/doc/Makefile cdbs-0.4.46/doc/Makefile --- cdbs-0.4.46.orig/doc/Makefile 2006-06-13 22:22:54.000000000 +0000 +++ cdbs-0.4.46/doc/Makefile 2006-10-17 22:46:06.000000000 +0000 @@ -3,35 +3,20 @@ graphics = buildcore depgraph xmllint-stamp-%: %.xml - xmllint --xinclude --postvalid --noblanks --noout $< + xmllint --nonet --xinclude --postvalid --noblanks --noout $< touch $@ html: cdbs-doc.html %.html: %.xml xmllint-stamp-% cdbs-doc-xhtml.xsl $(graphics:%=%.png) - xsltproc --xinclude -o $@ cdbs-doc-xhtml.xsl $< - -%.tex-pdf: %.xml xmllint-stamp-% cdbs-doc-latex.xsl - xsltproc --xinclude --stringparam graphic.default.extension pdf -o $@ cdbs-doc-latex.xsl $< - -%.tex-ps: %.xml xmllint-stamp-% cdbs-doc-latex.xsl - xsltproc --xinclude --stringparam graphic.default.extension eps -o $@ cdbs-doc-latex.xsl $< - -dvi: cdbs-doc.dvi -%.dvi: %.tex-ps $(graphics:%=%.eps) -# 3 passes to avoid undefined references - latex $< - mkindex $< - latex $< - latex $< + xsltproc --nonet --xinclude -o $@ cdbs-doc-xhtml.xsl $< pdf: cdbs-doc.pdf -%.pdf: %.tex-pdf $(graphics:%=%.pdf) - pdflatex $< - pdflatex $< +%.pdf: %.xml xmllint-stamp-% $(graphics:%=%.pdf) + dblatex -T db2latex $< ps: cdbs-doc.ps -%.ps: %.dvi - dvips $< +%.ps: %.xml xmllint-stamp-% $(graphics:%=%.eps) + dblatex -T db2latex -t ps -f eps $< txt: cdbs-doc.txt %.txt: %.html
