debianpkg: raise debhelper compat level to 9

Compat level 7 has long been deprecated.  9 works fine for us, though it
does change the library installation directories to multi-arch.  (Which
is not a problem.)

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

diff --git a/debianpkg/compat b/debianpkg/compat
index 7f8f011eb73d6043d2e6db9d2c101195ae2801f2..ec635144f60048986bc560c5576355344005e6e7 100644 (file)
--- a/debianpkg/compat
+++ b/debianpkg/compat
@@ -1 +1 @@
-7
+9

diff --git a/debianpkg/frr-rpki-rtrlib.install b/debianpkg/frr-rpki-rtrlib.install
index 3c9d4557edc7008d3c5417768b02f2259c5bb5ed..0465c0d9105f3eda26f473bd82cca6df61c31091 100644 (file)
--- a/debianpkg/frr-rpki-rtrlib.install
+++ b/debianpkg/frr-rpki-rtrlib.install
@@ -1 +1 @@
-usr/lib/frr/modules/bgpd_rpki.so
+usr/lib/*/frr/modules/bgpd_rpki.so

diff --git a/debianpkg/frr-snmp.install b/debianpkg/frr-snmp.install
index a400c07f8120806b587a189c1ed50bcdcdcd7609..33fcdfb5981acdda82305a5505bfe8473f98b32e 100644 (file)
--- a/debianpkg/frr-snmp.install
+++ b/debianpkg/frr-snmp.install
@@ -1,6 +1,2 @@
-usr/lib/libfrrsnmp.*
-usr/lib/frr/modules/bgpd_snmp.so
-usr/lib/frr/modules/ospfd_snmp.so
-usr/lib/frr/modules/ospf6d_snmp.so
-usr/lib/frr/modules/ripd_snmp.so
-usr/lib/frr/modules/zebra_snmp.so
+usr/lib/*/libfrrsnmp.*
+usr/lib/*/frr/modules/*_snmp.so

diff --git a/debianpkg/frr.install b/debianpkg/frr.install
index 0443e6198e58896654aa99c4d85db919e1e9a26a..7ef9aaa6112b4f73de3e5af4af8ac82f326368a1 100644 (file)
--- a/debianpkg/frr.install
+++ b/debianpkg/frr.install
@@ -1,13 +1,13 @@
 etc/frr/
 usr/bin/vtysh
 usr/bin/mtracebis
-usr/include/frr/
-usr/lib/libfrr.*
-usr/lib/libfrrospfapiclient.*
+usr/include/frr
+usr/lib/*/libfrr.*
+usr/lib/*/libfrrospfapiclient.*
 usr/lib/frr/*d
 usr/lib/frr/watchfrr
 usr/lib/frr/zebra
-usr/lib/frr/modules/zebra_irdp.so
+usr/lib/*/frr/modules/zebra_irdp.so
 usr/share/doc/frr/
 usr/share/man/
 usr/share/yang/

diff --git a/debianpkg/rules b/debianpkg/rules
index 27757863ee92f0e4f46c5918da26d1eb010f129b..94891c14c2c3cef7dd91eb32a622a7d191df1b86 100755 (executable)
--- a/debianpkg/rules
+++ b/debianpkg/rules
@@ -168,9 +168,9 @@ endif
        perl -pi -e 's#^!log file #!log file /var/log/frr/#' debian/tmp/usr/share/doc/frr/examples/*sample*
 
        # we don't need .la files
-       rm debian/tmp/usr/lib/*.la
-       rm debian/tmp/usr/lib/frr/modules/*.la
-       rm debian/tmp/usr/lib/frr/libyang_plugins/*.la
+       rm debian/tmp/usr/lib/*/*.la
+       rm debian/tmp/usr/lib/*/frr/modules/*.la
+       rm debian/tmp/usr/lib/*/frr/libyang_plugins/*.la
 
 override_dh_auto_build:
        dh_auto_build -- $(MAKE_SILENT)