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

dleidert-guest at users.alioth.debian.org dleidert-guest at users.alioth.debian.org
Sun Nov 27 14:17:32 UTC 2011 

Author: dleidert-guest
Date: Sun Nov 27 14:17:30 2011
New Revision: 1903

URL: http://svn.debian.org/wsvn/debian-xml-sgml/?sc=1&rev=1903
Log:
* debian/compat: Increased dh compatibility level.
* debian/control: Added Multi-Arch: foreign.
  (Standards-Version): Bumped to 3.9.2.
  (Build-Depends): Dropped dpatch. Increased required debhelper version.
  (Vcs-Browser): Point to correct location.
  (Depends): Fixed debhelper-but-no-misc-depends.
  (Description): Added XHTML and epub.
* debian/copyright: Minor update.
* debian/rules: Rewritten for debhelper 7 and new source format.
* debian/README.source: Dropped (obsolete).
* debian/patches/format_fo_passivetex_check.dpatch: Renamed to
  debian/patches/format_fo_passivetex_check.patch.
* debian/patches/extensions_fix.dpatch: Renamed to
  debian/patches/fop1_extensions_fix.patch and adjusted to fix extensions
  logic for fop (> 0.90).
* debian/patches/00list: Renamed to debian/patches/series and adjusted.
* debian/source/format: Added for source format 3.0 (quilt).

Added:
    packages/xmlto/trunk/debian/patches/fop1_extensions_fix.patch
      - copied, changed from r1902, packages/xmlto/trunk/debian/patches/extensions_fix.dpatch
    packages/xmlto/trunk/debian/patches/format_fo_passivetex_check.patch
      - copied, changed from r1902, packages/xmlto/trunk/debian/patches/format_fo_passivetex_check.dpatch
    packages/xmlto/trunk/debian/patches/series
      - copied, changed from r1902, packages/xmlto/trunk/debian/patches/00list
    packages/xmlto/trunk/debian/source/
    packages/xmlto/trunk/debian/source/format
Removed:
    packages/xmlto/trunk/debian/README.source
    packages/xmlto/trunk/debian/patches/00list
    packages/xmlto/trunk/debian/patches/extensions_fix.dpatch
    packages/xmlto/trunk/debian/patches/format_fo_passivetex_check.dpatch
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

Modified: packages/xmlto/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xmlto/trunk/debian/changelog?rev=1903&op=diff
==============================================================================
--- packages/xmlto/trunk/debian/changelog (original)
+++ packages/xmlto/trunk/debian/changelog Sun Nov 27 14:17:30 2011
@@ -2,11 +2,22 @@
 
   * NOT RELEASED YET
   * New upstream release.
-  * debian/patches/extensions_fix.dpatch: Fix extensions logic: Set
-    fop1.extensions and passivetex.extenions independent from the
-    --extensions switch. Further fop.extensions is useless on Debian
-    with fop 0.95.
-  * debian/patches/00list: Adjusted.
+  * debian/compat: Increased dh compatibility level.
+  * debian/control: Added Multi-Arch: foreign.
+    (Standards-Version): Bumped to 3.9.2.
+    (Build-Depends): Dropped dpatch. Increased required debhelper version.
+    (Vcs-Browser): Point to correct location.
+    (Depends): Fixed debhelper-but-no-misc-depends.
+    (Description): Added XHTML and epub.
+  * debian/copyright: Minor update.
+  * debian/rules: Rewritten for debhelper 7 and new source format.
+  * debian/README.source: Dropped (obsolete).
+  * debian/patches/format_fo_passivetex_check.dpatch: Renamed to
+    debian/patches/format_fo_passivetex_check.patch.
+  * debian/patches/fop1_extensions_fix.patch: Added.
+    - Fix extensions logic for fop (> 0.90).
+  * debian/patches/00list: Renamed to debian/patches/series and adjusted.
+  * debian/source/format: Added for source format 3.0 (quilt).
 
  -- Daniel Leidert (dale) <daniel.leidert at wgdd.de>  Thu, 24 Sep 2009 11:26:39 +0200
 
