Hello,
here are the patches to revert consequences of Debian's usrmerge:
cpio, dbus, debianutils (revert debian_rules.patch)
--- a/debian/changelog 2024-01-15 10:38:45.000000000 +0100
+++ b/debian/changelog 2024-01-16 15:22:13.000000000 +0100
@@ -1,3 +1,9 @@
+cpio (2.15+dfsg-1.1) UNRELEASED; urgency=medium
+
+ * d/postinst: Move update-alternatives to /usr too.
+
+ -- Svante Signell <svante.signell@???> Tue, 16 Jan 2024 15:22:27 +0100
+
cpio (2.15+dfsg-1) unstable; urgency=medium
* New upstream release
--- a/debian/postinst 2020-02-01 14:11:00.000000000 +0100
+++ b/debian/postinst 2024-01-16 15:16:31.000000000 +0100
@@ -3,7 +3,7 @@
set -e
if [ "$1" = configure ]; then
- update-alternatives --install /bin/mt mt /bin/mt-gnu 10 \
+ update-alternatives --install /usr/bin/mt mt /usr/bin/mt-gnu 10 \
--slave \
/usr/share/man/man1/mt.1.gz mt.1.gz /usr/share/man/man1/mt-gnu.1.gz
fi
--- a/debian/changelog 2024-01-11 12:12:45.000000000 +0100
+++ b/debian/changelog 2024-01-11 12:15:37.000000000 +0100
@@ -1,3 +1,9 @@
+dbus (1.14.10-4.1) UNRELEASED; urgency=medium
+
+ * d/control: Remove dependency on usr-is-merged.
+
+ -- Svante Signell <svante.signell@???> Thu, 11 Jan 2024 12:16:35 +0100
+
dbus (1.14.10-4) unstable; urgency=medium
* Move the shared library from /lib/MULTIARCH to /usr/lib/MULTIARCH
--- a/debian/control 2023-10-30 12:51:35.000000000 +0100
+++ b/debian/control 2023-10-31 14:09:30.000000000 +0100
@@ -50,7 +50,6 @@
dbus-bin (= ${binary:Version}),
dbus-daemon (= ${binary:Version}),
dbus-system-bus-common (>= ${source:Version}),
- usr-is-merged (>= 38~),
${misc:Depends},
${shlibs:Depends},
Suggests:
--- a/debian/changelog 2024-01-03 22:29:19.000000000 +0100
+++ b/debian/changelog 2024-01-11 14:22:07.000000000 +0100
@@ -1,3 +1,9 @@
+debianutils (5.16.1) UNRELEASED; urgency=medium
+
+ * Revert 5.15+nmu1: Install files into /usr.
+
+ -- Svante Signell <svante.signell@???> Thu, 11 Jan 2024 14:22:19 +0100
+
debianutils (5.16) unstable; urgency=medium
* Upload to unstable per request of Chris Hofstaedtler.
diff -Nru debianutils-5.14/debian/rules debianutils-5.14+nmu1/debian/rules
--- debianutils-5.14/debian/rules 2023-09-19 20:35:25.000000000 +0200
+++ debianutils-5.14+nmu1/debian/rules 2023-11-27 12:10:49.000000000 +0100
@@ -20,18 +20,13 @@
dh $@
execute_after_dh_auto_install:
- $(INSTALL_DIR) $(INSTALL_LOC)/bin \
- $(INSTALL_LOC)/sbin \
+ $(INSTALL_DIR) $(INSTALL_LOC)/usr/bin \
+ $(INSTALL_LOC)/usr/sbin \
$(INSTALL_LOC)/usr/share/$(PACKAGE)/shells.d \
$(INSTALL_LOC)/usr/share/$(PACKAGE)
- mv $(INSTALL_LOC)/usr/bin/run-parts \
- $(INSTALL_LOC)/usr/bin/tempfile \
- $(INSTALL_LOC)/bin/
$(INSTALL_FILE) debian/shells $(INSTALL_LOC)/usr/share/$(PACKAGE)
-ifeq ($(DEB_HOST_ARCH_OS),linux)
- mv $(INSTALL_LOC)/usr/sbin/installkernel $(INSTALL_LOC)/sbin/
-else
+ifneq ($(DEB_HOST_ARCH_OS),linux)
rm $(INSTALL_LOC)/usr/sbin/installkernel \
$(INSTALL_LOC)/usr/share/man/man8/installkernel.8
endif