Control: tags -1 + patch

On Fri, 12 Dec 2025 14:52:17 +0100 [email protected] wrote:
Source: nilfs-tools
Version: 2.2.11-2
Severity: normal
User: [email protected]
Usertags: dh_movetousr_removal

Hi,

your package nilfs-tools 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



Please find attached a patch which implements this change for your convenience.


Regards,
Michael
diff -Nru nilfs-tools-2.2.11/debian/changelog 
nilfs-tools-2.2.11/debian/changelog
--- nilfs-tools-2.2.11/debian/changelog 2024-08-10 12:02:10.000000000 +0200
+++ nilfs-tools-2.2.11/debian/changelog 2026-07-05 16:14:44.000000000 +0200
@@ -1,3 +1,10 @@
+nilfs-tools (2.2.11-2.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Avoid usage of dh_movetousr (Closes: #1122790)
+
+ -- Michael Biebl <[email protected]>  Sun, 05 Jul 2026 16:14:44 +0200
+
 nilfs-tools (2.2.11-2) unstable; urgency=medium
 
   * Team upload.
diff -Nru nilfs-tools-2.2.11/debian/control nilfs-tools-2.2.11/debian/control
--- nilfs-tools-2.2.11/debian/control   2024-08-10 11:59:52.000000000 +0200
+++ nilfs-tools-2.2.11/debian/control   2026-07-05 16:14:21.000000000 +0200
@@ -4,7 +4,7 @@
 Standards-Version: 4.7.0
 Maintainer: Filesystems Group <[email protected]>
 Uploaders: Dmitry Smirnov <[email protected]>
-Build-Depends: debhelper-compat (= 13), dh-sequence-movetousr, libmount-dev, 
uuid-dev, libblkid-dev
+Build-Depends: debhelper-compat (= 13), libmount-dev, uuid-dev, libblkid-dev
 Homepage: https://nilfs.osdn.jp/en/
 Vcs-Browser: https://salsa.debian.org/debian/nilfs-tools
 Vcs-Git: https://salsa.debian.org/debian/nilfs-tools.git
diff -Nru nilfs-tools-2.2.11/debian/patches/root_sbin_dir.patch 
nilfs-tools-2.2.11/debian/patches/root_sbin_dir.patch
--- nilfs-tools-2.2.11/debian/patches/root_sbin_dir.patch       1970-01-01 
01:00:00.000000000 +0100
+++ nilfs-tools-2.2.11/debian/patches/root_sbin_dir.patch       2026-07-05 
16:14:44.000000000 +0200
@@ -0,0 +1,19 @@
+From: Michael Biebl <[email protected]>
+Date: Jul, 05 2026 14:18:44 +0200
+Subject: [PATCH] Move root_sbin_dir to /usr
+
+Install binaries directly into /usr/sbin
+
+Bug-Debian: https://bugs.debian.org/1122790
+---
+--- nilfs-tools-2.2.11.orig/configure.ac
++++ nilfs-tools-2.2.11/configure.ac
+@@ -186,7 +186,7 @@ AC_SYS_LARGEFILE
+ AC_PREFIX_DEFAULT([/usr])
+ test "x$prefix" = "xNONE" && prefix="/usr"
+ test "x$exec_prefix" = "xNONE" && exec_prefix="${prefix}"
+-AC_SUBST([root_sbindir], [/sbin])
++AC_SUBST([root_sbindir], [${exec_prefix}/sbin])
+ AC_SUBST([sbindir], [${exec_prefix}/sbin])
+ AC_SUBST([sysconfdir], [/etc])
+ AC_SUBST([localstatedir], [/var])
diff -Nru nilfs-tools-2.2.11/debian/patches/series 
nilfs-tools-2.2.11/debian/patches/series
--- nilfs-tools-2.2.11/debian/patches/series    1970-01-01 01:00:00.000000000 
+0100
+++ nilfs-tools-2.2.11/debian/patches/series    2026-07-05 16:14:44.000000000 
+0200
@@ -0,0 +1 @@
+root_sbin_dir.patch

Attachment: OpenPGP_signature.asc
Description: OpenPGP digital signature

Reply via email to