Source: libcap2
Version: 1:2.66-4
Tags: patch
User: helm...@debian.org
Usertags: dep17m2
We want to finalize the /usr-merge via DEP17 by moving all files to
/usr. libcap2 is involved early, because it builds essential packages.
I'm attaching a patch that performs the move. This patch should not be
uploaded to bookworm-backports or earlier. If you want to support
backports, please use dh_movetousr instead.
Helmut
diff --minimal -Nru libcap2-2.66/debian/changelog libcap2-2.66/debian/changelog
--- libcap2-2.66/debian/changelog 2023-05-15 20:34:57.000000000 +0200
+++ libcap2-2.66/debian/changelog 2024-01-05 17:58:07.000000000 +0100
@@ -1,3 +1,10 @@
+libcap2 (1:2.66-4.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * DEP17: Move aliased files to /usr. (Closes: #-1)
+
+ -- Helmut Grohne <hel...@subdivi.de> Fri, 05 Jan 2024 17:58:07 +0100
+
libcap2 (1:2.66-4) unstable; urgency=medium
* Apply upstream patches for CVE-2023-2602, CVE-2023-2603
diff --minimal -Nru libcap2-2.66/debian/libcap2-bin.install
libcap2-2.66/debian/libcap2-bin.install
--- libcap2-2.66/debian/libcap2-bin.install 2023-05-15 20:34:57.000000000
+0200
+++ libcap2-2.66/debian/libcap2-bin.install 2024-01-05 17:50:20.000000000
+0100
@@ -1,3 +1,3 @@
-sbin
+usr/sbin
usr/share/man/man1
usr/share/man/man8
diff --minimal -Nru libcap2-2.66/debian/libcap2-udeb.install
libcap2-2.66/debian/libcap2-udeb.install
--- libcap2-2.66/debian/libcap2-udeb.install 2023-05-15 20:34:57.000000000
+0200
+++ libcap2-2.66/debian/libcap2-udeb.install 2024-01-05 17:50:31.000000000
+0100
@@ -1 +1 @@
-lib/*/*.so.*
+usr/lib/*/*.so.*
diff --minimal -Nru libcap2-2.66/debian/libcap2.install
libcap2-2.66/debian/libcap2.install
--- libcap2-2.66/debian/libcap2.install 2023-05-15 20:34:57.000000000 +0200
+++ libcap2-2.66/debian/libcap2.install 2024-01-05 17:50:34.000000000 +0100
@@ -1 +1 @@
-lib/*/*.so.*
+usr/lib/*/*.so.*
diff --minimal -Nru libcap2-2.66/debian/libpam-cap.install
libcap2-2.66/debian/libpam-cap.install
--- libcap2-2.66/debian/libpam-cap.install 2023-05-15 20:34:57.000000000
+0200
+++ libcap2-2.66/debian/libpam-cap.install 2024-01-05 17:50:46.000000000
+0100
@@ -1,3 +1,3 @@
debian/local/pam-configs/* usr/share/pam-configs
-lib/*/security
+usr/lib/*/security
pam_cap/capability.conf etc/security
diff --minimal -Nru libcap2-2.66/debian/rules libcap2-2.66/debian/rules
--- libcap2-2.66/debian/rules 2023-05-15 20:34:57.000000000 +0200
+++ libcap2-2.66/debian/rules 2024-01-05 17:57:24.000000000 +0100
@@ -25,6 +25,7 @@
# See pam_cap/Makefile for FORCELINKPAM
MAKE_ASSIGNMENTS = \
+ prefix=/usr \
FORCELINKPAM=yes \
GOLANG=no
@@ -89,19 +90,6 @@
PKGCONFIGDIR=/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig \
RAISE_SETFCAP=no
- # libcap-dev:
- # Move the development files from lib/ to usr/lib. dh_link will
- # later correct the link for us (from relative to absolute).
- cd debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH) && \
- mv ../../../lib/$(DEB_HOST_MULTIARCH)/*.a . && \
- ln -s ../../../lib/$(DEB_HOST_MULTIARCH)/libcap.so.*.*
libcap.so && \
- ln -s ../../../lib/$(DEB_HOST_MULTIARCH)/libpsx.so.*.* libpsx.so
- sed -i -e 's@^libdir=.*@libdir=/usr/lib/$(DEB_HOST_MULTIARCH)@' \
- debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/*.pc
- # We created the symlink ourselves
- # Remove the build-generate one to silence --fail-missing
- rm -f debian/tmp/lib/$(DEB_HOST_MULTIARCH)/*.so
-
override_dh_auto_test:
dh_auto_test -- $(MAKE_ASSIGNMENTS)
