diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:57:24 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:57:24 +0000 |
| commit | fa47b75c9113348aeb847ebfd08229c071c8f5c9 (patch) | |
| tree | f794fc85cc0daa2c5491c3fbf2580c8961dc2fbf | |
| parent | Releasing progress-linux version 7.4.7-1~progress7.99u1. (diff) | |
| download | sphinx-fa47b75c9113348aeb847ebfd08229c071c8f5c9.tar.xz sphinx-fa47b75c9113348aeb847ebfd08229c071c8f5c9.zip | |
Merging debian version 7.4.7-2.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
| -rw-r--r-- | debian/changelog | 16 | ||||
| -rwxr-xr-x | debian/dh-sphinxdoc/dh_sphinxdoc | 2 | ||||
| -rw-r--r-- | debian/patches/docutils_manpage_macros.diff | 22 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
4 files changed, 17 insertions, 24 deletions
diff --git a/debian/changelog b/debian/changelog index 6d93e06..133ff2a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +sphinx (7.4.7-2) unstable; urgency=medium + + * Merge 7.3.7-4 upload from unstable. + * Drop docutils_manpage_macros.diff, no longer needed. + * Upload to unstable. + + -- Dmitry Shachnev <mitya57@debian.org> Mon, 05 Aug 2024 15:08:07 +0300 + sphinx (7.4.7-1~progress7.99u1) graograman-backports; urgency=medium * Uploading to graograman-updates, remaining changes: @@ -27,6 +35,14 @@ sphinx (7.4.7-1) experimental; urgency=medium -- Dmitry Shachnev <mitya57@debian.org> Sat, 20 Jul 2024 19:09:09 +0300 +sphinx (7.3.7-4) unstable; urgency=medium + + [ Miriam España Acebal ] + * dh_sphinxdoc: Add quantifier for capture group (?:="defer") + (closes: #1076969, LP: #2074525). + + -- Dmitry Shachnev <mitya57@debian.org> Tue, 30 Jul 2024 12:04:38 +0300 + sphinx (7.3.7-3~progress7.99u1) graograman-backports; urgency=medium * Uploading to graograman-updates, remaining changes: diff --git a/debian/dh-sphinxdoc/dh_sphinxdoc b/debian/dh-sphinxdoc/dh_sphinxdoc index 30d9b88..5881372 100755 --- a/debian/dh-sphinxdoc/dh_sphinxdoc +++ b/debian/dh-sphinxdoc/dh_sphinxdoc @@ -290,7 +290,7 @@ sub sanity_check($$) } } defined $documentation_options or error("DOCUMENTATION_OPTIONS not found"); - my $loads_searchindex = $search =~ m{<script(?: type="text/javascript")? src="[^"]*searchindex.js\s?"(?: defer(?:="defer"))?>}; + my $loads_searchindex = $search =~ m{<script(?: type="text/javascript")? src="[^"]*searchindex.js\s?"(?: defer(?:="defer")?)?>}; unless ($loads_searchindex) { # old style, used before Sphinx 2.0 diff --git a/debian/patches/docutils_manpage_macros.diff b/debian/patches/docutils_manpage_macros.diff deleted file mode 100644 index e56ff00..0000000 --- a/debian/patches/docutils_manpage_macros.diff +++ /dev/null @@ -1,22 +0,0 @@ -From: Dmitry Shachnev <mitya57@debian.org> -Date: Thu, 3 Aug 2023 19:23:41 +0300 -Subject: Make test_build_manpage pass with docutils 0.19+dfsg-7 - -I backported the change from upstream 0.21 to our 0.19 and 0.20 packaging. ---- - tests/test_builders/test_build_manpage.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/test_builders/test_build_manpage.py b/tests/test_builders/test_build_manpage.py -index 31d75d6..7563dd7 100644 ---- a/tests/test_builders/test_build_manpage.py -+++ b/tests/test_builders/test_build_manpage.py -@@ -56,7 +56,7 @@ def test_captioned_code_block(app, status, warning): - app.build(force_all=True) - content = (app.outdir / 'projectnamenotset.1').read_text(encoding='utf8') - -- if docutils.__version_info__[:2] < (0, 21): -+ if docutils.__version_info__[:2] < (0, 19): - expected = """\ - .sp - caption \\fItest\\fP rb diff --git a/debian/patches/series b/debian/patches/series index f33bbe2..39c8d82 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,4 +5,3 @@ use_packaged_mathjax.diff skip_tests_serializinghtml.diff move_sphinxcontrib_to_extras_require.diff intersphinx_local.diff -docutils_manpage_macros.diff |