[xml/sgml-commit] r987 - in /packages/xmlto/trunk/debian: ./ patches/

dleidert-guest at users.alioth.debian.org dleidert-guest at users.alioth.debian.org
Sat Jan 19 03:29:15 UTC 2008 

Author: dleidert-guest
Date: Sat Jan 19 03:29:09 2008
New Revision: 987

URL: http://svn.debian.org/wsvn/debian-xml-sgml/?sc=1&rev=987
Log:
* debian/control (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.

Added:
    packages/xmlto/trunk/debian/patches/format_fo_passivetex_check.dpatch
      - copied, changed from r985, packages/xmlto/trunk/debian/patches/02_format_fo_passivetex_check.dpatch
    packages/xmlto/trunk/debian/patches/xmlto_libpaper_173090.dpatch
      - copied, changed from r985, packages/xmlto/trunk/debian/patches/03_xmlto_libpaper_173090.dpatch
Removed:
    packages/xmlto/trunk/debian/patches/01_format_cp_bug_293453.dpatch
    packages/xmlto/trunk/debian/patches/02_format_fo_passivetex_check.dpatch
    packages/xmlto/trunk/debian/patches/03_xmlto_libpaper_173090.dpatch
    packages/xmlto/trunk/debian/patches/04_xmlto_filename_spaces_fix_353829.dpatch
    packages/xmlto/trunk/debian/patches/05_xmlto_read_stylesheet_from_stdin_299461.dpatch
    packages/xmlto/trunk/debian/patches/06_xmlto_avoid_broken_manpages_327551.dpatch
Modified:
    packages/xmlto/trunk/debian/changelog
    packages/xmlto/trunk/debian/control
    packages/xmlto/trunk/debian/patches/00list
    packages/xmlto/trunk/debian/rules

Modified: packages/xmlto/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xmlto/trunk/debian/changelog?rev=987&op=diff
==============================================================================
--- packages/xmlto/trunk/debian/changelog (original)
+++ packages/xmlto/trunk/debian/changelog Sat Jan 19 03:29:09 2008
@@ -3,6 +3,26 @@
   * NOT RELEASED YET
   * New upstream release 0.0.20.
     - Added experimental support for the docbook-xsl/fop toolchain.
+
+  * debian/control (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) <daniel.leidert at wgdd.de>  Sat, 19 Jan 2008 02:55:50 +0100
 

Modified: packages/xmlto/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xmlto/trunk/debian/control?rev=987&op=diff
==============================================================================
--- packages/xmlto/trunk/debian/control (original)
+++ packages/xmlto/trunk/debian/control Sat Jan 19 03:29:09 2008
@@ -12,8 +12,9 @@
 
 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), libpaper-utils, libxml2-utils, sgml-base
-Suggests: passivetex (>= 1.23), w3m
+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
 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

Modified: packages/xmlto/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xmlto/trunk/debian/patches/00list?rev=987&op=diff
==============================================================================
--- packages/xmlto/trunk/debian/patches/00list (original)
+++ packages/xmlto/trunk/debian/patches/00list Sat Jan 19 03:29:09 2008
@@ -1,6 +1,2 @@
-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
+format_fo_passivetex_check
+xmlto_libpaper_173090

Copied: packages/xmlto/trunk/debian/patches/format_fo_passivetex_check.dpatch (from r985, 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/format_fo_passivetex_check.dpatch?rev=987&op=diff
==============================================================================
--- packages/xmlto/trunk/debian/patches/02_format_fo_passivetex_check.dpatch (original)
+++ packages/xmlto/trunk/debian/patches/format_fo_passivetex_check.dpatch Sat Jan 19 03:29:09 2008
@@ -1,5 +1,5 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_format_fo_passivetex_check.dpatch by Graham Wilson <graham at debian.org>
+## 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.
@@ -8,8 +8,8 @@
 
 @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
+--- 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"
@@ -22,30 +22,30 @@
    # 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
+--- 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	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
+--- 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

Copied: packages/xmlto/trunk/debian/patches/xmlto_libpaper_173090.dpatch (from r985, packages/xmlto/trunk/debian/patches/03_xmlto_libpaper_173090.dpatch)
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xmlto/trunk/debian/patches/xmlto_libpaper_173090.dpatch?rev=987&op=diff
==============================================================================
--- packages/xmlto/trunk/debian/patches/03_xmlto_libpaper_173090.dpatch (original)
+++ packages/xmlto/trunk/debian/patches/xmlto_libpaper_173090.dpatch Sat Jan 19 03:29:09 2008
@@ -1,5 +1,5 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_xmlto_libpaper_173090.dpatch by Graham Wilson <graham at debian.org>
+## 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)
@@ -10,80 +10,85 @@
 
 @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 @@
+--- 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 @@
  XSLTOPTS=
  SEARCHPATH=
  
 -# Magic paper size, based on LC_PAPER
 -if [ -x /usr/bin/locale ]
-+# Setup papersize using libpaper
-+if [ ! -f /etc/papersize ]
++# 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)
++    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)
--  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)
+   # 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"
-+PAPERSIZEMOD=$(${MKTEMP} ${TMPDIR:-/tmp}/@PACKAGE at -xsl.XXXXXX)
-+CLEANFILES[$CLEANFILE_COUNT]="$PAPERSIZEMOD"
-+CLEANFILE_COUNT=$(($CLEANFILE_COUNT + 1))
-+cat << EOF > "$PAPERSIZEMOD"
+     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>
-+
+@@ -116,8 +145,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
- 
- # Magic encoding, based on locale
- if [ -x /usr/bin/locale ]
-@@ -264,8 +268,17 @@
-   exit 1
+   fi
  fi
  
-+# Since we know DEST_FORMAT, we know whether or not to use
-+# PAPERSIZEMOD
+@@ -293,6 +320,19 @@
+ 
+ [ ! -e "$INPUT_FILE" ] && exit 1
+ 
++# 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))
++  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
 +    ;;
 +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)
+ #rootel=$(head -n 4 "$INPUT_FILE" | tr -d '\n' | \
+ #     sed -e 's/^<?[^?>]*?>//g' -e 's/^<![^>]*>//g' -e 's/^<\([^ ]*\).*$/\1/')

Modified: packages/xmlto/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xmlto/trunk/debian/rules?rev=987&op=diff
==============================================================================
--- packages/xmlto/trunk/debian/rules (original)
+++ packages/xmlto/trunk/debian/rules Sat Jan 19 03:29:09 2008
@@ -75,8 +75,7 @@
 	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 ; \
+	gpg --verify --trust-model always "$$TMPDIR"/$(PACKAGE)-$(version).tar.bz2.sig ; \
 	tar --directory="$$TMPDIR" -xjf "$$TMPDIR"/$(PACKAGE)-$(version).tar.bz2 ; \
 	mv "$$TMPDIR"/$(PACKAGE)-$(version) "$$TMPDIR"/$(PACKAGE)-$(version).orig ; \
 	GZIP=-9 tar --directory="$$TMPDIR" -czf \

More information about the debian-xml-sgml-commit mailing list