5 files changed, 10 insertions, 7 deletions
diff --git a/misc/kdehier4/files/dirlist b/misc/kdehier4/files/dirlist
index 9927c732eb4c..4627b41a001b 100644
--- a/misc/kdehier4/files/dirlist
+++ b/misc/kdehier4/files/dirlist
@@ -55,8 +55,6 @@ share/config
 share/config.kcfg
 share/dbus-1
 share/dbus-1/interfaces
-share/dbus-1/services
-share/dbus-1/system-services
 share/doc/HTML
 share/doc/HTML/bg
 share/doc/HTML/ca
@@ -645,6 +643,8 @@ share/locale/sr@ijekavianlatin
 share/locale/sr@ijekavianlatin/LC_MESSAGES
 share/locale/sr@latin
 share/locale/sr@latin/LC_MESSAGES
+share/locale/ug
+share/locale/ug/LC_MESSAGES
 share/locale/uz@cyrillic
 share/locale/uz@cyrillic/LC_MESSAGES
 share/locale/xh
diff --git a/misc/kdehier4/files/make-plist.sh b/misc/kdehier4/files/make-plist.sh
index 8b7c0be857dd..ef632cbb457f 100644
--- a/misc/kdehier4/files/make-plist.sh
+++ b/misc/kdehier4/files/make-plist.sh
@@ -15,9 +15,13 @@ echo "%%MTREE%%@cwd %%LOCALBASE%%
 %%MTREE%%@dirrmtry etc/dbus-1
 %%MTREE%%@cwd %%KDE4_PREFIX%%" >> ../pkg-plist
 
-echo "%%MTREE%%%%LDCONFIG_DIR%%
+echo "%%MTREE%%etc/pam.d
+%%MTREE%%etc/rc.d
+%%MTREE%%%%LDCONFIG_DIR%%
 %%MTREE%%%%LDCONFIG32_DIR%%
 %%MTREE%%libdata/pkgconfig
+%%MTREE%%share/dbus-1/services
+%%MTREE%%share/dbus-1/system-services
 %%MTREE%%share/polkit-1/actions" >> ../pkg-plist
 
 (
diff --git a/misc/kdehier4/files/mtree-dirlist b/misc/kdehier4/files/mtree-dirlist
index f5eb57ec7d79..a6805d5d7d7f 100644
--- a/misc/kdehier4/files/mtree-dirlist
+++ b/misc/kdehier4/files/mtree-dirlist
@@ -1,8 +1,9 @@
 @comment BSD.local.dist mtree replacement (used only if KDE4_PREFIX != LOCALBASE)
 bin
 etc
-etc/pam.d
-etc/rc.d
+@comment the following commented dirs will be linked from the corresponding LOCALBASE dirs
+@comment etc/pam.d
+@comment etc/rc.d
 include
 include/X11
 info
diff --git a/misc/kdehier4/files/session-kde4.conf.in b/misc/kdehier4/files/session-kde4.conf.in
index 9f7341036232..44e4b4b62a16 100644
--- a/misc/kdehier4/files/session-kde4.conf.in
+++ b/misc/kdehier4/files/session-kde4.conf.in
@@ -3,6 +3,5 @@
 <busconfig>
 
   <includedir>%%KDE4_PREFIX%%/etc/dbus-1/session.d</includedir>
-  <servicedir>%%KDE4_PREFIX%%/share/dbus-1/services</servicedir>
 
 </busconfig>
diff --git a/misc/kdehier4/files/system-kde4.conf.in b/misc/kdehier4/files/system-kde4.conf.in
index a6f4246bd472..c48e70c01d2c 100644
--- a/misc/kdehier4/files/system-kde4.conf.in
+++ b/misc/kdehier4/files/system-kde4.conf.in
@@ -3,6 +3,5 @@
 <busconfig>
 
   <includedir>%%KDE4_PREFIX%%/etc/dbus-1/system.d</includedir>
-  <servicedir>%%KDE4_PREFIX%%/share/dbus-1/system-services</servicedir>
 
 </busconfig>