Source: joystick
Version: 1.8.1-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.

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
diff -Nru joystick-1.8.1/debian/changelog joystick-1.8.1/debian/changelog
--- joystick-1.8.1/debian/changelog	2022-05-21 14:12:26.000000000 +0200
+++ joystick-1.8.1/debian/changelog	2023-12-08 16:39:54.000000000 +0100
@@ -1,3 +1,10 @@
+joystick (1:1.8.1-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Delegate placement of udev files to pkg-config data
+
+ -- Chris Hofstaedtler <z...@debian.org>  Fri, 08 Dec 2023 16:39:54 +0100
+
 joystick (1:1.8.1-1) unstable; urgency=medium
 
   [ Debian Janitor ]
diff -Nru joystick-1.8.1/debian/control joystick-1.8.1/debian/control
--- joystick-1.8.1/debian/control	2022-05-21 14:11:26.000000000 +0200
+++ joystick-1.8.1/debian/control	2023-12-08 16:39:54.000000000 +0100
@@ -6,7 +6,8 @@
                libsdl2-dev,
                pkg-config,
                python3,
-               libsystemd-dev
+               libsystemd-dev,
+               systemd-dev
 Standards-Version: 4.6.1
 Vcs-Browser: https://salsa.debian.org/debian/joystick
 Vcs-Git: https://salsa.debian.org/debian/joystick.git
diff -Nru joystick-1.8.1/debian/joystick.install joystick-1.8.1/debian/joystick.install
--- joystick-1.8.1/debian/joystick.install	2017-07-02 23:24:06.000000000 +0200
+++ joystick-1.8.1/debian/joystick.install	2023-12-08 16:39:54.000000000 +0100
@@ -1,6 +1,6 @@
-after_kernel_4_9/51-these-are-not-joysticks-rm.rules lib/udev/rules.d/
-lib/udev/js-set-enum-leds
-lib/udev/rules.d/*.rules
+after_kernel_4_9/51-these-are-not-joysticks-rm.rules ${env:deb_udevdir}/rules.d/
+lib/udev/js-set-enum-leds ${env:deb_udevdir}/
+lib/udev/rules.d/*.rules ${env:deb_udevdir}/rules.d/
 usr/bin/evdev-joystick
 usr/bin/ffcfstress
 usr/bin/ffmvforce
diff -Nru joystick-1.8.1/debian/rules joystick-1.8.1/debian/rules
--- joystick-1.8.1/debian/rules	2019-02-03 18:48:14.000000000 +0100
+++ joystick-1.8.1/debian/rules	2023-12-08 16:39:54.000000000 +0100
@@ -1,6 +1,7 @@
 #!/usr/bin/make -f
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+export deb_udevdir = $(shell pkg-config --variable=udevdir udev | sed s,^/,,)
 
 %:
 	PREFIX=/usr dh $@

Reply via email to