Control: tags -1 + patch
* Chris Hofstaedtler <z...@debian.org>:
> systemd.pc changed systemd_system_unit_dir to point to /usr. As a
> consequence, your package now FTBFS in unstable.
Please find a patch fixing this attached. It should also work if
sysstat is backported without additional changes.
Best,
Chris
diff -Nru sysstat-12.6.1/debian/changelog sysstat-12.6.1/debian/changelog
--- sysstat-12.6.1/debian/changelog 2022-12-04 22:23:25.000000000 +0100
+++ sysstat-12.6.1/debian/changelog 2023-12-07 21:50:19.000000000 +0100
@@ -1,3 +1,11 @@
+sysstat (12.6.1-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix FBTS when systemdsystemunitdir changes in systemd.pc. (Closes:
+ #1057421)
+
+ -- Chris Hofstaedtler <z...@debian.org> Thu, 07 Dec 2023 21:50:19 +0100
+
sysstat (12.6.1-1) unstable; urgency=medium
* New upstream stable version: fixes size_t overflow in sa_common.c
diff -Nru sysstat-12.6.1/debian/control sysstat-12.6.1/debian/control
--- sysstat-12.6.1/debian/control 2022-12-04 22:23:25.000000000 +0100
+++ sysstat-12.6.1/debian/control 2023-12-07 21:48:26.000000000 +0100
@@ -6,7 +6,8 @@
gettext,
libsensors-dev,
pkg-config,
- systemd
+ systemd,
+ systemd-dev
Standards-Version: 4.6.1
Rules-Requires-Root: no
Homepage: http://sebastien.godard.pagesperso-orange.fr/
diff -Nru sysstat-12.6.1/debian/rules sysstat-12.6.1/debian/rules
--- sysstat-12.6.1/debian/rules 2022-12-04 22:23:25.000000000 +0100
+++ sysstat-12.6.1/debian/rules 2023-12-07 21:50:09.000000000 +0100
@@ -19,6 +19,8 @@
DFLAGS :=
+export deb_systemdsystemunitdir=$(shell pkgconf --variable=systemdsystemunitdir systemd | sed s,^/,,)
+
%:
dh ${@}
diff -Nru sysstat-12.6.1/debian/sysstat.install sysstat-12.6.1/debian/sysstat.install
--- sysstat-12.6.1/debian/sysstat.install 2022-12-04 22:23:25.000000000 +0100
+++ sysstat-12.6.1/debian/sysstat.install 2023-12-07 21:50:17.000000000 +0100
@@ -1,5 +1,5 @@
debian/debian-sa1 usr/lib/sysstat
debian/tmp/etc/
-debian/tmp/lib/systemd/
+debian/tmp/${env:deb_systemdsystemunitdir}
debian/tmp/usr/
debian/tmp/var/
