From: Vincent Bernat <vincent@bernat.ch>
Date: Thu, 13 Aug 2026 05:56:44 +0000 (+0200)
Subject: debian: drop cdbs and switch to debhelper
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c91f4e2943aa2522dd2f490385217c538376baba;p=thirdparty%2Flldpd.git

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 53d94d41..3ed61514 100644
--- 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 5b4cd723..8f937d57 100644
--- 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 6864e796..2009a58b 100644
--- 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 148bf582..779e63df 100755
--- 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