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

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

Author: dleidert-guest
Date: Sat Jul 19 10:13:46 2008
New Revision: 1123

URL: http://svn.debian.org/wsvn/debian-xml-sgml/?sc=1&rev=1123
Log:
* debian/patches/xmlto_libpaper_173090.dpatch: Adjusted.
  - Delete papersizemod XSL file if created and not just for some
    formats (closes: #491390).

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=1123&op=diff
==============================================================================
--- packages/xmlto/trunk/debian/changelog (original)
+++ packages/xmlto/trunk/debian/changelog Sat Jul 19 10:13:46 2008
@@ -2,6 +2,9 @@
 
   * NOT RELEASED YET
   * 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) <daniel.leidert at wgdd.de>  Tue, 04 Mar 2008 01:29:12 +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=1123&op=diff
==============================================================================
--- packages/xmlto/trunk/debian/patches/xmlto_libpaper_173090.dpatch (original)
+++ packages/xmlto/trunk/debian/patches/xmlto_libpaper_173090.dpatch Sat Jul 19 10:13:46 2008
@@ -7,12 +7,13 @@
 ## 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-01-19 04:15:35.000000000 +0100
-@@ -94,8 +94,39 @@
++++ trunk/xmlto.in	2008-07-19 12:10:58.000000000 +0200
+@@ -94,8 +94,41 @@
  XSLTOPTS=
  SEARCHPATH=
  
@@ -28,6 +29,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"
@@ -54,16 +57,7 @@
  then
    # For paper sizes we know about, specify them.
    h=$(locale LC_PAPER 2>/dev/null | head -n 1)
-@@ -107,8 +138,6 @@
-   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"
-@@ -116,8 +145,6 @@
+@@ -116,8 +149,6 @@
  <xsl:param name="paper.type" select="'$papertype'"/>
  </xsl:stylesheet>
  EOF
@@ -72,7 +66,7 @@
    fi
  fi
  
-@@ -293,6 +320,19 @@
+@@ -293,6 +324,17 @@
  
  [ ! -e "$INPUT_FILE" ] && exit 1
  
@@ -81,8 +75,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