From c2f852d311fffad8dce18774c4e53957db14a460 Mon Sep 17 00:00:00 2001 From: Martina Ferrari Date: Sat, 18 Apr 2020 00:35:44 +0000 Subject: [PATCH 1/2] Import commit 8243bb6 from upstream. The patch added in 1.5.0-1 had rendered the package unusable. Closes: #958064. --- .../Add_missing_call_to_add_domain.patch | 25 +++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 26 insertions(+) create mode 100644 debian/patches/Add_missing_call_to_add_domain.patch diff --git a/debian/patches/Add_missing_call_to_add_domain.patch b/debian/patches/Add_missing_call_to_add_domain.patch new file mode 100644 index 0000000..0359257 --- /dev/null +++ b/debian/patches/Add_missing_call_to_add_domain.patch @@ -0,0 +1,25 @@ +From 8243bb6ec1ea0f3c96e0ed6177e743963fdd908b Mon Sep 17 00:00:00 2001 +From: Dave Shawley +Date: Tue, 27 Jun 2017 08:01:21 -0400 +Subject: [PATCH] httpdomain: Add missing call to add_domain. + +--- + sphinxcontrib/httpdomain.py | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/sphinxcontrib/httpdomain.py b/sphinxcontrib/httpdomain.py +index 9812671..6a25e2e 100644 +--- a/sphinxcontrib/httpdomain.py ++++ b/sphinxcontrib/httpdomain.py +@@ -763,6 +763,8 @@ def setup(app): + if HTTPDomain.name in app.domains: + return + ++ app.add_domain(HTTPDomain) ++ + try: + get_lexer_by_name('http') + except ClassNotFound: +-- +2.26.1 + diff --git a/debian/patches/series b/debian/patches/series index dc9b16a..df153ff 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ Update_http_domain_detection_to_work_with_new_Sphinx.patch +Add_missing_call_to_add_domain.patch -- GitLab From c361ec3e6c306d6aed561c481801be292b3fdb60 Mon Sep 17 00:00:00 2001 From: Martina Ferrari Date: Sat, 18 Apr 2020 00:36:53 +0000 Subject: [PATCH 2/2] Crete changelog entry. --- debian/changelog | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index 715fbfc..c23d407 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +sphinxcontrib-httpdomain (1.5.0-4) UNRELEASED; urgency=medium + + * Import commit 8243bb6ec1ea0f3c96e0ed6177e743963fdd908b from upstream. + The patch added in 1.5.0-1 had rendered the package unusable. + Closes: #958064. + + -- Martina Ferrari Sat, 18 Apr 2020 00:06:14 +0000 + sphinxcontrib-httpdomain (1.5.0-3) unstable; urgency=medium [ Ondřej Nový ] -- GitLab