[PATCH xf86-input-libinput] conf: rename to 60-libinput.conf

[Peter Hutterer]

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 at who-t.net>
---
 Makefile.am           |  2 +-
 conf/60-libinput.conf | 28 ++++++++++++++++++++++++++++
 conf/90-libinput.conf | 28 ----------------------------
 3 files changed, 29 insertions(+), 29 deletions(-)
 create mode 100644 conf/60-libinput.conf
 delete mode 100644 conf/90-libinput.conf

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/60-libinput.conf b/conf/60-libinput.conf
new file mode 100644
index 0000000..97afd07
--- /dev/null
+++ b/conf/60-libinput.conf
@@ -0,0 +1,28 @@
+# Match on all types of devices but tablet devices and joysticks
+Section "InputClass"
+        Identifier "libinput pointer catchall"
+        MatchIsPointer "on"
+        MatchDevicePath "/dev/input/event*"
+        Driver "libinput"
+EndSection
+
+Section "InputClass"
+        Identifier "libinput keyboard catchall"
+        MatchIsKeyboard "on"
+        MatchDevicePath "/dev/input/event*"
+        Driver "libinput"
+EndSection
+
+Section "InputClass"
+        Identifier "libinput touchpad catchall"
+        MatchIsTouchpad "on"
+        MatchDevicePath "/dev/input/event*"
+        Driver "libinput"
+EndSection
+
+Section "InputClass"
+        Identifier "libinput touchscreen catchall"
+        MatchIsTouchscreen "on"
+        MatchDevicePath "/dev/input/event*"
+        Driver "libinput"
+EndSection
diff --git a/conf/90-libinput.conf b/conf/90-libinput.conf
deleted file mode 100644
index 97afd07..0000000
--- a/conf/90-libinput.conf
+++ /dev/null
@@ -1,28 +0,0 @@
-# Match on all types of devices but tablet devices and joysticks
-Section "InputClass"
-        Identifier "libinput pointer catchall"
-        MatchIsPointer "on"
-        MatchDevicePath "/dev/input/event*"
-        Driver "libinput"
-EndSection
-
-Section "InputClass"
-        Identifier "libinput keyboard catchall"
-        MatchIsKeyboard "on"
-        MatchDevicePath "/dev/input/event*"
-        Driver "libinput"
-EndSection
-
-Section "InputClass"
-        Identifier "libinput touchpad catchall"
-        MatchIsTouchpad "on"
-        MatchDevicePath "/dev/input/event*"
-        Driver "libinput"
-EndSection
-
-Section "InputClass"
-        Identifier "libinput touchscreen catchall"
-        MatchIsTouchscreen "on"
-        MatchDevicePath "/dev/input/event*"
-        Driver "libinput"
-EndSection
-- 
2.7.4