From 401419c6abe1eb147add1905bebe4c6e84c23942 Mon Sep 17 00:00:00 2001 From: Nathan Scott Date: Wed, 15 May 2024 08:29:00 +1000 Subject: [PATCH] build: resolve debian issue with systemd-dev package Use conditional package dependency logic to allow for the newer split in systemd development packages. Fixes Debian bug #1060493 --- debian/changelog | 1 + debian/fixcontrol | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 434434ab67..964f3dce10 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ pcp (6.2.2-1) unstable; urgency=low * New release (full details in CHANGELOG). + * Fix build dependency on [lib]systemd-dev (closes: #1060493) * Relocate pmcheck to resolve a Perl conflict (closes: #1071010) -- Nathan Scott Wed, 15 May 2024 06:22:01 +1000 diff --git a/debian/fixcontrol b/debian/fixcontrol index 5f5a58c11a..b71414a865 100755 --- a/debian/fixcontrol +++ b/debian/fixcontrol @@ -118,7 +118,7 @@ fi # PMDA_SYSTEMD is only true if we have libsystemd, but HAVE_SYSTEMD # may be true when we're using systemd even if libsystemd is not -# installed ... so use the former to enable the libsystemd-dev in +# installed ... so use the former to enable the [lib]systemd-dev in # the Build-Depends: clause # Note: that the HAVE_SYSTEMD_SD_DAEMON_H macro that is used to # guard the use of libsystemd from libpcp is not available here, but @@ -127,7 +127,7 @@ fi # if $PMDA_SYSTEMD then - echo "s/?{libsystemd-dev}, /systemd, libsystemd-dev, /" >>$tmp.sed + echo "s/?{libsystemd-dev}, /systemd, systemd-dev | libsystemd-dev, /" >>$tmp.sed else echo "s/?{libsystemd-dev}, //" >>$tmp.sed fi