@@ -452,4 +463,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=79:

Modified: packages/xmlto/trunk/debian/compat
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xmlto/trunk/debian/compat?rev=1903&op=diff
==============================================================================
--- packages/xmlto/trunk/debian/compat (original)
+++ packages/xmlto/trunk/debian/compat Sun Nov 27 14:17:30 2011
@@ -1,1 +1,1 @@
-5
+7

Modified: packages/xmlto/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xmlto/trunk/debian/control?rev=1903&op=diff
==============================================================================
--- packages/xmlto/trunk/debian/control (original)
+++ packages/xmlto/trunk/debian/control Sun Nov 27 14:17:30 2011
@@ -3,18 +3,20 @@
 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),
+Build-Depends: debhelper (>> 7.0.50~), docbook-xsl (>= 1.64.1.0),
  docbook-xml (>= 4.2-8), libxml2-utils, sgml-base, xsltproc (>= 1.0.29)
-Standards-Version: 3.8.3
+Standards-Version: 3.9.2
 Homepage: https://fedorahosted.org/xmlto/
-Vcs-Browser: http://svn.debian.org/wsvn/debian-xml-sgml/packages/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/trunk/
 DM-Upload-Allowed: yes
 
 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), libxml2-utils, sgml-base
+Multi-Arch: foreign
+Depends: ${shlibs:Depends}, ${misc: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, dblatex | fop
 Suggests: xmltex (>= 1.9.debian.1), w3m | lynx-cur | links
 Description: XML-to-any converter
@@ -23,9 +25,9 @@
  XSLT processor (currently, only xsltproc is supported). It also performs
  any necessary post-processing.
  .
- It supports converting from DocBook XML to DVI, XSL-FO, HTML (multiple
- pages), HTML (one page), man page, PDF, PostScript and plain text. It
- supports converting from XSL-FO to DVI, PDF and PostScript.
+ It supports converting from DocBook XML to DVI, XSL-FO, HTML and XHTML
+ (one or multiple pages), epub, manual page, PDF, PostScript and plain
+ text. It also supports converting from XSL-FO to DVI, PDF and PostScript.
  .
  DVI output requires dblatex or PassiveTeX. Other formats can be produced
  with any of the supported toolchains - dblatex, PassiveTeX or

Modified: packages/xmlto/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xmlto/trunk/debian/copyright?rev=1903&op=diff
==============================================================================
--- packages/xmlto/trunk/debian/copyright (original)
+++ packages/xmlto/trunk/debian/copyright Sun Nov 27 14:17:30 2011
@@ -1,6 +1,7 @@
 This package was debianized by christophe barbe <christophe at debian.org> on
-Wed,  5 Jun 2002 15:59:21 -0400. It is now maintained by Graham Wilson
-<bob at decoy.wox.org>.
+Wed,  5 Jun 2002 15:59:21 -0400, and later maintained by Graham Wilson
+<bob at decoy.wox.org>. It is currently maintained by the Debian XML/SGML
+Group <debian-xml-sgml-pkgs at lists.alioth.debian.org>.
 
 It was downloaded from:
 

Copied: packages/xmlto/trunk/debian/patches/fop1_extensions_fix.patch (from r1902, packages/xmlto/trunk/debian/patches/extensions_fix.dpatch)
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xmlto/trunk/debian/patches/fop1_extensions_fix.patch?rev=1903&op=diff
==============================================================================
--- packages/xmlto/trunk/debian/patches/extensions_fix.dpatch (original)
+++ packages/xmlto/trunk/debian/patches/fop1_extensions_fix.patch Sun Nov 27 14:17:30 2011
@@ -1,58 +1,18 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## extensions_fix.dpatch by Daniel Leidert (dale) <daniel.leidert at wgdd.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Debian has fop 0.9x so we use fop1.extensions. Further the logic is
-## DP:   wrong to only enable fop1/passivetex extensions if --extensions
-## DP:   was used. use.extensions is AFAIK unrelated to fop1.extensions
-## DP:   and passivetex.extensions, so they should not rely on EXTENSIONS
-## DP:   being set.
+Description: Adjust extensions logic for fop (> 0.90)
+ Debian has fop 0.9x so we use fop1.extensions. 
+Author: Daniel Leidert <daniel.leidert at wgdd.de>
+Origin: upstream, private mail exchange
+Forwarded: yes
+Last-Update: 2011-11-27
 
- at DPATCH@
-diff -urNad trunk~/xmlto.in trunk/xmlto.in
---- trunk~/xmlto.in	2009-09-21 14:41:17.000000000 +0200
-+++ trunk/xmlto.in	2010-01-23 13:27:18.108509009 +0100
-@@ -341,7 +341,7 @@
- 		echo >&2 Warning: fop not found or not executable.
- 		echo >&2 Using default backend...
- 	else
--		USE_BACKEND="FOP"
-+		USE_BACKEND=FOP
- 	fi
- 	shift
- 	;;
-@@ -352,7 +352,7 @@
- 		echo >&2 Warning: dblatex not found or not executable.
- 		echo >&2 Using default backend...
- 	else
--		USE_BACKEND="DBLATEX"
-+		USE_BACKEND=DBLATEX
- 	fi
- 	shift
- 	;;
-@@ -364,18 +364,16 @@
- done
- 
- ##here we would decide which extensions should be active
--if [ "$EXTENSIONS" -eq 1 ]
--then
--  case "$USE_BACKEND" in
-+case "$USE_BACKEND" in
+--- a/xmlto.in
++++ b/xmlto.in
+@@ -385,7 +385,7 @@
+ then
+   case "$USE_BACKEND" in
    FOP)
