Bug#933582: BD on texlive-generic-extra which isn't build anymore and isn't in bullseye

2019-10-01 Thread Steve Langasek
Package: python-pymzml
Version: 0.7.6-dfsg-5
Followup-For: Bug #933582
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu eoan ubuntu-patch

Apologies, Paul's original bug report was correct, this should be moved to
texlive-plain-generic - NOT texlive-plain-extra, which is also now obsolete.

-- 
Steve Langasek   Give me a lever long enough and a Free OS
Debian Developer   to set it on, and I can move the world.
Ubuntu Developer   https://www.debian.org/
slanga...@ubuntu.com vor...@debian.org
diff -Nru python-pymzml-0.7.6-dfsg/debian/control 
python-pymzml-0.7.6-dfsg/debian/control
--- python-pymzml-0.7.6-dfsg/debian/control 2019-09-27 21:52:20.0 
-0700
+++ python-pymzml-0.7.6-dfsg/debian/control 2019-10-01 15:26:41.0 
-0700
@@ -12,7 +12,7 @@
dpkg-dev (>= 1.16.1~)
 Build-Depends-Indep: doxygen (>= 1.8.1.2), 
  latexmk,
- texlive-plain-extra, 
+ texlive-plain-generic, 
  texlive-extra-utils, 
  texlive-latex-extra, 
  texlive-latex-recommended,


Bug#933582: BD on texlive-generic-extra which isn't build anymore and isn't in bullseye

2019-09-28 Thread Steve Langasek
Package: python-pymzml
Followup-For: Bug #933582
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu eoan ubuntu-patch

This can be fixed by replacing texlive-generic-extra with a build-dependency
on texlive-plain-extra which replaces it.

In the process of fixing this in Ubuntu, I also found that python-pymzml
FTBFS due to use of an obsolete sphinx extension, so I've included a fix for
that as well in the attached patch.

-- 
Steve Langasek   Give me a lever long enough and a Free OS
Debian Developer   to set it on, and I can move the world.
Ubuntu Developer   https://www.debian.org/
slanga...@ubuntu.com vor...@debian.org
diff -Nru python-pymzml-0.7.6-dfsg/debian/control 
python-pymzml-0.7.6-dfsg/debian/control
--- python-pymzml-0.7.6-dfsg/debian/control 2018-02-02 16:42:13.0 
-0800
+++ python-pymzml-0.7.6-dfsg/debian/control 2019-09-27 17:21:35.0 
-0700
@@ -12,7 +12,7 @@
dpkg-dev (>= 1.16.1~)
 Build-Depends-Indep: doxygen (>= 1.8.1.2), 
  latexmk,
- texlive-generic-extra, 
+ texlive-plain-extra,
  texlive-extra-utils, 
  texlive-latex-extra, 
  texlive-latex-recommended,
diff -Nru python-pymzml-0.7.6-dfsg/debian/patches/series 
python-pymzml-0.7.6-dfsg/debian/patches/series
--- python-pymzml-0.7.6-dfsg/debian/patches/series  2015-11-25 
10:28:46.0 -0800
+++ python-pymzml-0.7.6-dfsg/debian/patches/series  2019-09-27 
17:21:35.0 -0700
@@ -1,2 +1,3 @@
 doc-config.patch
 remove-shebang-line.patch
+sphinx-imgmath.patch
diff -Nru python-pymzml-0.7.6-dfsg/debian/patches/sphinx-imgmath.patch 
python-pymzml-0.7.6-dfsg/debian/patches/sphinx-imgmath.patch
--- python-pymzml-0.7.6-dfsg/debian/patches/sphinx-imgmath.patch
1969-12-31 16:00:00.0 -0800
+++ python-pymzml-0.7.6-dfsg/debian/patches/sphinx-imgmath.patch
2019-09-27 17:21:35.0 -0700
@@ -0,0 +1,17 @@
+Description: replace obsoleted sphinx.ext.pngmath with sphinx.ext.imgmath
+Author: Steve Langasek 
+Last-Updated: 2019-09-27
+
+Index: python-pymzml-0.7.6-dfsg/Documentation_src/source/conf.py
+===
+--- python-pymzml-0.7.6-dfsg.orig/Documentation_src/source/conf.py
 python-pymzml-0.7.6-dfsg/Documentation_src/source/conf.py
+@@ -30,7 +30,7 @@
+ extensions = [
+ 'sphinx.ext.autodoc',
+ 'sphinx.ext.todo',
+-'sphinx.ext.pngmath'#,
++'sphinx.ext.imgmath'#,
+ # 'sphinx.ext.napoleon',
+ # 'sphinx.ext.viewcode'
+ ]