From 61df4815abebaa425a90b530f41b4cc6f10571a4 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Sun, 17 Sep 2017 13:05:17 -0700 Subject: [PATCH] drop dh_sphinxdoc workarounds --- debian/changelog | 3 +++ debian/control | 4 +--- debian/links | 3 --- 3 files changed, 4 insertions(+), 6 deletions(-) delete mode 100644 debian/links diff --git a/debian/changelog b/debian/changelog index c522385..b22157a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -51,6 +51,9 @@ debian-policy (4.1.1.0) UNRELEASED; urgency=medium * Add missing line breaks in summary of the ways in which maintainer scripts may be called (Closes: #874411). Thanks Sébastian Villemot for reporting the issue, and for the patch. + * Drop workarounds for dh_sphinxdoc's lack of support for singlehtml. + Thanks Dmitry Shachnev for the new support in dh_sphinxdoc. + - Tighten build-dep on sphinx-common. -- Russ Allbery Mon, 21 Aug 2017 18:29:37 -0700 diff --git a/debian/control b/debian/control index 546b5e8..3220136 100644 --- a/debian/control +++ b/debian/control @@ -17,7 +17,7 @@ Build-Depends: libxml2-utils, links | elinks, python3-sphinx, - sphinx-common, + sphinx-common (>= 1.6.3-2), texinfo, xsltproc, Standards-Version: 4.1.0 @@ -30,8 +30,6 @@ Multi-Arch: foreign Depends: ${misc:Depends}, ${sphinxdoc:Depends}, -# workaround for dh_sphinxdoc bug #872863 - libjs-sphinxdoc (>= 1.0), Suggests: doc-base, Built-Using: ${sphinxdoc:Built-Using} diff --git a/debian/links b/debian/links deleted file mode 100644 index 194ebc5..0000000 --- a/debian/links +++ /dev/null @@ -1,3 +0,0 @@ -# workaround for dh_sphinxdoc bug #872863 -/usr/share/javascript/sphinxdoc/1.0/underscore.js /usr/share/doc/debian-policy/policy.html/_static/underscore.js -/usr/share/javascript/sphinxdoc/1.0/jquery.js /usr/share/doc/debian-policy/policy.html/_static/jquery.js -- 2.11.4.GIT