debianpkg: change frr-pythontools dep to python3

The shebang can't be both at the same time;  since python2 is going to
be removed from Debian soon let's just stick with python3.

Signed-off-by: David Lamparter <equinox@diac24.net>

diff --git a/debianpkg/control b/debianpkg/control
index c7a531ed5461fb6fa20b80dac6ef5330c20ac019..252132f0f0af02648416731a89dc80ce7a081baf 100644 (file)
--- a/debianpkg/control
+++ b/debianpkg/control
@@ -113,8 +113,7 @@ Depends:
  ${misc:Depends},
  frr (<< ${source:Upstream-Version}.0-~),
  frr (>= ${source:Version}~),
- python (>= 2.7) | python3,
- python-ipaddr | python-ipaddress
+ python3:any
 Description: BGP/OSPF/RIP/RIPng/ISIS/PIM/LDP routing daemon (Python Tools)
  This package includes info files for frr, a free software which manages
  TCP/IP based routing protocols.  It supports BGP4, BGP4+, OSPFv2, OSPFv3,

diff --git a/debianpkg/frr-pythontools.install b/debianpkg/frr-pythontools.install
index aee093cf69f86ae4c73a872ba30b9ef3ce4e96b4..28140382f647a474c0cca6126417f01e91470c99 100644 (file)
--- a/debianpkg/frr-pythontools.install
+++ b/debianpkg/frr-pythontools.install
@@ -1 +1 @@
-tools/frr-reload.py usr/lib/frr/
+usr/lib/frr/frr-reload.py

diff --git a/debianpkg/rules b/debianpkg/rules
index 9ee866298ad0089de1b9938869199861deabdea8..5b9438109ec6f09dd0a4e4d185d008eeb466c966 100755 (executable)
--- a/debianpkg/rules
+++ b/debianpkg/rules
@@ -120,6 +120,8 @@ else
   USE_SYSTEMD=--enable-systemd=no
 endif
 
+export PYTHON=python3
+
 %:
        dh $@ --with=$(DH_WITH_SYSTEMD)autoreconf --parallel --dbg-package=frr-dbg
 
@@ -154,8 +156,7 @@ override_dh_auto_configure:
 override_dh_auto_install:
        dh_auto_install
 
-       # installed in frr-pythontools
-       rm debian/tmp/usr/lib/frr/frr-reload.py
+       sed -e '1c #!/usr/bin/python3' -i debian/tmp/usr/lib/frr/frr-reload.py
 
        # let dh_systemd_* and dh_installinit do their thing automatically
 ifeq ($(filter pkg.frr.nosystemd,$(DEB_BUILD_PROFILES)),)