--- xmlto-0.0.20.orig/debian/xmlto.links +++ xmlto-0.0.20/debian/xmlto.links @@ -0,0 +1 @@ +usr/share/xmlto/format/docbook/txt usr/share/xmlto/format/docbook/text --- xmlto-0.0.20.orig/debian/control +++ xmlto-0.0.20/debian/control @@ -0,0 +1,31 @@ +Source: xmlto +Section: text +Priority: optional +Maintainer: Debian XML/SGML Group +Uploaders: Daniel Leidert (dale) +Build-Depends: debhelper (>> 5), dpatch, docbook-xsl (>= 1.64.1.0), + docbook-xml (>= 4.2-8), xsltproc (>= 1.0.29), libxml2-utils, + libpaper-utils, sgml-base +Standards-Version: 3.7.3 +Homepage: http://cyberelk.net/tim/software/xmlto/ +Vcs-Browser: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xmlto/trunk/ +Vcs-Svn: svn://svn.debian.org/svn/debian-xml-sgml/packages/xmlto/ +DM-Upload-Allowed: yes + +Package: xmlto +Architecture: any +Depends: ${shlibs:Depends}, xsltproc (>= 1.1.12-8), docbook-xsl (>= 1.64.1.0), docbook-xml (>= 4.2-8), debianutils (>= 1.16), libxml2-utils, sgml-base +Recommends: libpaper-utils +Suggests: fop | passivetex (>= 1.23) | xmltex (>= 1.9.debian.1), w3m | lynx | links +Description: XML-to-any converter + xmlto is a front-end to an XSL toolchain. It chooses an appropriate + stylesheet for the conversion you want and applies it using an external + XSLT processor (currently, only xsltproc is supported). It also performs + any necessary post-processing. + . + It supports converting from DocBook XML to DVI, XSL-FO, HTML (multiple + pages), HTML (one page), man page, PDF, PostScript, and plain text. It + supports converting from XSL-FO to DVI, PDF and PostScript. + . + For DVI, PDF, and PostScript output, Sebastian Rahtz's PassiveTeX is + required. Alternatively docbook-xsl and fop produce PDF and PS output. --- xmlto-0.0.20.orig/debian/changelog +++ xmlto-0.0.20/debian/changelog @@ -0,0 +1,350 @@ +xmlto (0.0.20-5) unstable; urgency=low + + * debian/patches/483503_postvalid_needs_noent.dpatch: Added. + - xmlto.in: xmllints --postvalid switch needs the --noent switch + to substitute entity values and avoid 'references an unknown ID' + errors (closes: #483503). Thanks to Daniel Burrows for the + report. + + -- Daniel Leidert (dale) Sun, 25 Jan 2009 20:35:14 +0100 + +xmlto (0.0.20-4) unstable; urgency=low + + * debian/patches/499200_cannot_parse_XSLTPARAMS.dpatch: Adjusted. + - xmlto.in: The value of a given (string)param=value pair was not + parsed correctly due to a missing curly brace (closes: #513011). + Thanks to Max Kellermann. + + -- Daniel Leidert (dale) Sun, 25 Jan 2009 18:41:30 +0100 + +xmlto (0.0.20-3) unstable; urgency=low + + * debian/control (Suggests): Added xmltex now providing passivetex + (closes: #416622, #440518). Thanks to Robert Wohlrab. + (Description): Added information about fop/docbook-xsl as + alternative to passivetex. + * debian/patches/499200_cannot_parse_XSLTPARAMS.dpatch: Added. + - xmlto.in: Fixed error message using --stringparam switch + (closes: #499200). Thanks to Zed Pobre. + * debian/patches/00list: Adjusted. + + -- Daniel Leidert (dale) Thu, 09 Oct 2008 11:03:38 +0200 + +xmlto (0.0.20-2) unstable; urgency=low + + * debian/rules (get-orig-source): Use uscan and its --repack feature. + * debian/patches/xmlto_libpaper_173090.dpatch: Adjusted. + - Delete papersizemod XSL file if created and not just for some + formats (closes: #491390). + + -- Daniel Leidert (dale) Sat, 19 Jul 2008 12:28:11 +0200 + +xmlto (0.0.20-1) unstable; urgency=low + + * New upstream release 0.0.20. + - Added experimental support for the docbook-xsl/fop toolchain. + + * debian/control (XS-DM-Upload-Allowed): Removed XS-prefix as of + dpkg version 1.14.16. + (Uploaders): Removing Graham Wilson who does not longer actively + maintain the package. Thanks for your work! + (Depends): Moved libpaper-utils to Recommends. + (Suggests): Added fop as alternative for PDF/PS creation. Added the other + supported browsers for text conversion. + * debian/rules (get-orig-source): Use trust-model 'always' for GnuPG. + * debian/patches/01_format_cp_bug_293453.dpatch: Dropped. Applied upstream. + * debian/patches/04_xmlto_filename_spaces_fix_353829.dpatch: Ditto. + * debian/patches/05_xmlto_read_stylesheet_from_stdin_299461.dpatch: Ditto. + * debian/patches/06_xmlto_avoid_broken_manpages_327551.dpatch: Ditto. + * debian/patches/02_format_fo_passivetex_check.dpatch: Renamed to + debian/patches/format_fo_passivetex_check.dpatch. + * debian/patches/03_xmlto_libpaper_173090.dpatch: Renamed to + debian/patches/xmlto_libpaper_173090.dpatch. + * debian/patches/format_fo_passivetex_check.dpatch: Adjusted. + - Just adjusted to the new code. + * debian/patches/xmlto_libpaper_173090.dpatch: Adjusted. + - Made libpaper tools optional and the first choice *over* the upstream + solution, not a complete replacement. Further fixed the test to apply + the stylesheet also to FO creaation (closes: #270433). + * debian/patches/00list: Adjusted. + + -- Daniel Leidert (dale) Tue, 05 Feb 2008 02:33:44 +0100 + +xmlto (0.0.19-1) UNRELEASED; urgency=low + + * New upstream release 0.0.19. + - Upstream fixed option order for find call (closes: #366707). + - Manpage is rebuilt with newer docbook-xsl stylesheets and its formatting + should be fixed now (closes: #415353). + + * debian/compat: Raised to v5. + * debian/control: Homepage field transition. Added Vcs and + XS-DM-Upload-Allowed field. + (Standards-Version): Updated to latest 3.7.3. + (Uploaders): Added myself. + (Build-Depends): Raised debhelper to comply with compat level. Added + dpatch. + (Depends): Raised xsltproc dependency (closes: #311354). + * debian/copyright: Updated. + * debian/rules: Added a get-orig-source target to document the creation of + the .tar.gz from the .tar.bz2. Added dpatch infrastructure. + (CFLAGS): Added -Wall. + (clean): Do not ignore make result here. + (.PHONY): Removed test target. + * debian/xmlto.links: Added. + - Make text an alias for txt (closes: #263243). + * debian/watch: Slightly updated. + * debian/patches/01_format_cp_bug_293453.dpatch: Added. + - Copy the whole chunked HTML output and created manpages, even if in + sub-directories. Acknowledge NMU by Yann Dirson (closes: #293453). + * debian/patches/02_format_fo_passivetex_check.dpatch: Added. + - Just moved Graham Wilson's passivetex checks into this dpatch patch. + * debian/patches/03_xmlto_libpaper_173090.dpatch: Added. + - Just moved Graham Wilson's libpaper patch into this dpatch patch. + * debian/patches/04_xmlto_filename_spaces_fix_353829.dpatch: Added. + - Fixed a failure taking a file as argument, with spaces in its name + (closes: #353829). + * debian/patches/05_xmlto_read_stylesheet_from_stdin_299461.dpatch: Added. + - Allow xmlto to get a stylesheet from STDIN (closes: #299461, #413632). + * debian/patches/06_xmlto_avoid_broken_manpages_327551.dpatch: Added. + - Use always the whole roff character map for manpage output to avoid + broken output if environment and source locale differ (closes: #327551). + * debian/patches/00list: Added. + + -- Daniel Leidert (dale) Sun, 13 Jan 2008 21:14:59 +0100 + +xmlto (0.0.18-5.1) unstable; urgency=low + + * NMU - last version cannot work with too many stylesheets. + * Use "cp -r" to copy html results from temporary dir (Closes: #293453). + + -- Yann Dirson Sun, 17 Sep 2006 23:24:23 +0200 + +xmlto (0.0.18-5) unstable; urgency=low + + * Set maintainer to Debian XML/SGML Group, and add myself as + uploader. + * Fix check for XSL-FO. (closes: #252545) + + -- Graham Wilson Mon, 07 Jun 2004 18:20:43 +0000 + +xmlto (0.0.18-4) unstable; urgency=low + + * Woohoo Debian XML catalog registration! + - bump docbook-xml dependency for the support (closes: #183744) + + -- Graham Wilson Tue, 03 Feb 2004 01:03:32 +0000 + +xmlto (0.0.18-3) unstable; urgency=low + + * Use HTTP URIs in the documentation files. + * Remove SGML_CATALOG_FILES hack from xmlto.in. + * Don't install the stupid FAQ. + + -- Graham Wilson Mon, 02 Feb 2004 22:47:42 +0000 + +xmlto (0.0.18-2) unstable; urgency=low + + * Add a watch file for uscan. + * Fix typo in autogen.sh, and put it the top-level directory. + * Fix some typos in the XSL-FO to other processing scripts. + * Use HTTP URIs instead of local ones when transforming. + - bump docbook-xsl dependency to match + + -- Graham Wilson Sun, 01 Feb 2004 18:17:19 +0000 + +xmlto (0.0.18-1) unstable; urgency=low + + * New upstream release. + * Build depend on at least debhelper 4. + + -- Graham Wilson Thu, 22 Jan 2004 02:43:24 +0000 + +xmlto (0.0.17-3) unstable; urgency=low + + * Check more header lines to see if the file is XSL-FO. + + -- Graham Wilson Sat, 13 Dec 2003 20:44:56 +0000 + +xmlto (0.0.17-2) unstable; urgency=low + + * Fix a problem with the build script I use. + + -- Graham Wilson Fri, 12 Dec 2003 23:46:22 +0000 + +xmlto (0.0.17-1) unstable; urgency=low + + * New upstream release. + * Add a script to recreate auto* files. + * Correctly check DEB_BUILD_OPTIONS. + * Call head correctly. (closes: #221839) + * Suggest w3m, since it produces better table output. + * Remove a few empty directorys on clean. + + -- Graham Wilson Fri, 05 Dec 2003 20:27:20 +0000 + +xmlto (0.0.14-3) unstable; urgency=low + + * Remove testing framework, as it only made the diff larger, and I don't + think anybody used it. + * Change maintainer address. + * Increase standards version. No changes. + + -- Graham Wilson Thu, 11 Sep 2003 01:32:17 +0000 + +xmlto (0.0.14-2) unstable; urgency=low + + * The "woohoo debian xml catalog support oh wait" release. + * Really depend on libxml2-utils. (closes: #196376, #196967) + * Standards-Version: 3.6.0 (no changes) + * Minor improvements to the debian/test script. + * Export SGML_CATALOG_FILES: (closes: #204276) + - for xmllint and xsltproc + - also depend on sgml-base + + -- Graham Wilson Wed, 06 Aug 2003 20:46:48 +0000 + +xmlto (0.0.14-1) unstable; urgency=low + + * New upstream release. + * Enable maintainer mode in configure.in. + * Print a better message when PassiveTeX is not installed. + (closes: #190840) + * (Build-)Depend on xsltproc (>= 1.0.29). (closes: #189421) + * Depend on libxml2-utils. (closes: #196376, #196967) + * Really check the return code of xmllint. + + -- Graham Wilson Sat, 14 Jun 2003 05:41:35 +0000 + +xmlto (0.0.12-7) unstable; urgency=low + + * Adding 0.0.13pre4 patch. + * Various improvements to the testing framework, see README.test. + * Build-depend and depend on docbook-xsl (1.56.0): + - At this point db2man.xsl is included and the XHTML stylesheet + really produces XHTML. (closes: #183892) + - Don't depend on docbook-xml (>= 1.54.0). Oops. + * Update Standards-Version. No changes. + + -- Graham Wilson Thu, 20 Mar 2003 02:37:10 +0000 + +xmlto (0.0.12-6) unstable; urgency=low + + * Add myself to the copyright file. (closes: #180996) + * Suggest passivetex (>= 1.23). (closes: #179146) + - The newest version fixes some problems with XSL-FO files. + - Remove the note from README.Debian about this. + * Remove the patch code from the rules file. + - The patches will be included in the Debian diff. + + -- Graham Wilson Sat, 15 Feb 2003 17:27:43 +0000 + +xmlto (0.0.12-5) unstable; urgency=low + + * Added 00_0.0.13pre2.patch. + * Actually change Standards-Version to 3.5.8. + * debian/rules: + - Added a testing framework. Hopefully fewer bugs will get in now. + - Patches are numbered now, to avoid dependency problems. + - Call run-parts on the patches directory. + * Call xmllint with the --catalogs option. (closes: #173603) + * Only use paper information when converting from XSL-FO. (closes: #180070) + * Update 02_url patch to patch txt format script. + + -- Graham Wilson Fri, 31 Jan 2003 03:13:25 +0000 + +xmlto (0.0.12-4) unstable; urgency=low + + * Make URIs to point *XML* DTDs (man.patch). (closes: #177090) + * Supply default paper size if one doesn't exist (libpaper.patch). + + -- Graham Wilson Thu, 09 Jan 2003 05:42:38 +0000 + +xmlto (0.0.12-3) unstable; urgency=low + + * Update Standards-Version to 3.5.8. + - Support new DEB_BUILD_OPTIONS. + * Build-Depend on libxml2 and libpaper-utils, since xmlto uses them + it is called during build. (closes: #175166) + * Reupload so xmlto is a non-native package. (closes: #175425) + + -- Graham Wilson Mon, 06 Jan 2003 01:18:53 +0000 + +xmlto (0.0.12-2) unstable; urgency=low + + * Use local DTDs in man pages. (closes: #174804) + * Fix URI in url.patch. + + -- Graham Wilson Tue, 31 Dec 2002 07:45:41 +0000 + +xmlto (0.0.12-1) unstable; urgency=low + + * New upstream release: + - xmllint patch integrated upstream. + * Attempt to use libpaper-utils to determine papersize. (closes: #173090) + * Add 0.0.13pre1 patch: + - Don't try to validate XSL-FO input files. (closes: #170633) + - Tell xsltproc not to validate input, since xmllint does that. + * Clean up the description a little. + - Add upstream URL. + * Make sure to depend on libc6: + - Add ${shlibs:Depends} to Depends [control]. + - Run dh_shlibdeps during binary-arch target [rules]. + * Explicitly depend on libxml2, since we call xmllint. + * s/Author(s)/Author/ in copyright. + * Update rules to look for patches in debian/patches. + * Create README.Debian: + - Add note about PostScript and DVI output. + + -- Graham Wilson Tue, 31 Dec 2002 01:52:29 +0000 + +xmlto (0.0.11-1) unstable; urgency=low + + * New upstream release: + - Filenames can contain `_'. (closes: #163669) + * Calls xmllint correctly. (closes: #165226) + * Updated url.patch for newest upstream version. + * New maintainer. (closes: #171351) + * Depend on a docbook-xsl (>= 1.54.1) (closes: #161921) + * Make sure to strip executables. + + -- Graham Wilson Thu, 05 Dec 2002 23:18:29 +0000 + +xmlto (0.0.10-3) unstable; urgency=low + + * Suggest passivetex which is now available in debian (closes: #150067). + + -- christophe barbe Mon, 2 Sep 2002 10:13:07 -0400 + +xmlto (0.0.10-2) unstable; urgency=low + + * Added dependency on debianutils >= 1.16 for 'mktemp -d' (closes: #151221). + + -- christophe barbe Fri, 28 Jun 2002 08:46:54 -0400 + +xmlto (0.0.10-1) unstable; urgency=low + + * New Upstream Release. + + -- christophe barbe Tue, 18 Jun 2002 22:02:38 -0400 + +xmlto (0.0.8-3) unstable; urgency=low + + * Description improvement (closes: #150378). + + -- christophe barbe Tue, 18 Jun 2002 18:05:57 -0400 + +xmlto (0.0.8-2) unstable; urgency=low + + * Fix obvious bug in packaging (missing Build-Depends) (closes: #150030). + + -- christophe barbe Fri, 14 Jun 2002 20:23:51 -0400 + +xmlto (0.0.8-1) unstable; urgency=low + + * Initial Release. + * close ITP (closes: #149610). + + -- christophe barbe Wed, 5 Jun 2002 15:59:21 -0400 + +# vim:ts=2:sw=2:et:tw=70: --- xmlto-0.0.20.orig/debian/compat +++ xmlto-0.0.20/debian/compat @@ -0,0 +1 @@ +5 --- xmlto-0.0.20.orig/debian/watch +++ xmlto-0.0.20/debian/watch @@ -0,0 +1,4 @@ +# see uscan(1) for format + +version=3 +http://cyberelk.net/tim/data/xmlto/stable/xmlto-([\d\.]+)\.tar\.[bg]z2? --- xmlto-0.0.20.orig/debian/README.Debian +++ xmlto-0.0.20/debian/README.Debian @@ -0,0 +1,21 @@ +---------------------------- +Debian README file for xmlto +---------------------------- + +POSTSCRIPT OUTPUT +----------------- +There are some problems with generating PostScript or DVI output (see bug +#170633). As a workaround, you can ask xmlto to generate PDF output: + + $ xmlto pdf myfile.xml + +and then convert that to PostScript using pdf2ps (in the gs-common +package): + + $ pdf2ps myfile.pdf + +I don't current know of a way to generate DVI output, though. + + -- Graham Wilson $Date: 2003-10-13 22:32:06 -0500 (Mon, 13 Oct 2003) $ + +vim:tw=79: --- xmlto-0.0.20.orig/debian/copyright +++ xmlto-0.0.20/debian/copyright @@ -0,0 +1,33 @@ +This package was debianized by christophe barbe on +Wed, 5 Jun 2002 15:59:21 -0400. It is now maintained by Graham Wilson +. + +It was downloaded from: http://cyberelk.net/tim/data/xmlto/stable/ + +Upstream Author: + + Tim Waugh + Ondrej Vasik (since 0.0.19) + +Copyright: + + Copyright (C) 2001, 2002, 2003 Tim Waugh + +License: GNU General Public License (GPL) v2 or later + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +On Debian systems, the complete text of the GNU General Public License +version 2 can be found in the `/usr/share/common-licenses/GPL-2' file. --- xmlto-0.0.20.orig/debian/rules +++ xmlto-0.0.20/debian/rules @@ -0,0 +1,75 @@ +#!/usr/bin/make -f +# $Id: rules 26 2003-12-05 20:29:15Z bob $ +# Sample debian/rules that uses debhelper. +# GNU copyright 1997 to 1999 by Joey Hess. + +PACKAGE = xmlto + +include /usr/share/dpatch/dpatch.make + +CFLAGS += -Wall -g +ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O2 +endif + +config.status: configure + dh_testdir + CFLAGS="$(CFLAGS)" ./configure \ + --prefix=/usr \ + --mandir=\$${prefix}/share/man + +build: patch-stamp build-stamp +build-stamp: config.status + dh_testdir + $(MAKE) + touch build-stamp + +clean: unpatch + dh_testdir + dh_testroot + -rm -f build-stamp patch-stamp + -rm -rf .deps man + [ ! -f Makefile ] || $(MAKE) distclean + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + $(MAKE) install DESTDIR=$(CURDIR)/debian/$(PACKAGE) + +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installman + dh_installchangelogs ChangeLog + dh_installdocs + dh_link + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install + +# The following code is used to create the .orig.tar.gz tarball. +# Use it to prepare a .orig tarball for a release. +# +version = $(shell dpkg-parsechangelog | sed -n -e 's/^Version: \(.*\)-[^-]*$$/\1/p' ) + +.PHONY: get-orig-source +get-orig-source: + uscan --force-download --repack + +# vim:ts=4:sw=4: --- xmlto-0.0.20.orig/debian/NEWS +++ xmlto-0.0.20/debian/NEWS @@ -0,0 +1,10 @@ +xmlto (0.0.20-1) unstable; urgency=low + + This new upstream version adds support for the docbook-xsl/fop toolchain + via the --with-fop switch. Because passivetex is still missing from the + Debian archive and will probably never come back, use it to create PDF or + PS output. DVI output is still broken! But we are working on dblatex support + which will be available as of upstream version 0.0.21 or in + Debian/experimental soon. + + -- Daniel Leidert (dale) Wed, 23 Jan 2008 01:57:52 +0100 --- xmlto-0.0.20.orig/debian/patches/00list +++ xmlto-0.0.20/debian/patches/00list @@ -0,0 +1,4 @@ +format_fo_passivetex_check +xmlto_libpaper_173090 +499200_cannot_parse_XSLTPARAMS +483503_postvalid_needs_noent --- xmlto-0.0.20.orig/debian/patches/499200_cannot_parse_XSLTPARAMS.dpatch +++ xmlto-0.0.20/debian/patches/499200_cannot_parse_XSLTPARAMS.dpatch @@ -0,0 +1,29 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 499200_cannot_parse_XSLTPARAMS.dpatch by Daniel Leidert (dale) +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: * xmlto.in: Using the --stringparam option results in an error message: +## DP: 'warning: failed to load external entity "XSLTPARAMS" [..]'. The patch +## DP: has been suggested by Zed Pobre. +## DP: +## DP: * xmlto.in: Using the --stringparam option failes because of a missing +## DP: opening brace. Thanks to Max Kellermann. +## DP: +## DP: +## DP: + +@DPATCH@ +diff -urNad trunk~/xmlto.in trunk/xmlto.in +--- trunk~/xmlto.in 2009-01-25 18:34:09.000000000 +0100 ++++ trunk/xmlto.in 2009-01-25 18:34:28.000000000 +0100 +@@ -272,8 +272,8 @@ + ;; + --stringparam) + MYPARAM="$2" +- XSLTPARAMS="XSLTPARAMS --stringparam ${MYPARAM%=*}" +- XSLTPARAMS="XSLTPARAMS $MYPARAM#*=}" ++ XSLTPARAMS="$XSLTPARAMS --stringparam ${MYPARAM%=*}" ++ XSLTPARAMS="$XSLTPARAMS ${MYPARAM#*=}" + shift 2 + ;; + --noclean) --- xmlto-0.0.20.orig/debian/patches/format_fo_passivetex_check.dpatch +++ xmlto-0.0.20/debian/patches/format_fo_passivetex_check.dpatch @@ -0,0 +1,51 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## format_fo_passivetex_check.dpatch by Graham Wilson +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Check for a passivetex format file and tell the user, if it's missing. +## DP: +## DP: + +@DPATCH@ +diff -urNad trunk~/format/fo/dvi trunk/format/fo/dvi +--- trunk~/format/fo/dvi 2008-01-14 12:33:52.000000000 +0100 ++++ trunk/format/fo/dvi 2008-01-19 03:11:41.000000000 +0100 +@@ -6,6 +6,10 @@ + then + echo >&2 "Post-process XSL-FO to DVI" + fi ++ if [ ! -f /usr/share/texmf/tex/xmltex/passivetex/fotex.xmt ]; then ++ printf "PassiveTeX is needed for this format, but it is not installed. Please install\nthe passivetex package.\n" ++ exit 1 ++ fi + # Work around stupid tetex bug with '_' in filenames + # Also work around stupid tetex limitation with long lines (bug #101055) + sed -e "s,/>,\n/>,g" "$XSLT_PROCESSED" >tmp.fo +diff -urNad trunk~/format/fo/pdf trunk/format/fo/pdf +--- trunk~/format/fo/pdf 2008-01-15 15:27:24.000000000 +0100 ++++ trunk/format/fo/pdf 2008-01-19 03:11:09.000000000 +0100 +@@ -8,6 +8,10 @@ + then + echo >&2 "Post-process XSL-FO to PDF" + fi ++ if [ ! -f /usr/share/texmf/tex/xmltex/passivetex/fotex.xmt ]; then ++ printf "PassiveTeX is needed for this format, but it is not installed. Please install\nthe passivetex package.\n" ++ exit 1 ++ fi + # Work around stupid tetex bug with '_' in filenames + # Also work around stupid tetex limitation with long lines (bug #101055) + sed -e "s,/>,\n/>,g" "$XSLT_PROCESSED" >tmp.fo +diff -urNad trunk~/format/fo/ps trunk/format/fo/ps +--- trunk~/format/fo/ps 2008-01-15 15:27:49.000000000 +0100 ++++ trunk/format/fo/ps 2008-01-19 03:11:26.000000000 +0100 +@@ -8,6 +8,10 @@ + then + echo >&2 "Post-process XSL-FO to DVI" + fi ++ if [ ! -f /usr/share/texmf/tex/xmltex/passivetex/fotex.xmt ]; then ++ printf "PassiveTeX is needed for this format, but it is not installed. Please install\nthe passivetex package.\n" ++ exit 1 ++ fi + # Work around stupid tetex bug with '_' in filenames + # Also work around stupid tetex limitation with long lines (bug #101055) + sed -e "s,/>,\n/>,g" "$XSLT_PROCESSED" >tmp.fo --- xmlto-0.0.20.orig/debian/patches/xmlto_libpaper_173090.dpatch +++ xmlto-0.0.20/debian/patches/xmlto_libpaper_173090.dpatch @@ -0,0 +1,86 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## xmlto_libpaper_173090.dpatch by Graham Wilson +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: * Attempt to use libpaper-utils to determine papersize. (closes: #173090) +## DP: * Supply default paper size if one doesn't exist (libpaper.patch). +## DP: +## DP: +## DP: +## DP: + +@DPATCH@ +diff -urNad trunk~/xmlto.in trunk/xmlto.in +--- trunk~/xmlto.in 2008-01-17 10:39:02.000000000 +0100 ++++ trunk/xmlto.in 2008-07-19 12:10:58.000000000 +0200 +@@ -94,8 +94,41 @@ + XSLTOPTS= + SEARCHPATH= + +-# Magic paper size, based on LC_PAPER +-if [ -x /usr/bin/locale ] ++# Try to setup papersize using libpaper first ... ++if [ -x /usr/bin/paperconf ] ++then ++ papername=`paperconf -n` ++ paperheight=`paperconf -mh | sed 's/ //g'` ++ paperwidth=`paperconf -mw | sed 's/ //g'` ++ ++ if [ -n "$paperheight" -a -n "$paperwidth" ] ++ then ++ papersizemod=$(${MKTEMP} ${TMPDIR:-/tmp}/@PACKAGE@-xsl.XXXXXX) ++ CLEANFILES[$CLEANFILE_COUNT]="$papersizemod" ++ CLEANFILE_COUNT=$(($CLEANFILE_COUNT + 1)) ++ cat << EOF > "$papersizemod" ++ ++ ++$paperheight ++$paperwidth ++ ++ ++ Making ++ ++ pages on $papername paper ( ++ ++ x ++ ++ ) ++ ++ ++ ++EOF ++ fi ++ ++# ... or use magic paper size, based on LC_PAPER ++elif [ -x /usr/bin/locale ] + then + # For paper sizes we know about, specify them. + h=$(locale LC_PAPER 2>/dev/null | head -n 1) +@@ -116,8 +149,6 @@ + + + EOF +- XSL_MODS[$XSL_MOD_COUNT]="$papersizemod" +- XSL_MOD_COUNT=$(($XSL_MOD_COUNT + 1)) + fi + fi + +@@ -293,6 +324,17 @@ + + [ ! -e "$INPUT_FILE" ] && exit 1 + ++# Since we know DEST_FORMAT, we know whether or not to use $papersizemod. ++case "$DEST_FORMAT" in ++ fo | pdf | ps | dvi) ++ if [ -n "$papersizemod" ] ++ then ++ XSL_MODS[$XSL_MOD_COUNT]="$papersizemod" ++ XSL_MOD_COUNT=$(($XSL_MOD_COUNT + 1)) ++ fi ++ ;; ++esac ++ + # Decide what source format this is. Default to DocBook. + #rootel=$(head -n 4 "$INPUT_FILE" | tr -d '\n' | \ + # sed -e 's/^]*?>//g' -e 's/^]*>//g' -e 's/^<\([^ ]*\).*$/\1/') --- xmlto-0.0.20.orig/debian/patches/483503_postvalid_needs_noent.dpatch +++ xmlto-0.0.20/debian/patches/483503_postvalid_needs_noent.dpatch @@ -0,0 +1,29 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 483503_postvalid_needs_noent.dpatch by Daniel Leidert (dale) +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: * xmlto.in: The xmllint call uses --pistvalid switch, which may not try to +## DP: fetch external parsed entities and therefor can lead to errors: +## DP: +## DP: IDREF attribute linkend references an unknown ID +## DP: +## DP: Adding the --noent switch solves the issue. +## DP: +## DP: +## DP: + +@DPATCH@ +diff -urNad trunk~/xmlto.in trunk/xmlto.in +--- trunk~/xmlto.in 2009-01-25 20:25:00.000000000 +0100 ++++ trunk/xmlto.in 2009-01-25 20:25:44.000000000 +0100 +@@ -413,8 +413,8 @@ + then + VALIDATION="${XSLT_PROCESSED_DIR}/validation-errors" + [ "$VERBOSE" -ge 1 ] && \ +- echo >&2 "xmllint >/dev/null --xinclude --postvalid \"$INPUT_FILE\"" +- xmllint >/dev/null --xinclude --postvalid "$INPUT_FILE" 2>"${VALIDATION}" ++ echo >&2 "xmllint >/dev/null --xinclude --postvalid --noent \"$INPUT_FILE\"" ++ xmllint >/dev/null --xinclude --postvalid --noent "$INPUT_FILE" 2>"${VALIDATION}" + xmllint_status=$? + if [ $xmllint_status -ne 0 ] + then