Source: comedilib
Version: 0.11.0+5-1
Severity: normal
Tags: patch
User: helm...@debian.org
Usertags: dep17m2
Dear Maintainer,
your package installs files related to udev, into /lib. These
files need to be moved to /usr/lib as part of Debian's usr-merge
effort [1].
Attached you will find a patch using udev.pc to place the udev files
(using pkg-config). This works today in unstable and also for
bookworm, and is safe to do now.
Once udev.pc in unstable points to /usr/lib, your package will
benefit automatically after a binNMU or any other upload.
If during the trixie cycle your package will undergo structural
changes or any other file moves, please see the wiki and upload
to experimental first when these changes are done.
Later during the trixie cycle I expect this bug class to raise in
priority.
Thank you for considering,
Chris
[1] https://wiki.debian.org/UsrMerge
diff -Nru comedilib-0.11.0+5/debian/changelog comedilib-0.11.0+5/debian/changelog
--- comedilib-0.11.0+5/debian/changelog 2020-07-25 10:48:45.000000000 +0200
+++ comedilib-0.11.0+5/debian/changelog 2023-12-17 01:02:20.000000000 +0100
@@ -1,3 +1,10 @@
+comedilib (0.11.0+5-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Use udev.pc to place udev files. (Closes: #-1)
+
+ -- Chris Hofstaedtler <z...@debian.org> Sun, 17 Dec 2023 01:02:20 +0100
+
comedilib (0.11.0+5-1) unstable; urgency=medium
* Add gbp.conf
diff -Nru comedilib-0.11.0+5/debian/control comedilib-0.11.0+5/debian/control
--- comedilib-0.11.0+5/debian/control 2020-07-25 10:48:45.000000000 +0200
+++ comedilib-0.11.0+5/debian/control 2023-12-17 01:01:53.000000000 +0100
@@ -17,7 +17,9 @@
libboost-program-options-dev,
libgsl-dev,
python3-all-dev,
- libboost-dev
+ libboost-dev,
+ pkgconf,
+ systemd-dev,
Standards-Version: 4.5.0
Homepage: http://www.comedi.org
Vcs-Git: https://salsa.debian.org/electronics-team/comedilib.git
diff -Nru comedilib-0.11.0+5/debian/libcomedi0.install comedilib-0.11.0+5/debian/libcomedi0.install
--- comedilib-0.11.0+5/debian/libcomedi0.install 2020-07-25 10:48:45.000000000 +0200
+++ comedilib-0.11.0+5/debian/libcomedi0.install 2023-12-17 01:01:03.000000000 +0100
@@ -10,5 +10,5 @@
usr/share/man/man8/*
usr/share/doc/comedilib/*.conf usr/share/doc/libcomedi0/
etc/pcmcia/*
-lib/udev/*
+${env:deb_udevdir}/*
diff -Nru comedilib-0.11.0+5/debian/rules comedilib-0.11.0+5/debian/rules
--- comedilib-0.11.0+5/debian/rules 2020-07-25 10:48:45.000000000 +0200
+++ comedilib-0.11.0+5/debian/rules 2023-12-17 01:02:15.000000000 +0100
@@ -26,6 +26,8 @@
INSTALL_PROGRAM += -s
endif
+export deb_udevdir = $(shell pkg-config --variable=udevdir udev | sed s,^/,,)
+
configure: configure-stamp
configure-stamp:
dh_testdir
@@ -168,8 +170,8 @@
# do mv $$f $${f%.so}.$$ABITAG.so; done;)
mkdir -p $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/
mv $(CURDIR)/debian/tmp/usr/lib/pkgconfig $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/
- mkdir -p debian/tmp/lib/udev/rules.d
- cp debian/90-comedi.rules debian/tmp/lib/udev/rules.d/
+ mkdir -p debian/tmp/$(deb_udevdir)/rules.d
+ cp debian/90-comedi.rules debian/tmp/$(deb_udevdir)/rules.d/
chmod 644 debian/tmp/usr/lib/python*/dist-packages/comedi/comedi.py
mkdir -p debian/tmp/usr/share/doc/libcomedi-dev/demo
cp -a demo debian/libcomedi-dev/usr/share/doc/libcomedi-dev
