From b3a9d5955579822b5c5f0c9ef76e86e376e549e3 Mon Sep 17 00:00:00 2001 From: Apertis package maintainers <packagers@lists.apertis.org> Date: Thu, 3 Jun 2021 15:27:08 +0200 Subject: [PATCH] d/rules: remove conflicting binaries Some of the executables installed by `rust-coreutils` are already provided by other packages: - `more` is provided by `util-linux` - `hostname` is provided by `hostname` - `kill` and `uptime` are provided by `procps` Removing those executables from this package solves conflicts. Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com> --- debian/rules | 4 ++++ debian/rust-coreutils.install | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/rules b/debian/rules index b69f75f..82d5bd7 100755 --- a/debian/rules +++ b/debian/rules @@ -13,6 +13,10 @@ override_dh_auto_test: override_dh_auto_install: CARGO_HOME=$(shell pwd)/debian/cargo_home DEB_CARGO_CRATE=coreutils_$(VERSION) /usr/share/cargo/bin/cargo prepare-debian debian/cargo_registry --link-from-system CARGO_HOME=$(shell pwd)/debian/cargo_home DESTDIR=$(CURDIR)/debian/tmp/ make install PROFILE=release + rm -rf $(CURDIR)/debian/tmp/usr/local/bin/hostname \ + $(CURDIR)/debian/tmp/usr/local/bin/kill \ + $(CURDIR)/debian/tmp/usr/local/bin/more \ + $(CURDIR)/debian/tmp/usr/local/bin/uptime for f in $(CURDIR)/debian/tmp/usr/local/bin/*; do \ filename=$$(basename $$f); \ help2man $$f > docs/$$filename.1; \ diff --git a/debian/rust-coreutils.install b/debian/rust-coreutils.install index 5f9206a..7591d51 100644 --- a/debian/rust-coreutils.install +++ b/debian/rust-coreutils.install @@ -27,9 +27,6 @@ usr/local/bin/touch /bin/ usr/local/bin/true /bin/ usr/local/bin/uname /bin/ #usr/local/bin/vdir /bin/ -usr/local/bin/hostname /bin/ -usr/local/bin/kill /bin/ -usr/local/bin/more /bin/ # GNU/Coreutils: Installed in /usr/bin/ #usr/local/bin/[ usr/bin @@ -110,5 +107,4 @@ usr/local/bin/whoami usr/bin usr/local/bin/yes usr/bin usr/local/bin/chroot usr/bin usr/local/bin/hashsum usr/bin -usr/local/bin/uptime usr/bin usr/local/bin/relpath usr/bin -- GitLab