From 8923e883eaadc169a6b12dd84c1d64927201f237 Mon Sep 17 00:00:00 2001 From: Bill Allombert Date: Wed, 27 Jan 2016 22:36:36 +0100 Subject: [PATCH] Fix FTBFS and migrate to openjade/opensp debian/control, Makefile: - add missing Build-Depends on sp (opensp). Closes: #812663 - migrate to openjade and opensp. --- Makefile | 2 +- copyright-format/Makefile | 2 +- debconf_spec/Makefile | 2 +- debian/changelog | 5 ++++- debian/control | 2 +- 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index aa5408f..10b0f5a 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ perl-policy.sgml: version.ent --funcall org-html-export-to-html %.validate: % - nsgmls -wall -gues $< + onsgmls -wall -gues $< %.html/index.html: %.sgml LANG=C debiandoc2html $< diff --git a/copyright-format/Makefile b/copyright-format/Makefile index 9d03436..6d26018 100644 --- 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 - 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 $@ diff --git a/debconf_spec/Makefile b/debconf_spec/Makefile index cd3e4a3..cdfd135 100644 --- a/debconf_spec/Makefile +++ b/debconf_spec/Makefile @@ -1,7 +1,7 @@ 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 $@ diff --git a/debian/changelog b/debian/changelog index c799604..d1d6b3f 100644 --- 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. + * 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 Seconded: Bill Allombert @@ -37,7 +40,7 @@ debian-policy (3.9.7.0) unstable; urgency=low as-installed (AKA autopkgtest, or DEP-8) package tests Closes: #799779 - -- Bill Allombert Tue, 13 Oct 2015 22:03:00 +0200 + -- Bill Allombert Wed, 27 Jan 2016 22:33:51 +0100 debian-policy (3.9.6.1) unstable; urgency=low diff --git a/debian/control b/debian/control index 29f7527..c6de852 100644 --- a/debian/control +++ b/debian/control @@ -12,7 +12,7 @@ Build-Depends: bsdmainutils, docbook-xml, emacs-nox (>= 24.4) | emacs (>= 24.4), groff, - jade, + openjade, opensp, links | elinks, pstoedit, sgml-data, -- 2.39.2