diff options
author | Jonathan Bauer | 2016-12-23 13:12:09 +0100 |
---|---|---|
committer | Jonathan Bauer | 2016-12-23 13:12:09 +0100 |
commit | 6806ae4a850fc7785a8c05304237cf53b5b8f951 (patch) | |
tree | b1dd8413d6c7b9a250251da7f0d49bb52b4ddc57 /core/modules/kdm | |
parent | wrong kernel version variable used (diff) | |
download | mltk-6806ae4a850fc7785a8c05304237cf53b5b8f951.tar.gz mltk-6806ae4a850fc7785a8c05304237cf53b5b8f951.tar.xz mltk-6806ae4a850fc7785a8c05304237cf53b5b8f951.zip |
merge with latest dev version (tm-scripts commit f5a59daf8d70a9027118292cd40b18c221897408)
Diffstat (limited to 'core/modules/kdm')
-rw-r--r-- | core/modules/kdm/data/etc/kde4/kdm/kdmrc | 1 | ||||
-rw-r--r-- | core/modules/kdm/module.conf.debian | 2 | ||||
-rw-r--r-- | core/modules/kdm/module.conf.ubuntu | 2 | ||||
-rw-r--r-- | core/modules/kdm/module.conf.ubuntu.12 | 27 |
4 files changed, 30 insertions, 2 deletions
diff --git a/core/modules/kdm/data/etc/kde4/kdm/kdmrc b/core/modules/kdm/data/etc/kde4/kdm/kdmrc index 5f9f9e39..b14a7929 100644 --- a/core/modules/kdm/data/etc/kde4/kdm/kdmrc +++ b/core/modules/kdm/data/etc/kde4/kdm/kdmrc @@ -3,6 +3,7 @@ PidFile=/var/run/kdm.pid ServerVTs=-7 # Always spawn :0 (this is the default but it won't hurt) StaticServers=:0 +GreeterUID=kdm [X-*-Greeter] UseTheme=true diff --git a/core/modules/kdm/module.conf.debian b/core/modules/kdm/module.conf.debian index 2b1ca00d..233598d8 100644 --- a/core/modules/kdm/module.conf.debian +++ b/core/modules/kdm/module.conf.debian @@ -22,8 +22,8 @@ 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/kde4/apps/kdm/pics/shutdown.png /usr/share/icons/default/index.theme " diff --git a/core/modules/kdm/module.conf.ubuntu b/core/modules/kdm/module.conf.ubuntu index 660b3a1e..0e177c51 100644 --- a/core/modules/kdm/module.conf.ubuntu +++ b/core/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 diff --git a/core/modules/kdm/module.conf.ubuntu.12 b/core/modules/kdm/module.conf.ubuntu.12 new file mode 100644 index 00000000..80d59bf3 --- /dev/null +++ b/core/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 +" + |