summaryrefslogtreecommitdiffstats
path: root/remote/modules/kdm
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/kdm
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/kdm')
-rw-r--r--remote/modules/kdm/module.conf.debian2
-rw-r--r--remote/modules/kdm/module.conf.ubuntu6
-rw-r--r--remote/modules/kdm/module.conf.ubuntu.12 (renamed from remote/modules/kdm/module.conf.ubuntu.14)6
3 files changed, 5 insertions, 9 deletions
diff --git a/remote/modules/kdm/module.conf.debian b/remote/modules/kdm/module.conf.debian
index 2b1ca00d..20e044af 100644
--- a/remote/modules/kdm/module.conf.debian
+++ b/remote/modules/kdm/module.conf.debian
@@ -12,6 +12,7 @@ REQUIRED_CONTENT_PACKAGES="
libxfixes3
libxinerama1
libxi6
+ ttf-dejavu
"
REQUIRED_DIRECTORIES+="
/usr/lib
@@ -23,7 +24,6 @@ REQUIRED_DIRECTORIES+="
# non-standard vars
REQUIRED_SYSTEM_FILES+="
/usr/share/kde4/apps/kdm/pics/shutdown.png
- /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf
/usr/share/icons/default/index.theme
"
diff --git a/remote/modules/kdm/module.conf.ubuntu b/remote/modules/kdm/module.conf.ubuntu
index 660b3a1e..a68d26f4 100644
--- a/remote/modules/kdm/module.conf.ubuntu
+++ b/remote/modules/kdm/module.conf.ubuntu
@@ -5,7 +5,7 @@ REQUIRED_INSTALLED_PACKAGES="
REQUIRED_CONTENT_PACKAGES="
kdm
kde-workspace-kgreet-plugins
- libicu48
+ libicu52
libxcursor1
libxrandr2
libxfixes3
@@ -20,10 +20,8 @@ REQUIRED_DIRECTORIES+="
/etc/kde4/kdm
"
# non-standard vars
-REQUIRED_SYSTEM_FILES+="
+REQUIRED_SYSTEM_FILES+="
/usr/share/kde4/apps/kdm/pics/shutdown.png
- /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf
- /usr/share/fonts/truetype/ubuntu-font-family/Ubuntu-R.ttf
/usr/share/icons/default/index.theme
"
diff --git a/remote/modules/kdm/module.conf.ubuntu.14 b/remote/modules/kdm/module.conf.ubuntu.12
index e29f35d0..80d59bf3 100644
--- a/remote/modules/kdm/module.conf.ubuntu.14
+++ b/remote/modules/kdm/module.conf.ubuntu.12
@@ -5,7 +5,7 @@ REQUIRED_INSTALLED_PACKAGES="
REQUIRED_CONTENT_PACKAGES="
kdm
kde-workspace-kgreet-plugins
- libicu52
+ libicu48
libxcursor1
libxrandr2
libxfixes3
@@ -20,10 +20,8 @@ REQUIRED_DIRECTORIES+="
/etc/kde4/kdm
"
# non-standard vars
-REQUIRED_SYSTEM_FILES+="
+REQUIRED_SYSTEM_FILES+="
/usr/share/kde4/apps/kdm/pics/shutdown.png
- /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf
- /usr/share/fonts/truetype/ubuntu-font-family/Ubuntu-R.ttf
/usr/share/icons/default/index.theme
"