Bug#1060359: psmisc: install fuser into /usr (DEP17)

2024-01-12 Thread Craig Small
On Wed, 10 Jan 2024 at 09:42, Chris Hofstaedtler  wrote:

> Please find a patch attached to install fuser into /usr, for the
> currently ongoing UsrMerge effort [1].
> It has been build-tested and checked by dumat.
>
Hi Chris,
  Thanks for the patch. I have reviewed it and uploaded a new version of
psmisc with that patch.

 - Craig


Bug#1060359: psmisc: install fuser into /usr (DEP17)

2024-01-09 Thread Chris Hofstaedtler
Source: psmisc
Version: 23.6-1
Severity: normal
Tags: patch
User: helm...@debian.org
Usertags: dep17m2

Please find a patch attached to install fuser into /usr, for the
currently ongoing UsrMerge effort [1].
It has been build-tested and checked by dumat.

Please review it and upload to unstable during the trixie cycle.

Note: this should not be backported to bookworm. If you intend to
backport, please use dh_movetousr instead.

If your package will change for the t64 transition or otherwise
rename/split/move its binaries (packages) during trixie, please
then upload to experimental and get in touch with the UsrMerge
driver, please see the wiki [1].

Chris

[1] https://wiki.debian.org/UsrMerge
diff -Nru psmisc-23.6/debian/changelog psmisc-23.6/debian/changelog
--- psmisc-23.6/debian/changelog	2022-12-13 06:27:51.0 +0100
+++ psmisc-23.6/debian/changelog	2024-01-09 23:26:21.0 +0100
@@ -1,3 +1,10 @@
+psmisc (23.6-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Install fuser into /usr (DEP17 M2)
+
+ -- Chris Hofstaedtler   Tue, 09 Jan 2024 23:26:21 +0100
+
 psmisc (23.6-1) unstable; urgency=medium
 
   [ Debian Janitor ]
diff -Nru psmisc-23.6/debian/dirs psmisc-23.6/debian/dirs
--- psmisc-23.6/debian/dirs	2022-12-13 06:27:51.0 +0100
+++ psmisc-23.6/debian/dirs	2024-01-09 23:26:21.0 +0100
@@ -1,3 +1,2 @@
-bin
 usr/bin
 usr/share/pixmaps
diff -Nru psmisc-23.6/debian/rules psmisc-23.6/debian/rules
--- psmisc-23.6/debian/rules	2022-12-13 06:27:51.0 +0100
+++ psmisc-23.6/debian/rules	2024-01-09 23:26:21.0 +0100
@@ -16,9 +16,7 @@
 
 override_dh_auto_install:
 	dh_auto_install
-	if [ -f "debian/psmisc/usr/bin/fuser" ] ; then \
-	  mv debian/psmisc/usr/bin/fuser debian/psmisc/bin/fuser ; \
-	else \
+	if [ ! -f "debian/psmisc/usr/bin/fuser" ] ; then \
 	  rm -f debian/psmisc/usr/share/man/man1/fuser.1 ; \
 	fi
 	if [ "$(DEB_HOST_ARCH_OS)" = "kfreebsd" ] ; then \