From 3158f3b3844427ac312f4170e03521b68d1fcce7 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 27 Jan 2013 00:56:31 -0600 Subject: [PATCH] Rename a number of libraries and executables to avoid conflicts with KDE4 --- displayconfig/displayconfig.desktop | 2 +- grubconfig/grubconfig.desktop | 2 +- grubconfig/grubconfig.py | 2 +- mountconfig/mountconfig.desktop | 2 +- mountconfig/mountconfig.py | 2 +- package/mandrake/guidance-kcmdisplayconfig | 2 +- package/mandrake/guidance-kcmmountconfig | 2 +- package/mandrake/guidance-kcmserviceconfig | 2 +- package/mandrake/guidance-kcmuserconfig | 2 +- serviceconfig/serviceconfig.desktop | 2 +- serviceconfig/serviceconfig.py | 6 +++--- userconfig/userconfig.desktop | 2 +- userconfig/userconfig.py | 2 +- wineconfig/firstrunwizard.py | 2 +- wineconfig/wineconfig.desktop | 2 +- wineconfig/wineconfig.py | 2 +- 16 files changed, 18 insertions(+), 18 deletions(-) diff --git a/displayconfig/displayconfig.desktop b/displayconfig/displayconfig.desktop index 8c5f3dc..2dec22f 100644 --- a/displayconfig/displayconfig.desktop +++ b/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]=Επεξεργαστής ρυθμίσεων οθόνης diff --git a/grubconfig/grubconfig.desktop b/grubconfig/grubconfig.desktop index 9b733a3..3469cfc 100644 --- a/grubconfig/grubconfig.desktop +++ b/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]=Ρυθμίσεις φορτωτή εκκίνησης συστήματος diff --git a/grubconfig/grubconfig.py b/grubconfig/grubconfig.py index eb948cf..e95213c 100644 --- a/grubconfig/grubconfig.py +++ b/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 diff --git a/mountconfig/mountconfig.desktop b/mountconfig/mountconfig.desktop index 0c2a34d..19fb85b 100644 --- a/mountconfig/mountconfig.desktop +++ b/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]=Επεξεργαστής σημείων προσάρτησης diff --git a/mountconfig/mountconfig.py b/mountconfig/mountconfig.py index 12cb349..7e9cca0 100755 --- a/mountconfig/mountconfig.py +++ b/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 diff --git a/package/mandrake/guidance-kcmdisplayconfig b/package/mandrake/guidance-kcmdisplayconfig index 25f93e6..776358e 100644 --- a/package/mandrake/guidance-kcmdisplayconfig +++ b/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" diff --git a/package/mandrake/guidance-kcmmountconfig b/package/mandrake/guidance-kcmmountconfig index 0b8d08e..17835d6 100644 --- a/package/mandrake/guidance-kcmmountconfig +++ b/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" diff --git a/package/mandrake/guidance-kcmserviceconfig b/package/mandrake/guidance-kcmserviceconfig index bf63ba3..fdf6c7d 100644 --- a/package/mandrake/guidance-kcmserviceconfig +++ b/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" diff --git a/package/mandrake/guidance-kcmuserconfig b/package/mandrake/guidance-kcmuserconfig index f0608ae..b5fc77d 100644 --- a/package/mandrake/guidance-kcmuserconfig +++ b/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" diff --git a/serviceconfig/serviceconfig.desktop b/serviceconfig/serviceconfig.desktop index 675c237..59ef922 100644 --- a/serviceconfig/serviceconfig.desktop +++ b/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]=Επεξεργαστής επιπέδων εκτέλεσης diff --git a/serviceconfig/serviceconfig.py b/serviceconfig/serviceconfig.py index b93be65..233ebfb 100755 --- a/serviceconfig/serviceconfig.py +++ b/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]: diff --git a/userconfig/userconfig.desktop b/userconfig/userconfig.desktop index c2760a3..24f3439 100644 --- a/userconfig/userconfig.desktop +++ b/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]=Επεξεργαστής λογαριασμών χρηστών diff --git a/userconfig/userconfig.py b/userconfig/userconfig.py index 77b30f8..3cfd450 100755 --- a/userconfig/userconfig.py +++ b/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 diff --git a/wineconfig/firstrunwizard.py b/wineconfig/firstrunwizard.py index 2bd9943..7be88ae 100755 --- a/wineconfig/firstrunwizard.py +++ b/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 diff --git a/wineconfig/wineconfig.desktop b/wineconfig/wineconfig.desktop index 32a5eb7..9a405c8 100644 --- a/wineconfig/wineconfig.desktop +++ b/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 diff --git a/wineconfig/wineconfig.py b/wineconfig/wineconfig.py index 1b6f5ef..ca4719e 100755 --- a/wineconfig/wineconfig.py +++ b/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