Package: docbook-utils
Version: 0.6.14-3
Severity: normal
Tags: patch

Docbook-utils depends and build depends on the packages jade and sp
which are obsolete and will be removed from Debian.  Please replace uses
of those packages with the newer openjade and opensp packages.  Attached
is a debdiff of a test package of docbook-utils that I created with
the required changes.

diff -Nru docbook-utils-0.6.14/debian/changelog 
docbook-utils-0.6.14/debian/changelog
--- docbook-utils-0.6.14/debian/changelog       2012-09-12 05:48:00.000000000 
-0400
+++ docbook-utils-0.6.14/debian/changelog       2015-12-19 14:09:00.000000000 
-0500
@@ -1,3 +1,13 @@
+docbook-utils (0.6.14-3.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * d/control: Changed dependencies from jade/sp to openjade/opensp.
+  * d/rules: Added --with autoreconf to dh so that changes below are used.
+  * doc/man/Makefile.am: Changed nsgmls -> onsgmls
+  * doc/HTML/Makefile.am: Changed jade -> openjade; fixed htmldir path
+
+ -- Neil Roeth <n...@debian.org>  Fri, 18 Dec 2015 23:41:19 -0500
+
 docbook-utils (0.6.14-3) unstable; urgency=medium
 
   * Redo patch for 212088, it breaks on some system. Closes: #685766
diff -Nru docbook-utils-0.6.14/debian/control 
docbook-utils-0.6.14/debian/control
--- docbook-utils-0.6.14/debian/control 2012-05-09 12:38:19.000000000 -0400
+++ docbook-utils-0.6.14/debian/control 2015-12-18 23:46:29.000000000 -0500
@@ -4,7 +4,7 @@
 Maintainer: Debian XML/SGML Group 
<debian-xml-sgml-p...@lists.alioth.debian.org>
 Uploaders: Ardo van Rangelrooij <a...@debian.org>, Mathieu Malaterre 
<ma...@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
 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/
@@ -12,7 +12,7 @@
 
 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
 Description: Convert DocBook files to other formats (HTML, RTF, PS, man, PDF)
diff -Nru docbook-utils-0.6.14/debian/patches/jade-sp-obsolete.patch 
docbook-utils-0.6.14/debian/patches/jade-sp-obsolete.patch
--- docbook-utils-0.6.14/debian/patches/jade-sp-obsolete.patch  1969-12-31 
19:00:00.000000000 -0500
+++ docbook-utils-0.6.14/debian/patches/jade-sp-obsolete.patch  2015-12-19 
08:30:40.000000000 -0500
@@ -0,0 +1,29 @@
+Index: docbook-utils-0.6.14/doc/HTML/Makefile.am
+===================================================================
+--- docbook-utils-0.6.14.orig/doc/HTML/Makefile.am
++++ docbook-utils-0.6.14/doc/HTML/Makefile.am
+@@ -1,4 +1,4 @@
+-htmldir         = $(docdir)/html/docbook-utils-@VERSION@
++htmldir         = $(docdir)/html
+ html_DATA = api.html \
+       backend-spec.html \
+       docbook2man.html \
+@@ -25,6 +25,6 @@ $(html_DATA): $(top_srcdir)/doc/docbook-
+               $(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%' $<
+ 
+Index: docbook-utils-0.6.14/doc/man/Makefile.am
+===================================================================
+--- docbook-utils-0.6.14.orig/doc/man/Makefile.am
++++ docbook-utils-0.6.14/doc/man/Makefile.am
+@@ -12,5 +12,5 @@ $(man1_MANS) $(man7_MANS): $(top_srcdir)
+               $(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  2012-05-09 13:08:40.000000000 
-0400
+++ docbook-utils-0.6.14/debian/patches/series  2015-12-19 08:16:33.000000000 
-0500
@@ -4,3 +4,4 @@
 bug_214982.patch
 bug_394511.patch
 bug_528334.patch
+jade-sp-obsolete.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   2015-12-18 23:40:37.000000000 -0500
@@ -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
-- System Information:
Debian Release: stretch/sid
  APT prefers unstable
  APT policy: (990, 'unstable')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.14-2-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.utf8, LC_CTYPE=en_US.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)

Versions of packages docbook-utils depends on:
ii  docbook-dsssl  1.79-9
ii  jadetex        3.13-16
ii  lynx           2.8.9dev6-4
ii  perl           5.20.2-6
ii  sgmlspl        1.03ii-34
ii  sp             1.3.4-1.2.1-47.3+b1

Versions of packages docbook-utils recommends:
ii  docbook-xml  4.5-7.3

docbook-utils suggests no packages.

-- no debconf information

-- 
Neil Roeth

Reply via email to