Package: tarantool-common Version: 2.6.0-1.3 Tags: patch trixie sid User: helm...@debian.org Usertags: dep17m2
Hi, we want to finalize the /usr-merge transition by moving all aliased files from / to /usr via DEP17 to avoid negative effects arising from aliasing. tarantool-common is involved, because it installs files related to systemd in aliased locations. I am attaching a patch, because it cannot be converted using dh-sequence-movetousr. Note that this patch cannot represent "chmod +x debian/trantool-common.install" and you have to do this manually. Missing this chmod will result in a build failure. Note that since this patch defers placement to systemd.pc, the location will automatically revert to /lib when backporting to bookworm-backports, so this patch is safe in the face of backporting. Helmut
diff --minimal -Nru tarantool-2.6.0/debian/changelog tarantool-2.6.0/debian/changelog --- tarantool-2.6.0/debian/changelog 2023-11-25 14:34:46.000000000 +0100 +++ tarantool-2.6.0/debian/changelog 2024-02-11 07:50:08.000000000 +0100 @@ -1,3 +1,10 @@ +tarantool (2.6.0-1.4) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Let systemd.pc decide the location of systemd files. (Closes: #-1) + + -- Helmut Grohne <hel...@subdivi.de> Sun, 11 Feb 2024 07:50:08 +0100 + tarantool (2.6.0-1.3) unstable; urgency=medium * Non-maintainer upload. diff --minimal -Nru tarantool-2.6.0/debian/control tarantool-2.6.0/debian/control --- tarantool-2.6.0/debian/control 2022-09-12 07:51:23.000000000 +0200 +++ tarantool-2.6.0/debian/control 2024-02-11 07:50:08.000000000 +0100 @@ -5,6 +5,7 @@ Build-Depends: cdbs (>= 0.4.100), debhelper (>= 9.2), + dh-exec, dpkg-dev (>= 1.16.1~), cmake, libreadline-dev, @@ -15,6 +16,8 @@ libcurl4-openssl-dev, libyaml-dev, libzstd-dev, + pkgconf, + systemd-dev | systemd (<< 253-2~), Section: database Standards-Version: 3.9.8 Homepage: http://tarantool.org/ diff --minimal -Nru tarantool-2.6.0/debian/rules tarantool-2.6.0/debian/rules --- tarantool-2.6.0/debian/rules 2023-11-25 14:34:46.000000000 +0100 +++ tarantool-2.6.0/debian/rules 2024-02-11 07:50:08.000000000 +0100 @@ -6,6 +6,8 @@ ifeq ($(INIT_VARIANT),systemd) WITH_SYSTEMD:=ON +export deb_systemdsystemunitdir = $(shell pkgconf --variable=systemdsystemunitdir systemd) +export deb_systemdsystemgeneratordir = $(shell pkgconf --variable=systemdsystemgeneratordir systemd) else WITH_SYSTEMD:=OFF endif diff --minimal -Nru tarantool-2.6.0/debian/tarantool-common.install tarantool-2.6.0/debian/tarantool-common.install --- tarantool-2.6.0/debian/tarantool-common.install 2018-11-15 15:42:54.000000000 +0100 +++ tarantool-2.6.0/debian/tarantool-common.install 2024-02-11 07:50:08.000000000 +0100 @@ -1,9 +1,10 @@ +#!/usr/bin/dh-exec /etc/default/tarantool /usr/bin/tarantoolctl /etc/tarantool/instances.available/example.lua /etc/logrotate.d/tarantool -/lib/systemd/system/tarantool.service -/lib/systemd/system/tarantool@.service -/lib/systemd/system-generators/tarantool-generator +${deb_systemdsystemunitdir}/tarantool.service +${deb_systemdsystemunitdir}/tarantool@.service +${deb_systemdsystemgeneratordir}/tarantool-generator /usr/lib/tmpfiles.d/tarantool.conf /usr/share/man/man1/tarantoolctl.1
