It seems that changes are needed to account for the change in `pkg-config --variable=udevdir udev` as well. Attaching an updated diff that does that too.
We are going to need e2fsprogs building very soon for the time_t transition. I wonder if I should just upload this to DELAYED/1 or something.
diff -Nru e2fsprogs-1.47.0/debian/changelog e2fsprogs-1.47.0/debian/changelog --- e2fsprogs-1.47.0/debian/changelog 2023-03-05 16:16:08.000000000 +1300 +++ e2fsprogs-1.47.0/debian/changelog 2023-09-27 07:57:57.000000000 +1300 @@ -1,3 +1,14 @@ +e2fsprogs (1.47.0-2.1) UNRELEASED; urgency=medium + + [ Helmut Grohne ] + * Non-maintainer upload. + * Fix FTBFS when systemd.pc changes systemdsystemunitdir. (Closes: #-1) + + [ Michael Hudson-Doyle ] + * Account for changes in udevudevdir as well. + + -- Helmut Grohne <hel...@subdivi.de> Tue, 26 Sep 2023 20:57:57 +0200 + e2fsprogs (1.47.0-2) unstable; urgency=medium * Don't enable metadata_csum_seed and orhpan_file by default (Closes: diff -Nru e2fsprogs-1.47.0/debian/control e2fsprogs-1.47.0/debian/control --- e2fsprogs-1.47.0/debian/control 2023-03-05 16:16:08.000000000 +1300 +++ e2fsprogs-1.47.0/debian/control 2023-09-27 07:57:57.000000000 +1300 @@ -2,7 +2,7 @@ Section: admin Priority: required Maintainer: Theodore Y. Ts'o <ty...@mit.edu> -Build-Depends: gettext, texinfo, pkg-config, libfuse-dev [linux-any kfreebsd-any] <!pkg.e2fsprogs.no-fuse2fs>, debhelper-compat (= 12), dh-exec, libblkid-dev, uuid-dev, m4, udev [linux-any], systemd [linux-any], cron [linux-any] +Build-Depends: gettext, texinfo, pkg-config, libfuse-dev [linux-any kfreebsd-any] <!pkg.e2fsprogs.no-fuse2fs>, debhelper-compat (= 12), dh-exec, libblkid-dev, uuid-dev, m4, udev [linux-any], systemd [linux-any], systemd-dev [linux-any], cron [linux-any] Rules-Requires-Root: no Standards-Version: 4.6.2 Homepage: http://e2fsprogs.sourceforge.net diff -Nru e2fsprogs-1.47.0/debian/e2fsprogs.install e2fsprogs-1.47.0/debian/e2fsprogs.install --- e2fsprogs-1.47.0/debian/e2fsprogs.install 2023-03-05 16:16:08.000000000 +1300 +++ e2fsprogs-1.47.0/debian/e2fsprogs.install 2023-09-27 07:57:57.000000000 +1300 @@ -49,5 +49,5 @@ usr/share/man/man8/resize2fs.8 usr/share/man/man8/tune2fs.8 etc -[linux-any] lib/udev/rules.d -[linux-any] lib/systemd/system +[linux-any] ${deb_udevudevdir}/rules.d +[linux-any] ${deb_systemdsystemunitdir} diff -Nru e2fsprogs-1.47.0/debian/.gitignore e2fsprogs-1.47.0/debian/.gitignore --- e2fsprogs-1.47.0/debian/.gitignore 2023-03-05 16:16:08.000000000 +1300 +++ e2fsprogs-1.47.0/debian/.gitignore 1970-01-01 12:00:00.000000000 +1200 @@ -1 +0,0 @@ -!patches diff -Nru e2fsprogs-1.47.0/debian/rules e2fsprogs-1.47.0/debian/rules --- e2fsprogs-1.47.0/debian/rules 2023-03-05 16:16:08.000000000 +1300 +++ e2fsprogs-1.47.0/debian/rules 2023-09-27 07:57:57.000000000 +1300 @@ -14,6 +14,11 @@ SKIP_FUSE2FS=yes endif +ifeq ($(DEB_HOST_ARCH_OS), linux) +export deb_systemdsystemunitdir = $(shell pkg-config --variable=systemdsystemunitdir systemd | sed s,^/,,) +export deb_udevudevdir = $(shell pkg-config pkg-config --variable=udevdir udev | sed s,^/,,) +endif + ifneq ($(filter pkg.e2fsprogs.no-fuse2fs,$(DEB_BUILD_PROFILES)),) SKIP_FUSE2FS=yes endif
