Source: lm-sensors
Version: 1:3.6.0-8
Severity: normal
Tags: patch
User: helm...@debian.org
Usertags: dep17m2

Hi!

Your package installs fancontrol-systemd-sleep into
/lib/systemd/system-sleep. For the ongoing Debian UsrMerge effort
[1] this should move below /usr during the trixie cycle.

I'm attaching a patch to implement such a move, using systemd.pc to
determine the correct location.

However, please still read the wiki page on moving files, especially
if you intend to backport to bookworm or earlier. The patch has
already been checked by a local dumat copy.

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

Chris

[1] https://wiki.debian.org/UsrMerge
diff -Nru lm-sensors-3.6.0/debian/changelog lm-sensors-3.6.0/debian/changelog
--- lm-sensors-3.6.0/debian/changelog	2023-08-25 21:39:18.000000000 +0200
+++ lm-sensors-3.6.0/debian/changelog	2023-12-24 19:39:49.000000000 +0100
@@ -1,3 +1,10 @@
+lm-sensors (1:3.6.0-8.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Use systemd.pc to place systemd sleep files. (Closes: #-1)
+
+ -- Chris Hofstaedtler <z...@debian.org>  Sun, 24 Dec 2023 19:39:49 +0100
+
 lm-sensors (1:3.6.0-8) unstable; urgency=medium
 
   * Drop versioned depends on obsolete lsb-base package.
diff -Nru lm-sensors-3.6.0/debian/control lm-sensors-3.6.0/debian/control
--- lm-sensors-3.6.0/debian/control	2023-08-22 13:30:06.000000000 +0200
+++ lm-sensors-3.6.0/debian/control	2023-12-24 19:39:49.000000000 +0100
@@ -1,7 +1,7 @@
 Source: lm-sensors
 Section: utils
 Priority: optional
-Build-Depends: debhelper-compat (= 13), bison, flex
+Build-Depends: debhelper-compat (= 13), bison, flex, pkgconf, systemd-dev
 Rules-Requires-Root: no
 Standards-Version: 4.6.2
 Maintainer: Aurelien Jarno <aure...@debian.org>
diff -Nru lm-sensors-3.6.0/debian/rules lm-sensors-3.6.0/debian/rules
--- lm-sensors-3.6.0/debian/rules	2021-01-25 01:02:46.000000000 +0100
+++ lm-sensors-3.6.0/debian/rules	2023-12-24 19:39:49.000000000 +0100
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 
+export deb_systemdsleepdir = $(shell pkg-config --variable=systemdsleepdir systemd)
+
 %:
 	dh $@
 
@@ -31,8 +33,7 @@
 
 override_dh_auto_install-indep:
 	$(MAKE) install-etc install-prog-pwm $(MAKEARGS_INDP)
-	mkdir -p $(CURDIR)/debian/fancontrol/lib/systemd/system-sleep/
-	install -m 755 $(CURDIR)/debian/fancontrol-systemd-sleep $(CURDIR)/debian/fancontrol/lib/systemd/system-sleep/fancontrol
+	install -m 755 -D $(CURDIR)/debian/fancontrol-systemd-sleep $(CURDIR)/debian/fancontrol$(deb_systemdsleepdir)/fancontrol
 
 	# Make sure /etc/sensors.d/ is not removed
 	touch $(CURDIR)/debian/tmp/etc/sensors.d/.placeholder

Reply via email to