Control: tags 872242 + patch
Control: tags 933582 + patch
Control: tags 938078 + patch


Dear maintainer,

I've prepared an NMU for python-pymzml (versioned as 0.7.6-dfsg-5.1). The diff
is attached to this message.

I've uploaded directly to unstable as it fixes 2 RC bugs

Regards.

diff -Nru python-pymzml-0.7.6-dfsg/debian/changelog python-pymzml-0.7.6-dfsg/debian/changelog
--- python-pymzml-0.7.6-dfsg/debian/changelog	2017-09-15 08:05:47.000000000 -0400
+++ python-pymzml-0.7.6-dfsg/debian/changelog	2019-10-07 21:27:22.000000000 -0400
@@ -1,3 +1,15 @@
+python-pymzml (0.7.6-dfsg-5.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Drop python2 support; Closes: #938078
+  * add latexmk to b-d-i, fix a FTBFS; Closes: #872242
+  * replace b-d-i on texlive-generic-extra with texlive-plain-generic;
+    Closes: #933582
+  * debian/patches/sphinx-pngmath.patch
+    - replace sphinx extension pngmath with imgmath
+
+ -- Sandro Tosi <mo...@debian.org>  Mon, 07 Oct 2019 21:27:22 -0400
+
 python-pymzml (0.7.6-dfsg-5) unstable; urgency=low
 
   * debian/control: update the dependencies latex-xcolor replaced with
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	2017-09-15 08:05:47.000000000 -0400
+++ python-pymzml-0.7.6-dfsg/debian/control	2019-10-07 21:21:46.000000000 -0400
@@ -4,14 +4,13 @@
 Section: python
 Priority: optional
 Build-Depends: dh-python,
-               python-all (>= 2.6.6-3~),
-               python-setuptools,
                python3-all,
                python3-setuptools,
                debhelper (>=9.20130630),
                dpkg-dev (>= 1.16.1~)
 Build-Depends-Indep: doxygen (>= 1.8.1.2), 
-                     texlive-generic-extra, 
+                     latexmk, 
+                     texlive-plain-generic, 
                      texlive-extra-utils, 
                      texlive-latex-extra, 
                      texlive-latex-recommended,
@@ -26,23 +25,6 @@
 Vcs-Git: https://anonscm.debian.org/git/debichem/packages/python-pymzml.git
 Vcs-Browser: https://anonscm.debian.org/git/debichem/packages/python-pymzml.git
 
-Package: python-pymzml
-Architecture: all
-Depends: ${misc:Depends},
-         ${python:Depends}
-Suggests: python-pymzml-doc
-Conflicts: python-mzml
-Replaces: python-mzml
-Description: mzML mass spectrometric data parsing (Python 2.x)
- python-pymzml is an extension to Python that offers:
-  - easy access to mass spectrometry (MS) data that allows 
-    the rapid development of tools;
-  - a very fast parser for mzML data, the standard in 
-    mass spectrometry data format;
-  - a set of functions to compare or handle spectra.
- .
- This package contains python-pymzml for Python 2.
-
 Package: python3-pymzml
 Architecture: all
 Depends: ${misc:Depends},
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 13:28:46.000000000 -0500
+++ python-pymzml-0.7.6-dfsg/debian/patches/series	2019-10-07 21:25:13.000000000 -0400
@@ -1,2 +1,3 @@
 doc-config.patch
 remove-shebang-line.patch
+sphinx-pngmath.patch
diff -Nru python-pymzml-0.7.6-dfsg/debian/patches/sphinx-pngmath.patch python-pymzml-0.7.6-dfsg/debian/patches/sphinx-pngmath.patch
--- python-pymzml-0.7.6-dfsg/debian/patches/sphinx-pngmath.patch	1969-12-31 19:00:00.000000000 -0500
+++ python-pymzml-0.7.6-dfsg/debian/patches/sphinx-pngmath.patch	2019-10-07 21:27:05.000000000 -0400
@@ -0,0 +1,11 @@
+--- a/Documentation_src/source/conf.py
++++ b/Documentation_src/source/conf.py
+@@ -30,7 +30,7 @@ sys.path.insert(0, os.path.abspath('.'))
+ extensions = [
+     'sphinx.ext.autodoc',
+     'sphinx.ext.todo',
+-    'sphinx.ext.pngmath'#,
++    'sphinx.ext.imgmath'#,
+     # 'sphinx.ext.napoleon',
+     # 'sphinx.ext.viewcode'
+ ]
diff -Nru python-pymzml-0.7.6-dfsg/debian/python-pymzml.install python-pymzml-0.7.6-dfsg/debian/python-pymzml.install
--- python-pymzml-0.7.6-dfsg/debian/python-pymzml.install	2015-11-24 07:52:13.000000000 -0500
+++ python-pymzml-0.7.6-dfsg/debian/python-pymzml.install	1969-12-31 19:00:00.000000000 -0500
@@ -1,2 +0,0 @@
-README.md usr/share/doc/python-pymzml
-example_scripts usr/share/doc/python-pymzml/
diff -Nru python-pymzml-0.7.6-dfsg/debian/python-pymzml.lintian-overrides python-pymzml-0.7.6-dfsg/debian/python-pymzml.lintian-overrides
--- python-pymzml-0.7.6-dfsg/debian/python-pymzml.lintian-overrides	2015-11-25 15:49:24.000000000 -0500
+++ python-pymzml-0.7.6-dfsg/debian/python-pymzml.lintian-overrides	1969-12-31 19:00:00.000000000 -0500
@@ -1,2 +0,0 @@
-python-pymzml binary: no-upstream-changelog
-python-pymzml binary: package-contains-empty-directory
diff -Nru python-pymzml-0.7.6-dfsg/debian/python-pymzml.manpages python-pymzml-0.7.6-dfsg/debian/python-pymzml.manpages
--- python-pymzml-0.7.6-dfsg/debian/python-pymzml.manpages	2015-11-24 07:03:32.000000000 -0500
+++ python-pymzml-0.7.6-dfsg/debian/python-pymzml.manpages	1969-12-31 19:00:00.000000000 -0500
@@ -1 +0,0 @@
-debian/python-pymzml.7
diff -Nru python-pymzml-0.7.6-dfsg/debian/rules python-pymzml-0.7.6-dfsg/debian/rules
--- python-pymzml-0.7.6-dfsg/debian/rules	2015-11-26 04:32:40.000000000 -0500
+++ python-pymzml-0.7.6-dfsg/debian/rules	2019-10-07 21:20:18.000000000 -0400
@@ -8,7 +8,7 @@
 SRCDIR=$(CURDIR)
 
 %:
-	dh $@ --with python2,python3 --buildsystem=pybuild
+	dh $@ --with python3 --buildsystem=pybuild
 
 override_dh_compress:
 
@@ -21,15 +21,12 @@
 override_dh_install:
 	dh_install
 # Remove the symbolic link.
-	rm -fv debian/python-pymzml/usr/share/doc/python-pymzml/example_scripts/pymzml
 	rm -fv debian/python3-pymzml/usr/share/doc/python3-pymzml/example_scripts/pymzml
 
 # Remove all the pyc files.
-	rm -fv debian/python-pymzml/usr/share/doc/python-pymzml/example_scripts/*.pyc
 	rm -fv debian/python3-pymzml/usr/share/doc/python3-pymzml/example_scripts/*.pyc
 
 # Remove the license file
-	rm -fv debian/python-pymzml/usr/share/doc/python-pymzml/COPYING.txt
 	rm -fv debian/python3-pymzml/usr/share/doc/python3-pymzml/COPYING.txt
 
 	rm -fv debian/python-pymzml-doc/usr/share/doc/python-pymzml-doc/COPYING.txt

Reply via email to