Control: tags -1 + patch

Hi Lee

please find attached a patch which implements this change.
If you have concerns/questions, please ask.


Regards
Michael


On Fri, 12 Dec 2025 14:52:18 +0100 [email protected] wrote:
Source: thinkfan
Version: 2.0.0-1
Severity: normal
User: [email protected]
Usertags: dh_movetousr_removal

Hi,

your package thinkfan either Build-Depends on dh-sequence-movetousr
or uses dh_movetousr conditionally to move files from aliased
locations like /sbin, /bin or /lib to the canonical location in /usr.

Eventually, we would like to get rid of this debhelper addon.
Packages should use the canonical paths without any postprocessing.

This means, files are installed directly into /usr.

Please note, that such a change must not be backported to bookworm or
older. If you intend to provide such backports, these changes must be
reverted for those releases. If this means an undue burden on your
workflow our recommendation is to postpone this cleanup.

The motivation for this bug report is, to inform maintainers, that
installing files into the canonical location explicitly, is now the
preferred approach and dh_movetousr is now a deprecated tool.

The goal is, to have dh_movetousr removed after forky is released. We
can revise this plan, if needed. Please keep this timeline in mind
and let us know if this doesn't work for you.

For more information see [1].

If you have further questions, there is an IRC channel named
#debian-usrmerge on OFTC.

Regards,

Michael

[1] https://lists.debian.org/debian-devel/2025/11/msg00245.html


diff -Nru thinkfan-2.0.0/debian/changelog thinkfan-2.0.0/debian/changelog
--- thinkfan-2.0.0/debian/changelog	2025-09-01 17:54:39.000000000 +0200
+++ thinkfan-2.0.0/debian/changelog	2026-07-04 17:30:28.000000000 +0200
@@ -1,3 +1,10 @@
+thinkfan (2.0.0-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Avoid usage of dh_movetousr. (Closes: #1122793)
+
+ -- Michael Biebl <[email protected]>  Sat, 04 Jul 2026 17:30:28 +0200
+
 thinkfan (2.0.0-1) unstable; urgency=medium
 
   * New upstream version 2.0.0
diff -Nru thinkfan-2.0.0/debian/control thinkfan-2.0.0/debian/control
--- thinkfan-2.0.0/debian/control	2025-09-01 12:07:50.000000000 +0200
+++ thinkfan-2.0.0/debian/control	2026-07-04 17:30:22.000000000 +0200
@@ -8,9 +8,6 @@
                libsensors-dev,
                libyaml-cpp-dev,
                pkgconf,
-               dh-sequence-movetousr,
-#              ^^^^^
-# Remove this dependency after trixie and drop 0003-no-usr-lib-systemd.patch
 Rules-Requires-Root: no
 Standards-Version: 4.7.0.0
 Homepage: https://github.com/vmatare/thinkfan
diff -Nru thinkfan-2.0.0/debian/patches/0003-no-usr-lib-systemd.patch thinkfan-2.0.0/debian/patches/0003-no-usr-lib-systemd.patch
--- thinkfan-2.0.0/debian/patches/0003-no-usr-lib-systemd.patch	2025-09-01 11:42:53.000000000 +0200
+++ thinkfan-2.0.0/debian/patches/0003-no-usr-lib-systemd.patch	1970-01-01 01:00:00.000000000 +0100
@@ -1,21 +0,0 @@
-Description: Install systemd units to /lib/systemd/system/
- See here for a rationale
- ("Moratorium on moving files' logical locations into /usr"):
- https://lists.debian.org/debian-devel/2021/10/msg00190.html
-Author: Evgeni Golov <[email protected]>
-Forwarded: not-needed
-Reviewed-by: Lee Garrett <[email protected]>
-Last-Update: 2023-01-14
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -178,7 +178,7 @@
- 		rcscripts/systemd/thinkfan-sleep.service
- 		rcscripts/systemd/thinkfan-wakeup.service
- 		"${CMAKE_BINARY_DIR}/rcscripts/systemd/thinkfan.service"
--		DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/systemd/system")
-+		DESTINATION "/lib/systemd/system")
- 	if(NOT EXISTS "/etc/systemd/system/thinkfan.service.d/override.conf")
- 		install(FILES
- 			rcscripts/systemd/override.conf
diff -Nru thinkfan-2.0.0/debian/patches/series thinkfan-2.0.0/debian/patches/series
--- thinkfan-2.0.0/debian/patches/series	2025-09-01 11:37:41.000000000 +0200
+++ thinkfan-2.0.0/debian/patches/series	2026-07-04 17:30:12.000000000 +0200
@@ -1,5 +1,4 @@
 0001-rcscripts-drop-start-check.patch
 0002-rcscripts-load-defaults-for-systemd.patch
-0003-no-usr-lib-systemd.patch
 0006-fix-ftbfs-riscv64.patch
 0008-CMakeLists.txt.patch

Attachment: OpenPGP_signature.asc
Description: OpenPGP digital signature

Reply via email to