--      #maybe fop1.extensions for latest fop, but keeping this one
--      XSLTOPTS="$XSLTOPTS --param fop.extensions '1'" ;;
-+	#maybe fop1.extensions for latest fop, but keeping this one
-+	#Debian fix for fop 0.9x
-+	XSLTOPTS="$XSLTOPTS --param fop1.extensions '1'" ;;
+-      XSLTOPTS="$XSLTOPTS --param fop.extensions '1' --param fop1.extensions '1'" ;;
++      XSLTOPTS="$XSLTOPTS --param fop.extensions '0' --param fop1.extensions '1'" ;;
    DBLATEX)
--      ;;
-+	;;
+       ;;
    DEFAULT)
--      XSLTOPTS="$XSLTOPTS --param passivetex.extensions '1'" ;;
--  esac
--fi
-+	XSLTOPTS="$XSLTOPTS --param passivetex.extensions '1'" ;;
-+esac
- 
- if [ "$#" != "2" ]
- then

Copied: packages/xmlto/trunk/debian/patches/format_fo_passivetex_check.patch (from r1902, packages/xmlto/trunk/debian/patches/format_fo_passivetex_check.dpatch)
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xmlto/trunk/debian/patches/format_fo_passivetex_check.patch?rev=1903&op=diff
==============================================================================
--- packages/xmlto/trunk/debian/patches/format_fo_passivetex_check.dpatch (original)
+++ packages/xmlto/trunk/debian/patches/format_fo_passivetex_check.patch Sun Nov 27 14:17:30 2011
@@ -1,43 +1,38 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 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>
+Description: Check for a passivetex format file and tell the user, if it's
+ missing.
+Author: Graham Wilson <graham at debian.org>
+Bug-Debian: http://bugs.debian.org/190840
+Forwarded: not-needed
+Last-Update: 2008-02-05
 
- at DPATCH@
-diff -urNad trunk~/format/fo/dvi trunk/format/fo/dvi
---- 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"
+--- a/format/fo/dvi
++++ b/format/fo/dvi
+@@ -11,6 +11,10 @@
+     echo >&2 "Can't process, xmltex tool not found at $XMLTEX_PATH."
+     exit 3
    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	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"
