XPost: linux.debian.maint.boot

Source: console-setup
Version: 1.226
Tags: patch trixie sid
User: helmutg@debian.org
Usertags: dep17m2

We want to finalize the /usr-merge transition by moving all aliased
files from / to /usr via DEP17 to avoid negative effects arising from
aliasing. console-setup is involved, because it ships quite a few
aliased files. I'm sending a patch, because it cannot be automatically converted using dh-sequence-movetousr. I note that the Debian installer
is producing a merged-/usr filesystem since a few months. Also take note
that this patch must not be uploaded to bookworm-backports or earlier as
it would violate the file move moratorium there.

Helmut

diff --minimal -Nru console-setup-1.226/debian/changelog console-setup-1.227/debian/changelog
--- console-setup-1.226/debian/changelog 2024-02-09 15:45:38.000000000 +0100
+++ console-setup-1.227/debian/changelog 2024-02-18 13:51:52.000000000 +0100
@@ -1,3 +1,10 @@
+console-setup (1.227) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * DEP17: Move aliased files to /usr. (Closes: #-1)
+
+ -- Helmut Grohne <helmut@subdivi.de> Sun, 18 Feb 2024 13:51:52 +0100
+
console-setup (1.226) unstable; urgency=medium

* Team upload
diff --minimal -Nru console-setup-1.226/debian/console-setup-udeb.postinst console-setup-1.227/debian/console-setup-udeb.postinst
--- console-setup-1.226/debian/console-setup-udeb.postinst 2024-02-09 15:45:38.000000000 +0100
+++ console-setup-1.227/debian/console-setup-udeb.postinst 2024-02-18 13:51:52.000000000 +0100
@@ -96,7 +96,7 @@
fi
fi

-if ! [ -d /lib/debian-installer.d ]; then
+if ! [ -d /usr/lib/debian-installer.d ]; then
dpkg-maintscript-helper rm_conffile \
/etc/init.d/keyboard-setup 1.138~ -- "$@"