From 20a74d7b383bd2ac377160f6a1f5143dfd378956 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 12 Dec 2022 15:31:06 +0100
Subject: Make buildable on debian 12

---
 core/modules/xorg/module.conf        |  1 -
 core/modules/xorg/module.conf.debian | 10 ++++------
 2 files changed, 4 insertions(+), 7 deletions(-)

(limited to 'core/modules/xorg')

diff --git a/core/modules/xorg/module.conf b/core/modules/xorg/module.conf
index 219c0381..202a56df 100644
--- a/core/modules/xorg/module.conf
+++ b/core/modules/xorg/module.conf
@@ -3,7 +3,6 @@ REQUIRED_BINARIES="
 			X
 			Xorg
 			gtf
-			cvt
 			setxkbmap
 			xkbvleds
 			xkbprint
diff --git a/core/modules/xorg/module.conf.debian b/core/modules/xorg/module.conf.debian
index 4fbb0307..16b15ac0 100644
--- a/core/modules/xorg/module.conf.debian
+++ b/core/modules/xorg/module.conf.debian
@@ -3,7 +3,6 @@ REQUIRED_INSTALLED_PACKAGES="
 			xauth
 			fonts-dejavu-core
 			fonts-dejavu-extra
-			ttf-dejavu-core
 			xserver-xorg$UBUNTU_XORG_PKG_SUFFIX
 			xserver-xorg-core$UBUNTU_XORG_PKG_SUFFIX
 			libgl1-mesa-dri
@@ -18,7 +17,7 @@ REQUIRED_INSTALLED_PACKAGES="
 			x11-utils
 			xdotool
 			libinput10
-			libwacom2
+			libwacom9
 			xserver-xorg-input-evdev$UBUNTU_XORG_PKG_SUFFIX
 			xserver-xorg-input-synaptics$UBUNTU_XORG_PKG_SUFFIX
 			xserver-xorg-input-wacom$UBUNTU_XORG_PKG_SUFFIX
@@ -26,7 +25,6 @@ REQUIRED_INSTALLED_PACKAGES="
 			xserver-xorg-video-fbdev$UBUNTU_XORG_PKG_SUFFIX
 			xserver-xorg-video-amdgpu$UBUNTU_XORG_PKG_SUFFIX
 			xserver-xorg-video-radeon$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-video-intel$UBUNTU_XORG_PKG_SUFFIX
 			xserver-xorg-video-nouveau$UBUNTU_XORG_PKG_SUFFIX
 			xserver-xorg-video-vesa$UBUNTU_XORG_PKG_SUFFIX
 			xserver-xorg-video-vmware$UBUNTU_XORG_PKG_SUFFIX
@@ -36,7 +34,6 @@ REQUIRED_CONTENT_PACKAGES="
 			xauth
 			fonts-dejavu-core
 			fonts-dejavu-extra
-			ttf-dejavu-core
 			xserver-xorg$UBUNTU_XORG_PKG_SUFFIX
 			xserver-xorg-core$UBUNTU_XORG_PKG_SUFFIX
 			libgl1-mesa-dri
@@ -51,6 +48,7 @@ REQUIRED_CONTENT_PACKAGES="
 			libgbm1
 			libwayland-client0
 			libwayland-server0
+			mesa-utils
 			xkb-data
 			x11-xkb-utils
 			x11-xserver-utils
@@ -59,11 +57,11 @@ REQUIRED_CONTENT_PACKAGES="
 			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-fbdev$UBUNTU_XORG_PKG_SUFFIX
 			xserver-xorg-video-amdgpu$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-video-radeon$UBUNTU_XORG_PKG_SUFFIX
+			xserver-xorg-video-fbdev$UBUNTU_XORG_PKG_SUFFIX
 			xserver-xorg-video-intel$UBUNTU_XORG_PKG_SUFFIX
 			xserver-xorg-video-nouveau$UBUNTU_XORG_PKG_SUFFIX
+			xserver-xorg-video-radeon$UBUNTU_XORG_PKG_SUFFIX
 			xserver-xorg-video-vesa$UBUNTU_XORG_PKG_SUFFIX
 			xserver-xorg-video-vmware$UBUNTU_XORG_PKG_SUFFIX
 			@xserver-xorg-input-mouse$UBUNTU_XORG_PKG_SUFFIX
-- 
cgit v1.2.3-55-g7522