[xml/sgml-commit] r1365 - in /packages/xmlto/trunk/debian: changelog patches/xmlto_libpaper_173090.dpatch

[dleidert-guest at users.alioth.debian.org]

Author: dleidert-guest
Date: Mon Mar  9 13:10:28 2009
New Revision: 1365

URL: http://svn.debian.org/wsvn/debian-xml-sgml/?sc=1&rev=1365
Log:
* debian/patches/xmlto_libpaper_173090.dpatch: Adjusted.
  - xmlto.in: Another regression fix: Remove papersizemod-XSL in
    paperconf-scenario (closes: #518907). Thanks to Jonathan Nieder
    for the report.

Modified:
    packages/xmlto/trunk/debian/changelog
    packages/xmlto/trunk/debian/patches/xmlto_libpaper_173090.dpatch

Modified: packages/xmlto/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xmlto/trunk/debian/changelog?rev=1365&op=diff
==============================================================================
--- packages/xmlto/trunk/debian/changelog (original)
+++ packages/xmlto/trunk/debian/changelog Mon Mar  9 13:10:28 2009
@@ -6,6 +6,10 @@
     (Suggests): Removed obsolete passivetex.
     (Description): Applied update to mention all supported toolchains
     and their limitations.
+  * debian/patches/xmlto_libpaper_173090.dpatch: Adjusted.
+    - xmlto.in: Another regression fix: Remove papersizemod-XSL in
+      paperconf-scenario (closes: #518907). Thanks to Jonathan Nieder
+      for the report.
 
  -- Daniel Leidert (dale) <daniel.leidert at wgdd.de>  Sun, 15 Feb 2009 23:55:07 +0100
 

Modified: packages/xmlto/trunk/debian/patches/xmlto_libpaper_173090.dpatch
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xmlto/trunk/debian/patches/xmlto_libpaper_173090.dpatch?rev=1365&op=diff
==============================================================================
--- packages/xmlto/trunk/debian/patches/xmlto_libpaper_173090.dpatch (original)
+++ packages/xmlto/trunk/debian/patches/xmlto_libpaper_173090.dpatch Mon Mar  9 13:10:28 2009
@@ -7,7 +7,7 @@
 ## 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: * xmlto.in: The original patch contained a small mistake (#491390, #518907).
 ## 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.
@@ -15,12 +15,22 @@
 ## DP: <URL:http://bugs.debian.org/173090>
 ## DP: <URL:http://bugs.debian.org/180070>
 ## DP: <URL:http://bugs.debian.org/491390>
+## DP: <URL:http://bugs.debian.org/518907>
 
 @DPATCH@
-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 @@
+diff -urNad trunk~/xmlto.in trunk/xmlto.in
+--- trunk~/xmlto.in	2008-05-30 15:41:31.000000000 +0200
++++ trunk/xmlto.in	2009-03-09 13:38:39.000000000 +0100
+@@ -106,6 +106,8 @@
+   if [ -n "$paperheight" -a -n "$paperwidth" ]
+   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"
+@@ -140,6 +142,8 @@
    if [ -n "$papertype" ]
    then
      papersizemod=$(${MKTEMP} ${TMPDIR:-/tmp}/@PACKAGE at -xsl.XXXXXX)
@@ -29,7 +39,7 @@
      cat << EOF > "$papersizemod"
  <?xml version='1.0'?>
  <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-@@ -337,8 +339,6 @@
+@@ -337,8 +341,6 @@
    fo | pdf | ps | dvi)
      if [ -n "$papersizemod" ]
      then