Merging debian version 9.4-3.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

6 files changed, 8 insertions, 24 deletions

diff --git a/debian/changelog b/debian/changelog
index cdc4377..4b927ef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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 <helmut@subdivi.de>  Sat, 09 Mar 2024 18:42:01 +0100
+
 coreutils (9.4-3~progress7.99u1) graograman-backports; urgency=low
 
   * Initial reupload to graograman-backports.
diff --git a/debian/control b/debian/control
index dfc7f34..ec858fd 100644
--- a/debian/control
+++ b/debian/control
@@ -16,6 +16,7 @@ Multi-Arch: foreign
 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 --git a/debian/coreutils.dirs b/debian/coreutils.dirs
index 4825263..5add52c 100644
--- a/debian/coreutils.dirs
+++ b/debian/coreutils.dirs
@@ -1,2 +1 @@
-bin
 usr/share/doc/coreutils
diff --git a/debian/coreutils.postinst b/debian/coreutils.postinst
deleted file mode 100644
index 7f5fc53..0000000
--- a/debian/coreutils.postinst
+++ /dev/null
@@ -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 --git a/debian/coreutils.postrm b/debian/coreutils.postrm
deleted file mode 100644
index 6f475ce..0000000
--- a/debian/coreutils.postrm
+++ /dev/null
@@ -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 --git a/debian/rules b/debian/rules
index f773a42..1097f60 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,11 +36,6 @@ override_dh_auto_install:
 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 @@ override_dh_install-arch:
 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