Hi,
Please find attached the debdiff for fixing this bug. I'm uploading it
to the DELAYED/2 queue. Let me know if you want me to cancel this upload
and/or sponsor something else.
Cheers,
Thomas Goirand (zigo)
diff -Nru nwdiag-1.0.4+dfsg/debian/changelog nwdiag-1.0.4+dfsg/debian/changelog
--- nwdiag-1.0.4+dfsg/debian/changelog 2016-10-11 06:47:37.000000000 +0200
+++ nwdiag-1.0.4+dfsg/debian/changelog 2019-10-19 02:40:47.000000000 +0200
@@ -1,3 +1,10 @@
+nwdiag (1.0.4+dfsg-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Remove Python 2 support (Closes: #937172).
+
+ -- Thomas Goirand <z...@debian.org> Sat, 19 Oct 2019 02:40:47 +0200
+
nwdiag (1.0.4+dfsg-1) unstable; urgency=medium
* New upstream release
diff -Nru nwdiag-1.0.4+dfsg/debian/control nwdiag-1.0.4+dfsg/debian/control
--- nwdiag-1.0.4+dfsg/debian/control 2016-10-11 06:47:26.000000000 +0200
+++ nwdiag-1.0.4+dfsg/debian/control 2019-10-19 02:37:12.000000000 +0200
@@ -4,36 +4,17 @@
Maintainer: Kouhei Maeda <mkou...@palmtb.net>
Build-Depends: debhelper (>= 8.0.0),
dh-python,
- python-all,
- python-setuptools,
- python-nose,
- python-pep8 (>= 1.3),
- python-unittest2,
- python-reportlab,
- python-blockdiag (>= 1.5.0),
python3-all,
python3-setuptools,
python3-nose,
python3-pep8 (>= 1.3),
python3-reportlab,
+ python3-unittest2,
python3-blockdiag (>= 1.5.0),
fonts-vlgothic | fonts-japanese-gothic
Standards-Version: 3.9.8
-X-Python-Version: 2.7
Homepage: http://blockdiag.com/
-Package: python-nwdiag
-Architecture: all
-Provides: ${python:Provides}
-Depends: ${misc:Depends}, ${python:Depends},
- python-blockdiag (>= 1.5.0),
- python-docutils,
- python-reportlab
-Description: generate network-diagram image file from spec-text file
- Generate network-diagram from dot like text with multilingualization for
- node-label. But this supports utf-8 only. And get some examples and generated
- images.
-
Package: python3-nwdiag
Architecture: all
Depends: ${misc:Depends}, ${python3:Depends},
diff -Nru nwdiag-1.0.4+dfsg/debian/pydist-overrides
nwdiag-1.0.4+dfsg/debian/pydist-overrides
--- nwdiag-1.0.4+dfsg/debian/pydist-overrides 2011-06-12 16:40:31.000000000
+0200
+++ nwdiag-1.0.4+dfsg/debian/pydist-overrides 1970-01-01 01:00:00.000000000
+0100
@@ -1,3 +0,0 @@
-PIL python-imaging
-funcparserlib python-funcparserlib
-blockdiag python-blockdiag
diff -Nru nwdiag-1.0.4+dfsg/debian/python-nwdiag.manpages
nwdiag-1.0.4+dfsg/debian/python-nwdiag.manpages
--- nwdiag-1.0.4+dfsg/debian/python-nwdiag.manpages 2013-06-08
17:08:12.000000000 +0200
+++ nwdiag-1.0.4+dfsg/debian/python-nwdiag.manpages 1970-01-01
01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-nwdiag.1
-rackdiag.1
-packetdiag.1
diff -Nru nwdiag-1.0.4+dfsg/debian/rules nwdiag-1.0.4+dfsg/debian/rules
--- nwdiag-1.0.4+dfsg/debian/rules 2015-10-28 01:52:25.000000000 +0100
+++ nwdiag-1.0.4+dfsg/debian/rules 2019-10-19 02:37:43.000000000 +0200
@@ -7,7 +7,7 @@
export PYBUILD_BEFORE_BUILD=cp -a $(CURDIR)/src/nwdiag.egg-info {build_dir}
%:
- dh $@ --with python2,python3 --buildsystem=pybuild
+ dh $@ --with python3 --buildsystem=pybuild
override_dh_python3:
dh_python3
diff -Nru nwdiag-1.0.4+dfsg/debian/test-runner
nwdiag-1.0.4+dfsg/debian/test-runner
--- nwdiag-1.0.4+dfsg/debian/test-runner 2013-06-08 17:06:55.000000000
+0200
+++ nwdiag-1.0.4+dfsg/debian/test-runner 2019-10-19 02:39:29.000000000
+0200
@@ -1,11 +1,9 @@
-#!/usr/bin/python
+#!/usr/bin/python3
import os.path
import sys
sys.path[0:0] = [
os.path.abspath('src'),
- '/usr/lib/python2.7/dist-packages',
- '/usr/lib/pymodules/python2.7',
- '/usr/lib/python2.7/dist-packages/PIL',
+ '/usr/lib/python3/dist-packages',
]
