debian: drop cdbs and switch to debhelper

CDBS was the "most" compatible but is dropped in Ubuntu 26.04 and now in
Debian too. Switch to Debhelper 9. Keep autotools-dev (dh-autoreconf is
"too" recent). dh-systemd may not be available (require debhelper >=
9.20160709).

diff --git a/debian/control b/debian/control
index 53d94d4188a8ab41beca39fc2c767a93d14efb05..3ed61514e53f5ec9b6bdb65970a1caf674bb0467 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,9 +3,7 @@ Section: net
 Priority: optional
 Maintainer: Vincent Bernat <bernat@debian.org>
 Build-Depends: debhelper (>= 9),
-               cdbs,
                autotools-dev,
-               dh-autoreconf,
                libsnmp-dev,
                libxml2-dev,
                libevent-dev (>= 2.0.5),

diff --git a/debian/liblldpctl-dev.install b/debian/liblldpctl-dev.install
index 5b4cd723a2d3f0a59b96127c159e904198cc4157..8f937d5700ff37ec24bd4ae64feecd4abf486be6 100644 (file)
--- a/debian/liblldpctl-dev.install
+++ b/debian/liblldpctl-dev.install
@@ -1,5 +1,5 @@
 debian/tmp/usr/include/*.h
 debian/tmp/usr/include/*.hpp
-debian/tmp/usr/lib/*.so
-debian/tmp/usr/lib/*.a
-debian/tmp/usr/lib/pkgconfig/*.pc
+debian/tmp/usr/lib/*/*.so
+debian/tmp/usr/lib/*/*.a
+debian/tmp/usr/lib/*/pkgconfig/*.pc

diff --git a/debian/lldpd.install b/debian/lldpd.install
index 6864e796e67d13b7aba0eea755720d2c3e68611a..2009a58b3a7d4a5e93fb8d08991d1198735b3594 100644 (file)
--- a/debian/lldpd.install
+++ b/debian/lldpd.install
@@ -1,5 +1,5 @@
 debian/tmp/lib/systemd/system/lldpd.service 
-debian/tmp/usr/lib/*.so.*
+debian/tmp/usr/lib/*/*.so.*
 debian/tmp/usr/share/man/man8/*
 debian/tmp/usr/sbin/lldp*
 debian/tmp/usr/share/bash-completion/completions/*

diff --git a/debian/rules b/debian/rules
index 148bf5826eb9e81a224566b6f20f6d855fbb77c5..779e63df2e0f67fab51ecf3df2e271dafbbe47f7 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +1,13 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/autoreconf.mk
-include /usr/share/cdbs/1/class/autotools.mk
+DH_WITH  = $(if $(wildcard /usr/bin/dh_systemd_enable),--with systemd)
 
-DEB_CONFIGURE_EXTRA_FLAGS = --with-snmp --with-xml --enable-pie
-DEB_CONFIGURE_EXTRA_FLAGS += --with-systemdsystemunitdir=/lib/systemd/system
+%:
+       dh $@ $(DH_WITH)
+
+override_dh_auto_configure:
+       dh_auto_configure -- \
+               --with-snmp \
+               --with-xml \
+               --enable-pie \
+               --with-systemdsystemunitdir=/lib/systemd/system