From: David Lamparter <equinox@diac24.net>
Date: Wed, 24 Oct 2018 18:57:32 +0000 (+0200)
Subject: debianpkg: raise debhelper compat level to 9
X-Git-Tag: frr-7.0~5^2~63
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=4909b3ec86a35ad8056ed1c1dbe312d0a4262de1;p=matthieu%2Ffrr.git

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 7f8f011eb7..ec635144f6 100644
--- 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 3c9d4557ed..0465c0d910 100644
--- 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 a400c07f81..33fcdfb598 100644
--- 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 0443e6198e..7ef9aaa611 100644
--- 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 27757863ee..94891c14c2 100755
--- 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)