From 3fce7943f47444f0ac0ccbd225e8b48d8275764b Mon Sep 17 00:00:00 2001 From: Darrell Anderson Date: Sun, 18 Aug 2013 10:16:29 -0500 Subject: Rename KStyle to TDEStyle to avoid conflicts with KDE4. --- r14-xdg-update | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'r14-xdg-update') diff --git a/r14-xdg-update b/r14-xdg-update index 84c9e0c08..090cec9e3 100644 --- a/r14-xdg-update +++ b/r14-xdg-update @@ -634,7 +634,12 @@ if [ ! -f $HOME/.tderc ] && [ -f $HOME/.kderc ]; then mv $HOME/.kderc $HOME/.tderc 2>/dev/null fi fi -# Copy the following two rc files rather than move because the older versions are for HAL systems. +if [ -a $PROFILE_DIR/share/apps/kstyle ]; then + Message_Prefix + echo " kstyle->tdestyle" + mv $PROFILE_DIR/share/apps/kstyle $PROFILE_DIR/share/apps/tdestyle 2>/dev/null +fi +# Copy the following two rc files rather than move because the older versions are needed for HAL systems. if [ ! -f $PROFILE_DIR/share/config/tdenetworkmanagerrc ] && [ -f $PROFILE_DIR/share/config/knetworkmanagerrc ]; then Message_Prefix echo " knetworkmanager->tdenetworkmanager" -- cgit v1.2.3