Source: heartbeat
Version: 1:3.0.6-13
Tags: ftbfs patch
User: helm...@debian.org
Usertags: dep17m2
We want to change the value of systemd_system_unit_dir in systemd.pc to
reside below /usr as part of the changes proposed in DEP17. When doing
so, heartbeat will FTBFS, because debian/rules hard codes its location
to /lib. I'm proposing a patch that makes it not FTBFS and currently is
a noop (it reproduces the same packages as without). Would you mind
applying it to avert that future FTBFS?
Helmut
diff -Nru heartbeat-3.0.6/debian/changelog heartbeat-3.0.6/debian/changelog
--- heartbeat-3.0.6/debian/changelog 2022-04-02 00:34:24.000000000 +0200
+++ heartbeat-3.0.6/debian/changelog 2023-09-19 17:04:22.000000000 +0200
@@ -1,3 +1,10 @@
+heartbeat (1:3.0.6-13.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix FTBFS with changed systemd_system_unit_dir. (Closes: #-1)
+
+ -- Helmut Grohne <hel...@subdivi.de> Tue, 19 Sep 2023 17:04:22 +0200
+
heartbeat (1:3.0.6-13) unstable; urgency=medium
[ Debian Janitor ]
diff -Nru heartbeat-3.0.6/debian/control heartbeat-3.0.6/debian/control
--- heartbeat-3.0.6/debian/control 2022-04-02 00:19:57.000000000 +0200
+++ heartbeat-3.0.6/debian/control 2023-09-19 17:04:22.000000000 +0200
@@ -35,6 +35,7 @@
net-tools,
openssh-client,
perl,
+ pkgconf,
psmisc,
python3-dev,
resource-agents,
diff -Nru heartbeat-3.0.6/debian/heartbeat.install
heartbeat-3.0.6/debian/heartbeat.install
--- heartbeat-3.0.6/debian/heartbeat.install 2022-04-02 00:28:01.000000000
+0200
+++ heartbeat-3.0.6/debian/heartbeat.install 2023-09-19 17:04:22.000000000
+0200
@@ -1,3 +1,4 @@
+etc/init.d/heartbeat
etc/ha.d/README.config
etc/ha.d/harc
etc/ha.d/rc.d/ask_resources
@@ -30,8 +31,10 @@
etc/ha.d/resource.d/portblock
etc/heartbeat
etc/logrotate.d/heartbeat
+${env:systemd_system_unit_dir}/heartbeat.service
usr/bin/cl_respawn
usr/bin/cl_status
+usr/lib/tmpfiles.d/heartbeat.conf
usr/libexec/heartbeat/api_test
usr/libexec/heartbeat/apphbd
usr/libexec/heartbeat/apphbtest
diff -Nru heartbeat-3.0.6/debian/rules heartbeat-3.0.6/debian/rules
--- heartbeat-3.0.6/debian/rules 2022-04-02 00:28:53.000000000 +0200
+++ heartbeat-3.0.6/debian/rules 2023-09-19 17:04:22.000000000 +0200
@@ -24,6 +24,8 @@
DH_INSTALL_EXCLUDE=-Xdopd -Xdrbd
endif
+export systemd_system_unit_dir=$(shell pkgconf
--variable=systemd_system_unit_dir systemd | sed 's,^/,,' )
+
build: build-arch build-indep
build-arch: build-stamp
build-indep: build-stamp
@@ -101,14 +103,6 @@
rm -rf ./debian/libheartbeat2-dev/usr/include/heartbeat/ha_msg.h
rm -rf ./debian/libheartbeat2-dev/usr/include/heartbeat/compress.h
- # move sysv init script and systemd service file to expected locations
for dh_install
- ! test -e ./debian/tmp/usr/lib/tmpfiles.d/heartbeat.conf || \
- mv ./debian/tmp/usr/lib/tmpfiles.d/heartbeat.conf
./debian/heartbeat.tmpfiles
- ! test -e ./debian/tmp/lib/systemd/system/heartbeat.service || \
- mv ./debian/tmp/lib/systemd/system/heartbeat.service
./debian/heartbeat.service
- ! test -e ./debian/tmp/etc/init.d/heartbeat || \
- mv ./debian/tmp/etc/init.d/heartbeat ./debian/heartbeat.init
-
# python modules will be compiled in postinst
rm -f ./debian/tmp/usr/share/heartbeat/cts/*.py[co]
rm -rf ./debian/tmp/usr/share/heartbeat/cts/__pycache__
