summaryrefslogtreecommitdiffstats
path: root/remote/modules/xorg
diff options
context:
space:
mode:
authorSimon Rettberg2016-03-24 17:23:17 +0100
committerroot2016-03-24 17:23:17 +0100
commit3fdf8ece5d176bcba760b11d74f831abf7bd58f9 (patch)
treeeb95de378fa9b4cefb4d07aad7183fe377dc9801 /remote/modules/xorg
parent[dbus] Include dbus-launch, add missing dir so session daemon starts (diff)
downloadtm-scripts-3fdf8ece5d176bcba760b11d74f831abf7bd58f9.tar.gz
tm-scripts-3fdf8ece5d176bcba760b11d74f831abf7bd58f9.tar.xz
tm-scripts-3fdf8ece5d176bcba760b11d74f831abf7bd58f9.zip
[xorg/kdm] Move all font related stuff to xorg
Diffstat (limited to 'remote/modules/xorg')
-rw-r--r--remote/modules/xorg/module.conf5
-rw-r--r--remote/modules/xorg/module.conf.debian4
-rw-r--r--remote/modules/xorg/module.conf.ubuntu6
3 files changed, 13 insertions, 2 deletions
diff --git a/remote/modules/xorg/module.conf b/remote/modules/xorg/module.conf
index b99f0e2a..929fc8e5 100644
--- a/remote/modules/xorg/module.conf
+++ b/remote/modules/xorg/module.conf
@@ -15,5 +15,8 @@ REQUIRED_BINARIES="
"
REQUIRED_DIRECTORIES="
/usr/share/X11
+ /usr/share/fonts
+ /etc/fonts
+"
+REQUIRED_FILES="
"
-REQUIRED_FILES=""
diff --git a/remote/modules/xorg/module.conf.debian b/remote/modules/xorg/module.conf.debian
index 86d473a3..3bde05ef 100644
--- a/remote/modules/xorg/module.conf.debian
+++ b/remote/modules/xorg/module.conf.debian
@@ -1,4 +1,5 @@
REQUIRED_INSTALLED_PACKAGES="
+ ttf-dejavu
"
REQUIRED_CONTENT_PACKAGES="
xserver-xorg
@@ -33,8 +34,9 @@ REQUIRED_CONTENT_PACKAGES="
@xserver-xorg-video-geode
@xserver-xorg-video-s3
@xserver-xorg-video-tdfx
+ ttf-dejavu
"
REQUIRED_DIRECTORIES+="
- /usr/lib
+ /usr/lib
"
REQUIRED_FILES=""
diff --git a/remote/modules/xorg/module.conf.ubuntu b/remote/modules/xorg/module.conf.ubuntu
index 41a8739a..f0517f66 100644
--- a/remote/modules/xorg/module.conf.ubuntu
+++ b/remote/modules/xorg/module.conf.ubuntu
@@ -1,4 +1,7 @@
REQUIRED_INSTALLED_PACKAGES="
+ fonts-dejavu-core
+ fonts-dejavu-extra
+ ttf-dejavu-core
"
REQUIRED_CONTENT_PACKAGES="
xserver-xorg$UBUNTU_XORG_PKG_SUFFIX
@@ -32,6 +35,9 @@ REQUIRED_CONTENT_PACKAGES="
@xserver-xorg-video-geode$UBUNTU_XORG_PKG_SUFFIX
@xserver-xorg-video-s3$UBUNTU_XORG_PKG_SUFFIX
@xserver-xorg-video-tdfx$UBUNTU_XORG_PKG_SUFFIX
+ fonts-dejavu-core
+ fonts-dejavu-extra
+ ttf-dejavu-core
"
REQUIRED_DIRECTORIES+="