Control: tags 1063699 + patch
Control: tags 1063699 + pending

Dear maintainer,

I've prepared an NMU for tarantool (versioned as 2.6.0-1.4) and
uploaded it to DELAYED/5. Please feel free to tell me if I
should delay it longer.

Regards.

diff -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-06-11 01:27:53.000000000 +0200
@@ -1,3 +1,12 @@
+tarantool (2.6.0-1.4) unstable; urgency=medium
+
+  * Non-maintainer upload.
+
+  [ Helmut Grohne ]
+  * Let systemd.pc decide the location of systemd files. (Closes: #1063699)
+
+ -- Chris Hofstaedtler <z...@debian.org>  Tue, 11 Jun 2024 01:27:53 +0200
+
 tarantool (2.6.0-1.3) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -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-06-11 01:27:52.000000000 +0200
@@ -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 -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-06-11 01:27:52.000000000 +0200
@@ -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 -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-06-11 01:27:52.000000000 +0200
@@ -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

Reply via email to