diff options
| author | Simon Rettberg | 2013-09-10 13:05:54 +0200 |
|---|---|---|
| committer | Jonathan Bauer | 2013-09-30 13:22:05 +0200 |
| commit | 41d39b3bb70d6e4ce4577b88a737d7e52e0eb5d5 (patch) | |
| tree | d1d0f2aa8a533df4ebd9c0a22782566556d3c9d3 /remote | |
| parent | [debug] Config tweaks (diff) | |
| download | tm-scripts-41d39b3bb70d6e4ce4577b88a737d7e52e0eb5d5.tar.gz tm-scripts-41d39b3bb70d6e4ce4577b88a737d7e52e0eb5d5.tar.xz tm-scripts-41d39b3bb70d6e4ce4577b88a737d7e52e0eb5d5.zip | |
[kdm] Clean up config files
Diffstat (limited to 'remote')
| -rw-r--r-- | remote/modules/kdm/kdm.conf | 3 | ||||
| -rw-r--r-- | remote/modules/kdm/kdm.conf.opensuse | 19 | ||||
| -rw-r--r-- | remote/modules/kdm/kdm.conf.ubuntu | 43 |
3 files changed, 27 insertions, 38 deletions
diff --git a/remote/modules/kdm/kdm.conf b/remote/modules/kdm/kdm.conf index 92dd47d7..2778a2bc 100644 --- a/remote/modules/kdm/kdm.conf +++ b/remote/modules/kdm/kdm.conf @@ -8,6 +8,7 @@ REQUIRED_DIRECTORIES=" /etc/dbus-1 " REQUIRED_LIBRARIES="" +# non-standard vars REQUIRED_SYSTEM_FILES=" /usr/share/icons/oxygen/16x16/actions/system-reboot.png /usr/share/icons/oxygen/16x16/actions/system-shutdown.png @@ -15,3 +16,5 @@ REQUIRED_SYSTEM_FILES=" /usr/share/icons/oxygen/index.theme /usr/share/icons/default.kde4/index.theme " +# Ignore these libs even if output by ldd +REQUIRED_LDD_BLACKLIST="\|libQtWebKit\|libGL" diff --git a/remote/modules/kdm/kdm.conf.opensuse b/remote/modules/kdm/kdm.conf.opensuse index d3c0044b..832baf9c 100644 --- a/remote/modules/kdm/kdm.conf.opensuse +++ b/remote/modules/kdm/kdm.conf.opensuse @@ -1,21 +1,10 @@ REQUIRED_INSTALLED_PACKAGES=" - kdm + kdm " REQUIRED_CONTENT_PACKAGES=" - kdm - kde4-kgreeter-plugins + kdm + kde4-kgreeter-plugins " -REQUIRED_BINARIES="" REQUIRED_DIRECTORIES+=" - /usr/$LIB64/kde4 -" -REQUIRED_FILES="" -REQUIRED_LIBRARIES="" -#non-standard vars -REQUIRED_SYSTEM_FILES=" - /usr/share/icons/oxygen/16x16/actions/system-reboot.png - /usr/share/icons/oxygen/16x16/actions/system-shutdown.png - /usr/share/icons/oxygen/16x16/actions/dialog-cancel.png - /usr/share/icons/oxygen/index.theme - /usr/share/icons/default.kde4/index.theme + /usr/$LIB64/kde4 " diff --git a/remote/modules/kdm/kdm.conf.ubuntu b/remote/modules/kdm/kdm.conf.ubuntu index 7119bf6f..b91d00e0 100644 --- a/remote/modules/kdm/kdm.conf.ubuntu +++ b/remote/modules/kdm/kdm.conf.ubuntu @@ -1,32 +1,29 @@ REQUIRED_INSTALLED_PACKAGES=" - kdm - kde-workspace-kgreet-plugins + kdm + kde-workspace-kgreet-plugins " REQUIRED_CONTENT_PACKAGES=" - kdm - kde-workspace-kgreet-plugins - libicu48 - libxcursor1 - libxrandr2 - libxfixes3 - libxinerama1 - libxi6 + kdm + kde-workspace-kgreet-plugins + libicu48 + libxcursor1 + libxrandr2 + libxfixes3 + libxinerama1 + libxi6 " -REQUIRED_BINARIES="" REQUIRED_DIRECTORIES+=" - /usr/lib - /etc/pam.d - /etc/logrotate.d - /etc/insserv.conf.d - /etc/kde4/kdm + /usr/lib + /etc/pam.d + /etc/logrotate.d + /etc/insserv.conf.d + /etc/kde4/kdm " -REQUIRED_FILES="" -REQUIRED_LIBRARIES="" # 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 + /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 " -REQUIRED_LDD_BLACKLIST="\|libQtWebKit\|libGL" + |