Hello,
here are patches to revert consequences of Debian's usrmerge:
psmisc (revert: revert-23.6-1.1.patch) , sed (revert debian_rules.patch),
util-linux (current version is 2.39.3-2devuan1)
Thanks!
--- a/debian/changelog 2024-01-13 03:56:53.000000000 +0100
+++ b/debian/changelog 2024-01-16 19:06:58.580000000 +0100
@@ -1,3 +1,9 @@
+psmisc (23.6-2.1) UNRELEASED; urgency=medium
+
+ * Revert installation of fuser in /usr/bin.
+
+ -- Svante Signell <svante.signell@???> Tue, 16 Jan 2024 19:07:53 +0100
+
psmisc (23.6-2) unstable; urgency=medium
* Install fuser into /usr (DEP17 M2) Closes: #1060359
diff -Nru psmisc-23.6/debian/dirs psmisc-23.6/debian/dirs
--- psmisc-23.6/debian/dirs 2022-12-13 06:27:51.000000000 +0100
+++ psmisc-23.6/debian/dirs 2024-01-09 23:26:21.000000000 +0100
@@ -1,3 +1,2 @@
-bin
usr/bin
usr/share/pixmaps
diff -Nru psmisc-23.6/debian/rules psmisc-23.6/debian/rules
--- psmisc-23.6/debian/rules 2022-12-13 06:27:51.000000000 +0100
+++ psmisc-23.6/debian/rules 2024-01-09 23:26:21.000000000 +0100
@@ -16,9 +16,7 @@
override_dh_auto_install:
dh_auto_install
- if [ -f "debian/psmisc/usr/bin/fuser" ] ; then \
- mv debian/psmisc/usr/bin/fuser debian/psmisc/bin/fuser ; \
- else \
+ if [ ! -f "debian/psmisc/usr/bin/fuser" ] ; then \
rm -f debian/psmisc/usr/share/man/man1/fuser.1 ; \
fi
if [ "$(DEB_HOST_ARCH_OS)" = "kfreebsd" ] ; then \
--- a/debian/changelog 2024-01-02 00:37:14.000000000 +0100
+++ b/debian/changelog 2024-01-11 14:43:15.000000000 +0100
@@ -1,3 +1,9 @@
+sed (4.9-2.1) UNRELEASED; urgency=medium
+
+ * Revert from 4.9-2: Move sed to /usr/bin.
+
+ -- Svante Signell <svante.signell@???> Thu, 11 Jan 2024 14:43:14 +0100
+
sed (4.9-2) unstable; urgency=medium
[ Gioele Barabucci ]
--- sed-4.9/debian/rules 2023-01-05 20:55:25.000000000 +0100
+++ sed-4.9/debian/rules 2024-01-01 23:14:16.000000000 +0100
@@ -4,7 +4,7 @@
dh $@
override_dh_auto_configure:
- dh_auto_configure -- --exec-prefix=/ --with-packager=Debian --without-included-regex
+ dh_auto_configure -- --with-packager=Debian --without-included-regex
override_dh_shlibdeps:
dh_shlibdeps -- -dPre-Depends
--- a/debian/changelog 2024-01-05 15:25:05.000000000 +0100
+++ b/debian/changelog 2024-01-11 16:50:18.000000000 +0100
@@ -1,3 +1,9 @@
+util-linux (2.39.3-6.1) UNRELEASED; urgency=medium
+
+ * Revert moving findmnt, mountpoint and su to /usr/bin.
+
+ -- Svante Signell <svante.signell@???> Thu, 11 Jan 2024 16:50:05 +0100
+
util-linux (2.39.3-6) unstable; urgency=medium
* Upload to unstable.
--- a/debian/rules 2024-01-05 15:25:05.000000000 +0100
+++ b/debian/rules 2024-01-12 09:30:48.000000000 +0100
@@ -3,7 +3,10 @@
include /usr/share/dpkg/architecture.mk
include /usr/share/dpkg/pkg-info.mk
+#FIXME: Remove for Devuan build
+ifeq ($(DEB_HOST_ARCH_OS),linux)
CONFOPTS += --enable-usrdir-path
+endif
ifeq ($(DEB_HOST_ARCH_OS),linux)
CONFOPTS += --with-selinux
@@ -158,7 +161,7 @@
dh_installpam --package=util-linux --name=su-l
override_dh_fixperms:
- dh_fixperms -i -a -Xusr/bin/wall -Xusr/bin/write -Xusr/bin/mount -Xusr/bin/umount -Xusr/bin/su
+ dh_fixperms -i -a -Xusr/bin/wall -Xusr/bin/write -Xbin/mount -Xbin/umount -Xbin/su
ifeq (linux,$(DEB_HOST_ARCH_OS))
override_dh_installsystemd:
--- a/debian/util-linux.install 2024-01-05 15:25:05.000000000 +0100
+++ b/debian/util-linux.install 2024-01-11 16:56:47.000000000 +0100
@@ -8,10 +8,10 @@
# weekly fstrim only available on linux
[linux-any] ${deb_systemdsystemunitdir}/fstrim.timer
[linux-any] ${deb_systemdsystemunitdir}/fstrim.service
-bin/findmnt usr/bin/
+bin/findmnt bin/
bin/more bin/ [linux-any]
-bin/mountpoint usr/bin/
-bin/su usr/bin/
+bin/mountpoint bin/
+bin/su bin/
sbin/agetty usr/sbin/
sbin/blkid usr/sbin/
sbin/findfs usr/sbin/