summaryrefslogtreecommitdiffstats
path: root/source/kde
diff options
context:
space:
mode:
Diffstat (limited to 'source/kde')
-rw-r--r--source/kde/build/kdelibs2
-rw-r--r--source/kde/doinst.sh/kde-workspace9
-rw-r--r--source/kde/post-install/kde-workspace.post-install1
3 files changed, 7 insertions, 5 deletions
diff --git a/source/kde/build/kdelibs b/source/kde/build/kdelibs
index 7ed6ff82d..1e8b31496 100644
--- a/source/kde/build/kdelibs
+++ b/source/kde/build/kdelibs
@@ -1 +1 @@
-5
+6
diff --git a/source/kde/doinst.sh/kde-workspace b/source/kde/doinst.sh/kde-workspace
index 5834cc55f..796b2956b 100644
--- a/source/kde/doinst.sh/kde-workspace
+++ b/source/kde/doinst.sh/kde-workspace
@@ -13,6 +13,12 @@ config() {
# Otherwise, we leave the .new copy for the admin to consider...
}
+config etc/kde/kdm/backgroundrc.new
+config etc/kde/kdm/kdmrc.new
+if [ -r etc/pam.d/kde.new ]; then
+ config etc/pam.d/kde.new
+fi
+
if [ -x usr/bin/update-desktop-database ]; then
usr/bin/update-desktop-database usr/share/applications >/dev/null 2>&1
fi
@@ -20,6 +26,3 @@ fi
if [ -x usr/bin/update-mime-database ]; then
usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
fi
-
-config etc/kde/kdm/backgroundrc.new
-config etc/kde/kdm/kdmrc.new
diff --git a/source/kde/post-install/kde-workspace.post-install b/source/kde/post-install/kde-workspace.post-install
index f6e0c236d..8dbc910db 100644
--- a/source/kde/post-install/kde-workspace.post-install
+++ b/source/kde/post-install/kde-workspace.post-install
@@ -45,7 +45,6 @@ if [ -L /lib${LIBDIRSUFFIX}/libpam.so.? ]; then
cp -a $CWD/post-install/kde-workspace/config/kde.pamd $PKG/etc/pam.d/kde.new
chown root:root $PKG/etc/pam.d/kde.new
chmod 644 $PKG/etc/pam.d/kde.new
- echo "config etc/pam.d/kde.new" >> $PKG/install/doinst.sh
fi
# Move the KDM files someplace FHS compliant: