Bug#1061238: discover: install binaries into /usr
Source: discover
Version: 2.1.2-10
Severity: normal
User: helmutg@debian.org
Usertags: dep17m2
We want to finalize the /usr-merge via DEP17 by moving all files to
/usr.
discover installs its binaries into /sbin.
Those should be moved to /usr/sbin instead.
Please find a build tested patch attached.
Regards,
Michael
>From 932f9862f0a8613ed552ec665753787468b7d633 Mon Sep 17 00:00:00 2001
From: Michael Biebl <biebl@debian.org>
Date: Sun, 21 Jan 2024 11:17:00 +0100
Subject: [PATCH] Install binaries into /usr
---
debian/discover.install | 6 +++---
debian/rules | 1 -
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/debian/discover.install b/debian/discover.install
index ef6f77d..395299b 100644
--- a/debian/discover.install
+++ b/debian/discover.install
@@ -1,7 +1,7 @@
etc/discover-modprobe.conf
-usr/bin/discover sbin/
-sbin/discover-modprobe
-sbin/discover-pkginstall
+usr/bin/discover usr/sbin/
+usr/sbin/discover-modprobe
+usr/sbin/discover-pkginstall
usr/bin/discover-config
usr/share/discover/init-discover
usr/share/man/man1/discover-config.1
diff --git a/debian/rules b/debian/rules
index 181f79c..1335c03 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,7 +25,6 @@
CONFIGURE_FLAGS= \
--prefix=/usr \
- --sbindir=/sbin \
--sysconfdir=/etc \
--localstatedir=/var \
--mandir=\$${prefix}/share/man \
--
2.43.0
Reply to: