Rename a number of libraries and executables to avoid conflicts with KDE4

displayconfig/displayconfig.desktop

@@ -32,7 +32,7 @@ X-TDE-Library=displayconfig
 X-TDE-FactoryName=displayconfig
 X-TDE-RootOnly=true
 Type=Application
-Exec=kcmshell Peripherals/displayconfig
+Exec=tdecmshell Peripherals/displayconfig
 Categories=Qt;TDE;X-TDE-settings-hardware;
 GenericName=Screen Configuration Editor
 GenericName[el]=Επεξεργαστής ρυθμίσεων οθόνης

grubconfig/grubconfig.desktop

@@ -32,7 +32,7 @@ X-TDE-Library=grubconfig
 X-TDE-FactoryName=grubconfig
 X-TDE-RootOnly=true
 Type=Application
-Exec=kcmshell System/grubconfig
+Exec=tdecmshell System/grubconfig
 Categories=Qt;TDE;X-TDE-settings-system;
 GenericName=Boot Loader Configuration
 GenericName[el]=Ρυθμίσεις φορτωτή εκκίνησης συστήματος

grubconfig/grubconfig.py

@@ -21,7 +21,7 @@
 from qt import *
 from tdeui import *
 from tdecore import *
-from kfile import *
+from tdefile import *
 import sys, os, string, re
 import os.path
 import shutil

mountconfig/mountconfig.desktop

@@ -34,7 +34,7 @@ X-TDE-Library=mountconfig
 X-TDE-FactoryName=mountconfig
 X-TDE-RootOnly=true
 Type=Application
-Exec=kcmshell System/mountconfig
+Exec=tdecmshell System/mountconfig
 Categories=Qt;TDE;X-TDE-settings-system;
 GenericName=Mount Point Editor
 GenericName[el]=Επεξεργαστής σημείων προσάρτησης

mountconfig/mountconfig.py

@@ -19,7 +19,7 @@
 from qt import *
 from tdeui import *
 from tdecore import *
-from kfile import *
+from tdefile import *
 from kio import *
 import sys
 import os

package/mandrake/guidance-kcmdisplayconfig

@@ -1 +1 @@
-?package(guidance): needs="kde" kde_filename="displayconfig" section="System/Configuration/KDE/Peripherals" title="Display & Monitor" icon="displayconfig.png" command="/usr/bin/displayconfig" kde_command="kcmshell displayconfig" longtitle="Display and monitor settings" kde_opt="\\nEncoding=UTF-8\\nX-TDE-ModuleType=Library\\nX-TDE-Library=displayconfig\\nX-TDE-FactoryName=displayconfig\\nX-TDE-ParentApp=kcontrol\\nX-TDE-RootOnly=true\\nX-TDE-SubstituteUID=true\\nKeywords=resolution;display;monitor;video;X11;xorg;gfx\\n"
+?package(guidance): needs="kde" kde_filename="displayconfig" section="System/Configuration/KDE/Peripherals" title="Display & Monitor" icon="displayconfig.png" command="/usr/bin/displayconfig" kde_command="tdecmshell displayconfig" longtitle="Display and monitor settings" kde_opt="\\nEncoding=UTF-8\\nX-TDE-ModuleType=Library\\nX-TDE-Library=displayconfig\\nX-TDE-FactoryName=displayconfig\\nX-TDE-ParentApp=kcontrol\\nX-TDE-RootOnly=true\\nX-TDE-SubstituteUID=true\\nKeywords=resolution;display;monitor;video;X11;xorg;gfx\\n"

package/mandrake/guidance-kcmmountconfig

@@ -1 +1 @@
-?package(guidance): needs="kde" kde_filename="mountconfig" section="System/Configuration/KDE/System" title="Disk & Filesystems" icon="disksfilesystems.png" command="/usr/bin/mountconfig" kde_command="kcmshell mountconfig" longtitle="Manage disks and filesystems" kde_opt="\\nEncoding=UTF-8\\nX-TDE-ModuleType=Library\\nX-TDE-Library=mountconfig\\nX-TDE-FactoryName=mountconfig\\nX-TDE-ParentApp=kcontrol\\nX-TDE-RootOnly=true\\nX-TDE-SubstituteUID=true\\nKeywords=disk;filesystem;mount\\n"
+?package(guidance): needs="kde" kde_filename="mountconfig" section="System/Configuration/KDE/System" title="Disk & Filesystems" icon="disksfilesystems.png" command="/usr/bin/mountconfig" kde_command="tdecmshell mountconfig" longtitle="Manage disks and filesystems" kde_opt="\\nEncoding=UTF-8\\nX-TDE-ModuleType=Library\\nX-TDE-Library=mountconfig\\nX-TDE-FactoryName=mountconfig\\nX-TDE-ParentApp=kcontrol\\nX-TDE-RootOnly=true\\nX-TDE-SubstituteUID=true\\nKeywords=disk;filesystem;mount\\n"

package/mandrake/guidance-kcmserviceconfig

