From bdbff984d564e47ecdd26ef1ba19ebbfaa45de40 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Fri, 17 Nov 2017 15:31:05 +0100
Subject: [xorg] Support Ubuntu 17.10

---
 core/modules/xorg/module.conf           | 2 --
 core/modules/xorg/module.conf.ubuntu.17 | 4 ++++
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'core/modules')

diff --git a/core/modules/xorg/module.conf b/core/modules/xorg/module.conf
index 328ebd0e..019b0a81 100644
--- a/core/modules/xorg/module.conf
+++ b/core/modules/xorg/module.conf
@@ -14,14 +14,12 @@ REQUIRED_BINARIES="
 			xset
 			xdotool
 			xkbcomp
-			vmmouse_detect
 "
 REQUIRED_DIRECTORIES="
 			/usr/share/X11
 			/usr/share/fonts
 			/etc/fonts
 			/usr/bin
-			/bin
 			/usr/lib/udev
 "
 REQUIRED_FILES="
diff --git a/core/modules/xorg/module.conf.ubuntu.17 b/core/modules/xorg/module.conf.ubuntu.17
index 1701a7b1..2f9d0885 100644
--- a/core/modules/xorg/module.conf.ubuntu.17
+++ b/core/modules/xorg/module.conf.ubuntu.17
@@ -12,9 +12,12 @@ REQUIRED_INSTALLED_PACKAGES="
 			x11-xserver-utils
 			x11-utils
 			xdotool
+			libinput10
+			libwacom2
 			xserver-xorg-input-evdev$UBUNTU_XORG_PKG_SUFFIX
 			xserver-xorg-input-synaptics$UBUNTU_XORG_PKG_SUFFIX
 			xserver-xorg-input-wacom$UBUNTU_XORG_PKG_SUFFIX
+			xserver-xorg-input-libinput$UBUNTU_XORG_PKG_SUFFIX
 			xserver-xorg-video-ati$UBUNTU_XORG_PKG_SUFFIX
 			xserver-xorg-video-fbdev$UBUNTU_XORG_PKG_SUFFIX
 			xserver-xorg-video-intel$UBUNTU_XORG_PKG_SUFFIX
@@ -38,6 +41,7 @@ REQUIRED_CONTENT_PACKAGES="
 			x11-utils
 			xdotool
 			xserver-xorg-input-evdev$UBUNTU_XORG_PKG_SUFFIX
+			xserver-xorg-input-libinput$UBUNTU_XORG_PKG_SUFFIX
 			xserver-xorg-input-synaptics$UBUNTU_XORG_PKG_SUFFIX
 			xserver-xorg-input-wacom$UBUNTU_XORG_PKG_SUFFIX
 			xserver-xorg-video-ati$UBUNTU_XORG_PKG_SUFFIX
-- 
cgit v1.2.3-55-g7522