debian: merge tag 'frr-8.4.1' into debian/master

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>

diff --cc debian/control
index c77a752b8a93fa485537fa2e7b0f19d40afa82cc,06c16cc9450c5742059781a1255d67f883a616d0..debc6f7f8a49e566d76f221dd28719dc256ffa20
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -25,11 -25,12 +25,12 @@@ Build-Depends: bison
                 libyang2-dev,
                 lsb-base,
                 pkg-config,
 -               python3,
 -               python3-dev,
 -               python3-pytest <!nocheck>,
 -               python3-sphinx,
 +               python3:native,
 +               python3-dev:native,
 +               python3-pytest:native <!nocheck>,
 +               python3-sphinx:native,
                 texinfo (>= 4.7),
+                lua5.3 <pkg.frr.lua>,
                 liblua5.3-dev <pkg.frr.lua>
  Standards-Version: 4.5.0.3
  Homepage: https://www.frrouting.org/

diff --cc debian/rules
index 2b8139c5ef5f3effeee532ece58adf177daff489,fdb458e6a84d3dce1fe88cb231c377329ff000e4..c4b82faf21dd92552f5d5bbb83c393e8c86aa2b0
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -71,8 -78,9 +78,9 @@@ override_dh_auto_install
        sed -e '1c #!/usr/bin/python3' -i debian/tmp/usr/lib/frr/generate_support_bundle.py
  
  # let dh_systemd_* and dh_installinit do their thing automatically
 -      cp tools/frr.service debian/frr.service
 -      cp tools/frr@.service debian/frr@.service
 -      cp tools/frrinit.sh debian/frr.init
 +      cp build/tools/frr.service debian/frr.service
++      cp build/tools/frr@.service debian/frr@.service
 +      cp build/tools/frrinit.sh debian/frr.init
        -rm -f debian/tmp/usr/lib/frr/frr
  
  # install config files