summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-08-26 10:16:34 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-08-26 10:16:34 +0000
commit68398cd680e69f21272badae82283f1d885f1fef (patch)
treee83d647dbf14a7ff1c3f35e1b0a2b30ee2c4e256
parentAdding debian version 3.1.8-2. (diff)
downloadcorosync-debian.tar.xz
corosync-debian.zip
Adding debian version 3.1.8-3.debian/3.1.8-3debian
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/changelog12
-rw-r--r--debian/corosync-notifyd.install2
-rw-r--r--debian/corosync.install2
-rwxr-xr-xdebian/rules1
4 files changed, 14 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index a901bd2..79d2d21 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+corosync (3.1.8-3) unstable; urgency=medium
+
+ * [192c744] Revert "Revert "No need to override the default
+ /usr/lib/systemd/system systemd directory anymore""
+ This reverts commit a836090ec1d812f6a73d13aa14f752cc5fbf5ffa.
+ Now dh_installsystemd handles service files under /usr/lib correctly,
+ so let DEP17 (Improve situation around aliasing effects from /usr-merge)
+ proceed by moving our service files to /usr/lib/systemd/system.
+ (Closes: #1073683)
+
+ -- Ferenc Wágner <wferi@debian.org> Sat, 20 Jul 2024 19:32:52 +0200
+
corosync (3.1.8-2) unstable; urgency=medium
* [c241cd2] corosync-blackbox uses qb-blackbox, so pull in libqb-tools
diff --git a/debian/corosync-notifyd.install b/debian/corosync-notifyd.install
index 372c797..cfd60a9 100644
--- a/debian/corosync-notifyd.install
+++ b/debian/corosync-notifyd.install
@@ -1,5 +1,5 @@
usr/share/dbus-1/system.d/corosync-signals.conf
-lib/systemd/system/corosync-notifyd.service
+usr/lib/systemd/system/corosync-notifyd.service
usr/sbin/corosync-notifyd
usr/share/man/man8/corosync-notifyd.8
usr/share/snmp/mibs/COROSYNC-MIB.txt
diff --git a/debian/corosync.install b/debian/corosync.install
index ac6561a..bd3e9d5 100644
--- a/debian/corosync.install
+++ b/debian/corosync.install
@@ -1,5 +1,5 @@
etc/logrotate.d/corosync
-lib/systemd/system/corosync.service
+usr/lib/systemd/system/corosync.service
usr/bin/corosync-blackbox
usr/bin/corosync-xmlproc
usr/sbin/corosync
diff --git a/debian/rules b/debian/rules
index 49b9298..0197e8c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -31,7 +31,6 @@ override_dh_auto_configure:
BASHPATH=/bin/bash \
--with-initconfigdir=/etc/default \
--with-logdir=/var/log/corosync \
- --with-systemddir=/lib/systemd/system \
--enable-dbus \
$(enable-monitoring) \
$(enable-watchdog) \