From 3eda4c46c8d4cf35f55ca6bf1861fe1b33ab380b Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 16 Aug 2022 19:07:38 +0200 Subject: Drop obsolete --with-dnssec-trigger configure option The unbound DNS plugin was marked deprecated for a while and has been removed now in this release. --- debian/rules | 1 - 1 file changed, 1 deletion(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index bcb76768..9b61ddcb 100755 --- a/debian/rules +++ b/debian/rules @@ -30,7 +30,6 @@ override_dh_auto_configure: --with-resolvconf=/sbin/resolvconf \ --with-dhclient=/sbin/dhclient \ --with-dnsmasq=/usr/sbin/dnsmasq \ - --with-dnssec-trigger=/usr/lib/dnssec-trigger/dnssec-trigger-script \ --with-polkit-agent-helper-1=/usr/lib/policykit-1/polkit-agent-helper-1 \ --with-systemdsystemunitdir=/lib/systemd/system \ --with-udev-dir=/lib/udev \ -- cgit 1.3.0-6-gf8a5 From 2e2b3e870532229f903adca0a9a37086ce46459a Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 17 Aug 2022 10:13:29 +0200 Subject: Simplify dh_autoreconf override by calling upstream provided autogen.sh This ensures the correct sequence of commands is run. In this specific case we were still using intltoolize when upstream dropped its usage in favour of gettext a while ago. --- debian/rules | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 9b61ddcb..52c938d3 100755 --- a/debian/rules +++ b/debian/rules @@ -11,13 +11,8 @@ PPPD_PLUGIN_DIR := $(shell dh_ppp --plugin-dir) %: dh $@ --with ppp -autoreconf: - gtkdocize --copy - autopoint --force - AUTOPOINT='intltoolize --automake --copy' autoreconf --verbose --force --install - override_dh_autoreconf: - dh_autoreconf debian/rules -- autoreconf + NOCONFIGURE=true dh_autoreconf ./autogen.sh override_dh_auto_configure: dh_auto_configure -- \ -- cgit 1.3.0-6-gf8a5