Timo Aaltonen pushed to branch debian-unstable at X Strike Force / xserver / 
xorg-server


Commits:
b6acc2e6 by Chris Hofstaedtler at 2024-02-08T06:56:15+00:00
Use udev.pc to place udev files

Closes: #1057945

- - - - -


2 changed files:

- debian/control
- debian/rules


Changes:

=====================================
debian/control
=====================================
@@ -73,6 +73,7 @@ Build-Depends:
   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


=====================================
debian/rules
=====================================
@@ -4,6 +4,10 @@ include debian/rules.flags
 
 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 @@ override_dh_install:
        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:



View it on GitLab: 
https://salsa.debian.org/xorg-team/xserver/xorg-server/-/commit/b6acc2e6eb9f4bf97e7fc4b4da3ef3d9489267e4

-- 
View it on GitLab: 
https://salsa.debian.org/xorg-team/xserver/xorg-server/-/commit/b6acc2e6eb9f4bf97e7fc4b4da3ef3d9489267e4
You're receiving this email because of your account on salsa.debian.org.


Reply via email to