[Git][xorg-team/driver/xserver-xorg-input-keyboard][debian-unstable] 2 commits: Revert "Fix multiarch modules path"

Andreas Tille pushed to branch debian-unstable at X Strike Force / driver / xserver-xorg-input-keyboard


Commits:
61a6b431 by Samuel Thibault at 2026-02-05T09:15:07+01:00
Revert "Fix multiarch modules path"

This reverts commit 566377df7bac936e6bead2d2e708456c123bc9fe.

Xorg doesn't actually look there.

- - - - -
fac1048d by Samuel Thibault at 2026-02-05T09:16:18+01:00
Revert moving to multiarch modules path, fix ./configure call instead

Xorg doesn't actually look in the multiarch path.

- - - - -


4 changed files:

- debian/changelog
- debian/rules
- debian/xserver-xorg-input-kbd-udeb.install
- debian/xserver-xorg-input-kbd.install


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+xserver-xorg-input-keyboard (1:2.0.0-3) unstable; urgency=medium
+
+  * Revert moving to multiarch modules path, fix ./configure call instead
+
+ -- Samuel Thibault <[email protected]>  Thu, 05 Feb 2026 09:16:15 +0100
+
 xserver-xorg-input-keyboard (1:2.0.0-2) unstable; urgency=medium
 
   [ Samuel Thibault ]


=====================================
debian/rules
=====================================
@@ -3,7 +3,8 @@
 DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 
 override_dh_auto_configure:
-	dh_auto_configure -- --disable-silent-rules
+	dh_auto_configure -- --disable-silent-rules \
+		--libdir=\$${exec_prefix}/lib
 
 # Install in debian/tmp to retain control through dh_install:
 override_dh_auto_install:


=====================================
debian/xserver-xorg-input-kbd-udeb.install
=====================================
@@ -1 +1 @@
-usr/lib/*/xorg/modules/input/*.so
+usr/lib/xorg/modules/input/*.so


=====================================
debian/xserver-xorg-input-kbd.install
=====================================
@@ -1,2 +1,2 @@
-usr/lib/*/xorg/modules/input/*.so
+usr/lib/xorg/modules/input/*.so
 usr/share/man



View it on GitLab: https://salsa.debian.org/xorg-team/driver/xserver-xorg-input-keyboard/-/compare/5d24beaac789423fd2cd464b4c234076a7276e94...fac1048d8a2b544d4f94b49011da2cadb99a7a0f

-- 
View it on GitLab: https://salsa.debian.org/xorg-team/driver/xserver-xorg-input-keyboard/-/compare/5d24beaac789423fd2cd464b4c234076a7276e94...fac1048d8a2b544d4f94b49011da2cadb99a7a0f
You're receiving this email because of your account on salsa.debian.org.