[xml/sgml-commit] r1388 - in /packages/xmlto/trunk/debian: changelog control rules

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

Author: dleidert-guest
Date: Thu Mar 26 18:33:59 2009
New Revision: 1388

URL: http://svn.debian.org/wsvn/debian-xml-sgml/?sc=1&rev=1388
Log:
* debian/control (Build-Depends): Removed libpaper-utils.
  (Suggests): Replaced lynx with lynx-cur.
* debian/rules: Removed get-orig-source target because upstream
  provides gzipped tarballs.
  (config.status): Set the utilities location.

Modified:
    packages/xmlto/trunk/debian/changelog
    packages/xmlto/trunk/debian/control
    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=1388&op=diff
==============================================================================
--- packages/xmlto/trunk/debian/changelog (original)
+++ packages/xmlto/trunk/debian/changelog Thu Mar 26 18:33:59 2009
@@ -5,10 +5,14 @@
     - Patch by Jonathan Nieder applied by upstream to handle mktemp
       failures more gracefully (closes: #518950).
 
-  * debian/control (Standards-Version): Bumped to 3.8.1 (no other
-    changes).
-    (Recommends, Suggests): Moved fop back to Recommends as
-    alternative for dblatex now that it is back in main.
+  * debian/control (Build-Depends): Removed libpaper-utils.
+    (Standards-Version): Bumped to 3.8.1 (no other changes).
+    (Suggests): Moved fop back to Recommends as alternative for
+    dblatex now that it is back in main. Also replaced lynx with
+    lynx-cur.
+  * debian/rules: Removed get-orig-source target because upstream
+    provides gzipped tarballs.
+    (config.status): Set the utilities location.
   * debian/watch: Fixed.
   * debian/patches/xmlto_libpaper_173090.dpatch: Dropped (applied
     upstream).

Modified: packages/xmlto/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xmlto/trunk/debian/control?rev=1388&op=diff
==============================================================================
--- packages/xmlto/trunk/debian/control (original)
+++ packages/xmlto/trunk/debian/control Thu Mar 26 18:33:59 2009
@@ -4,8 +4,7 @@
 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
+ docbook-xml (>= 4.2-8), libxml2-utils, sgml-base, xsltproc (>= 1.0.29)
 Standards-Version: 3.8.1
 Homepage: https://fedorahosted.org/xmlto/
 Vcs-Browser: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xmlto/
@@ -17,7 +16,7 @@
 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, dblatex | fop
-Suggests: xmltex (>= 1.9.debian.1), w3m | lynx | links
+Suggests: xmltex (>= 1.9.debian.1), w3m | lynx-cur | 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/rules
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xmlto/trunk/debian/rules?rev=1388&op=diff
==============================================================================
--- packages/xmlto/trunk/debian/rules (original)
+++ packages/xmlto/trunk/debian/rules Thu Mar 26 18:33:59 2009
@@ -6,13 +6,22 @@
 
 include /usr/share/dpatch/dpatch.make
 
-CFLAGS += -Wall
+override CFLAGS += -Wall
 
 config.status: configure
 	dh_testdir
-	CFLAGS="$(CFLAGS)" ./configure \
+	./configure \
 		--prefix=/usr \
-		--mandir=\$${prefix}/share/man
+		--mandir=\$${prefix}/share/man \
+		CFLAGS="$(CFLAGS)" \
+		PAPERCONF="/usr/bin/paperconf" \
+		DBLATEX="/usr/bin/dblatex" \
+		FOP="/usr/bin/fop" \
+	    XMLTEX="/usr/bin/xmltex" \
+	    PDFXMLTEX="/usr/bin/pdfxmltex" \
+	    LYNX="/usr/bin/lynx" \
+	    LINKS="/usr/bin/links" \
+	    W3M="/usr/bin/w3m"
 
 build: patch-stamp build-stamp
 build-stamp: config.status
@@ -53,8 +62,5 @@
 
 binary: binary-indep binary-arch
 
-get-orig-source:
-	uscan --force-download --repack
-
-.PHONY: build clean binary-indep binary-arch binary install get-orig-source
+.PHONY: build clean binary-indep binary-arch binary install
 # vim:ts=4:sw=4: