[Pkg-samba-maint] Bug#1061332: cifs-utils: install files into /usr

[Michael Biebl]

Source: cifs-utils
Version: 2:7.0-2
Severity: normal
Tags: patch
User: helmutg at debian.org
Usertags: dep17m2

We want to finalize the /usr-merge via DEP17 by moving all files to
/usr. cifs-utils installs files into /lib and /sbin; these should
be moved into the respective directories in /usr/

Please find a patch attached.  It has been build-tested.

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].

Michael

[1] https://wiki.debian.org/UsrMerge
-------------- next part --------------
diff -Nru cifs-utils-7.0/debian/changelog cifs-utils-7.0/debian/changelog
--- cifs-utils-7.0/debian/changelog	2022-08-26 16:06:45.000000000 +0200
+++ cifs-utils-7.0/debian/changelog	2024-01-22 20:20:42.000000000 +0100
@@ -1,3 +1,10 @@
+cifs-utils (2:7.0-2.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Install files into /usr (DEP17 M2). (Closes: #-1)
+
+ -- Michael Biebl <biebl at debian.org>  Mon, 22 Jan 2024 20:20:42 +0100
+
 cifs-utils (2:7.0-2) unstable; urgency=medium
 
   * root_sbindir-hook.patch - fix upstream fix for non-parallel
diff -Nru cifs-utils-7.0/debian/cifs-utils.lintian-overrides cifs-utils-7.0/debian/cifs-utils.lintian-overrides
--- cifs-utils-7.0/debian/cifs-utils.lintian-overrides	2022-08-25 22:11:10.000000000 +0200
+++ cifs-utils-7.0/debian/cifs-utils.lintian-overrides	2024-01-22 20:20:04.000000000 +0100
@@ -1 +1 @@
-cifs-utils: elevated-privileges 4755 root/root [sbin/mount.cifs]
+cifs-utils: elevated-privileges 4755 root/root [usr/sbin/mount.cifs]
diff -Nru cifs-utils-7.0/debian/rules cifs-utils-7.0/debian/rules
--- cifs-utils-7.0/debian/rules	2022-05-10 21:59:48.000000000 +0200
+++ cifs-utils-7.0/debian/rules	2024-01-22 20:20:42.000000000 +0100
@@ -6,7 +6,7 @@
 	dh $@ --with bash-completion
 
 override_dh_auto_configure:
-	dh_auto_configure -- --enable-cifsidmap --enable-cifscreds --with-libcap-ng=auto --enable-pam --with-pamdir=/lib/$(DEB_HOST_MULTIARCH)/security
+	ROOTSBINDIR=/usr/sbin dh_auto_configure -- --enable-cifsidmap --enable-cifscreds --with-libcap-ng=auto --enable-pam --with-pamdir=/usr/lib/$(DEB_HOST_MULTIARCH)/security
 
 override_dh_auto_install-indep:
 override_dh_auto_install-arch:
@@ -16,7 +16,7 @@
 
 override_dh_fixperms:
 	dh_fixperms
-	chmod u+s debian/cifs-utils/sbin/mount.cifs
+	chmod u+s debian/cifs-utils/usr/sbin/mount.cifs
 
 override_dh_auto_clean-indep:
 override_dh_auto_clean-arch: