Your message dated Sat, 23 Dec 2023 15:04:05 +0000
with message-id <e1rh3xp-003vxp...@fasolo.debian.org>
and subject line Bug#1052277: fixed in heartbeat 1:3.0.6-14
has caused the Debian Bug report #1052277,
regarding heartbeat FTBFS when systemd_system_unit_dir changes
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)
--
1052277: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1052277
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
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__
--- End Message ---
--- Begin Message ---
Source: heartbeat
Source-Version: 1:3.0.6-14
Done: Valentin Vidic <vvi...@debian.org>
We believe that the bug you reported is fixed in the latest version of
heartbeat, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to 1052...@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Valentin Vidic <vvi...@debian.org> (supplier of updated heartbeat package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmas...@ftp-master.debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Format: 1.8
Date: Thu, 21 Dec 2023 17:32:05 +0100
Source: heartbeat
Architecture: source
Version: 1:3.0.6-14
Distribution: unstable
Urgency: medium
Maintainer: Debian HA Maintainers
<debian-ha-maintain...@lists.alioth.debian.org>
Changed-By: Valentin Vidic <vvi...@debian.org>
Closes: 1052277
Changes:
heartbeat (1:3.0.6-14) unstable; urgency=medium
.
[ Helmut Grohne ]
* Fix FTBFS with changed systemd_system_unit_dir. (Closes: #1052277)
.
[ Valentin Vidic ]
* Use Standards-Version 4.6.2
* Use libncurses-dev in Build-Depends
* Update lintian-overrides
Checksums-Sha1:
18a696467e400dcda55005b66bb8ce57493deaeb 2673 heartbeat_3.0.6-14.dsc
decdc97b28fc362fceeddad904ebc8438440f176 41660 heartbeat_3.0.6-14.debian.tar.xz
af76096993eb6ba62726a44596104175adc12dd5 9154
heartbeat_3.0.6-14_source.buildinfo
Checksums-Sha256:
3c950ea85b42e319c87b60c605f81fee72fce8471da2a93c90bbbc6c82742471 2673
heartbeat_3.0.6-14.dsc
7527f3159d76c9b71c57ca23d4a3202cde69fddac540758ada1502e2c1b88471 41660
heartbeat_3.0.6-14.debian.tar.xz
d900defa0bda70463d4afa78407443a0dc3a35b6e5d5bf7f77497262cc570e52 9154
heartbeat_3.0.6-14_source.buildinfo
Files:
f24892b02ee967b614ce96f21b0e378a 2673 admin optional heartbeat_3.0.6-14.dsc
227c292013c0eec1edea78af18106fd3 41660 admin optional
heartbeat_3.0.6-14.debian.tar.xz
80f889a33b61c77ec48b308fc4dca43a 9154 admin optional
heartbeat_3.0.6-14_source.buildinfo
-----BEGIN PGP SIGNATURE-----
iQJGBAEBCgAwFiEExaW53cM9k/u2PWfIMofYmpfNqHsFAmWG9UESHHZ2aWRpY0Bk
ZWJpYW4ub3JnAAoJEDKH2JqXzah7x7oP/1cS4KWpS1bhMMM1JKMJKSrJPmI7hS9b
kqEgfXWiNx7RwIWCVFWU9O4ba9Ud+kZV2B5AjitOaTNP4NivAJpqJbTA2KbiJUl1
Bp7Pu2BotqrwIdkT8GxIk82ImBjBeDdrx8CuvidTK1k8Io/odE8Bh8rmfYVALWWc
LPRDayhW0i95ITFo8vWeaC4iL7XCFB8xC7/Ew3HVuYaBbFiNazNFCAc9Bd2kCzs0
Icxyu0PCajVHbXm8OuLVuKO1zwTuBdT79+RH56rRQQgjK87bRqRKXiVWWCWasK/E
WbIh0ykpLJI9Kh9Hx2THi4KaRBjLqcZEebQmdP8Y+Io8CV2Q+GEjQKvj9dvbYN7g
qr1SYm2KV4q7VzwbTcpa9xzzVsNeg5yejKPWxpE92uGiA5NnfC2kooR0IWCLUzAB
OzHyl0TwFWqUucxPBnLrdZ+vjOSbbT3pIQk2c6zeLMWWFLuARbIC5mDdR5Iyx87a
VuacYyLhvCeJYLaENWHcpSbn7OnBqfKi9wk4Ct72ZFp0fw6OAqaufIMEdhPC62e7
on6sH5KEEyRmKmHyL6l73l39MOgalETiylydopJqzHdTiH7cYaFXi3n7KewVgqlM
WjiKmxqbabtGCBxbo62X4Zy5zzziTIst44jk8PcDX/TKZLjg1uBE6jzm87F5hzLK
C84PN5aPu25F
=PkMj
-----END PGP SIGNATURE-----
--- End Message ---