+   # Also work around stupid tetex limitation with long lines (rhbz #101055)
+   # and workaround passivetex limitation for chapter titles starting with L
+--- a/format/fo/pdf
++++ b/format/fo/pdf
+@@ -13,6 +13,10 @@
+ 	    echo >&2 "Can't process, pdfxmltex tool not found at $PDFXMLTEX_PATH."
+ 	    exit 3
  	  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	2008-01-15 15:27:49.000000000 +0100
-+++ trunk/format/fo/ps	2008-01-19 03:11:26.000000000 +0100
+ 	  # Also work around stupid tetex limitation with long lines
+ 	  # (rhbz #101055) and workaround passivetex limitation for chapter
+--- a/format/fo/ps
++++ b/format/fo/ps
 @@ -8,6 +8,10 @@
  	  then
  	    echo >&2 "Post-process XSL-FO to DVI"
@@ -47,5 +42,5 @@
 +	    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
+ 	  # Also work around stupid tetex limitation with long lines 
+ 	  # (rhbz #101055) and workaround passivetex limitation for chapter

Copied: packages/xmlto/trunk/debian/patches/series (from r1902, packages/xmlto/trunk/debian/patches/00list)
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xmlto/trunk/debian/patches/series?rev=1903&op=diff
==============================================================================
--- packages/xmlto/trunk/debian/patches/00list (original)
+++ packages/xmlto/trunk/debian/patches/series Sun Nov 27 14:17:30 2011
@@ -1,2 +1,2 @@
-format_fo_passivetex_check
-extensions_fix
+format_fo_passivetex_check.patch
+fop1_extensions_fix.patch

Modified: packages/xmlto/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xmlto/trunk/debian/rules?rev=1903&op=diff
==============================================================================
--- packages/xmlto/trunk/debian/rules (original)
+++ packages/xmlto/trunk/debian/rules Sun Nov 27 14:17:30 2011
@@ -1,20 +1,15 @@
 #!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
+
+#export DH_VERBOSE=1
 
 PACKAGE = xmlto
 
-include /usr/share/dpatch/dpatch.make
+%:
+	dh $@ --parallel
 
-override CFLAGS += -Wall
-
-config.status: configure
-	dh_testdir
-	./configure \
-	    --prefix=/usr \
-	    --mandir=\$${prefix}/share/man \
-	    CFLAGS="$(CFLAGS)" \
-		BASH="/bin/bash" \
+override_dh_auto_configure: configure
+	dh_auto_configure -- \
+	    BASH="/bin/bash" \
 	    PAPERCONF="/usr/bin/paperconf" \
 	    DBLATEX="/usr/bin/dblatex" \
 	    FOP="/usr/bin/fop" \
@@ -24,44 +19,6 @@
 	    LINKS="/usr/bin/links" \
 	    W3M="/usr/bin/w3m"
 
-build: patch-stamp build-stamp
-build-stamp: config.status
-	dh_testdir
-	$(MAKE)
-	touch build-stamp
+override_dh_installchangelogs:
+	dh_installchangelogs NEWS
 
-clean: unpatch
-	dh_testdir
-	dh_testroot
-	rm -rf .deps man
-	[ ! -f Makefile ] || $(MAKE) distclean
-	dh_clean build-stamp patch-stamp
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/$(PACKAGE)
-
-binary-indep: build install
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installman
-	dh_installchangelogs NEWS
-	dh_installdocs
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-
-.PHONY: build clean binary-indep binary-arch binary install
-# vim:ts=4:sw=4:

Added: packages/xmlto/trunk/debian/source/format
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xmlto/trunk/debian/source/format?rev=1903&op=file
==============================================================================
--- packages/xmlto/trunk/debian/source/format (added)
+++ packages/xmlto/trunk/debian/source/format Sun Nov 27 14:17:30 2011
@@ -1,0 +1,1 @@
+3.0 (quilt)

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