[xml/sgml-pkgs] Bug#808403: docbook-utils: diff for NMU version 0.6.14-3.2

[Neil Roeth]

Control: tags 808403 + patch
Control: tags 808403 + pending

Dear maintainer,

I've prepared an NMU for docbook-utils (versioned as 0.6.14-3.2) and
uploaded it to DELAYED/10. Please feel free to tell me if I
should delay it longer.

Regards.
diff -Nru docbook-utils-0.6.14/debian/changelog docbook-utils-0.6.14/debian/changelog
--- docbook-utils-0.6.14/debian/changelog	2016-07-04 10:11:02.000000000 -0400
+++ docbook-utils-0.6.14/debian/changelog	2016-07-24 21:32:01.000000000 -0400
@@ -1,3 +1,14 @@
+docbook-utils (0.6.14-3.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * d/rules: Add --with autoreconf to dh so that changes below are used.
+  * doc/man/Makefile.am: Change nsgmls -> onsgmls
+  * doc/HTML/Makefile.am: Change jade -> openjade; fix htmldir path
+  * d/control: Change dependencies from jade/sp to openjade/opensp.
+    Closes: #808403
+
+ -- Neil Roeth <neil at debian.org>  Sun, 24 Jul 2016 20:33:55 -0400
+
 docbook-utils (0.6.14-3.1) unstable; urgency=low
 
   * Non-maintainer upload.
diff -Nru docbook-utils-0.6.14/debian/control docbook-utils-0.6.14/debian/control
--- docbook-utils-0.6.14/debian/control	2016-07-04 10:11:48.000000000 -0400
+++ docbook-utils-0.6.14/debian/control	2016-07-24 21:20:42.000000000 -0400
@@ -4,14 +4,14 @@
 Maintainer: Debian XML/SGML Group <debian-xml-sgml-pkgs at lists.alioth.debian.org>
 Uploaders: Ardo van Rangelrooij <ardo at debian.org>, Mathieu Malaterre <malat at debian.org>
 Standards-Version: 3.9.3
-Build-Depends-Indep: debhelper (>= 7.0.50~), docbook-dsssl, jade, perl, sgmlspl, sp, autotools-dev
+Build-Depends-Indep: debhelper (>= 7.0.50~), docbook-dsssl, openjade, perl, sgmlspl, opensp, autotools-dev, dh-autoreconf
 Homepage: http://sources.redhat.com/docbook-tools/
 Vcs-Browser: http://anonscm.debian.org/viewvc/debian-xml-sgml/packages/docbook-utils/
 Vcs-Svn: svn://svn.debian.org/debian-xml-sgml/packages/docbook-utils/trunk/
 
 Package: docbook-utils
 Architecture: all
-Depends: docbook-dsssl, jadetex, lynx | links | links2| w3m, sgmlspl, sp, ${perl:Depends}, ${misc:Depends}
+Depends: docbook-dsssl, jadetex, lynx | links | links2| w3m, sgmlspl, opensp, ${perl:Depends}, ${misc:Depends}
 Recommends: docbook-xml
 Replaces: docbook2man, docbook2texi, docbk-xml2x, docbook2x-doc, cygnus-stylesheets
 Multi-Arch: foreign
diff -Nru docbook-utils-0.6.14/debian/patches/remove-jade-sp.patch docbook-utils-0.6.14/debian/patches/remove-jade-sp.patch
--- docbook-utils-0.6.14/debian/patches/remove-jade-sp.patch	1969-12-31 19:00:00.000000000 -0500
+++ docbook-utils-0.6.14/debian/patches/remove-jade-sp.patch	2016-07-24 21:16:58.000000000 -0400
@@ -0,0 +1,30 @@
+Description: Change dependencies on jade and sp to openjade and opensp
+Author: Neil Roeth <neil at debian.org>
+Last-Update: 2016-07-24
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/doc/HTML/Makefile.am
++++ b/doc/HTML/Makefile.am
+@@ -1,4 +1,4 @@
+-htmldir	  = $(docdir)/html/docbook-utils- at VERSION@
++htmldir	  = $(docdir)/html
+ html_DATA = api.html \
+ 	backend-spec.html \
+ 	docbook2man.html \
+@@ -25,6 +25,6 @@
+ 		$(top_srcdir)/doc/refentry/sgmldiff.sgml
+ 	SGML_CATALOG_FILES=/etc/sgml/catalog \
+ 	SGML_SEARCH_PATH=$(top_srcdir):$(top_srcdir)/doc:.. \
+-		jade -t sgml -i html -d $(top_srcdir)/docbook-utils.dsl\#html \
++		openjade -t sgml -i html -d $(top_srcdir)/docbook-utils.dsl\#html \
+ 			-V '%use-id-as-filename%' $<
+ 
+--- a/doc/man/Makefile.am
++++ b/doc/man/Makefile.am
+@@ -12,5 +12,5 @@
+ 		$(top_srcdir)/helpers/docbook2man-spec.pl
+ 	SGML_CATALOG_FILES=/etc/sgml/catalog \
+ 	SGML_SEARCH_PATH=$(top_srcdir)/doc:.. \
+-		nsgmls $< | \
++		onsgmls $< | \
+ 		sgmlspl $(top_srcdir)/helpers/docbook2man-spec.pl
diff -Nru docbook-utils-0.6.14/debian/patches/series docbook-utils-0.6.14/debian/patches/series
--- docbook-utils-0.6.14/debian/patches/series	2016-07-04 04:49:44.000000000 -0400
+++ docbook-utils-0.6.14/debian/patches/series	2016-07-24 20:40:49.000000000 -0400
@@ -5,3 +5,4 @@
 bug_394511.patch
 bug_528334.patch
 support_source_date_epoch.patch
+remove-jade-sp.patch
diff -Nru docbook-utils-0.6.14/debian/rules docbook-utils-0.6.14/debian/rules
--- docbook-utils-0.6.14/debian/rules	2012-05-09 12:29:15.000000000 -0400
+++ docbook-utils-0.6.14/debian/rules	2016-07-24 20:59:40.000000000 -0400
@@ -2,7 +2,7 @@
 # export DH_VERBOSE=1
 
 %:
-	dh $@ --with autotools_dev
+	dh $@ --with autotools_dev --with autoreconf
 
 override_dh_auto_configure:
 	dh_auto_configure -- --prefix=/usr --mandir=\$${prefix}/share/man