diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-08-26 10:16:34 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-08-26 10:16:34 +0000 |
| commit | 7e2e9513da31e37feb657bc5b670445428d6e26e (patch) | |
| tree | 8e441d346111b8283994ad360df09fd90c5b747f | |
| parent | Releasing progress-linux version 3.1.8-2~progress7.99u1. (diff) | |
| download | corosync-7e2e9513da31e37feb657bc5b670445428d6e26e.tar.xz corosync-7e2e9513da31e37feb657bc5b670445428d6e26e.zip | |
Merging debian version 3.1.8-3.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
| -rw-r--r-- | debian/changelog | 12 | ||||
| -rw-r--r-- | debian/corosync-notifyd.install | 2 | ||||
| -rw-r--r-- | debian/corosync.install | 2 | ||||
| -rwxr-xr-x | debian/rules | 1 |
4 files changed, 14 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index 9c4aa35..261ea67 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~progress7.99u1) graograman-backports; urgency=medium * Uploading to graograman-backports, remaining changes: 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) \ |