Merge ~pushkarnk/ubuntu/+source/sphinx:fix-2110098 into ubuntu/+source/sphinx:ubuntu/devel

[Pushkar Kulkarni]

[Dmitry Shachnev (mitya57)]

It’s a bit unfortunate to carry a delta against upstream and Debian, but okay.

I wonder what were the upstream reasons to switch to a new library. Maybe you can file an upstream bug asking about that?

review: Approve

[Pushkar Kulkarni (pushkarnk)]

Thanks for the review!

It looks like upstream moved [1] to using roman-numerals after docutils.utils removed [2] the roman package.

I started an upstream discussion [3].

[1] https://github.com/sphinx-doc/sphinx/pull/13131
[2] https://sourceforge.net/p/docutils/code/9977/
[3] https://github.com/orgs/sphinx-doc/discussions/13532

[Pushkar Kulkarni (pushkarnk)]

Package built in https://launchpad.net/~pushkarnk/+archive/ubuntu/test-ppa

Autopkgtests:

    + ✅ sphinx on questing for amd64 @ 07.05.25 10:48:16 Log️ 🗒️
    + ✅ sphinx on questing for arm64 @ 07.05.25 10:48:49 Log️ 🗒️
    + ✅ sphinx on questing for armhf @ 07.05.25 10:52:01 Log️ 🗒️
    + ✅ sphinx on questing for i386 @ 07.05.25 10:49:10 Log️ 🗒️
    + ✅ sphinx on questing for ppc64el @ 07.05.25 10:48:40 Log️ 🗒️
    + ❌ sphinx on questing for s390x @ 07.05.25 10:47:22 Log️ 🗒️
      • sphinx-doc SKIP 🟧
      • sphinx-doc SKIP 🟧
      • python3-sphinx FAIL 🟥

The failures on s390x look like infrastructure issues.

https://autopkgtest.ubuntu.com/results/autopkgtest-questing-pushkarnk-test-ppa/questing/s390x/s/sphinx/20250507_145031_b1f1f@/log.gz

[Pushkar Kulkarni (pushkarnk)]

So, roman-numerals was an intentional upstream choice.

https://github.com/orgs/sphinx-doc/discussions/13532#discussioncomment-13071544

diff --git a/debian/changelog b/debian/changelog
index 69f9669..b763519 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+sphinx (8.2.3-1ubuntu1) questing; urgency=medium
+
+  * d/{control, patches}: replace the new python3-roman-numerals
+    dependency with the existing python3-roman to avoid a component
+    mismatch (LP: #2110098)
+
+ -- Pushkar Kulkarni <[e-mail]>  Wed, 07 May 2025 13:22:48 +0530
+
 sphinx (8.2.3-1) experimental; urgency=medium
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index bb92fa1..dea1081 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: sphinx
 Section: python
 Priority: optional
-Maintainer: Debian Python Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Python Team <[e-mail]>
 Uploaders: Dmitry Shachnev <[e-mail]>
 Homepage: https://www.sphinx-doc.org/
 Build-Depends: debhelper-compat (= 13),
@@ -36,7 +37,7 @@ Build-Depends-Indep: dpkg-dev (>= 1.17.14),
                      python3-pygments (>= 2.17),
                      python3-pytest (>= 8.0) <!nocheck>,
                      python3-requests (>= 2.30.0),
-                     python3-roman-numerals,
+                     python3-roman,
                      python3-setuptools (>= 70.0),
                      python3-snowballstemmer (>= 2.2),
                      python3-sphinxcontrib.websupport <!nodoc>,
diff --git a/debian/patches/replace_roman_numerals_by_roman.diff b/debian/patches/replace_roman_numerals_by_roman.diff
new file mode 100644
index 0000000..cac1a1c
--- /dev/null
+++ b/debian/patches/replace_roman_numerals_by_roman.diff
@@ -0,0 +1,22 @@
+--- a/sphinx/writers/latex.py
++++ b/sphinx/writers/latex.py
+@@ -12,7 +12,7 @@
+ from typing import TYPE_CHECKING, cast
+ 
+ from docutils import nodes, writers
+-from roman_numerals import RomanNumeral
++import roman
+ 
+ from sphinx import addnodes, highlighting
+ from sphinx.errors import SphinxError
+@@ -1425,8 +1425,8 @@
+                 return get_nested_level(node.parent)
+ 
+         nested_level = get_nested_level(node)
+-        enum = f'enum{RomanNumeral(nested_level).to_lowercase()}'
+-        enumnext = f'enum{RomanNumeral(nested_level + 1).to_lowercase()}'
++        enum = f'enum{roman.toRoman(nested_level).lower()}'
++        enumnext = f'enum{roman.toRoman(nested_level + 1).lower()}'
+         style = ENUMERATE_LIST_STYLE.get(get_enumtype(node))
+         prefix = node.get('prefix', '')
+         suffix = node.get('suffix', '.')
diff --git a/debian/patches/series b/debian/patches/series
index 39c8d82..a75dce4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ use_packaged_mathjax.diff
 skip_tests_serializinghtml.diff
 move_sphinxcontrib_to_extras_require.diff
 intersphinx_local.diff
+replace_roman_numerals_by_roman.diff