Source: trojan
Version: 1.16.0-1
Severity: normal
Tags: patch
User: helm...@debian.org
Usertags: dep17m2

Dear Maintainer,

your package installs systemd system units, currently into /lib.
These files need to be moved to /usr/lib as part of Debian's usr-merge
effort [1].

Attached you will find a patch using systemd.pc to place these files
(using pkg-config).  This works for unstable today, and also for 
bookworm, and is safe to do now.

Later during the trixie cycle I expect this bug class to raise in
priority.

If during the trixie cycle your package will undergo structural
changes or any other file moves, please see the wiki and upload
to experimental first when these changes are done.

Thank you for considering,
Chris

[1] https://wiki.debian.org/UsrMerge
diff -Nru trojan-1.16.0/debian/changelog trojan-1.16.0/debian/changelog
--- trojan-1.16.0/debian/changelog	2020-06-12 21:23:01.000000000 +0200
+++ trojan-1.16.0/debian/changelog	2023-12-19 21:37:43.000000000 +0100
@@ -1,3 +1,10 @@
+trojan (1.16.0-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Use systemd.pc to place systemd service unit. (Closes: #-1)
+
+ -- Chris Hofstaedtler <z...@debian.org>  Tue, 19 Dec 2023 21:37:43 +0100
+
 trojan (1.16.0-1) unstable; urgency=medium
 
   * New upstream release 1.16.0.
diff -Nru trojan-1.16.0/debian/control trojan-1.16.0/debian/control
--- trojan-1.16.0/debian/control	2020-06-12 21:23:01.000000000 +0200
+++ trojan-1.16.0/debian/control	2023-12-19 21:37:29.000000000 +0100
@@ -2,7 +2,7 @@
 Section: web
 Priority: optional
 Maintainer: GreaterFire <greaterf...@protonmail.com>
-Build-Depends: debhelper-compat (= 12), cmake (>= 3.7.2), libboost-system-dev, libboost-program-options-dev, libssl-dev, default-libmysqlclient-dev, openssl, python3:any, curl, netcat-openbsd
+Build-Depends: debhelper-compat (= 12), cmake (>= 3.7.2), libboost-system-dev, libboost-program-options-dev, libssl-dev, default-libmysqlclient-dev, openssl, python3:any, curl, netcat-openbsd, pkgconf, systemd-dev
 Standards-Version: 4.5.0
 Vcs-Browser: https://salsa.debian.org/debian/trojan
 Vcs-Git: https://salsa.debian.org/debian/trojan.git
diff -Nru trojan-1.16.0/debian/rules trojan-1.16.0/debian/rules
--- trojan-1.16.0/debian/rules	2020-06-12 21:23:01.000000000 +0200
+++ trojan-1.16.0/debian/rules	2023-12-19 21:37:43.000000000 +0100
@@ -9,7 +9,7 @@
 	dh $@
 
 override_dh_auto_configure:
-	dh_auto_configure -- -DCMAKE_BUILD_TYPE=Release -DSYSTEMD_SERVICE=ON
+	dh_auto_configure -- -DCMAKE_BUILD_TYPE=Release -DSYSTEMD_SERVICE=ON -DSYSTEMD_SERVICE_PATH=$(shell pkg-config --variable=systemdsystemunitdir systemd)
 
 override_dh_auto_test:
 	dh_auto_test --no-parallel

Reply via email to