Hi, I've uploaded the proposed patch to DELAYED/5 in agreement with DevRef. Please let me know if I should delay it any longer. I'm also attaching the actual .debdiff with updated changelog to this mail.
Helmut
diff --minimal -Nru coreutils-9.4/debian/changelog coreutils-9.4/debian/changelog --- coreutils-9.4/debian/changelog 2024-01-02 14:54:03.000000000 +0100 +++ coreutils-9.4/debian/changelog 2024-03-09 18:42:01.000000000 +0100 @@ -1,3 +1,10 @@ +coreutils (9.4-3.1) unstable; urgency=medium + + * Non-maintainer upload. + * DEP17: Move files to /usr. (Closes: #1061274, #1057250) + + -- Helmut Grohne <hel...@subdivi.de> Sat, 09 Mar 2024 18:42:01 +0100 + coreutils (9.4-3) unstable; urgency=low * remove arch restriction from libssl-dev build-depend diff --minimal -Nru coreutils-9.4/debian/control coreutils-9.4/debian/control --- coreutils-9.4/debian/control 2024-01-02 14:22:27.000000000 +0100 +++ coreutils-9.4/debian/control 2024-03-09 18:40:09.000000000 +0100 @@ -11,6 +11,7 @@ Pre-Depends: ${shlibs:Depends}, ${misc:Pre-Depends} Essential: yes Depends: ${misc:Depends} +Breaks: usrmerge (<< 39) Description: GNU core utilities This package contains the basic file, shell and text manipulation utilities which are expected to exist on every operating system. diff --minimal -Nru coreutils-9.4/debian/coreutils.dirs coreutils-9.4/debian/coreutils.dirs --- coreutils-9.4/debian/coreutils.dirs 2014-09-01 15:51:06.000000000 +0200 +++ coreutils-9.4/debian/coreutils.dirs 2024-03-09 18:40:09.000000000 +0100 @@ -1,2 +1 @@ -bin usr/share/doc/coreutils diff --minimal -Nru coreutils-9.4/debian/coreutils.postinst coreutils-9.4/debian/coreutils.postinst --- coreutils-9.4/debian/coreutils.postinst 2022-09-20 17:04:38.000000000 +0200 +++ coreutils-9.4/debian/coreutils.postinst 1970-01-01 01:00:00.000000000 +0100 @@ -1,8 +0,0 @@ -#!/bin/sh -set -e - -if [ "$1" = 'configure' -a ! -e "$DPKG_ROOT/usr/bin/touch" ]; then - ln -s /bin/touch "$DPKG_ROOT/usr/bin/touch" -fi - -#DEBHELPER# diff --minimal -Nru coreutils-9.4/debian/coreutils.postrm coreutils-9.4/debian/coreutils.postrm --- coreutils-9.4/debian/coreutils.postrm 2022-09-20 17:04:49.000000000 +0200 +++ coreutils-9.4/debian/coreutils.postrm 1970-01-01 01:00:00.000000000 +0100 @@ -1,8 +0,0 @@ -#!/bin/sh -set -e - -if [ "$1" = 'remove' -a -L "$DPKG_ROOT/usr/bin/touch" ]; then - rm "$DPKG_ROOT/usr/bin/touch" -fi - -#DEBHELPER# diff --minimal -Nru coreutils-9.4/debian/rules coreutils-9.4/debian/rules --- coreutils-9.4/debian/rules 2023-11-10 14:31:21.000000000 +0100 +++ coreutils-9.4/debian/rules 2024-03-09 18:40:09.000000000 +0100 @@ -36,11 +36,6 @@ override_dh_install-arch: dh_install -a - # some things go in root rather than usr - for f in $(BIN_PROGS); do \ - mv $(d)/usr/bin/$$f $(d)/bin/$$f; \ - done - # backward compatability ln -s /usr/bin/md5sum $(d)/usr/bin/md5sum.textutils ln -s /usr/share/man/man1/md5sum.1 $(d)/usr/share/man/man1/md5sum.textutils.1 @@ -49,8 +44,6 @@ ifeq ($(DEB_HOST_ARCH_OS),linux) # kill from procps is linux-specific rm -f $(d)/usr/bin/kill $(d)/usr/share/man/man1/kill.1 -else - mv $(d)/usr/bin/kill $(d)/bin endif rm -f $(d)/usr/bin/hostname $(d)/usr/share/man/man1/hostname.1 rm -f $(d)/usr/bin/uptime $(d)/usr/share/man/man1/uptime.1