Hi,
I've uploaded the fix to DELAYED/2 as this bug is now RC. Let me know if
you want me to sponsor a better fix (or any subsequent debian release).
Cheers,
Thomas Goirand (zigo)
diff -Nru sphinxcontrib-nwdiag-0.9.5/debian/changelog
sphinxcontrib-nwdiag-0.9.5/debian/changelog
--- sphinxcontrib-nwdiag-0.9.5/debian/changelog 2016-11-01 01:12:35.000000000
+0100
+++ sphinxcontrib-nwdiag-0.9.5/debian/changelog 2019-10-19 02:18:16.000000000
+0200
@@ -1,3 +1,11 @@
+sphinxcontrib-nwdiag (0.9.5-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Remove Python 2 support (Closes: #938535).
+ * Add dh-python as build-depends.
+
+ -- Thomas Goirand <z...@debian.org> Sat, 19 Oct 2019 02:18:16 +0200
+
sphinxcontrib-nwdiag (0.9.5-1) unstable; urgency=medium
* New upstream release
diff -Nru sphinxcontrib-nwdiag-0.9.5/debian/control
sphinxcontrib-nwdiag-0.9.5/debian/control
--- sphinxcontrib-nwdiag-0.9.5/debian/control 2016-11-01 01:12:32.000000000
+0100
+++ sphinxcontrib-nwdiag-0.9.5/debian/control 2019-10-19 02:18:14.000000000
+0200
@@ -3,12 +3,7 @@
Priority: optional
Maintainer: Kouhei Maeda <mkou...@palmtb.net>
Build-Depends: debhelper (>= 9.0.0),
- python-all,
- python-setuptools,
- python-sphinx (>= 0.6),
- python-mock,
- python-blockdiag (>= 1.5.0),
- python-nwdiag (>= 1.0.3),
+ dh-python,
python3-all,
python3-setuptools,
python3-sphinx (>= 0.6),
@@ -16,21 +11,8 @@
python3-blockdiag (>= 1.5.0),
python3-nwdiag (>= 1.0.3),
Standards-Version: 3.9.8
-X-Python-Version: 2.7
Homepage: http://github.com/blockdiag/sphinxcontrib-nwdiag
-Package: python-sphinxcontrib.nwdiag
-Architecture: all
-Provides: ${python:Provides}
-Depends: ${misc:Depends}, ${python:Depends},
- python-blockdiag (>= 1.5.0),
- python-nwdiag (>= 1.0.3),
- python-sphinx (>= 0.6)
-Description: Sphinx "nwdiag" extension
- This package contains the nwdiag Sphinx extension. This extension enable
- you to insert network diagrams in your Sphinx document. This renders block
- diagrams by using python-nwdiag.
-
Package: python3-sphinxcontrib.nwdiag
Architecture: all
Depends: ${misc:Depends}, ${python3:Depends},
diff -Nru sphinxcontrib-nwdiag-0.9.5/debian/pydist-overrides
sphinxcontrib-nwdiag-0.9.5/debian/pydist-overrides
--- sphinxcontrib-nwdiag-0.9.5/debian/pydist-overrides 2011-06-12
17:02:30.000000000 +0200
+++ sphinxcontrib-nwdiag-0.9.5/debian/pydist-overrides 1970-01-01
01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-PIL python-imaging
-nwdiag python-nwdiag
-sphinx python-sphinx
diff -Nru sphinxcontrib-nwdiag-0.9.5/debian/rules
sphinxcontrib-nwdiag-0.9.5/debian/rules
--- sphinxcontrib-nwdiag-0.9.5/debian/rules 2014-11-22 18:41:59.000000000
+0100
+++ sphinxcontrib-nwdiag-0.9.5/debian/rules 2019-10-19 02:18:16.000000000
+0200
@@ -8,12 +8,8 @@
export PYBUILD_DISABLE=test
%:
- dh $@ --with python2,python3 --buildsystem=pybuild
+ dh $@ --with python3 --buildsystem=pybuild
override_dh_python3:
dh_python3
find $(CURDIR)/debian/python3-sphinxcontrib.nwdiag -name tests -a -type
d | xargs rm -rf
-
-override_dh_python2:
- dh_python2
- find $(CURDIR)/debian/python-sphinxcontrib.nwdiag -name tests -a -type
d | xargs rm -rf
