Bug#1059283: mate-settings-daemon: use udev.pc to place udev rules

[Chris Hofstaedtler <zeha@debian.org>]

Source: mate-settings-daemon
Version: 1.26.0-2
Severity: normal
Tags: patch
User: helmutg@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 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.

Note that a simpler approach would be this, but if you intend to
backport to bookworm, you need to remember changing it back:
-[linux-any] usr/lib/udev/rules.d/ lib/udev
+[linux-any] usr/lib/udev/rules.d/


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 mate-settings-daemon-1.26.0/debian/changelog mate-settings-daemon-1.26.0/debian/changelog
--- mate-settings-daemon-1.26.0/debian/changelog	2023-09-10 14:02:31.000000000 +0200
+++ mate-settings-daemon-1.26.0/debian/changelog	2023-12-22 12:31:52.000000000 +0100
@@ -1,3 +1,10 @@
+mate-settings-daemon (1.26.0-2.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Use udev.pc to place udev files. (Closes: #-1)
+
+ -- Chris Hofstaedtler <zeha@debian.org>  Fri, 22 Dec 2023 12:31:52 +0100
+
 mate-settings-daemon (1.26.0-2) unstable; urgency=medium
 
   [ Martin Wimpress ]
diff -Nru mate-settings-daemon-1.26.0/debian/control mate-settings-daemon-1.26.0/debian/control
--- mate-settings-daemon-1.26.0/debian/control	2023-09-10 14:02:31.000000000 +0200
+++ mate-settings-daemon-1.26.0/debian/control	2023-12-22 11:54:14.000000000 +0100
@@ -33,6 +33,8 @@
                libxrandr-dev,
                libxt-dev,
                mate-common (>= 1.18),
+               pkgconf,
+               systemd-dev,
                x11proto-kb-dev,
 Standards-Version: 4.6.0
 Rules-Requires-Root: no
diff -Nru mate-settings-daemon-1.26.0/debian/mate-settings-daemon-common.install mate-settings-daemon-1.26.0/debian/mate-settings-daemon-common.install
--- mate-settings-daemon-1.26.0/debian/mate-settings-daemon-common.install	2019-08-11 13:32:02.000000000 +0200
+++ mate-settings-daemon-1.26.0/debian/mate-settings-daemon-common.install	2023-12-22 12:31:43.000000000 +0100
@@ -1,6 +1,6 @@
 #! /usr/bin/dh-exec
 
-[linux-any] usr/lib/udev/rules.d/ lib/udev
+[linux-any] usr/lib/udev/rules.d/ ${deb_udevdir}
 usr/share/glib-2.0/
 usr/share/icons/
 usr/share/locale/
diff -Nru mate-settings-daemon-1.26.0/debian/rules mate-settings-daemon-1.26.0/debian/rules
--- mate-settings-daemon-1.26.0/debian/rules	2019-08-11 13:32:02.000000000 +0200
+++ mate-settings-daemon-1.26.0/debian/rules	2023-12-22 12:31:52.000000000 +0100
@@ -9,8 +9,10 @@
 DEB_HOST_ARCH_OS?=$(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 ifeq (,$(filter linux, $(DEB_HOST_ARCH_OS)))
 WITHOUT_RFKILL = "--disable-rfkill"
+export deb_udevdir =
 else
 WITHOUT_RFKILL = ""
+export deb_udevdir = $(shell pkg-config --variable=udevdir udev | sed s,^/,,)
 endif