diff options
author | Darrell Anderson <[email protected]> | 2013-08-18 10:16:29 -0500 |
---|---|---|
committer | Darrell Anderson <[email protected]> | 2013-08-18 10:16:29 -0500 |
commit | 3fce7943f47444f0ac0ccbd225e8b48d8275764b (patch) | |
tree | 1245fb62987e54d04ddd5a245a84ab90b28eea4d /r14-xdg-update | |
parent | df510360d365d88e9496f583fc4d385680b15a17 (diff) | |
download | tdebase-3fce7943f47444f0ac0ccbd225e8b48d8275764b.tar.gz tdebase-3fce7943f47444f0ac0ccbd225e8b48d8275764b.zip |
Rename KStyle to TDEStyle to avoid conflicts with KDE4.
Diffstat (limited to 'r14-xdg-update')
-rw-r--r-- | r14-xdg-update | 7 |
1 files changed, 6 insertions, 1 deletions
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" |