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

... sync up with upstream debian packaging (which is 8.1 right now)

NB: manual merge/reconciliation in debian/

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

diff --cc debian/control
index dfeb83b61504a873f049747a1be3ce9f70f1f952,2bc144e798d55b1571dcbfb4854c895d6f0612e8..c77a752b8a93fa485537fa2e7b0f19d40afa82cc
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -3,35 -3,35 +3,35 @@@ Section: ne
  Priority: optional
  Maintainer: David Lamparter <equinox-debian@diac24.net>
  Uploaders: FRRouting-dev <dev@lists.frrouting.org>,
-          Ondřej Surý <ondrej@debian.org>
- Build-Depends:
-  bison,
-  chrpath,
-  debhelper (>= 9.20150101),
-  debhelper (>= 9.20160709) <!pkg.frr.nosystemd> | dh-systemd <!pkg.frr.nosystemd>,
-  flex,
-  gawk,
-  install-info,
-  libc-ares-dev,
-  libcap-dev,
-  libjson-c-dev | libjson0-dev,
-  libpam0g-dev | libpam-dev,
-  libpcre3-dev,
-  libpython3-dev,
-  libreadline-dev,
-  librtr-dev <!pkg.frr.nortrlib>,
-  libsnmp-dev,
-  libssh-dev <!pkg.frr.nortrlib>,
-  libsystemd-dev <!pkg.frr.nosystemd>,
-  libyang-dev (>= 0.16.74),
-  lsb-base,
-  pkg-config,
-  python3:native,
-  python3-dev:native,
-  python3-sphinx:native,
-  python3-pytest:native <!nocheck>,
-  texinfo (>= 4.7)
- Standards-Version: 4.4.1
+            Ondřej Surý <ondrej@debian.org>
+ Build-Depends: bison,
+                chrpath,
+                debhelper (>= 10~) | dh-systemd,
+                debhelper (>= 9.20150101~),
+                flex,
+                gawk,
+                install-info,
+                libc-ares-dev,
+                libcap-dev,
+                libelf-dev,
+                libjson-c-dev | libjson0-dev,
+                libpam0g-dev | libpam-dev,
+                libpcre2-dev,
+                libpython3-dev,
+                libreadline-dev,
+                librtr-dev <!pkg.frr.nortrlib>,
+                libsnmp-dev,
+                libssh-dev <!pkg.frr.nortrlib>,
+                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),
+                liblua5.3-dev <pkg.frr.lua>
+ Standards-Version: 4.5.0.3
  Homepage: https://www.frrouting.org/
  Vcs-Browser: https://github.com/FRRouting/frr/tree/debian/master
  Vcs-Git: https://github.com/FRRouting/frr.git -b debian/master

diff --cc debian/frr-doc.install
index 955c8fc5a94587b72e731a8e0ceb0c219486277b,a6661621223861234afe3864d3541a53580df60b..f7c4f5074d56c751c73559695106b48b38b0cfe3
--- 1/debian/frr-doc.install
--- 2/debian/frr-doc.install
+++ b/debian/frr-doc.install
@@@ -5,5 -3,14 +3,5 @@@
  # other
  README.md         usr/share/doc/frr
  doc/figures/*.png usr/share/doc/frr
 -doc/figures/fig-normal-processing.png usr/share/info
 -doc/figures/fig-rs-processing.png usr/share/info
 -doc/figures/fig-vnc-commercial-route-reflector.png usr/share/info
 -doc/figures/fig-vnc-frr-route-reflector.png usr/share/info
 -doc/figures/fig-vnc-gw.png usr/share/info
 -doc/figures/fig-vnc-mesh.png usr/share/info
 -doc/figures/fig-vnc-redundant-route-reflectors.png usr/share/info
 -doc/figures/fig_topologies_full.png usr/share/info
 -doc/figures/fig_topologies_rs.png usr/share/info
+ usr/share/doc/frr/html
+ usr/share/info/

diff --cc debian/frr.install
index 161497252ee59ddd6beb08d2551e15bd8bc95782,48263222f82b958e19f1d7a6e181edca45fbfafb..69ccb4f8a006be2e08781fd01bef3580228028a6
--- 1/debian/frr.install
--- 2/debian/frr.install
+++ b/debian/frr.install
@@@ -1,6 -1,9 +1,8 @@@
 -debian/frr.conf usr/lib/tmpfiles.d
  etc/
- usr/bin/vtysh
+ tools/etc/frr/frr.conf etc/frr/
+ tools/frr-reload usr/lib/frr/
  usr/bin/mtracebis
+ usr/bin/vtysh
  usr/lib/*/frr/libfrr.*
  usr/lib/*/frr/libfrrcares.*
  usr/lib/*/frr/libfrrospfapiclient.*

diff --cc debian/rules
index 6b1d9f9ce843f5804e5c647848d9be67db4c5052,0fa9c3a3b00cdd33fd31ce13b038ac53b5a1f37c..2b8139c5ef5f3effeee532ece58adf177daff489
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -72,10 -71,8 +71,8 @@@ 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
- ifeq ($(filter pkg.frr.nosystemd,$(DEB_BUILD_PROFILES)),)
--      cp tools/frr.service debian/frr.service
- endif
 -      cp tools/frrinit.sh debian/frr.init
++      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