Fix FTBFS and migrate to openjade/opensp

debian/control, Makefile:
 - add missing Build-Depends on sp (opensp). Closes: #812663
 - migrate to openjade and opensp.

diff --git a/Makefile b/Makefile
index aa5408f8ee6e1985c8f472fe263882768cfb2eb8..10b0f5ad104db2e2f443df42bda9e1d84a830eb0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ perl-policy.sgml: version.ent
           --funcall org-html-export-to-html
 
 %.validate: %
           --funcall org-html-export-to-html
 
 %.validate: %

-       nsgmls -wall -gues $<
+       onsgmls -wall -gues $<

 
 %.html/index.html: %.sgml
        LANG=C debiandoc2html $<
 
 %.html/index.html: %.sgml
        LANG=C debiandoc2html $<

diff --git a/copyright-format/Makefile b/copyright-format/Makefile
index 9d03436d59fd28ce8741eed2808e1c26c3db9456..6d26018acbe6f385017d49b312422beb507c0e4e 100644 (file)
--- a/copyright-format/Makefile
+++ b/copyright-format/Makefile
@@ -1,7 +1,7 @@
 all: copyright-format-1.0.txt.gz copyright-format-1.0.html
 
 copyright-format-1.0.html: copyright-format-1.0.xml html.dsl
 all: copyright-format-1.0.txt.gz copyright-format-1.0.html
 
 copyright-format-1.0.html: copyright-format-1.0.xml html.dsl

-       jade -V nochunks -t sgml -d html.dsl \
+       openjade -V nochunks -t sgml -d html.dsl \

                /usr/share/xml/declaration/xml.dcl $< > $@
        -tidy -q -i -m -f /dev/null $@
 
                /usr/share/xml/declaration/xml.dcl $< > $@
        -tidy -q -i -m -f /dev/null $@
 

diff --git a/debconf_spec/Makefile b/debconf_spec/Makefile
index cd3e4a3a6b5d96d1446d60c6d426b9ce2bf465eb..cdfd135d50d75802d5443a434e6859f13c1ac4cf 100644 (file)
--- a/debconf_spec/Makefile
+++ b/debconf_spec/Makefile
@@ -1,7 +1,7 @@
 all: debconf_specification.txt.gz debconf_specification.html
 
 %.html: %.xml html.dsl
 all: debconf_specification.txt.gz debconf_specification.html
 
 %.html: %.xml html.dsl

-       jade -V nochunks -t sgml -d html.dsl \
+       openjade -V nochunks -t sgml -d html.dsl \

                /usr/share/xml/declaration/xml.dcl $< > $@
        -tidy -q -i -m -f /dev/null $@
 
                /usr/share/xml/declaration/xml.dcl $< > $@
        -tidy -q -i -m -f /dev/null $@
 

diff --git a/debian/changelog b/debian/changelog
index c7996043aadef31ee36d64226e34e778344d8e2e..d1d6b3f3c0c0776ab5f248bf3911e918c5dd7a1f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ debian-policy (3.9.7.0) unstable; urgency=low
 
   * Policy: refreshed the names of the Policy Editors.
   * Makefile: use gzip -n when compressing generated files.
 
   * Policy: refreshed the names of the Policy Editors.
   * Makefile: use gzip -n when compressing generated files.

+  * debian/control, Makefile: 
+     - add missing Build-Depends on sp (opensp). Closes: #812663
+     - migrate to openjade and opensp.

   * Policy: Symbolic links must not traverse above the root directory.
     Wording: Andrey Rahmatullin <wrar@debian.org>
     Seconded: Bill Allombert <ballombe@debian.org>
   * Policy: Symbolic links must not traverse above the root directory.
     Wording: Andrey Rahmatullin <wrar@debian.org>
     Seconded: Bill Allombert <ballombe@debian.org>


@@ -37,7 +40,7 @@ debian-policy (3.9.7.0) unstable; urgency=low
     as-installed (AKA autopkgtest, or DEP-8) package tests
     Closes: #799779
 
     as-installed (AKA autopkgtest, or DEP-8) package tests
     Closes: #799779
 

- -- Bill Allombert <ballombe@debian.org>  Tue, 13 Oct 2015 22:03:00 +0200
+ -- Bill Allombert <ballombe@debian.org>  Wed, 27 Jan 2016 22:33:51 +0100

 
 debian-policy (3.9.6.1) unstable; urgency=low
 
 
 debian-policy (3.9.6.1) unstable; urgency=low
 

diff --git a/debian/control b/debian/control
index 29f7527acef00760d38dca37c54977496f126c98..c6de852bd351f010beb539ed2652e4bf4416fdbc 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Build-Depends: bsdmainutils,
                docbook-xml,
                emacs-nox (>= 24.4) | emacs (>= 24.4),
                groff,
                docbook-xml,
                emacs-nox (>= 24.4) | emacs (>= 24.4),
                groff,

-               jade,
+               openjade, opensp,

                links | elinks,
                pstoedit,
                sgml-data,
                links | elinks,
                pstoedit,
                sgml-data,