Control: tags 1061491 + pending

Dear maintainer,

I've prepared an NMU for libcgroup (versioned as 2.0.2-2.1) and
uploaded it to DELAYED/12. Please feel free to tell me if I
should delay it longer.

Regards.

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-05-30 19:52:18.000000000 +0200
@@ -1,3 +1,12 @@
+libcgroup (2.0.2-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+
+  [ Michael Biebl ]
+  * Move PAM module and library to /usr. (Closes: #1061491)
+
+ -- Chris Hofstaedtler <[email protected]>  Thu, 30 May 2024 19:52:18 +0200
+
 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-05-30 19:52:17.000000000 +0200
@@ -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-05-30 19:52:17.000000000 +0200
@@ -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-05-30 19:52:17.000000000 +0200
@@ -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-05-30 19:52:17.000000000 +0200
@@ -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.*
 

Reply via email to