On Mon, Feb 19, 2024 at 08:13:29PM +0100, Helmut Grohne wrote:
> 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.
I've uploaded a slightly rebased version of the patch to DELAYED/10. Let
me know if I should delay any longer.
Helmut
diff -Nru console-setup-1.227/CHANGES console-setup-1.228/CHANGES
--- console-setup-1.227/CHANGES 2024-05-30 10:54:36.000000000 +0200
+++ console-setup-1.228/CHANGES 2024-02-18 13:51:52.000000000 +0100
@@ -1,3 +1,10 @@
+console-setup (1.228) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * DEP17: Move aliased files to /usr. (Closes: #1064299)
+
+ -- Helmut Grohne <hel...@subdivi.de> Sun, 18 Feb 2024 13:51:52 +0100
+
console-setup (1.227) unstable; urgency=medium
* Team upload
diff -Nru console-setup-1.227/debian/changelog
console-setup-1.228/debian/changelog
--- console-setup-1.227/debian/changelog 2024-05-30 10:54:36.000000000
+0200
+++ console-setup-1.228/debian/changelog 2024-02-18 13:51:52.000000000
+0100
@@ -1,3 +1,10 @@
+console-setup (1.228) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * DEP17: Move aliased files to /usr. (Closes: #1064299)
+
+ -- Helmut Grohne <hel...@subdivi.de> Sun, 18 Feb 2024 13:51:52 +0100
+
console-setup (1.227) unstable; urgency=medium
* Team upload
diff -Nru console-setup-1.227/debian/console-setup-udeb.postinst
console-setup-1.228/debian/console-setup-udeb.postinst
--- console-setup-1.227/debian/console-setup-udeb.postinst 2018-10-29
22:12:09.000000000 +0100
+++ console-setup-1.228/debian/console-setup-udeb.postinst 2024-02-18
13:51:52.000000000 +0100
@@ -80,7 +80,7 @@
fi
if \
- [ -d /lib/debian-installer.d ] && keyboard_present
+ [ -d /usr/lib/debian-installer.d ] && keyboard_present
then
if [ "$DISPLAY" ] && which setxkbmap >/dev/null; then
setxkbmap -option '' -model "$model" "$layout" "$variant" "$options"
@@ -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~ -- "$@"
dpkg-maintscript-helper rm_conffile \
diff -Nru console-setup-1.227/debian/console-setup.postrm
console-setup-1.228/debian/console-setup.postrm
--- console-setup-1.227/debian/console-setup.postrm 2018-10-29
22:12:09.000000000 +0100
+++ console-setup-1.228/debian/console-setup.postrm 2024-02-18
13:51:52.000000000 +0100
@@ -7,7 +7,7 @@
fi
if [ remove = "$1" -o purge = "$1" ]; then
- if [ ! -f /bin/setupcon ]; then
+ if [ ! -f /usr/bin/setupcon ]; then
rm -f /etc/console-setup/cached_*
fi
fi
diff -Nru console-setup-1.227/debian/keyboard-configuration.postinst
console-setup-1.228/debian/keyboard-configuration.postinst
--- console-setup-1.227/debian/keyboard-configuration.postinst 2018-10-29
22:12:09.000000000 +0100
+++ console-setup-1.228/debian/keyboard-configuration.postinst 2024-02-18
13:51:52.000000000 +0100
@@ -80,7 +80,7 @@
fi
if \
- [ -d /lib/debian-installer.d ] && keyboard_present
+ [ -d /usr/lib/debian-installer.d ] && keyboard_present
then
if [ "$DISPLAY" ] && which setxkbmap >/dev/null; then
setxkbmap -option '' -model "$model" "$layout" "$variant" "$options"
@@ -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~ -- "$@"
dpkg-maintscript-helper rm_conffile \
diff -Nru console-setup-1.227/debian/rules console-setup-1.228/debian/rules
--- console-setup-1.227/debian/rules 2024-05-28 18:28:45.000000000 +0200
+++ console-setup-1.228/debian/rules 2024-02-18 13:51:52.000000000 +0100
@@ -112,11 +112,11 @@
$(MAKE) etcdir=debian/console-setup-linux/etc \
prefix=debian/console-setup-linux/usr install-common-linux
dh_install -p console-setup-linux \
- init/90-console-setup.rules lib/udev/rules.d/
+ init/90-console-setup.rules usr/lib/udev/rules.d/
dh_install -p console-setup-linux \
- init/keyboard-setup.sh lib/console-setup/
+ init/keyboard-setup.sh usr/lib/console-setup/
dh_install -p console-setup-linux \
- init/console-setup.sh lib/console-setup/
+ init/console-setup.sh usr/lib/console-setup/
dh_systemd_enable -p console-setup-linux \
--name keyboard-setup
dh_systemd_enable -p console-setup-linux \
@@ -140,9 +140,9 @@
$(MAKE) etcdir=debian/console-setup-freebsd/etc \
prefix=debian/console-setup-freebsd/usr install-common-freebsd
dh_install -p console-setup-freebsd \
- init/keyboard-setup.sh lib/console-setup/
+ init/keyboard-setup.sh usr/lib/console-setup/
dh_install -p console-setup-freebsd \
- init/console-setup.sh lib/console-setup/
+ init/console-setup.sh usr/lib/console-setup/
dh_systemd_enable -p console-setup-freebsd \
--name keyboard-setup
dh_systemd_enable -p console-setup-freebsd \
@@ -166,14 +166,16 @@
dh_prep -p console-setup
dh_prep -p console-setup-mini
$(MAKE) etcdir=debian/console-setup/etc \
- prefix=debian/console-setup/usr install-common
+ prefix=debian/console-setup/usr \
+ bootprefix=debian/console-setup/usr install-common
$(MAKE) etcdir=debian/console-setup/etc \
prefix=debian/console-setup/usr install-ckbcomp
$(MAKE) etcdir=debian/console-setup-mini/etc \
- prefix=debian/console-setup-mini/usr install-common
+ prefix=debian/console-setup-mini/usr \
+ bootprefix=debian/console-setup-mini/usr install-common
$(MAKE) etcdir=debian/console-setup-mini/etc \
prefix=debian/console-setup-mini/usr install-ckbcomp-mini
- $(pre) --mini debian/console-setup-mini/bin/setupcon
+ $(pre) --mini debian/console-setup-mini/usr/bin/setupcon
$(pre) --mini debian/console-setup-mini/usr/bin/ckbcomp-mini
ls debian/console-setup/usr/share/man/*/* \
debian/console-setup-mini/usr/share/man/*/* \
@@ -259,10 +261,11 @@
dh_prep -p console-setup-udeb
dh_prep -p console-setup-pc-ekbd
$(MAKE) etcdir=debian/console-setup-udeb/etc \
- prefix=debian/console-setup-udeb/usr install-common
+ prefix=debian/console-setup-udeb/usr \
+ bootprefix=debian/console-setup-udeb/usr install-common
$(MAKE) etcdir=debian/console-setup-udeb/etc \
prefix=debian/console-setup-udeb/usr install-ckbcomp-mini
- $(pre) --udeb debian/console-setup-udeb/bin/setupcon
+ $(pre) --udeb debian/console-setup-udeb/usr/bin/setupcon
$(pre) --udeb debian/console-setup-udeb/usr/bin/ckbcomp-mini
rm -r debian/console-setup-udeb/usr/share/man/
dh_installdirs -p console-setup-udeb usr/share/console-setup
@@ -273,9 +276,9 @@
install -m0755 debian/keyboard-configuration.config \
debian/console-setup-udeb/usr/share/console-setup/
$(pre) --udeb
debian/console-setup-udeb/usr/share/console-setup/keyboard-configuration.config
- dh_installdirs -p console-setup-udeb lib/debian-installer.d/
+ dh_installdirs -p console-setup-udeb usr/lib/debian-installer.d/
install -m0644 debian/console-setup-udeb.startup \
-
debian/console-setup-udeb/lib/debian-installer.d/S55console-setup
+
debian/console-setup-udeb/usr/lib/debian-installer.d/S55console-setup
dh_installdirs -p console-setup-udeb usr/lib/base-installer.d
install -m0755 debian/console-setup-udeb.base-installer \
debian/console-setup-udeb/usr/lib/base-installer.d/20console-setup
