Bug#1064396: libinput: install udev files into /usr
Source: libinput
Version: 1.25.0-1
Severity: normal
Tags: patch trixie sid
User: helmutg@debian.org
Usertags: dep17m2
We want to finalize the /usr-merge via DEP17 by moving all files to
/usr. libinput installs files into /lib; these should be moved into
the respective canonical locations in /usr/.
Please find a patch attached. It has been build-tested.
This should not be backported to bookworm. If you intend to
backport, please use dh_movetousr instead or defer the placement of the
unit files to udev.pc.
If your package will change for the t64 transition or otherwise
rename/split/move its binaries (packages) during trixie, please
then upload to experimental and get in touch with the UsrMerge
driver, please see the wiki [1].
Michael
[1] https://wiki.debian.org/UsrMerge
diff -Nru libinput-1.25.0/debian/changelog libinput-1.25.0/debian/changelog
--- libinput-1.25.0/debian/changelog 2024-02-05 13:20:23.000000000 +0100
+++ libinput-1.25.0/debian/changelog 2024-02-21 14:23:22.000000000 +0100
@@ -1,3 +1,10 @@
+libinput (1.25.0-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Install udev rules and helpers into /usr. (Closes: #-1)
+
+ -- Michael Biebl <biebl@debian.org> Wed, 21 Feb 2024 14:23:22 +0100
+
libinput (1.25.0-1) unstable; urgency=medium
* New upstream release.
diff -Nru libinput-1.25.0/debian/libinput10-udeb.install libinput-1.25.0/debian/libinput10-udeb.install
--- libinput-1.25.0/debian/libinput10-udeb.install 2024-01-24 16:25:22.000000000 +0100
+++ libinput-1.25.0/debian/libinput10-udeb.install 2024-02-21 14:23:22.000000000 +0100
@@ -1,3 +1,3 @@
-lib/udev
+usr/lib/udev
usr/lib/*/libinput.so.10*
usr/share/libinput
diff -Nru libinput-1.25.0/debian/libinput-bin.install libinput-1.25.0/debian/libinput-bin.install
--- libinput-1.25.0/debian/libinput-bin.install 2024-01-24 16:25:22.000000000 +0100
+++ libinput-1.25.0/debian/libinput-bin.install 2024-02-21 14:23:22.000000000 +0100
@@ -1,2 +1,2 @@
-lib/udev
+usr/lib/udev
usr/share/libinput
diff -Nru libinput-1.25.0/debian/rules libinput-1.25.0/debian/rules
--- libinput-1.25.0/debian/rules 2024-01-24 16:25:22.000000000 +0100
+++ libinput-1.25.0/debian/rules 2024-02-21 14:23:22.000000000 +0100
@@ -7,12 +7,12 @@
override_dh_auto_configure:
dh_auto_configure -B build-deb -- \
-Ddocumentation=false \
- -Dudev-dir=/lib/udev
+ -Dudev-dir=/usr/lib/udev
ifeq ($(with_udeb),yes)
dh_auto_configure -B build-udeb -- \
-Ddocumentation=false \
- -Dudev-dir=/lib/udev \
+ -Dudev-dir=/usr/lib/udev \
-Dlibwacom=false
endif
Reply to: