Hi,
Please see attached debdiff for fixing the 2 open bugs, one of which is
a RC bug (ie: Python 2 removal). I'm uploading this to DELAYED/10.
Please let me know if that's ok, or if I should dcut the package.
Cheers,
Thomas Goirand (zigo)
diff -Nru iptables-converter-0.9.8/debian/changelog
iptables-converter-0.9.8/debian/changelog
--- iptables-converter-0.9.8/debian/changelog 2015-10-31 21:20:47.000000000
+0100
+++ iptables-converter-0.9.8/debian/changelog 2020-03-22 13:01:11.000000000
+0100
@@ -1,3 +1,25 @@
+iptables-converter (0.9.8-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Switch the package to Python 3 (Closes: #943068):
+ - Remove obsolete X-Python-Version:.
+ - Replaced python2 direct depends by ${python3:Depends}.
+ - Removed python2 build-depends, replaced python3 build-depends by a
+ python3-all build-depends.
+ - Use python3 to build the sphinx doc.
+ * Ran wrap-and-sort -bastk.
+ * Fixed the package descriptions (Closes: #805459).
+ * Removed useless overrides.
+ * Switched to debhelper-compat = 12.
+ * Standards-Version: 4.5.0.
+ * Removed wrong exports in d/rules:
+ - export DH_VERBOSE=1
+ - export DH_OPTIONS=-v
+ - export DEB_BUILD_OPTIONS=1
+ * Better ordering for d/control source package.
+
+ -- Thomas Goirand <z...@debian.org> Sun, 22 Mar 2020 13:01:11 +0100
+
iptables-converter (0.9.8-1) unstable; urgency=medium
* Import upstream version 0.9.8
diff -Nru iptables-converter-0.9.8/debian/compat
iptables-converter-0.9.8/debian/compat
--- iptables-converter-0.9.8/debian/compat 2015-10-31 21:13:12.000000000
+0100
+++ iptables-converter-0.9.8/debian/compat 1970-01-01 01:00:00.000000000
+0100
@@ -1 +0,0 @@
-9
diff -Nru iptables-converter-0.9.8/debian/control
iptables-converter-0.9.8/debian/control
--- iptables-converter-0.9.8/debian/control 2015-10-31 21:13:12.000000000
+0100
+++ iptables-converter-0.9.8/debian/control 2020-03-22 13:01:11.000000000
+0100
@@ -1,34 +1,37 @@
Source: iptables-converter
-Maintainer: Johannes Hubertz <johan...@hubertz.de>
Section: utils
Priority: optional
-Build-Depends: python (>= 2.6.5),
- python-setuptools,
- python-sphinx,
- dh-python,
- debhelper (>= 9),
- python3 (>= 3.4),
- python3-setuptools,
- python3-sphinx
-Uploaders: Toni Mueller <t...@debian.org>
-X-Python-Version: (>= 2.6)
-Standards-Version: 3.9.6
+Maintainer: Johannes Hubertz <johan...@hubertz.de>
+Uploaders:
+ Toni Mueller <t...@debian.org>,
+Build-Depends:
+ debhelper-compat (= 12),
+ dh-python,
+ python3-all,
+ python3-setuptools,
+ python3-sphinx,
+Standards-Version: 4.5.0
Package: iptables-converter
Section: utils
Architecture: all
-Depends: python (>= 2.6.5), ${misc:Depends}
+Depends:
+ ${misc:Depends},
+ ${python3:Depends},
Description: convert iptables-commands from a file to iptables-save format
- iptables-converter: reads a file with iptables commands and converts
- these to an iptables-save readable format. To provide compatibility
- with iptables-save -c command zero packet and byte counters [0:0] are
- printed out.
- ip6tables-converter does the same for IPv6.
+ iptables-converter: reads a file with iptables commands and converts these to
+ an iptables-save readable format. To provide compatibility with
+ "iptables-save -c" command zero packet and byte counters [0:0] are printed
+ out. ip6tables-converter does the same for IPv6.
Package: iptables-converter-doc
Section: doc
Architecture: all
-Depends: ${misc:Depends}, ${sphinxdoc:Depends}
-Description: sphinx documentation for iptables-converter
- iptables-converter: convert iptables from file to iptables-save format
- ip6tables-converter mentioned
+Depends:
+ ${misc:Depends},
+ ${sphinxdoc:Depends},
+Description: convert iptables-commands from a file to iptables-save format -
doc
+ iptables-converter: reads a file with iptables commands and converts these to
+ an iptables-save readable format. To provide compatibility with
+ "iptables-save -c" command zero packet and byte counters [0:0] are printed
+ out. ip6tables-converter does the same for IPv6.
diff -Nru iptables-converter-0.9.8/debian/copyright
iptables-converter-0.9.8/debian/copyright
--- iptables-converter-0.9.8/debian/copyright 2015-10-31 21:13:12.000000000
+0100
+++ iptables-converter-0.9.8/debian/copyright 2020-03-22 13:00:58.000000000
+0100
@@ -25,4 +25,3 @@
On Debian systems, the full text of the GNU General Public
License version 3 can be found in the file
`/usr/share/common-licenses/GPL-3'.
-
diff -Nru iptables-converter-0.9.8/debian/iptables-converter.install
iptables-converter-0.9.8/debian/iptables-converter.install
--- iptables-converter-0.9.8/debian/iptables-converter.install 1970-01-01
01:00:00.000000000 +0100
+++ iptables-converter-0.9.8/debian/iptables-converter.install 2020-03-22
13:01:11.000000000 +0100
@@ -0,0 +1 @@
+/usr
diff -Nru iptables-converter-0.9.8/debian/iptables-converter.manpages
iptables-converter-0.9.8/debian/iptables-converter.manpages
--- iptables-converter-0.9.8/debian/iptables-converter.manpages 2015-10-31
21:13:12.000000000 +0100
+++ iptables-converter-0.9.8/debian/iptables-converter.manpages 2020-03-22
13:00:58.000000000 +0100
@@ -1,2 +1,2 @@
-man/iptables-converter.8
man/ip6tables-converter.8
+man/iptables-converter.8
diff -Nru iptables-converter-0.9.8/debian/rules
iptables-converter-0.9.8/debian/rules
--- iptables-converter-0.9.8/debian/rules 2015-10-31 21:13:12.000000000
+0100
+++ iptables-converter-0.9.8/debian/rules 2020-03-22 13:01:11.000000000
+0100
@@ -3,40 +3,25 @@
include /usr/share/dpkg/pkg-info.mk
-export DH_VERBOSE=1
-export DH_OPTIONS=-v
-export DEB_BUILD_OPTIONS=1
-
# Prevent setuptools/distribute from accessing the internet.
export http_proxy = http://127.0.9.1:9
%:
- dh $@ --with python2,python3,sphinxdoc --buildsystem=pybuild
-
-build: build-stamp
-
-build-stamp:
- dh_testdir
-
-clean:
- dh_clean
+ dh $@ --with python3,sphinxdoc --buildsystem=pybuild
override_dh_install:
- dh_prep
- dh_installdirs /usr/sbin /usr/share/pyshared /usr/share/man/man8
- dh_installman --language=C man/*
- dh_installdocs --exclude=html
- cd $(CURDIR)/debian/iptables-converter/usr/sbin && \
- cp $(CURDIR)/iptables_converter.py iptables-converter && \
- cp $(CURDIR)/ip6tables_converter.py ip6tables-converter && \
- cd $(CURDIR)
- dh_lintian
-
-override_dh_installdocs:
- python setup.py build_sphinx
- dh_installdocs --package=iptables-converter-doc build/sphinx/html
+ dh_install
+ mkdir -p $(CURDIR)/debian/iptables-converter/usr/sbin
+ cp $(CURDIR)/iptables_converter.py
$(CURDIR)/debian/iptables-converter/usr/sbin/iptables-converter
+ cp $(CURDIR)/ip6tables_converter.py
$(CURDIR)/debian/iptables-converter/usr/sbin/ip6tables-converter
+ sed -i '1 s|#!/usr/bin/python|#!/usr/bin/python3|'
$(CURDIR)/debian/iptables-converter/usr/sbin/iptables-converter
+ sed -i '1 s|#!/usr/bin/python|#!/usr/bin/python3|'
$(CURDIR)/debian/iptables-converter/usr/sbin/ip6tables-converter
+
+override_dh_sphinxdoc:
+ python3 -m sphinx -b html docs/source
$(CURDIR)/debian/iptables-converter-doc/usr/share/doc/iptables-converter-doc/html
+ dh_sphinxdoc
override_dh_auto_clean:
rm -rf build
rm -rf *.egg-info
-
+ dh_auto_clean
