Bug#1057945: xorg-server: use udev.pc to place udev rules
Source: xorg-server
Version: 21.1.9-1
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 to delegate the exact placement of
the udev files to udev.pc (using pkg-config). This works today
in unstable and also for bookworm.
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 -u xorg-server-21.1.9/debian/changelog xorg-server-21.1.9/debian/changelog
--- xorg-server-21.1.9/debian/changelog
+++ xorg-server-21.1.9/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:21.1.9-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Use udev.pc to place udev files. (Closes: #-1)
+
+ -- Chris Hofstaedtler <zeha@debian.org> Sun, 10 Dec 2023 20:49:20 +0100
+
xorg-server (2:21.1.9-1) unstable; urgency=medium
* New upstream release.
diff -u xorg-server-21.1.9/debian/control xorg-server-21.1.9/debian/control
--- xorg-server-21.1.9/debian/control
+++ xorg-server-21.1.9/debian/control
@@ -73,6 +73,7 @@
libdbus-1-dev (>= 1.0) [linux-any],
# systemd-daemon
libsystemd-dev [linux-any],
+ systemd-dev [linux-any],
Build-Depends-Indep: xz-utils
Standards-Version: 3.9.8
Rules-Requires-Root: binary-targets
diff -u xorg-server-21.1.9/debian/rules xorg-server-21.1.9/debian/rules
--- xorg-server-21.1.9/debian/rules
+++ xorg-server-21.1.9/debian/rules
@@ -4,6 +4,10 @@
include /usr/share/dpkg/architecture.mk
+ifeq ($(DEB_HOST_ARCH_OS), linux)
+deb_udevdir = $(shell pkg-config --variable=udevdir udev)
+endif
+
%:
dh $@ --with quilt
@@ -129,10 +133,10 @@
install -m 755 -d debian/xserver-xorg-core/usr/share/bug/xserver-xorg-core
install -m 755 debian/xserver-xorg-core.bug.script debian/xserver-xorg-core/usr/share/bug/xserver-xorg-core/script
ifeq ($(DEB_HOST_ARCH_OS), linux)
- install -d debian/xserver-xorg-core/lib/udev/rules.d
- install -m 644 debian/local/64-xorg-xkb.rules debian/xserver-xorg-core/lib/udev/rules.d
- install -d debian/xserver-xorg-core-udeb/lib/udev/rules.d
- install -m 644 debian/local/64-xorg-xkb.rules debian/xserver-xorg-core-udeb/lib/udev/rules.d
+ install -d debian/xserver-xorg-core$(deb_udevdir)/rules.d
+ install -m 644 debian/local/64-xorg-xkb.rules debian/xserver-xorg-core$(deb_udevdir)/rules.d
+ install -d debian/xserver-xorg-core-udeb$(deb_udevdir)/rules.d
+ install -m 644 debian/local/64-xorg-xkb.rules debian/xserver-xorg-core-udeb$(deb_udevdir)/rules.d
endif
override_dh_missing-indep:
Reply to: