summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2016-04-26 15:45:18 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2016-04-28 12:29:20 +1000
commit3f569ec493e738242da97afe30f7dd2a3b2b834d (patch)
treee048b9ad99b63442c049172549f34c92b3a29d30
parent602bb8eefac929501b2cd5e5bd4a9838d1903774 (diff)
downloadxorg-driver-xf86-input-libinput-3f569ec493e738242da97afe30f7dd2a3b2b834d.tar.gz
conf: rename to 60-libinput.conf
60 sorts higher than the other drivers (evdev has 10, synaptics, wacom and others have 50) so we keep the same order. This is part of a two-step solution, the other half is renaming the xf86-input-wacom's config snippet to sort higher than libinput's. Currently libinput picks up devices that are (for now) destined to the wacom driver. Since the wacom driver is more of a leaf package than libinput, the best option here is to make the wacom driver sort higher and let users uninstall it when not needed. To avoid crowding the 90-* space where users usually have custom config snippets, drop libinput down to 60 and bump wacom up. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Acked-by: Jason Gerecke <jason.gerecke@wacom.com>
-rw-r--r--Makefile.am2
-rw-r--r--conf/60-libinput.conf (renamed from conf/90-libinput.conf)0
2 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index 4001f94..c73c15f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,7 +27,7 @@ MAINTAINERCLEANFILES = ChangeLog INSTALL
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xorg-libinput.pc
-dist_xorgconf_DATA = conf/90-libinput.conf
+dist_xorgconf_DATA = conf/60-libinput.conf
.PHONY: ChangeLog INSTALL
diff --git a/conf/90-libinput.conf b/conf/60-libinput.conf
index 97afd07..97afd07 100644
--- a/conf/90-libinput.conf
+++ b/conf/60-libinput.conf