Bug#1052715: tirex: let dh_installsystemd choose the location of systemd units

2023-09-26 Thread Sebastiaan Couwenberg

Control: tags -1 pending

Thanks for the patch, it's applied in git.

Kind Regards,

Bas

--
 GPG Key ID: 4096R/6750F10AE88D4AF1
Fingerprint: 8182 DE41 7056 408D 6146  50D1 6750 F10A E88D 4AF1



Bug#1052715: tirex: let dh_installsystemd choose the location of systemd units

2023-09-26 Thread Helmut Grohne
Source: tirex
Version: 0.7.0-3
Tags: patch
User: helm...@debian.org
Usertags: dep17m2

As part of finalizing the /usr-merge transition, we want to move systemd
units from / to /usr. tirex' packaging manually chooses the aliased
location. I propose changing it to let dh_installsystemd choose the
location such that the conversion can be performed using a binNMU. I'm
attaching a patch for your convenience.

Helmut
diff -Nru tirex-0.7.0/debian/changelog tirex-0.7.0/debian/changelog
--- tirex-0.7.0/debian/changelog2023-04-11 10:20:03.0 +0200
+++ tirex-0.7.0/debian/changelog2023-09-26 13:12:30.0 +0200
@@ -1,3 +1,10 @@
+tirex (0.7.0-3.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Let dh_installsystemd choose the location of systemd units. (Closes: #-1)
+
+ -- Helmut Grohne   Tue, 26 Sep 2023 13:12:30 +0200
+
 tirex (0.7.0-3) unstable; urgency=medium
 
   * Team upload.
diff -Nru tirex-0.7.0/debian/rules tirex-0.7.0/debian/rules
--- tirex-0.7.0/debian/rules2022-11-29 19:04:47.0 +0100
+++ tirex-0.7.0/debian/rules2023-09-26 13:12:30.0 +0200
@@ -9,4 +9,8 @@
 %:
dh $@ --with apache2
 
+execute_after_dh_installsystemd:
+   dh_installsystemd -ptirex --name tirex-master
+   dh_installsystemd -ptirex --name tirex-backend-manager
+
 .PHONY: templates
diff -Nru tirex-0.7.0/debian/tirex.install tirex-0.7.0/debian/tirex.install
--- tirex-0.7.0/debian/tirex.install2023-04-11 10:03:09.0 +0200
+++ tirex-0.7.0/debian/tirex.install2023-09-26 13:12:20.0 +0200
@@ -24,7 +24,5 @@
 debian/etc/tirex/tirex.conf  etc/tirex
 debian/etc/tirex/renderer/mapnik.confetc/tirex/renderer
 debian/tmpfiles.d/tirex.conf usr/lib/tmpfiles.d
-debian/tirex-master.service  lib/systemd/system/
-debian/tirex-backend-manager.service lib/systemd/system/
 usr/libexec/tirex-backend-mapnik
 usr/libexec/tirex-backend-test