summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2021-03-30 05:45:59 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2021-03-30 05:45:59 +0000
commite32f383ad77ad24389fd2eefd15203523a2b4d02 (patch)
tree8f13b67c9a3a77644652e93a29f1616c020e8608
parentReleasing progress-linux version 3.4.3-1~progress5+u1. (diff)
downloadsphinx-e32f383ad77ad24389fd2eefd15203523a2b4d02.tar.xz
sphinx-e32f383ad77ad24389fd2eefd15203523a2b4d02.zip
Merging debian version 3.4.3-2.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/changelog7
-rwxr-xr-xdebian/dh-sphinxdoc/dh_sphinxdoc2
2 files changed, 8 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 2307745..3e10c8c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+sphinx (3.4.3-2) unstable; urgency=medium
+
+ * dh_sphinxdoc: Fix the script tag regex used in singlehtml detection
+ (closes: #983858).
+
+ -- Dmitry Shachnev <mitya57@debian.org> Mon, 08 Mar 2021 21:40:25 +0300
+
sphinx (3.4.3-1~progress5+u1) engywuck-backports; urgency=medium
* Initial upload to engywuck-backports.
diff --git a/debian/dh-sphinxdoc/dh_sphinxdoc b/debian/dh-sphinxdoc/dh_sphinxdoc
index 6bdfafd..6c7f0d0 100755
--- a/debian/dh-sphinxdoc/dh_sphinxdoc
+++ b/debian/dh-sphinxdoc/dh_sphinxdoc
@@ -211,7 +211,7 @@ sub looks_like_sphinx_singlehtml_doc($)
open(my $fh, '<', $html_file) or error("cannot open $html_file");
while (my $line = <$fh>)
{
- if ($line =~ /<script type="text\/javascript" src="_static\/doctools.js">/)
+ if ($line =~ /<script(?: type="text\/javascript")? src="_static\/doctools.js">/)
{
push @sphinx_html_files, $html_file;
last;