diff -Nru sphinx-1.8.5/debian/changelog sphinx-1.8.5/debian/changelog
--- sphinx-1.8.5/debian/changelog	2019-07-14 14:40:25.000000000 +0000
+++ sphinx-1.8.5/debian/changelog	2019-08-16 19:08:42.000000000 +0000
@@ -1,3 +1,16 @@
+sphinx (1.8.5-3) unstable; urgency=medium
+
+  [ Ondřej Nový ]
+  * Use debhelper-compat instead of debian/compat.
+
+  [ Dmitry Shachnev ]
+  * Suggest texlive-plain-generic instead of texlive-generic-extra.
+    The latter package is no longer built, and iftex.sty is now shipped by
+    the former package.
+  * Backport upstream patch to fix test failure with docutils 0.15.
+
+ -- Dmitry Shachnev <mitya57@debian.org>  Fri, 16 Aug 2019 22:08:42 +0300
+
 sphinx (1.8.5-2) unstable; urgency=medium
 
   * Update debian/.gitlab-ci.yml to use salsa-pipeline.
diff -Nru sphinx-1.8.5/debian/compat sphinx-1.8.5/debian/compat
--- sphinx-1.8.5/debian/compat	2019-07-14 14:40:25.000000000 +0000
+++ sphinx-1.8.5/debian/compat	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-11
diff -Nru sphinx-1.8.5/debian/control sphinx-1.8.5/debian/control
--- sphinx-1.8.5/debian/control	2019-07-14 14:40:25.000000000 +0000
+++ sphinx-1.8.5/debian/control	2019-08-16 19:08:42.000000000 +0000
@@ -4,7 +4,7 @@
 Maintainer: Debian Python Modules Team <python-modules-team@lists.alioth.debian.org>
 Uploaders: Dmitry Shachnev <mitya57@debian.org>
 Homepage: http://sphinx-doc.org/
-Build-Depends: debhelper (>= 11)
+Build-Depends: debhelper-compat (= 11)
 Build-Depends-Indep: dh-python (>= 3.20180313~),
                      dpkg-dev (>= 1.17.14),
                      dvipng,
@@ -73,9 +73,9 @@
           python-stemmer,
           sphinx-doc,
           texlive-fonts-recommended,
-          texlive-generic-extra,
           texlive-latex-extra,
-          texlive-latex-recommended
+          texlive-latex-recommended,
+          texlive-plain-generic
 Breaks: python-sphinxcontrib.issuetracker (<< 0.11-1),
         python-sphinxcontrib.spelling (<< 2.1.1-1)
 Description: documentation generator for Python projects (implemented in Python 2)
@@ -109,9 +109,9 @@
           python3-stemmer,
           sphinx-doc,
           texlive-fonts-recommended,
-          texlive-generic-extra,
           texlive-latex-extra,
-          texlive-latex-recommended
+          texlive-latex-recommended,
+          texlive-plain-generic
 Description: documentation generator for Python projects (implemented in Python 3)
  Sphinx is a tool for producing documentation for Python projects, using
  reStructuredText as markup language.
diff -Nru sphinx-1.8.5/debian/patches/docutils_0.15.diff sphinx-1.8.5/debian/patches/docutils_0.15.diff
--- sphinx-1.8.5/debian/patches/docutils_0.15.diff	1970-01-01 00:00:00.000000000 +0000
+++ sphinx-1.8.5/debian/patches/docutils_0.15.diff	2019-08-16 19:08:42.000000000 +0000
@@ -0,0 +1,24 @@
+From: Takeshi KOMIYA <i.tkomiya@gmail.com>
+Date: Mon, 29 Jul 2019 01:35:50 +0900
+Subject: Fix #6620: i18n: classifiers of definition list are not translated
+ with docutils-0.15
+
+(cherry picked from commit c45f962b05106d91d64d9fa820a3951b694d9a6a)
+---
+ sphinx/util/nodes.py | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/sphinx/util/nodes.py b/sphinx/util/nodes.py
+index 1777f58..9656df7 100644
+--- a/sphinx/util/nodes.py
++++ b/sphinx/util/nodes.py
+@@ -79,6 +79,9 @@ def apply_source_workaround(node):
+         node.source = definition_list_item.source
+         node.line = definition_list_item.line - 1
+         node.rawsource = node.astext()  # set 'classifier1' (or 'classifier2')
++    elif isinstance(node, nodes.classifier) and not node.source:
++        # docutils-0.15 fills in rawsource attribute, but not in source.
++        node.source = node.parent.source
+     if isinstance(node, nodes.image) and node.source is None:
+         logger.debug('[i18n] PATCH: %r to have source, line: %s',
+                      get_full_module_name(node), repr_domxml(node))
diff -Nru sphinx-1.8.5/debian/patches/series sphinx-1.8.5/debian/patches/series
--- sphinx-1.8.5/debian/patches/series	2019-07-14 14:40:25.000000000 +0000
+++ sphinx-1.8.5/debian/patches/series	2019-08-16 19:08:42.000000000 +0000
@@ -8,3 +8,4 @@
 python2_tests_import_hack.diff
 python2_test_get_module_source.diff
 reproducible_download.diff
+docutils_0.15.diff