[xml/sgml-commit] r1284 - in /packages/xmlto/branches/experimental/debian: README.source changelog control copyright patches/00list patches/499200_cannot_parse_XSLTPARAMS.dpatch patches/xmlto_libpaper_173090.dpatch rules watch
dleidert-guest at users.alioth.debian.org
dleidert-guest at users.alioth.debian.org
Sun Nov 30 23:13:50 UTC 2008
Author: dleidert-guest
Date: Sun Nov 30 23:13:49 2008
New Revision: 1284
URL: http://svn.debian.org/wsvn/debian-xml-sgml/?sc=1&rev=1284
Log:
* debian/control (Homepage): Fixed.
(Standards-Version): Bumped to 3.8.0.
* debian/copyright: Updated to reflect author change.
* debian/rules: Small cleanup.
* debian/watch: Fixed download location.
* debian/README.source: Added accordingly to standard 3.8.0.
* debian/patches/xmlto_libpaper_173090.dpatch: Adjusted.
- The Debian patch has been applied upstream, but included the bug
#491390. So this patch simply fixes #491390.
* debian/control (Suggests, Description): Merged xmlto (0.0.20-3).
* debian/patches/499200_cannot_parse_XSLTPARAMS.dpatch: Ditto.
* debian/patches/00list: Ditto.
Added:
packages/xmlto/branches/experimental/debian/README.source
packages/xmlto/branches/experimental/debian/patches/499200_cannot_parse_XSLTPARAMS.dpatch
- copied unchanged from r1252, packages/xmlto/trunk/debian/patches/499200_cannot_parse_XSLTPARAMS.dpatch
Modified:
packages/xmlto/branches/experimental/debian/changelog
packages/xmlto/branches/experimental/debian/control
packages/xmlto/branches/experimental/debian/copyright
packages/xmlto/branches/experimental/debian/patches/00list
packages/xmlto/branches/experimental/debian/patches/xmlto_libpaper_173090.dpatch
packages/xmlto/branches/experimental/debian/rules
packages/xmlto/branches/experimental/debian/watch
Added: packages/xmlto/branches/experimental/debian/README.source
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xmlto/branches/experimental/debian/README.source?rev=1284&op=file
==============================================================================
--- packages/xmlto/branches/experimental/debian/README.source (added)
+++ packages/xmlto/branches/experimental/debian/README.source Sun Nov 30 23:13:49 2008
@@ -1,0 +1,7 @@
+xmlto source for Debian
+-----------------------
+
+The packages uses the dpatch patch system. For more information see
+/usr/share/doc/dpatch/README.source.gz.
+
+ -- Daniel Leidert (dale) <daniel.leidert at wgdd.de>, 2008
Modified: packages/xmlto/branches/experimental/debian/changelog
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xmlto/branches/experimental/debian/changelog?rev=1284&op=diff
==============================================================================
--- packages/xmlto/branches/experimental/debian/changelog (original)
+++ packages/xmlto/branches/experimental/debian/changelog Sun Nov 30 23:13:49 2008
@@ -3,7 +3,30 @@
* NOT RELEASED YET
* New upstream release 0.0.21.
+ * debian/control (Homepage): Fixed.
+ (Standards-Version): Bumped to 3.8.0.
+ * debian/copyright: Updated to reflect author change.
+ * debian/rules: Small cleanup.
+ * debian/watch: Fixed download location.
+ * debian/README.source: Added accordingly to standard 3.8.0.
+ * debian/patches/xmlto_libpaper_173090.dpatch: Adjusted.
+ - The Debian patch has been applied upstream, but included the bug
+ #491390. So this patch simply fixes #491390.
+
-- Daniel Leidert (dale) <daniel.leidert at wgdd.de> Mon, 21 Jul 2008 22:09:04 +0200
+
+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) <daniel.leidert at wgdd.de> Thu, 09 Oct 2008 11:03:38 +0200
xmlto (0.0.20-2) unstable; urgency=low
Modified: packages/xmlto/branches/experimental/debian/control
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xmlto/branches/experimental/debian/control?rev=1284&op=diff
==============================================================================
--- packages/xmlto/branches/experimental/debian/control (original)
+++ packages/xmlto/branches/experimental/debian/control Sun Nov 30 23:13:49 2008
@@ -3,9 +3,11 @@
Priority: optional
Maintainer: Debian XML/SGML Group <debian-xml-sgml-pkgs at lists.alioth.debian.org>
Uploaders: 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/
+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.8.0
+Homepage: https://fedorahosted.org/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
@@ -14,7 +16,7 @@
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), w3m | lynx | links
+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
@@ -26,4 +28,4 @@
supports converting from XSL-FO to DVI, PDF and PostScript.
.
For DVI, PDF, and PostScript output, Sebastian Rahtz's PassiveTeX is
- required.
+ required. Alternatively docbook-xsl and fop produce PDF and PS output.
Modified: packages/xmlto/branches/experimental/debian/copyright
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xmlto/branches/experimental/debian/copyright?rev=1284&op=diff
==============================================================================
--- packages/xmlto/branches/experimental/debian/copyright (original)
+++ packages/xmlto/branches/experimental/debian/copyright Sun Nov 30 23:13:49 2008
@@ -2,7 +2,10 @@
Wed, 5 Jun 2002 15:59:21 -0400. It is now maintained by Graham Wilson
<bob at decoy.wox.org>.
-It was downloaded from: http://cyberelk.net/tim/data/xmlto/stable/
+It was downloaded from:
+
+ https://fedorahosted.org/xmlto/browser (>= 0.0.21)
+ http://cyberelk.net/tim/data/xmlto/stable/ (old, <= 0.0.20)
Upstream Author:
Modified: packages/xmlto/branches/experimental/debian/patches/00list
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xmlto/branches/experimental/debian/patches/00list?rev=1284&op=diff
==============================================================================
--- packages/xmlto/branches/experimental/debian/patches/00list (original)
+++ packages/xmlto/branches/experimental/debian/patches/00list Sun Nov 30 23:13:49 2008
@@ -1,2 +1,3 @@
format_fo_passivetex_check
xmlto_libpaper_173090
+499200_cannot_parse_XSLTPARAMS
Modified: packages/xmlto/branches/experimental/debian/patches/xmlto_libpaper_173090.dpatch
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xmlto/branches/experimental/debian/patches/xmlto_libpaper_173090.dpatch?rev=1284&op=diff
==============================================================================
--- packages/xmlto/branches/experimental/debian/patches/xmlto_libpaper_173090.dpatch (original)
+++ packages/xmlto/branches/experimental/debian/patches/xmlto_libpaper_173090.dpatch Sun Nov 30 23:13:49 2008
@@ -3,84 +3,38 @@
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: * Attempt to use libpaper-utils to determine papersize. (closes: #173090)
+## DP: -> Applied upstream.
## DP: * Supply default paper size if one doesn't exist (libpaper.patch).
+## DP: -> Applied upstream.
+## DP:
+## DP: * xmlto.in: The original patch contained a small mistake (#491390).
+## DP: Unfortunatly this buggy part of the patch has been applied upstream
+## DP: too. So we need to fix it here. As soon as upstream incorporates this
+## DP: fix, this patch can be dropped.
## DP:
## DP: <URL:http://bugs.debian.org/173090>
## DP: <URL:http://bugs.debian.org/180070>
## DP: <URL:http://bugs.debian.org/491390>
@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 at -xsl.XXXXXX)
+diff -urNad experimental~/xmlto.in experimental/xmlto.in
+--- experimental~/xmlto.in 2008-05-30 15:41:31.000000000 +0200
++++ experimental/xmlto.in 2008-09-12 21:58:10.000000000 +0200
+@@ -140,6 +140,8 @@
+ if [ -n "$papertype" ]
+ then
+ 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="page.height">$paperheight</xsl:param>
-+<xsl:param name="page.width">$paperwidth</xsl:param>
-+<xsl:template name="root.messages">
-+ <xsl:message>
-+ <xsl:text>Making </xsl:text>
-+ <xsl:value-of select="\$page.orientation"/>
-+ <xsl:text> pages on $papername paper (</xsl:text>
-+ <xsl:value-of select="\$page.width"/>
-+ <xsl:text>x</xsl:text>
-+ <xsl:value-of select="\$page.height"/>
-+ <xsl:text>)</xsl:text>
-+ </xsl:message>
-+</xsl:template>
-+</xsl:stylesheet>
-+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 @@
- <xsl:param name="paper.type" select="'$papertype'"/>
- </xsl:stylesheet>
- 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/')
+ cat << EOF > "$papersizemod"
+ <?xml version='1.0'?>
+ <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+@@ -337,8 +339,6 @@
+ fo | pdf | ps | dvi)
+ if [ -n "$papersizemod" ]
+ then
+- CLEANFILES[$CLEANFILE_COUNT]="$papersizemod"
+- CLEANFILE_COUNT=$(($CLEANFILE_COUNT + 1))
+ XSL_MODS[$XSL_MOD_COUNT]="$papersizemod"
+ XSL_MOD_COUNT=$(($XSL_MOD_COUNT + 1))
+ fi
Modified: packages/xmlto/branches/experimental/debian/rules
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xmlto/branches/experimental/debian/rules?rev=1284&op=diff
==============================================================================
--- packages/xmlto/branches/experimental/debian/rules (original)
+++ packages/xmlto/branches/experimental/debian/rules Sun Nov 30 23:13:49 2008
@@ -1,5 +1,4 @@
#!/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.
@@ -7,10 +6,7 @@
include /usr/share/dpatch/dpatch.make
-CFLAGS += -Wall -g
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O2
-endif
+CFLAGS += -Wall
config.status: configure
dh_testdir
@@ -27,10 +23,9 @@
clean: unpatch
dh_testdir
dh_testroot
- -rm -f build-stamp patch-stamp
- -rm -rf .deps man
+ rm -rf .deps man
[ ! -f Makefile ] || $(MAKE) distclean
- dh_clean
+ dh_clean build-stamp patch-stamp
install: build
dh_testdir
@@ -39,11 +34,7 @@
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
@@ -61,15 +52,9 @@
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
+.PHONY: build clean binary-indep binary-arch binary install get-orig-source
# vim:ts=4:sw=4:
Modified: packages/xmlto/branches/experimental/debian/watch
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xmlto/branches/experimental/debian/watch?rev=1284&op=diff
==============================================================================
--- packages/xmlto/branches/experimental/debian/watch (original)
+++ packages/xmlto/branches/experimental/debian/watch Sun Nov 30 23:13:49 2008
@@ -1,4 +1,5 @@
# see uscan(1) for format
version=3
-http://cyberelk.net/tim/data/xmlto/stable/xmlto-([\d\.]+)\.tar\.[bg]z2?
+opts=downloadurlmangle=s/.*\/(xmlto-[^\/]+\.tar\.bz2)$/https:\/\/fedorahosted.org\/xmlto\/export\/latest\/$1/ \
+ https://fedorahosted.org/xmlto/browser/xmlto-([\d\.]+)\.tar\.bz2
More information about the debian-xml-sgml-commit
mailing list