Bug#1057822: libpsm2: diff for NMU version 11.2.185-2.1
Control: tags 1057822 + patch
Control: tags 1057822 + pending
Dear maintainer,
I've prepared an NMU for libpsm2 (versioned as 11.2.185-2.1) and
uploaded it to DELAYED/7. Please feel free to tell me if I
should delay it longer.
Regards.
diff -Nru libpsm2-11.2.185/debian/changelog libpsm2-11.2.185/debian/changelog
--- libpsm2-11.2.185/debian/changelog 2022-10-14 05:13:28.000000000 +0200
+++ libpsm2-11.2.185/debian/changelog 2024-06-07 22:06:50.000000000 +0200
@@ -1,3 +1,10 @@
+libpsm2 (11.2.185-2.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Use udev.pc to place udev rules (Closes: #1057822)
+
+ -- Chris Hofstaedtler <zeha@debian.org> Fri, 07 Jun 2024 22:06:50 +0200
+
libpsm2 (11.2.185-2) unstable; urgency=medium
* Team upload.
diff -Nru libpsm2-11.2.185/debian/control libpsm2-11.2.185/debian/control
--- libpsm2-11.2.185/debian/control 2022-10-14 05:12:14.000000000 +0200
+++ libpsm2-11.2.185/debian/control 2024-06-07 22:06:46.000000000 +0200
@@ -11,6 +11,8 @@
Homepage: https://github.com/01org/opa-psm2
Build-Depends: debhelper-compat (= 13),
libnuma-dev,
+ pkgconf,
+ systemd-dev,
Package: libpsm2-2
Architecture: amd64
diff -Nru libpsm2-11.2.185/debian/libpsm2-2-compat.install libpsm2-11.2.185/debian/libpsm2-2-compat.install
--- libpsm2-11.2.185/debian/libpsm2-2-compat.install 2022-10-14 05:12:14.000000000 +0200
+++ libpsm2-11.2.185/debian/libpsm2-2-compat.install 2024-06-07 22:06:46.000000000 +0200
@@ -1,3 +1,3 @@
etc/modprobe.d/libpsm2-compat.conf
-lib/udev/rules.d/40-psm-compat.rules
+${env:deb_udevdir}/rules.d/40-psm-compat.rules
usr/lib/libpsm2-2
diff -Nru libpsm2-11.2.185/debian/rules libpsm2-11.2.185/debian/rules
--- libpsm2-11.2.185/debian/rules 2022-10-14 05:12:42.000000000 +0200
+++ libpsm2-11.2.185/debian/rules 2024-06-07 22:06:46.000000000 +0200
@@ -12,6 +12,8 @@
debian/libpsm2-2-compat.prerm \
debian/libpsm2-2-compat.postrm
+export deb_udevdir = $(shell pkg-config --variable=udevdir udev | sed s,^/,,)
+
%:
dh $@
@@ -53,7 +55,7 @@
mv $(DESTDIR)/$(LIBDIR)/psm2-compat/libpsm_infinipath.so.* $(DESTDIR)/usr/lib/libpsm2-2/
sed -i 's~/libpsm2/~/libpsm2-2/~g' $(DESTDIR)/etc/modprobe.d/libpsm2-compat.conf
rmdir $(DESTDIR)/$(LIBDIR)/psm2-compat/
- rm -f $(DESTDIR)/lib/udev/rules.d/40-psm.rules
+ rm -f $(DESTDIR)/$(deb_udevdir)/rules.d/40-psm.rules
# libpsm2-2 contains the compatibility library. Don't process it for dependencies.
.PHONY: override_dh_makeshlibs
Reply to: