From 3fdf8ece5d176bcba760b11d74f831abf7bd58f9 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 24 Mar 2016 17:23:17 +0100
Subject: [xorg/kdm] Move all font related stuff to xorg

---
 remote/modules/kdm/module.conf.debian    |  2 +-
 remote/modules/kdm/module.conf.ubuntu    |  6 ++----
 remote/modules/kdm/module.conf.ubuntu.12 | 27 +++++++++++++++++++++++++++
 remote/modules/kdm/module.conf.ubuntu.14 | 29 -----------------------------
 remote/modules/xorg/module.conf          |  5 ++++-
 remote/modules/xorg/module.conf.debian   |  4 +++-
 remote/modules/xorg/module.conf.ubuntu   |  6 ++++++
 7 files changed, 43 insertions(+), 36 deletions(-)
 create mode 100644 remote/modules/kdm/module.conf.ubuntu.12
 delete mode 100644 remote/modules/kdm/module.conf.ubuntu.14

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.12 b/remote/modules/kdm/module.conf.ubuntu.12
new file mode 100644
index 00000000..80d59bf3
--- /dev/null
+++ b/remote/modules/kdm/module.conf.ubuntu.12
@@ -0,0 +1,27 @@
+REQUIRED_INSTALLED_PACKAGES="	
+	kdm
+	kde-workspace-kgreet-plugins
+"
+REQUIRED_CONTENT_PACKAGES="	
+	kdm
+	kde-workspace-kgreet-plugins
+	libicu48
+	libxcursor1
+	libxrandr2
+	libxfixes3
+	libxinerama1
+	libxi6
+"
+REQUIRED_DIRECTORIES+="
+	/usr/lib
+	/etc/pam.d
+	/etc/logrotate.d
+	/etc/insserv.conf.d
+	/etc/kde4/kdm
+"
+# non-standard vars
+REQUIRED_SYSTEM_FILES+="
+	/usr/share/kde4/apps/kdm/pics/shutdown.png
+	/usr/share/icons/default/index.theme
+"
+
diff --git a/remote/modules/kdm/module.conf.ubuntu.14 b/remote/modules/kdm/module.conf.ubuntu.14
deleted file mode 100644
index e29f35d0..00000000
--- a/remote/modules/kdm/module.conf.ubuntu.14
+++ /dev/null
@@ -1,29 +0,0 @@
-REQUIRED_INSTALLED_PACKAGES="	
-	kdm
-	kde-workspace-kgreet-plugins
-"
-REQUIRED_CONTENT_PACKAGES="	
-	kdm
-	kde-workspace-kgreet-plugins
-	libicu52
-	libxcursor1
-	libxrandr2
-	libxfixes3
-	libxinerama1
-	libxi6
-"
-REQUIRED_DIRECTORIES+="
-	/usr/lib
-	/etc/pam.d
-	/etc/logrotate.d
-	/etc/insserv.conf.d
-	/etc/kde4/kdm
-"
-# non-standard vars
-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/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+="
-- 
cgit v1.2.3-55-g7522