Bug#1058821: x2gothinclient: use udev.pc to place udev rules
Source: x2gothinclient
Version: 1.5.0.1-10
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 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 x2gothinclient-1.5.0.1/debian/changelog x2gothinclient-1.5.0.1/debian/changelog
--- x2gothinclient-1.5.0.1/debian/changelog 2023-05-19 10:59:29.000000000 +0200
+++ x2gothinclient-1.5.0.1/debian/changelog 2023-12-16 22:27:22.000000000 +0100
@@ -1,3 +1,10 @@
+x2gothinclient (1.5.0.1-10.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Use udev.pc to place udev files. (Closes: #-1)
+
+ -- Chris Hofstaedtler <zeha@debian.org> Sat, 16 Dec 2023 22:27:22 +0100
+
x2gothinclient (1.5.0.1-10) unstable; urgency=medium
* debian/changelog:
diff -Nru x2gothinclient-1.5.0.1/debian/control x2gothinclient-1.5.0.1/debian/control
--- x2gothinclient-1.5.0.1/debian/control 2023-05-16 22:14:12.000000000 +0200
+++ x2gothinclient-1.5.0.1/debian/control 2023-12-16 22:25:32.000000000 +0100
@@ -8,7 +8,9 @@
Build-Depends:
debhelper-compat (= 13),
qtbase5-dev,
+ pkgconf,
po-debconf,
+ systemd-dev,
Standards-Version: 4.6.1
Rules-Requires-Root: no
Homepage: https://code.x2go.org/releases/source/x2gothinclient
diff -Nru x2gothinclient-1.5.0.1/debian/rules x2gothinclient-1.5.0.1/debian/rules
--- x2gothinclient-1.5.0.1/debian/rules 2022-10-03 11:48:15.000000000 +0200
+++ x2gothinclient-1.5.0.1/debian/rules 2023-12-16 22:26:32.000000000 +0100
@@ -4,6 +4,8 @@
DPKG_EXPORT_BUILDFLAGS = 1
include /usr/share/dpkg/buildflags.mk
+export deb_udevdir = $(shell pkg-config --variable=udevdir udev | sed s,^/,,)
+
export QT_SELECT=qt5
DHFLAGS=--parallel
diff -Nru x2gothinclient-1.5.0.1/debian/x2gothinclient-smartcardrules.install x2gothinclient-1.5.0.1/debian/x2gothinclient-smartcardrules.install
--- x2gothinclient-1.5.0.1/debian/x2gothinclient-smartcardrules.install 2019-12-13 12:28:30.000000000 +0100
+++ x2gothinclient-1.5.0.1/debian/x2gothinclient-smartcardrules.install 2023-12-16 22:27:02.000000000 +0100
@@ -1,3 +1,3 @@
-smartcardrules/21-x2gognupgccid.rules lib/udev/rules.d/
+smartcardrules/21-x2gognupgccid.rules ${env:deb_udevdir}/rules.d/
smartcardrules/x2gognupgccid usr/lib/x2go/tce/
diff -Nru x2gothinclient-1.5.0.1/debian/x2gothinclient-usbmount.install x2gothinclient-1.5.0.1/debian/x2gothinclient-usbmount.install
--- x2gothinclient-1.5.0.1/debian/x2gothinclient-usbmount.install 2019-12-13 12:28:29.000000000 +0100
+++ x2gothinclient-1.5.0.1/debian/x2gothinclient-usbmount.install 2023-12-16 22:27:02.000000000 +0100
@@ -1,3 +1,3 @@
-usbmount/61-x2gousbmount.rules lib/udev/rules.d/
+usbmount/61-x2gousbmount.rules ${env:deb_udevdir}/rules.d/
usbmount/x2gousbmount usr/lib/x2go/tce/
Reply to: