diff -pruN 1.8.5-7/debian/changelog 1.8.5-7ubuntu3/debian/changelog --- 1.8.5-7/debian/changelog 2020-03-20 11:33:53.000000000 +0000 +++ 1.8.5-7ubuntu3/debian/changelog 2020-04-23 02:59:36.000000000 +0000 @@ -1,3 +1,24 @@ +sphinx (1.8.5-7ubuntu3) focal; urgency=medium + + * Drop python2 support. + + -- Steve Langasek Wed, 22 Apr 2020 19:59:36 -0700 + +sphinx (1.8.5-7ubuntu2) focal; urgency=medium + + * Make Sphinx' documentation use HTML 5 instead of XHTML, to fix WebKitGTK + parsing errors with shared-mime-info ≥ 0.11 (LP: #1871610). + + -- Dmitry Shachnev Wed, 08 Apr 2020 20:02:54 +0300 + +sphinx (1.8.5-7ubuntu1) focal; urgency=medium + + * Restore changes to workaround webkitgtk/js being buggy on ppc/s390x + see https://bugs.webkit.org/show_bug.cgi?id=209337 for details about + the current issue + + -- Sebastien Bacher Fri, 20 Mar 2020 16:01:31 +0100 + sphinx (1.8.5-7) unstable; urgency=medium * Make the autopkgtest depend on python3-all, and use py3versions -s diff -pruN 1.8.5-7/debian/control 1.8.5-7ubuntu3/debian/control --- 1.8.5-7/debian/control 2020-03-20 11:33:53.000000000 +0000 +++ 1.8.5-7ubuntu3/debian/control 2020-04-23 02:59:36.000000000 +0000 @@ -1,7 +1,8 @@ Source: sphinx Section: python Priority: optional -Maintainer: Debian Python Modules Team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Python Modules Team Uploaders: Dmitry Shachnev Homepage: http://sphinx-doc.org/ Build-Depends: debhelper-compat (= 12) @@ -14,23 +15,6 @@ Build-Depends-Indep: dh-python (>= 3.201 libjs-underscore, librsvg2-bin, perl, - python-alabaster (>= 0.7), - python-all (>= 2.6.6-4~), - python-babel (>= 1.3), - python-docutils (>= 0.11), - python-enum34, - python-html5lib, - python-imagesize, - python-jinja2 (>= 2.3), - python-mock, - python-packaging, - python-pygments (>= 2.1.1), - python-pytest, - python-requests (>= 2.4.0), - python-setuptools (>= 0.6c5-1~), - python-six (>= 1.5), - python-stemmer, - python-typing, python3-alabaster (>= 0.7), python3-all (>= 3.3.3-1~), python3-babel (>= 1.3), @@ -58,42 +42,6 @@ Standards-Version: 4.5.0 Vcs-Git: https://salsa.debian.org/python-team/modules/sphinx.git Vcs-Browser: https://salsa.debian.org/python-team/modules/sphinx -Package: python-sphinx -Architecture: all -Depends: python-typing, - sphinx-common (= ${source:Version}), - ${misc:Depends}, - ${python:Depends} -Recommends: make, python-enum34, python-pil -Suggests: dvipng, - imagemagick-6.q16, - latexmk, - libjs-mathjax, - python-sphinx-rtd-theme, - python-stemmer, - sphinx-doc, - texlive-fonts-recommended, - texlive-latex-extra, - texlive-latex-recommended, - texlive-plain-generic -Breaks: python-sphinxcontrib.issuetracker (<< 0.11-1), - python-sphinxcontrib.spelling (<< 2.1.1-1), - python-sphinxcontrib.websupport (<< 1.1.2) -Description: documentation generator for Python projects (implemented in Python 2) - Sphinx is a tool for producing documentation for Python projects, using - reStructuredText as markup language. - . - Sphinx features: - * HTML, CHM, LaTeX output, - * Cross-referencing source code, - * Automatic indices, - * Code highlighting, using Pygments, - * Extensibility. Existing extensions: - - automatic testing of code snippets, - - including docstrings from Python modules. - . - This package includes Python 2 modules and command line utilities. - Package: python3-sphinx Architecture: all Depends: python3-distutils, @@ -132,7 +80,7 @@ Description: documentation generator for Package: sphinx-common Architecture: all Depends: libjs-sphinxdoc (= ${source:Version}), ${misc:Depends} -Recommends: python-sphinx | python3-sphinx +Recommends: python3-sphinx Conflicts: python-sphinx (<< 1.1) Replaces: python-sphinx (<< 1.1) Provides: dh-sequence-sphinxdoc diff -pruN 1.8.5-7/debian/patches/html5_docs.diff 1.8.5-7ubuntu3/debian/patches/html5_docs.diff --- 1.8.5-7/debian/patches/html5_docs.diff 1970-01-01 00:00:00.000000000 +0000 +++ 1.8.5-7ubuntu3/debian/patches/html5_docs.diff 2020-04-08 17:02:54.000000000 +0000 @@ -0,0 +1,53 @@ +From: Dmitry Shachnev +Date: Wed, 8 Apr 2020 19:31:12 +0300 +Subject: Make Sphinx' documentation use HTML 5 builder + +shared-mime-info 1.11 and newer versions that include commit [1] +started to (correctly) detect XHTML files as XHTML and not HTML. + +However that makes WebKitGTK use the XML parser which is more strict +than the HTML parser, and it does not allow certain symbols like <, > +and & even inside