@@ -1 +1 @@
-?package(guidance): needs="kde" kde_filename="serviceconfig" section="System/Configuration/KDE/System" title="Services" icon="daemons.png" command="/usr/bin/serviceconfig" kde_command="kcmshell serviceconfig" longtitle="Manage running services" kde_opt="\\nEncoding=UTF-8\\nX-TDE-ModuleType=Library\\nX-TDE-Library=serviceconfig\\nX-TDE-FactoryName=serviceconfig\\nX-TDE-ParentApp=kcontrol\\nX-TDE-RootOnly=true\\nX-TDE-SubstituteUID=true\\nKeywords=init.d;service;boot;daemon;demon\\n"
+?package(guidance): needs="kde" kde_filename="serviceconfig" section="System/Configuration/KDE/System" title="Services" icon="daemons.png" command="/usr/bin/serviceconfig" kde_command="tdecmshell serviceconfig" longtitle="Manage running services" kde_opt="\\nEncoding=UTF-8\\nX-TDE-ModuleType=Library\\nX-TDE-Library=serviceconfig\\nX-TDE-FactoryName=serviceconfig\\nX-TDE-ParentApp=kcontrol\\nX-TDE-RootOnly=true\\nX-TDE-SubstituteUID=true\\nKeywords=init.d;service;boot;daemon;demon\\n"

package/mandrake/guidance-kcmuserconfig

@@ -1 +1 @@
-?package(guidance): needs="kde" kde_filename="userconfig" section="System/Configuration/KDE/System" title="Users and Groups" icon="userconfig.png" command="/usr/bin/userconfig" kde_command="kcmshell userconfig" longtitle="Manage user accounts and groups" kde_opt="\\nEncoding=UTF-8\\nX-TDE-ModuleType=Library\\nX-TDE-Library=userconfig\\nX-TDE-FactoryName=userconfig\\nX-TDE-ParentApp=kcontrol\\nX-TDE-RootOnly=true\\nX-TDE-SubstituteUID=true\\nKeywords=user;account;group;password\\n"
+?package(guidance): needs="kde" kde_filename="userconfig" section="System/Configuration/KDE/System" title="Users and Groups" icon="userconfig.png" command="/usr/bin/userconfig" kde_command="tdecmshell userconfig" longtitle="Manage user accounts and groups" kde_opt="\\nEncoding=UTF-8\\nX-TDE-ModuleType=Library\\nX-TDE-Library=userconfig\\nX-TDE-FactoryName=userconfig\\nX-TDE-ParentApp=kcontrol\\nX-TDE-RootOnly=true\\nX-TDE-SubstituteUID=true\\nKeywords=user;account;group;password\\n"

serviceconfig/serviceconfig.desktop

@@ -33,7 +33,7 @@ X-TDE-Library=serviceconfig
 X-TDE-FactoryName=serviceconfig
 X-TDE-RootOnly=true
 Type=Application
-Exec=kcmshell System/serviceconfig
+Exec=tdecmshell System/serviceconfig
 Categories=Qt;TDE;X-TDE-settings-system;
 GenericName=Runlevel Editor
 GenericName[el]=Επεξεργαστής επιπέδων εκτέλεσης

serviceconfig/serviceconfig.py

@@ -37,7 +37,7 @@ DISTRO = "Mandrake"
 initdir = "/etc/init.d"
 rcdir = "/etc/rc.d"
 
-chkconfigpath = "/sbin/chkconfig"
+chtdeconfigpath = "/sbin/chtdeconfig"
 statusblacklist = ['iptables']
 
 # Are we running as a separate standalone application or in KControl?
@@ -132,7 +132,7 @@ class Service(object):
                         place = 1
                 elif place==1:  # Grab the short description line.
                     if line!="#":
-                        if line.startswith("# chkconfig:"):
+                        if line.startswith("# chtdeconfig:"):
                             parts = line[12:].split()
                             if len(parts)>=1:
                                 for c in parts[0]:
@@ -151,7 +151,7 @@ class Service(object):
                             self.longname = line[2:]
                         place = 2
                 elif place==2:  # Look for the description line
-                    if line.startswith("# chkconfig:"):
+                    if line.startswith("# chtdeconfig:"):
                         parts = line[12:].split()
                         if len(parts)>=1:
                             for c in parts[0]:

userconfig/userconfig.desktop

@@ -32,7 +32,7 @@ X-TDE-Library=userconfig
 X-TDE-FactoryName=userconfig
 X-TDE-RootOnly=true
 Type=Application
-Exec=kcmshell System/userconfig
+Exec=tdecmshell System/userconfig
 Categories=Qt;TDE;X-TDE-settings-system;
 GenericName=User Account Editor
 GenericName[el]=Επεξεργαστής λογαριασμών χρηστών

userconfig/userconfig.py

@@ -19,7 +19,7 @@
 from qt import *
 from tdeui import *
 from tdecore import *
-from kfile import *
+from tdefile import *
 import sys
 import os.path
 import shutil

wineconfig/firstrunwizard.py

@@ -19,7 +19,7 @@
 from qt import *
 from tdecore import *
 from tdeui import *
-from kfile import *
+from tdefile import *
 from kio import *
 import os
 import sys

wineconfig/wineconfig.desktop

@@ -14,7 +14,7 @@ Comment[sr@Latn]=Wine podešavanja
 Comment[sv]=Inställning av Wine
 Comment[xx]=xxWine Configurationxx
 Encoding=UTF-8
-Exec=kcmshell System/wineconfig
+Exec=tdecmshell System/wineconfig
 GenericName=Wine Configuration Editor
 GenericName[el]=Επεξεργαστής ρυθμίσεων του  Wine
 GenericName[es]=Editor de la configuración de wine

wineconfig/wineconfig.py

@@ -19,7 +19,7 @@
 from qt import *
 from tdecore import *
 from tdeui import *
-from kfile import *
+from tdefile import *
 from kio import *
 #import string
 #import math