Source: libwacom
Version: 2.8.0-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 to delegate the exact placement of
the udev files to udev.pc (using pkg-config). This should work today
in unstable and, if necessary, for bookworm. Once udev.pc in
unstable points to /usr/lib your package will benefit automatically
after a binNMU or any other upload.

Here is the same patch as a salsa merge request:
  https://salsa.debian.org/debian/libwacom/-/merge_requests/4

Later during the trixie cycle I expect this bug class to raise in
priority.

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.

Thank you for considering,
Chris

[1] https://wiki.debian.org/UsrMerge


PS: please push the pristine-tar branch and the upstream/... tags
to salsa, if you are still using git-buildpackage.
>From e9be582e96ae1b98751206ff64060d47ca623178 Mon Sep 17 00:00:00 2001
From: Chris Hofstaedtler <z...@debian.org>
Date: Sat, 9 Dec 2023 00:05:54 +0100
Subject: [PATCH] Use udev.pc to place udev files

---
 debian/control                 | 2 ++
 debian/libwacom-common.install | 4 ++--
 debian/rules                   | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index 38282ec..b0ff22b 100644
--- a/debian/control
+++ b/debian/control
@@ -7,10 +7,12 @@ Build-Depends: debhelper-compat (= 13),
  libglib2.0-dev,
  libgudev-1.0-dev,
  libxml2-dev <!nocheck>,
+ pkgconf,
  python3-libevdev <!nocheck>,
  python3-pytest <!nocheck>,
  python3-pyudev <!nocheck>,
  systemd <!nocheck>,
+ systemd-dev,
  udev <!nocheck>,
 Standards-Version: 4.6.1
 Vcs-Git: https://salsa.debian.org/debian/libwacom.git
diff --git a/debian/libwacom-common.install b/debian/libwacom-common.install
index 5cd7219..8379393 100644
--- a/debian/libwacom-common.install
+++ b/debian/libwacom-common.install
@@ -1,3 +1,3 @@
-lib/udev/hwdb.d/65-libwacom.hwdb
-lib/udev/rules.d/65-libwacom.rules
+${env:deb_udevdir}/hwdb.d/65-libwacom.hwdb
+${env:deb_udevdir}/rules.d/65-libwacom.rules
 usr/share/libwacom
diff --git a/debian/rules b/debian/rules
index a99b7f6..df75e22 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,11 @@
 #!/usr/bin/make -f
 
 export DEB_BUILD_MAINT_OPTIONS = optimize=-lto
+export deb_udevdir = $(shell pkg-config --variable=udevdir udev | sed s,^/,,)
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
-		-Dudev-dir=/lib/udev \
+		-Dudev-dir=/$(deb_udevdir) \
 		-Dtests=$(if $(filter nocheck,$(DEB_BUILD_OPTIONS)),dis,en)abled
 
 override_dh_auto_test:
-- 
2.39.2

Reply via email to