Control: tags -1 + patch

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

Hi,

your package etckeeper 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 attach a patch which implements this change.

Regards
Michael
diff -Nru etckeeper-1.18.23/debian/changelog etckeeper-1.18.23/debian/changelog
--- etckeeper-1.18.23/debian/changelog  2025-09-03 16:46:44.000000000 +0200
+++ etckeeper-1.18.23/debian/changelog  2026-07-04 22:14:29.000000000 +0200
@@ -1,3 +1,10 @@
+etckeeper (1.18.23-2.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Avoid usage of dh_movetousr (Closes: #1122800)
+
+ -- Michael Biebl <[email protected]>  Sat, 04 Jul 2026 22:14:29 +0200
+
 etckeeper (1.18.23-2) unstable; urgency=medium
 
   * add build-dep on python-is-python3 (Closes: #1113847)
diff -Nru etckeeper-1.18.23/debian/control etckeeper-1.18.23/debian/control
--- etckeeper-1.18.23/debian/control    2025-09-03 16:46:44.000000000 +0200
+++ etckeeper-1.18.23/debian/control    2026-07-04 22:14:21.000000000 +0200
@@ -5,7 +5,6 @@
                bats,
                brz,
                dh-python,
-               dh-sequence-movetousr,
                fakeroot <!nocheck>,
                git,
                python3:any,
diff -Nru 
etckeeper-1.18.23/debian/patches/0004-Install-systemd-files-into-usr.patch 
etckeeper-1.18.23/debian/patches/0004-Install-systemd-files-into-usr.patch
--- etckeeper-1.18.23/debian/patches/0004-Install-systemd-files-into-usr.patch  
1970-01-01 01:00:00.000000000 +0100
+++ etckeeper-1.18.23/debian/patches/0004-Install-systemd-files-into-usr.patch  
2026-07-04 22:14:14.000000000 +0200
@@ -0,0 +1,13 @@
+Index: etckeeper-1.18.23/Makefile
+===================================================================
+--- etckeeper-1.18.23.orig/Makefile    2026-07-04 22:11:25.000000000 +0200
++++ etckeeper-1.18.23/Makefile 2026-07-04 22:13:41.485486211 +0200
+@@ -9,7 +9,7 @@
+ etcdir=/etc
+ mandir=${prefix}/share/man
+ vardir=/var
+-systemddir=/lib/systemd/system
++systemddir=${prefix}/lib/systemd/system
+ bashcompletiondir=${prefix}/share/bash-completion/completions
+ zshcompletiondir=${prefix}/share/zsh/vendor-completions
+ CP=cp -R
diff -Nru etckeeper-1.18.23/debian/patches/series 
etckeeper-1.18.23/debian/patches/series
--- etckeeper-1.18.23/debian/patches/series     2025-09-03 16:46:44.000000000 
+0200
+++ etckeeper-1.18.23/debian/patches/series     2026-07-04 22:14:29.000000000 
+0200
@@ -1,3 +1,4 @@
 0001-Add-breezy-python3-plugin.patch
 0002-Default-to-UTF8-encoding-for-consistent-ordering.patch
 0003-etckeeper.conf-add-quiet-to-BZR_COMMIT_OPTIONS-Close.patch
+0004-Install-systemd-files-into-usr.patch

Attachment: OpenPGP_signature.asc
Description: OpenPGP digital signature

Reply via email to