Source: libcgroup
Version: 2.0.2-2
Severity: normal
Tags: patch
User: helm...@debian.org
Usertags: dep17m2
We want to finalize the /usr-merge via DEP17 by moving all files to
/usr. libcgroup installs files into /lib; these should be moved into the
respective canonical locations 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
diff -Nru libcgroup-2.0.2/debian/changelog libcgroup-2.0.2/debian/changelog
--- libcgroup-2.0.2/debian/changelog 2022-07-25 17:16:51.000000000 +0200
+++ libcgroup-2.0.2/debian/changelog 2024-01-25 14:47:19.000000000 +0100
@@ -1,3 +1,10 @@
+libcgroup (2.0.2-2.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Move PAM module and library to /usr. (Closes: #-1)
+
+ -- Michael Biebl <bi...@debian.org> Thu, 25 Jan 2024 14:47:19 +0100
+
libcgroup (2.0.2-2) unstable; urgency=medium
* Upload to unstable
diff -Nru libcgroup-2.0.2/debian/libcgroup2.install
libcgroup-2.0.2/debian/libcgroup2.install
--- libcgroup-2.0.2/debian/libcgroup2.install 2022-05-16 14:08:22.000000000
+0200
+++ libcgroup-2.0.2/debian/libcgroup2.install 2024-01-25 14:47:19.000000000
+0100
@@ -1 +1 @@
-lib/*/libcgroup.so.*
+usr/lib/*/libcgroup.so.*
diff -Nru libcgroup-2.0.2/debian/libcgroup-dev.install
libcgroup-2.0.2/debian/libcgroup-dev.install
--- libcgroup-2.0.2/debian/libcgroup-dev.install 2021-09-30
15:04:30.000000000 +0200
+++ libcgroup-2.0.2/debian/libcgroup-dev.install 2024-01-25
14:47:19.000000000 +0100
@@ -1,4 +1,4 @@
usr/include
usr/lib/*/*.so
usr/lib/*/pkgconfig
-lib/*/*.a
+usr/lib/*/*.a
diff -Nru libcgroup-2.0.2/debian/libpam-cgroup.install
libcgroup-2.0.2/debian/libpam-cgroup.install
--- libcgroup-2.0.2/debian/libpam-cgroup.install 2021-09-30
15:04:30.000000000 +0200
+++ libcgroup-2.0.2/debian/libpam-cgroup.install 2024-01-25
14:46:32.000000000 +0100
@@ -1 +1 @@
-lib/*/security/*.so
+usr/lib/*/security/*.so
diff -Nru libcgroup-2.0.2/debian/rules libcgroup-2.0.2/debian/rules
--- libcgroup-2.0.2/debian/rules 2022-05-11 15:22:01.000000000 +0200
+++ libcgroup-2.0.2/debian/rules 2024-01-25 14:47:19.000000000 +0100
@@ -15,7 +15,6 @@
override_dh_auto_configure:
dh_auto_configure -- \
- --libdir /lib/$(DEB_HOST_MULTIARCH) \
--disable-silent-rules \
--enable-opaque-hierarchy="name=systemd"
@@ -24,28 +23,12 @@
# Disabled. Requires root and also modifies the testbed.
-override_dh_installdirs:
- dh_installdirs
-
- # While the PAM module and the library are in /lib, according to the
- # FHS, development files must go into usr/lib/<triplet>.
- mkdir -p debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)
-
-
override_dh_auto_install:
dh_auto_install
- # libcgroup-dev:
- # Move the development files from lib/ to usr/lib. The pkgconfig files
- # can be moved as-is, but we need to redirect the .so symlink. dh_link
- # will later correct this link for us (from relative to absolute).
- cd debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH) && \
- mv ../../../lib/$(DEB_HOST_MULTIARCH)/pkgconfig . && \
- ln -s ../../../lib/$(DEB_HOST_MULTIARCH)/libcgroup.so.*.*.*
libcgroup.so
-
# Remove unwanted/unused files (because of --fail-missing)
- cd debian/tmp/lib/$(DEB_HOST_MULTIARCH) && \
- rm -f *.so security/pam_cgroup.so.* *.la security/*.la
security/*.a \
+ cd debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH) && \
+ rm -f *.la security/*.la security/*.a \
libcgroupfortesting.so.* \
libcgset.so.*
