Source: keyutils Version: 1.6.3-2 Tags: patch User: [email protected] Usertags: dep17m2
For finalizing the /usr-merge, we want to move all files /to usr (DEP17). keyutils is involved, because it is installed by debootstrap. I'm attaching a patch for your convenience. This patch should not be uploaded to bookworm-backports or earlier. If you want to support backports, please use dh_movetousr/dh-sequence-movetousr instead. Helmut
diff --minimal -Nru keyutils-1.6.3/debian/changelog keyutils-1.6.3/debian/changelog --- keyutils-1.6.3/debian/changelog 2022-12-18 22:15:58.000000000 +0100 +++ keyutils-1.6.3/debian/changelog 2024-01-01 21:47:20.000000000 +0100 @@ -1,3 +1,10 @@ +keyutils (1.6.3-2.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Move files to /usr for DEP17. (Closes: #-1) + + -- Helmut Grohne <[email protected]> Mon, 01 Jan 2024 21:47:20 +0100 + keyutils (1.6.3-2) unstable; urgency=medium * Bump Standards-Version to 4.6.2 (no changes needed) diff --minimal -Nru keyutils-1.6.3/debian/keyutils.install keyutils-1.6.3/debian/keyutils.install --- keyutils-1.6.3/debian/keyutils.install 2022-12-18 22:15:58.000000000 +0100 +++ keyutils-1.6.3/debian/keyutils.install 2024-01-01 21:45:42.000000000 +0100 @@ -1,6 +1,6 @@ -bin etc -sbin +usr/bin +usr/sbin usr/share/keyutils usr/share/man/man1 usr/share/man/man5 diff --minimal -Nru keyutils-1.6.3/debian/libkeyutils-dev.install keyutils-1.6.3/debian/libkeyutils-dev.install --- keyutils-1.6.3/debian/libkeyutils-dev.install 2022-12-18 22:15:58.000000000 +0100 +++ keyutils-1.6.3/debian/libkeyutils-dev.install 2024-01-01 21:47:20.000000000 +0100 @@ -1,3 +1,5 @@ usr/include -usr/lib +usr/lib/*/*.a +usr/lib/*/*.so +usr/lib/*/pkgconfig usr/share/man/man3 diff --minimal -Nru keyutils-1.6.3/debian/libkeyutils1.install keyutils-1.6.3/debian/libkeyutils1.install --- keyutils-1.6.3/debian/libkeyutils1.install 2022-12-18 22:15:58.000000000 +0100 +++ keyutils-1.6.3/debian/libkeyutils1.install 2024-01-01 21:45:47.000000000 +0100 @@ -1 +1 @@ -lib/*/*.so.* +usr/lib/*/*.so.* diff --minimal -Nru keyutils-1.6.3/debian/rules keyutils-1.6.3/debian/rules --- keyutils-1.6.3/debian/rules 2022-12-18 22:15:58.000000000 +0100 +++ keyutils-1.6.3/debian/rules 2024-01-01 21:45:25.000000000 +0100 @@ -17,7 +17,7 @@ endif override_dh_auto_install: - dh_auto_install -- LIBDIR=/lib/$(DEB_HOST_MULTIARCH) USRLIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH) + dh_auto_install -- BINDIR=/usr/bin LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH) USRLIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH) SBINDIR=/usr/sbin override_dh_auto_test: # Use the library and executable we just built;
