[xml/sgml-commit] r971 - in /packages/xmlto/trunk/debian: ./ patches/
dleidert-guest at users.alioth.debian.org
dleidert-guest at users.alioth.debian.org
Mon Jan 14 01:29:54 UTC 2008
Author: dleidert-guest
Date: Mon Jan 14 01:29:54 2008
New Revision: 971
URL: http://svn.debian.org/wsvn/debian-xml-sgml/?sc=1&rev=971
Log:
* 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.
* 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.
Added:
packages/xmlto/trunk/debian/patches/
packages/xmlto/trunk/debian/patches/00list
packages/xmlto/trunk/debian/patches/01_format_cp_bug_293453.dpatch (with props)
packages/xmlto/trunk/debian/patches/02_format_fo_passivetex_check.dpatch (with props)
packages/xmlto/trunk/debian/patches/03_xmlto_libpaper_173090.dpatch (with props)
packages/xmlto/trunk/debian/patches/04_xmlto_filename_spaces_fix_353829.dpatch (with props)
packages/xmlto/trunk/debian/patches/05_xmlto_read_stylesheet_from_stdin_299461.dpatch (with props)
packages/xmlto/trunk/debian/patches/06_xmlto_avoid_broken_manpages_327551.dpatch (with props)
packages/xmlto/trunk/debian/xmlto.links
Modified:
packages/xmlto/trunk/debian/changelog
packages/xmlto/trunk/debian/compat
packages/xmlto/trunk/debian/control
packages/xmlto/trunk/debian/copyright
packages/xmlto/trunk/debian/rules
packages/xmlto/trunk/debian/watch
Modified: packages/xmlto/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xmlto/trunk/debian/changelog?rev=971&op=diff
==============================================================================
--- packages/xmlto/trunk/debian/changelog (original)
+++ packages/xmlto/trunk/debian/changelog Mon Jan 14 01:29:54 2008
@@ -2,6 +2,43 @@
* NOT RELEASED YET
* 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).
+
+ [ Daniel Leidert ]
+ * 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.
+ * 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) <daniel.leidert at wgdd.de> Sun, 13 Jan 2008 21:14:59 +0100
@@ -239,4 +276,4 @@
-- christophe barbe <christophe at debian.org> Wed, 5 Jun 2002 15:59:21 -0400
- vim:ts=2:sw=2:et:tw=70:
+# vim:ts=2:sw=2:et:tw=70:
Modified: packages/xmlto/trunk/debian/compat
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xmlto/trunk/debian/compat?rev=971&op=diff
==============================================================================
--- packages/xmlto/trunk/debian/compat (original)
+++ packages/xmlto/trunk/debian/compat Mon Jan 14 01:29:54 2008
@@ -1,1 +1,1 @@
-4
+5
Modified: packages/xmlto/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xmlto/trunk/debian/control?rev=971&op=diff
==============================================================================
--- packages/xmlto/trunk/debian/control (original)
+++ packages/xmlto/trunk/debian/control Mon Jan 14 01:29:54 2008
@@ -2,9 +2,13 @@
Section: text
Priority: optional
Maintainer: Debian XML/SGML Group <debian-xml-sgml-pkgs at lists.alioth.debian.org>
-Uploaders: Graham Wilson <graham at debian.org>
-Build-Depends: debhelper (>> 4.0.0), docbook-xsl (>= 1.64.1.0), docbook-xml (>= 4.2-8), xsltproc (>= 1.0.29), libxml2-utils, libpaper-utils, sgml-base
-Standards-Version: 3.6.1
+Uploaders: Graham Wilson <graham at debian.org>, Daniel Leidert (dale) <daniel.leidert at wgdd.de>
+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/
+XS-DM-Upload-Allowed: yes
Package: xmlto
Architecture: any
@@ -22,5 +26,3 @@
.
For DVI, PDF, and PostScript output, Sebastian Rahtz's PassiveTeX is
required.
- .
- See the homepage for more information: http://cyberelk.net/tim/xmlto/
Modified: packages/xmlto/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xmlto/trunk/debian/copyright?rev=971&op=diff
==============================================================================
--- packages/xmlto/trunk/debian/copyright (original)
+++ packages/xmlto/trunk/debian/copyright Mon Jan 14 01:29:54 2008
@@ -4,17 +4,30 @@
It was downloaded from: http://cyberelk.net/tim/data/xmlto/stable/
-Upstream Author: Tim Waugh <twaugh at redhat.com>
+Upstream Author:
+
+ Tim Waugh <twaugh at redhat.com>
+ Ondrej Vasik <ovasik at redhat.com> (since 0.0.19)
Copyright:
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
+ Copyright (C) 2001, 2002, 2003 Tim Waugh <twaugh at redhat.com>
-Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-Everyone is permitted to copy and distribute verbatim copies
-of this license document, but changing it is not allowed.
+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 /usr/share/common-licenses/GPL-2 file.
+version 2 can be found in the `/usr/share/common-licenses/GPL-2' file.
Added: packages/xmlto/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xmlto/trunk/debian/patches/00list?rev=971&op=file
==============================================================================
--- packages/xmlto/trunk/debian/patches/00list (added)
+++ packages/xmlto/trunk/debian/patches/00list Mon Jan 14 01:29:54 2008
@@ -1,0 +1,6 @@
+01_format_cp_bug_293453
+02_format_fo_passivetex_check
+03_xmlto_libpaper_173090
+04_xmlto_filename_spaces_fix_353829
+05_xmlto_read_stylesheet_from_stdin_299461
+06_xmlto_avoid_broken_manpages_327551
Added: packages/xmlto/trunk/debian/patches/01_format_cp_bug_293453.dpatch
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xmlto/trunk/debian/patches/01_format_cp_bug_293453.dpatch?rev=971&op=file
==============================================================================
--- packages/xmlto/trunk/debian/patches/01_format_cp_bug_293453.dpatch (added)
+++ packages/xmlto/trunk/debian/patches/01_format_cp_bug_293453.dpatch Mon Jan 14 01:29:54 2008
@@ -1,0 +1,34 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_format_cp_bug_293453.dpatch by Daniel Leidert <daniel.leidert at wgdd.de>,
+## Alejandro Exojo <suy at badopi.org>, Yann Dirson <dirson at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Output mac be out into sub-directories so plain cp will fail. We need
+## DP: recursive copying here.
+## DP:
+## DP: <URL:http://bugs.debian.org/293453>
+## DP: <URL:http://bugs.debian.org/413632>
+
+ at DPATCH@
+diff -urNad trunk~/format/docbook/html trunk/format/docbook/html
+--- trunk~/format/docbook/html 2003-08-08 12:53:55.000000000 +0200
++++ trunk/format/docbook/html 2008-01-14 00:16:16.000000000 +0100
+@@ -7,6 +7,6 @@
+ echo "http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl"
+ ;;
+ post-process)
+- cp -- * "$OUTPUT_DIR"
++ cp -r -- * "$OUTPUT_DIR"
+ ;;
+ esac
+diff -urNad trunk~/format/docbook/man trunk/format/docbook/man
+--- trunk~/format/docbook/man 2003-05-23 19:19:49.000000000 +0200
++++ trunk/format/docbook/man 2008-01-14 00:16:44.000000000 +0100
+@@ -8,6 +8,6 @@
+ ;;
+ post-process)
+ [ -e "$XSLT_PROCESSED" ] && rm "$XSLT_PROCESSED"
+- cp -- * "$OUTPUT_DIR" 2>/dev/null
++ cp -r -- * "$OUTPUT_DIR" 2>/dev/null
+ ;;
+ esac
Propchange: packages/xmlto/trunk/debian/patches/01_format_cp_bug_293453.dpatch
------------------------------------------------------------------------------
svn:executable = *
Added: packages/xmlto/trunk/debian/patches/02_format_fo_passivetex_check.dpatch
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xmlto/trunk/debian/patches/02_format_fo_passivetex_check.dpatch?rev=971&op=file
==============================================================================
--- packages/xmlto/trunk/debian/patches/02_format_fo_passivetex_check.dpatch (added)
+++ packages/xmlto/trunk/debian/patches/02_format_fo_passivetex_check.dpatch Mon Jan 14 01:29:54 2008
@@ -1,0 +1,51 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_format_fo_passivetex_check.dpatch by Graham Wilson <graham at debian.org>
+##
+## 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: <URL:http://bugs.debian.org/190840>
+
+ at DPATCH@
+diff -urNad trunk~/format/fo/dvi trunk/format/fo/dvi
+--- trunk~/format/fo/dvi 2007-11-19 16:18:43.000000000 +0100
++++ trunk/format/fo/dvi 2008-01-14 00:18:00.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 2007-11-19 16:18:43.000000000 +0100
++++ trunk/format/fo/pdf 2008-01-14 00:18:29.000000000 +0100
+@@ -6,6 +6,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 2007-11-19 16:18:43.000000000 +0100
++++ trunk/format/fo/ps 2008-01-14 00:18:15.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
Propchange: packages/xmlto/trunk/debian/patches/02_format_fo_passivetex_check.dpatch
------------------------------------------------------------------------------
svn:executable = *
Added: packages/xmlto/trunk/debian/patches/03_xmlto_libpaper_173090.dpatch
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xmlto/trunk/debian/patches/03_xmlto_libpaper_173090.dpatch?rev=971&op=file
==============================================================================
--- packages/xmlto/trunk/debian/patches/03_xmlto_libpaper_173090.dpatch (added)
+++ packages/xmlto/trunk/debian/patches/03_xmlto_libpaper_173090.dpatch Mon Jan 14 01:29:54 2008
@@ -1,0 +1,89 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03_xmlto_libpaper_173090.dpatch by Graham Wilson <graham at debian.org>
+##
+## 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: <URL:http://bugs.debian.org/173090>
+## DP: <URL:http://bugs.debian.org/180070>
+
+ at DPATCH@
+diff -urNad trunk~/xmlto.in trunk/xmlto.in
+--- trunk~/xmlto.in 2007-11-23 15:04:15.000000000 +0100
++++ trunk/xmlto.in 2008-01-14 00:21:35.000000000 +0100
+@@ -97,32 +97,36 @@
+ XSLTOPTS=
+ SEARCHPATH=
+
+-# Magic paper size, based on LC_PAPER
+-if [ -x /usr/bin/locale ]
++# Setup papersize using libpaper
++if [ ! -f /etc/papersize ]
+ then
+- # For paper sizes we know about, specify them.
+- h=$(locale LC_PAPER 2>/dev/null | head -n 1)
+- if [ "$h" = "297" ]
+- then
+- papertype=A4
+- fi
++ export PAPERSIZE=letter
++fi
++papername=`paperconf -n`
++paperheight=`paperconf -mh`
++paperwidth=`paperconf -mw`
+
+- if [ -n "$papertype" ]
+- then
+- papersizemod=$(${MKTEMP} ${TMPDIR:-/tmp}/@PACKAGE at -xsl.XXXXXX)
+- CLEANFILES[$CLEANFILE_COUNT]="$papersizemod"
+- CLEANFILE_COUNT=$(($CLEANFILE_COUNT + 1))
+- cat << EOF > "$papersizemod"
++PAPERSIZEMOD=$(${MKTEMP} ${TMPDIR:-/tmp}/@PACKAGE at -xsl.XXXXXX)
++CLEANFILES[$CLEANFILE_COUNT]="$PAPERSIZEMOD"
++CLEANFILE_COUNT=$(($CLEANFILE_COUNT + 1))
++cat << EOF > "$PAPERSIZEMOD"
+ <?xml version='1.0'?>
+ <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'>
+-<xsl:param name="paper.type" select="'$papertype'"/>
++
++<xsl:template name="root.messages">
++ <xsl:message>
++ <xsl:text>Making </xsl:text>
++ <xsl:value-of select="\$page.orientation"/>
++ <xsl:text> pages on $papername paper (${paperwidth} x ${paperheight})</xsl:text>
++ </xsl:message>
++</xsl:template>
++
++<xsl:param name="page.height">$paperheight</xsl:param>
++<xsl:param name="page.width">$paperwidth</xsl:param>
++
+ </xsl:stylesheet>
+ EOF
+- XSL_MODS[$XSL_MOD_COUNT]="$papersizemod"
+- XSL_MOD_COUNT=$(($XSL_MOD_COUNT + 1))
+- fi
+-fi
+
+ # Magic encoding, based on locale
+ if [ -x /usr/bin/locale ]
+@@ -264,8 +268,17 @@
+ exit 1
+ fi
+
++# Since we know DEST_FORMAT, we know whether or not to use
++# PAPERSIZEMOD
++case "$DEST_FORMAT" in
++ pdf | ps | dvi)
++ XSL_MODS[$XSL_MOD_COUNT]="$PAPERSIZEMOD"
++ XSL_MOD_COUNT=$(($XSL_MOD_COUNT + 1))
++ ;;
++esac
++
+ # Decide what source format this is. Default to DocBook.
+-rootel=$(head -n 2 "$INPUT_FILE" | \
++rootel=$(head -n 4 "$INPUT_FILE" | tr -d '\n' | \
+ sed -e 's/^<?[^?>]*?>//g' -e 's/^<![^>]*>//g' -e 's/^<\([^ ]*\).*$/\1/')
+ case $(echo $rootel) in
+ fo:root)
Propchange: packages/xmlto/trunk/debian/patches/03_xmlto_libpaper_173090.dpatch
------------------------------------------------------------------------------
svn:executable = *
Added: packages/xmlto/trunk/debian/patches/04_xmlto_filename_spaces_fix_353829.dpatch
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xmlto/trunk/debian/patches/04_xmlto_filename_spaces_fix_353829.dpatch?rev=971&op=file
==============================================================================
--- packages/xmlto/trunk/debian/patches/04_xmlto_filename_spaces_fix_353829.dpatch (added)
+++ packages/xmlto/trunk/debian/patches/04_xmlto_filename_spaces_fix_353829.dpatch Mon Jan 14 01:29:54 2008
@@ -1,0 +1,43 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 04_xmlto_filename_spaces_fix_353829.dpatch by MeDon <xmedeko at gmail.com>.
+## Daniel Leidert <daniel.leidert at wgdd.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Using a file with spaces in its name may fail.
+## DP:
+## DP: <URL:http://bugs.debian.org/353829>
+
+ at DPATCH@
+diff -urNad trunk~/format/docbook/txt trunk/format/docbook/txt
+--- trunk~/format/docbook/txt 2007-11-19 16:18:43.000000000 +0100
++++ trunk/format/docbook/txt 2008-01-14 01:54:27.000000000 +0100
+@@ -28,7 +28,7 @@
+ then
+ echo >&2 "Convert HTML to ASCII"
+ fi
+- ${CONVERT} ${ARGS} ${POSTARGS} ${XSLT_PROCESSED} > \
++ ${CONVERT} ${ARGS} ${POSTARGS} "${XSLT_PROCESSED}" > \
+ "$OUTPUT_DIR/$(basename "${XSLT_PROCESSED%.*}").txt"
+ ;;
+ esac
+diff -urNad trunk~/xmlto.in trunk/xmlto.in
+--- trunk~/xmlto.in 2008-01-14 01:54:08.000000000 +0100
++++ trunk/xmlto.in 2008-01-14 01:54:09.000000000 +0100
+@@ -351,7 +351,7 @@
+ then
+ VALIDATION="${XSLT_PROCESSED_DIR}/validation-errors"
+ [ "$VERBOSE" -ge 1 ] && \
+- echo >&2 "xmllint >/dev/null --xinclude --postvalid $INPUT_FILE"
++ echo >&2 "xmllint >/dev/null --xinclude --postvalid \"$INPUT_FILE\""
+ xmllint >/dev/null --xinclude --postvalid "$INPUT_FILE" 2>"${VALIDATION}"
+ xmllint_status=$?
+ if [ $xmllint_status -ne 0 ]
+@@ -385,7 +385,7 @@
+
+ XSLTOPTS="$XSLTPARAMS $XSLTOPTS"
+ [ "$VERBOSE" -ge 1 ] && \
+- echo -e >&2 "xsltproc${XSLTOPTS} ${XSLTSHOWPATH}\\\\\n -o "$XSLT_PROCESSED" \\\\\n $STYLESHEET \\\\\n $INPUT_FILE"
++ echo -e >&2 "xsltproc${XSLTOPTS} ${XSLTSHOWPATH}\\\\\n -o \"$XSLT_PROCESSED\" \\\\\n $STYLESHEET \\\\\n \"$INPUT_FILE\""
+
+ if [ -z "$XSLTWITHPATH" ]
+ then
Propchange: packages/xmlto/trunk/debian/patches/04_xmlto_filename_spaces_fix_353829.dpatch
------------------------------------------------------------------------------
svn:executable = *
Added: packages/xmlto/trunk/debian/patches/05_xmlto_read_stylesheet_from_stdin_299461.dpatch
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xmlto/trunk/debian/patches/05_xmlto_read_stylesheet_from_stdin_299461.dpatch?rev=971&op=file
==============================================================================
--- packages/xmlto/trunk/debian/patches/05_xmlto_read_stylesheet_from_stdin_299461.dpatch (added)
+++ packages/xmlto/trunk/debian/patches/05_xmlto_read_stylesheet_from_stdin_299461.dpatch Mon Jan 14 01:29:54 2008
@@ -1,0 +1,25 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 05_xmlto_read_stylesheet_from_stdin_299461.dpatch by Daniel Leidert <daniel.leidert at wgdd.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Added possibility to pipe stylesheets to xmlto via STDIN.
+## DP:
+## DP: <URL:http://bugs.debian.org/299461>
+## DP: <URL:http://bugs.debian.org/413632>
+
+ at DPATCH@
+diff -urNad trunk~/xmlto.in trunk/xmlto.in
+--- trunk~/xmlto.in 2008-01-14 00:40:03.000000000 +0100
++++ trunk/xmlto.in 2008-01-14 00:41:23.000000000 +0100
+@@ -183,6 +183,11 @@
+ ;;
+ -x)
+ case "$2" in
++ -) TMP_STYLESHEET="$(${MKTEMP} ${TMPDIR:-/tmp}/@PACKAGE at -stdin-xsl.XXXXXX)" || exit 1
++ CLEANFILES[$CLEANFILE_COUNT]="$TMP_STYLESHEET"
++ CLEANFILE_COUNT=$(($CLEANFILE_COUNT + 1))
++ cat /dev/stdin > ${TMP_STYLESHEET}
++ STYLESHEET=${TMP_STYLESHEET} ;;
+ /*) STYLESHEET="$2" ;;
+ *) STYLESHEET="$PWD/$2" ;;
+ esac
Propchange: packages/xmlto/trunk/debian/patches/05_xmlto_read_stylesheet_from_stdin_299461.dpatch
------------------------------------------------------------------------------
svn:executable = *
Added: packages/xmlto/trunk/debian/patches/06_xmlto_avoid_broken_manpages_327551.dpatch
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xmlto/trunk/debian/patches/06_xmlto_avoid_broken_manpages_327551.dpatch?rev=971&op=file
==============================================================================
--- packages/xmlto/trunk/debian/patches/06_xmlto_avoid_broken_manpages_327551.dpatch (added)
+++ packages/xmlto/trunk/debian/patches/06_xmlto_avoid_broken_manpages_327551.dpatch Mon Jan 14 01:29:54 2008
@@ -1,0 +1,25 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 06_xmlto_avoid_broken_manpages_327551.dpatch by Daniel Leidert (dale) <daniel.leidert at wgdd.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Because the locale is read from the environment and not from the XML
+## DP: source, we should disable the usage of a subset of the roff character
+## DP: map and make sure, all special characters are replaced. This slows
+## DP: down the processing a bit, but we are on the safe side for manpage
+## DP: creation.
+## DP:
+## DP: <URL:http://bugs.debian.org/327551>
+## DP: <FILE:/usr/share/doc/docbook-xsl/doc/manpages/man.charmap.use.subset.html>
+
+ at DPATCH@
+diff -urNad trunk~/xmlto.in trunk/xmlto.in
+--- trunk~/xmlto.in 2008-01-14 00:59:31.000000000 +0100
++++ trunk/xmlto.in 2008-01-14 01:03:20.000000000 +0100
+@@ -143,6 +143,7 @@
+ <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'>
+ <xsl:param name="chunker.output.encoding" select="'$charmap'"/>
++<xsl:param name="man.charmap.use.subset" select="'0'"/>
+ </xsl:stylesheet>
+ EOF
+ XSL_MODS[$XSL_MOD_COUNT]="$encodingmod"
Propchange: packages/xmlto/trunk/debian/patches/06_xmlto_avoid_broken_manpages_327551.dpatch
------------------------------------------------------------------------------
svn:executable = *
Modified: packages/xmlto/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xmlto/trunk/debian/rules?rev=971&op=diff
==============================================================================
--- packages/xmlto/trunk/debian/rules (original)
+++ packages/xmlto/trunk/debian/rules Mon Jan 14 01:29:54 2008
@@ -3,30 +3,33 @@
# Sample debian/rules that uses debhelper.
# GNU copyright 1997 to 1999 by Joey Hess.
-CFLAGS += -g
+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: build-stamp
+build: patch-stamp build-stamp
build-stamp: config.status
dh_testdir
$(MAKE)
touch build-stamp
-clean:
+clean: unpatch
dh_testdir
dh_testroot
- -rm -f build-stamp
+ -rm -f build-stamp patch-stamp
-rm -rf .deps man
- -$(MAKE) distclean
+ [ ! -f Makefile ] || $(MAKE) distclean
dh_clean
install: build
@@ -34,7 +37,7 @@
dh_testroot
dh_clean -k
dh_installdirs
- $(MAKE) install DESTDIR=$(CURDIR)/debian/xmlto
+ $(MAKE) install DESTDIR=$(CURDIR)/debian/$(PACKAGE)
# Build architecture-independent files here.
binary-indep: build install
@@ -58,6 +61,27 @@
dh_builddeb
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install test
+.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:
+ set -ex ; \
+ TMPDIR=`mktemp -d $(PACKAGE)-$(version).orig` ; \
+ wget -P "$$TMPDIR" \
+ http://cyberelk.net/tim/data/xmlto/stable/$(PACKAGE)-$(version).tar.bz2 \
+ http://cyberelk.net/tim/data/xmlto/stable/$(PACKAGE)-$(version).tar.bz2.sig ; \
+ gpg --verify "$$TMPDIR"/$(PACKAGE)-$(version).tar.bz2.sig \
+ "$$TMPDIR"/$(PACKAGE)-$(version).tar.bz2 ; \
+ tar --directory="$$TMPDIR" -xjf "$$TMPDIR"/$(PACKAGE)-$(version).tar.bz2 ; \
+ mv "$$TMPDIR"/$(PACKAGE)-$(version) "$$TMPDIR"/$(PACKAGE)-$(version).orig ; \
+ GZIP=-9 tar --directory="$$TMPDIR" -czf \
+ $(CURDIR)/$(PACKAGE)_$(version).orig.tar.gz \
+ $(PACKAGE)-$(version).orig ; \
+ rm -rf "$$TMPDIR"
# vim:ts=4:sw=4:
Modified: packages/xmlto/trunk/debian/watch
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xmlto/trunk/debian/watch?rev=971&op=diff
==============================================================================
--- packages/xmlto/trunk/debian/watch (original)
+++ packages/xmlto/trunk/debian/watch Mon Jan 14 01:29:54 2008
@@ -1,2 +1,4 @@
-version=2
-http://cyberelk.net/tim/data/xmlto/stable/xmlto-([-0-9\.]*)\.tar\.(bz2|gz)
+# see uscan(1) for format
+
+version=3
+http://cyberelk.net/tim/data/xmlto/stable/xmlto-([\d\.]+)\.tar\.[bg]z2?
Added: packages/xmlto/trunk/debian/xmlto.links
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xmlto/trunk/debian/xmlto.links?rev=971&op=file
==============================================================================
--- packages/xmlto/trunk/debian/xmlto.links (added)
+++ packages/xmlto/trunk/debian/xmlto.links Mon Jan 14 01:29:54 2008
@@ -1,0 +1,1 @@
+usr/share/xmlto/format/docbook/txt usr/share/xmlto/format/docbook/text
More information about the debian-xml-sgml-commit
mailing list