From a0c2ce35981530590e698f7491df7a2ba5512a15 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 19 Apr 2024 19:00:49 +0200 Subject: Adding debian version 9.4-3.1. Signed-off-by: Daniel Baumann --- debian/changelog | 7 +++++++ debian/control | 1 + debian/coreutils.dirs | 1 - debian/coreutils.postinst | 8 -------- debian/coreutils.postrm | 8 -------- debian/rules | 7 ------- 6 files changed, 8 insertions(+), 24 deletions(-) delete mode 100644 debian/coreutils.postinst delete mode 100644 debian/coreutils.postrm diff --git a/debian/changelog b/debian/changelog index 22423d5..2628e34 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 Sat, 09 Mar 2024 18:42:01 +0100 + coreutils (9.4-3) unstable; urgency=low * remove arch restriction from libssl-dev build-depend diff --git a/debian/control b/debian/control index 87e41e4..eb3ad9c 100644 --- a/debian/control +++ b/debian/control @@ -11,6 +11,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 3e14f8e..b346bd8 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 -- cgit v1.2.3