diff options
33 files changed, 80 insertions, 80 deletions
diff --git a/doc/api/HowToAddApplicationTemplates.dox b/doc/api/HowToAddApplicationTemplates.dox index 6a9ac48b..21917b11 100644 --- a/doc/api/HowToAddApplicationTemplates.dox +++ b/doc/api/HowToAddApplicationTemplates.dox @@ -130,13 +130,13 @@ Example: \code #!/bin/sh -kde_prefix=`kde-config --prefix` +kde_prefix=`tde-config --prefix` if [ `id -u` = 0 ]; then # we are root so install the template into the global kde directory - kde_dir=`kde-config --prefix` + kde_dir=`tde-config --prefix` else # we are a user so install it into $HOME/.kde/share/apps/kdevappwizard directory - kde_dir=`kde-config --localprefix` + kde_dir=`tde-config --localprefix` echo "Note: It would be better to install as root. Press CTRL+C to abort" fi diff --git a/languages/cpp/app_templates/dcopservice/dcopservice.kdevtemplate b/languages/cpp/app_templates/dcopservice/dcopservice.kdevtemplate index 1b33fee1..2c4d5a7f 100644 --- a/languages/cpp/app_templates/dcopservice/dcopservice.kdevtemplate +++ b/languages/cpp/app_templates/dcopservice/dcopservice.kdevtemplate @@ -135,7 +135,7 @@ Dest=%{dest}/Makefile.cvs [FILE9] Type=install -Source=%{tdevelop}/template-common/kde-configure.in.in +Source=%{tdevelop}/template-common/tde-configure.in.in Dest=%{dest}/configure.in.in [FILE10] diff --git a/languages/cpp/app_templates/kapp/kapp.kdevtemplate b/languages/cpp/app_templates/kapp/kapp.kdevtemplate index c86fde78..55374438 100644 --- a/languages/cpp/app_templates/kapp/kapp.kdevtemplate +++ b/languages/cpp/app_templates/kapp/kapp.kdevtemplate @@ -115,7 +115,7 @@ Dest=%{dest}/Makefile.cvs [FILE7] Type=install -Source=%{tdevelop}/template-common/kde-configure.in.in +Source=%{tdevelop}/template-common/tde-configure.in.in Dest=%{dest}/configure.in.in [MkDir3] diff --git a/languages/cpp/app_templates/kateplugin/kateplugin.kdevtemplate b/languages/cpp/app_templates/kateplugin/kateplugin.kdevtemplate index 22895a3b..b562a7f6 100644 --- a/languages/cpp/app_templates/kateplugin/kateplugin.kdevtemplate +++ b/languages/cpp/app_templates/kateplugin/kateplugin.kdevtemplate @@ -115,7 +115,7 @@ Dest=%{dest}/Makefile.am [FILE7] Type=install -Source=%{tdevelop}/template-common/kde-configure.in.in +Source=%{tdevelop}/template-common/tde-configure.in.in Dest=%{dest}/configure.in.in [MkDir3] diff --git a/languages/cpp/app_templates/kateplugin2/kateplugin2.kdevtemplate b/languages/cpp/app_templates/kateplugin2/kateplugin2.kdevtemplate index 266120d1..06b0daeb 100644 --- a/languages/cpp/app_templates/kateplugin2/kateplugin2.kdevtemplate +++ b/languages/cpp/app_templates/kateplugin2/kateplugin2.kdevtemplate @@ -116,7 +116,7 @@ Dest=%{dest}/Makefile.am [FILE7] Type=install -Source=%{tdevelop}/template-common/kde-configure.in.in +Source=%{tdevelop}/template-common/tde-configure.in.in Dest=%{dest}/configure.in.in [MkDir3] diff --git a/languages/cpp/app_templates/kcmodule/kcmodule.kdevtemplate b/languages/cpp/app_templates/kcmodule/kcmodule.kdevtemplate index 2710abdb..dd7f617c 100644 --- a/languages/cpp/app_templates/kcmodule/kcmodule.kdevtemplate +++ b/languages/cpp/app_templates/kcmodule/kcmodule.kdevtemplate @@ -126,7 +126,7 @@ Dest=%{dest}/Makefile.cvs [FILE8] Type=install -Source=%{tdevelop}/template-common/kde-configure.in.in +Source=%{tdevelop}/template-common/tde-configure.in.in Dest=%{dest}/configure.in.in [MkDir4] diff --git a/languages/cpp/app_templates/kconfig35/kconfig35.kdevtemplate b/languages/cpp/app_templates/kconfig35/kconfig35.kdevtemplate index 4a01c38e..869ad3b2 100644 --- a/languages/cpp/app_templates/kconfig35/kconfig35.kdevtemplate +++ b/languages/cpp/app_templates/kconfig35/kconfig35.kdevtemplate @@ -100,7 +100,7 @@ Dest=%{dest}/Makefile.cvs [FILE7] Type=install -Source=%{tdevelop}/template-common/kde-configure.in.in +Source=%{tdevelop}/template-common/tde-configure.in.in Dest=%{dest}/configure.in.in [MkDir3] diff --git a/languages/cpp/app_templates/kdedcop/kdedcop.kdevtemplate b/languages/cpp/app_templates/kdedcop/kdedcop.kdevtemplate index a182867a..4d522d17 100644 --- a/languages/cpp/app_templates/kdedcop/kdedcop.kdevtemplate +++ b/languages/cpp/app_templates/kdedcop/kdedcop.kdevtemplate @@ -115,7 +115,7 @@ Dest=%{dest}/Makefile.cvs [FILE7] Type=install -Source=%{tdevelop}/template-common/kde-configure.in.in +Source=%{tdevelop}/template-common/tde-configure.in.in Dest=%{dest}/configure.in.in [MkDir3] diff --git a/languages/cpp/app_templates/kfileplugin/kfileplugin.kdevtemplate b/languages/cpp/app_templates/kfileplugin/kfileplugin.kdevtemplate index b0f7fee4..5197a88c 100644 --- a/languages/cpp/app_templates/kfileplugin/kfileplugin.kdevtemplate +++ b/languages/cpp/app_templates/kfileplugin/kfileplugin.kdevtemplate @@ -113,7 +113,7 @@ Dest=%{dest}/Makefile.am [FILE7] Type=install -Source=%{tdevelop}/template-common/kde-configure.in.in +Source=%{tdevelop}/template-common/tde-configure.in.in Dest=%{dest}/configure.in.in [MkDir3] diff --git a/languages/cpp/app_templates/khello/khello.kdevtemplate b/languages/cpp/app_templates/khello/khello.kdevtemplate index 1936046a..8c08fedf 100644 --- a/languages/cpp/app_templates/khello/khello.kdevtemplate +++ b/languages/cpp/app_templates/khello/khello.kdevtemplate @@ -116,7 +116,7 @@ Dest=%{dest}/Makefile.am [FILE7] Type=install -Source=%{tdevelop}/template-common/kde-configure.in.in +Source=%{tdevelop}/template-common/tde-configure.in.in Dest=%{dest}/configure.in.in [MkDir3] diff --git a/languages/cpp/app_templates/khello2/khello2.kdevtemplate b/languages/cpp/app_templates/khello2/khello2.kdevtemplate index a0fd1809..18534cf9 100644 --- a/languages/cpp/app_templates/khello2/khello2.kdevtemplate +++ b/languages/cpp/app_templates/khello2/khello2.kdevtemplate @@ -112,7 +112,7 @@ Dest=%{dest}/Makefile.am [FILE7] Type=install -Source=%{tdevelop}/template-common/kde-configure.in.in +Source=%{tdevelop}/template-common/tde-configure.in.in Dest=%{dest}/configure.in.in [MkDir3] diff --git a/languages/cpp/app_templates/kicker/kicker.kdevtemplate b/languages/cpp/app_templates/kicker/kicker.kdevtemplate index 9912545c..d1a0fa84 100644 --- a/languages/cpp/app_templates/kicker/kicker.kdevtemplate +++ b/languages/cpp/app_templates/kicker/kicker.kdevtemplate @@ -132,7 +132,7 @@ Dest=%{dest}/Makefile.cvs [FILE9] Type=install -Source=%{tdevelop}/template-common/kde-configure.in.in +Source=%{tdevelop}/template-common/tde-configure.in.in Dest=%{dest}/configure.in.in [FILE10] diff --git a/languages/cpp/app_templates/kioslave/kioslave.kdevtemplate b/languages/cpp/app_templates/kioslave/kioslave.kdevtemplate index 24c6143f..ad242fa3 100644 --- a/languages/cpp/app_templates/kioslave/kioslave.kdevtemplate +++ b/languages/cpp/app_templates/kioslave/kioslave.kdevtemplate @@ -122,7 +122,7 @@ Dest=%{dest}/Makefile.cvs [FILE9] Type=install -Source=%{tdevelop}/template-common/kde-configure.in.in +Source=%{tdevelop}/template-common/tde-configure.in.in Dest=%{dest}/configure.in.in [FILE10] diff --git a/languages/cpp/app_templates/kmake/src.pro b/languages/cpp/app_templates/kmake/src.pro index f15f3cca..ee656ea2 100644 --- a/languages/cpp/app_templates/kmake/src.pro +++ b/languages/cpp/app_templates/kmake/src.pro @@ -2,10 +2,10 @@ # ------------------------------------------- # Subdir relative project main directory: ./src # Target is an application: ../bin/%{APPNAMELC} -KDELIB=$$system(kde-config --expandvars --install lib) -KDEBIN=$$system(kde-config --expandvars --install exe) -KDEAPPS=$$system(kde-config --expandvars --install apps) -KDEPREFIX=$$system(kde-config --prefix) +KDELIB=$$system(tde-config --expandvars --install lib) +KDEBIN=$$system(tde-config --expandvars --install exe) +KDEAPPS=$$system(tde-config --expandvars --install apps) +KDEPREFIX=$$system(tde-config --prefix) KDEINCLUDE=$$KDEPREFIX/include/tde $$KDEPREFIX/include TEMPLATE = app diff --git a/languages/cpp/app_templates/kofficepart/CMakeLists.txt b/languages/cpp/app_templates/kofficepart/CMakeLists.txt index 37a7ef44..955225bc 100644 --- a/languages/cpp/app_templates/kofficepart/CMakeLists.txt +++ b/languages/cpp/app_templates/kofficepart/CMakeLists.txt @@ -15,7 +15,7 @@ add_custom_target( kopart.tar.gz ALL kopart_view.h src-Makefile.am kopart.png kopart_factory.cpp kopart_part.h subdirs kopart.desktop kopart.rc kopart_factory.h kopart_view.cpp x-kopart.desktop - kde-configure.in.in main.cpp + tde-configure.in.in main.cpp ) diff --git a/languages/cpp/app_templates/kofficepart/Makefile.am b/languages/cpp/app_templates/kofficepart/Makefile.am index 02b87d82..a38746b1 100644 --- a/languages/cpp/app_templates/kofficepart/Makefile.am +++ b/languages/cpp/app_templates/kofficepart/Makefile.am @@ -1,7 +1,7 @@ dataFiles = kopart.tdevelop kopart_aboutdata.h kopart_part.cpp kopart_view.h \ src-Makefile.am kopart.png kopart_factory.cpp kopart_part.h \ subdirs kopart.desktop kopart.rc kopart_factory.h \ - kopart_view.cpp x-kopart.desktop kde-configure.in.in \ + kopart_view.cpp x-kopart.desktop tde-configure.in.in \ main.cpp templateName = kopart diff --git a/languages/cpp/app_templates/kofficepart/kopart.kdevtemplate b/languages/cpp/app_templates/kofficepart/kopart.kdevtemplate index 97885dc4..d9e23857 100644 --- a/languages/cpp/app_templates/kofficepart/kopart.kdevtemplate +++ b/languages/cpp/app_templates/kofficepart/kopart.kdevtemplate @@ -129,7 +129,7 @@ Dest=%{dest}/Makefile.cvs [FILE9] Type=install -Source=%{src}/kde-configure.in.in +Source=%{src}/tde-configure.in.in Dest=%{dest}/configure.in.in [FILE10] diff --git a/languages/cpp/app_templates/kofficepart/kde-configure.in.in b/languages/cpp/app_templates/kofficepart/tde-configure.in.in index 3ba8fc32..3ba8fc32 100644 --- a/languages/cpp/app_templates/kofficepart/kde-configure.in.in +++ b/languages/cpp/app_templates/kofficepart/tde-configure.in.in diff --git a/languages/cpp/app_templates/konqnavpanel/konqnavpanel.kdevtemplate b/languages/cpp/app_templates/konqnavpanel/konqnavpanel.kdevtemplate index d9afb9a5..6f054a86 100644 --- a/languages/cpp/app_templates/konqnavpanel/konqnavpanel.kdevtemplate +++ b/languages/cpp/app_templates/konqnavpanel/konqnavpanel.kdevtemplate @@ -131,7 +131,7 @@ Dest=%{dest}/Makefile.cvs [FILE9] Type=install -Source=%{tdevelop}/template-common/kde-configure.in.in +Source=%{tdevelop}/template-common/tde-configure.in.in Dest=%{dest}/configure.in.in [FILE10] diff --git a/languages/cpp/app_templates/kpartapp/kpartapp.kdevtemplate b/languages/cpp/app_templates/kpartapp/kpartapp.kdevtemplate index dc5f67ae..1a524ea4 100644 --- a/languages/cpp/app_templates/kpartapp/kpartapp.kdevtemplate +++ b/languages/cpp/app_templates/kpartapp/kpartapp.kdevtemplate @@ -113,7 +113,7 @@ Dest=%{dest}/Makefile.am [FILE7] Type=install -Source=%{tdevelop}/template-common/kde-configure.in.in +Source=%{tdevelop}/template-common/tde-configure.in.in Dest=%{dest}/configure.in.in [MkDir3] diff --git a/languages/cpp/app_templates/kpartplugin/kpartplugin.kdevtemplate b/languages/cpp/app_templates/kpartplugin/kpartplugin.kdevtemplate index ec8d3dcf..d993dbc8 100644 --- a/languages/cpp/app_templates/kpartplugin/kpartplugin.kdevtemplate +++ b/languages/cpp/app_templates/kpartplugin/kpartplugin.kdevtemplate @@ -112,7 +112,7 @@ Dest=%{dest}/Makefile.am [FILE7] Type=install -Source=%{tdevelop}/template-common/kde-configure.in.in +Source=%{tdevelop}/template-common/tde-configure.in.in Dest=%{dest}/configure.in.in [MkDir3] diff --git a/languages/cpp/app_templates/kscons_kmdi/INSTALL b/languages/cpp/app_templates/kscons_kmdi/INSTALL index 798f33ff..d73ac7db 100644 --- a/languages/cpp/app_templates/kscons_kmdi/INSTALL +++ b/languages/cpp/app_templates/kscons_kmdi/INSTALL @@ -44,12 +44,12 @@ $ scons -c install CONFIGURATION NOTES ------------------- -The installation scripts are relying on the kde-config program. -The programs kde-config, qmake, uic and moc must be accesssible +The installation scripts are relying on the tde-config program. +The programs tde-config, qmake, uic and moc must be accesssible through your PATH. Qt and kde may not be installed as expected (in QTDIR and TDEDIR) -So until kde-config is able to give that information, you may +So until tde-config is able to give that information, you may have to give those paths. You may also want to tune the build. In these cases, you must first run "scons configure" with some options diff --git a/languages/cpp/app_templates/kscons_kmdi/messages.sh b/languages/cpp/app_templates/kscons_kmdi/messages.sh index 2fd4f0bd..34870bc1 100755 --- a/languages/cpp/app_templates/kscons_kmdi/messages.sh +++ b/languages/cpp/app_templates/kscons_kmdi/messages.sh @@ -17,9 +17,9 @@ SRCDIR=../test1-kconfigxt # srcdir is the directory containing the source code TIPSDIR=$SRCDIR # tipsdir is the directory containing the tips -TDEDIR=`kde-config --prefix` +TDEDIR=`tde-config --prefix` EXTRACTRC=extractrc -KDEPOT=`kde-config --prefix`/include/kde.pot +KDEPOT=`tde-config --prefix`/include/kde.pot XGETTEXT="xgettext -C -ki18n -ktr2i18n -kI18N_NOOP -ktranslate -kaliasLocale -x $KDEPOT " ## check that kde.pot is available diff --git a/languages/cpp/app_templates/kscons_kxt/INSTALL b/languages/cpp/app_templates/kscons_kxt/INSTALL index 798f33ff..d73ac7db 100644 --- a/languages/cpp/app_templates/kscons_kxt/INSTALL +++ b/languages/cpp/app_templates/kscons_kxt/INSTALL @@ -44,12 +44,12 @@ $ scons -c install CONFIGURATION NOTES ------------------- -The installation scripts are relying on the kde-config program. -The programs kde-config, qmake, uic and moc must be accesssible +The installation scripts are relying on the tde-config program. +The programs tde-config, qmake, uic and moc must be accesssible through your PATH. Qt and kde may not be installed as expected (in QTDIR and TDEDIR) -So until kde-config is able to give that information, you may +So until tde-config is able to give that information, you may have to give those paths. You may also want to tune the build. In these cases, you must first run "scons configure" with some options diff --git a/languages/cpp/app_templates/kscons_kxt/messages.sh b/languages/cpp/app_templates/kscons_kxt/messages.sh index 2fd4f0bd..34870bc1 100755 --- a/languages/cpp/app_templates/kscons_kxt/messages.sh +++ b/languages/cpp/app_templates/kscons_kxt/messages.sh @@ -17,9 +17,9 @@ SRCDIR=../test1-kconfigxt # srcdir is the directory containing the source code TIPSDIR=$SRCDIR # tipsdir is the directory containing the tips -TDEDIR=`kde-config --prefix` +TDEDIR=`tde-config --prefix` EXTRACTRC=extractrc -KDEPOT=`kde-config --prefix`/include/kde.pot +KDEPOT=`tde-config --prefix`/include/kde.pot XGETTEXT="xgettext -C -ki18n -ktr2i18n -kI18N_NOOP -ktranslate -kaliasLocale -x $KDEPOT " ## check that kde.pot is available diff --git a/languages/cpp/app_templates/kscreensaver/kscreensaver.kdevtemplate b/languages/cpp/app_templates/kscreensaver/kscreensaver.kdevtemplate index 979b6614..06fe5a20 100644 --- a/languages/cpp/app_templates/kscreensaver/kscreensaver.kdevtemplate +++ b/languages/cpp/app_templates/kscreensaver/kscreensaver.kdevtemplate @@ -135,7 +135,7 @@ Dest=%{dest}/Makefile.cvs [FILE9] Type=install -Source=%{tdevelop}/template-common/kde-configure.in.in +Source=%{tdevelop}/template-common/tde-configure.in.in Dest=%{dest}/configure.in.in [FILE10] diff --git a/languages/cpp/app_templates/kxt/kxt.kdevtemplate b/languages/cpp/app_templates/kxt/kxt.kdevtemplate index 43918275..010fe886 100644 --- a/languages/cpp/app_templates/kxt/kxt.kdevtemplate +++ b/languages/cpp/app_templates/kxt/kxt.kdevtemplate @@ -115,7 +115,7 @@ Dest=%{dest}/Makefile.cvs [FILE7] Type=install -Source=%{tdevelop}/template-common/kde-configure.in.in +Source=%{tdevelop}/template-common/tde-configure.in.in Dest=%{dest}/configure.in.in [MkDir3] diff --git a/languages/cpp/app_templates/noatunui/noatunui.kdevtemplate b/languages/cpp/app_templates/noatunui/noatunui.kdevtemplate index cc3720c1..08011ea0 100644 --- a/languages/cpp/app_templates/noatunui/noatunui.kdevtemplate +++ b/languages/cpp/app_templates/noatunui/noatunui.kdevtemplate @@ -111,7 +111,7 @@ Dest=%{dest}/Makefile.am [FILE7] Type=install -Source=%{tdevelop}/template-common/kde-configure.in.in +Source=%{tdevelop}/template-common/tde-configure.in.in Dest=%{dest}/configure.in.in [MkDir3] diff --git a/languages/java/app_templates/kappjava/kappjava.kdevtemplate b/languages/java/app_templates/kappjava/kappjava.kdevtemplate index b070a6bc..749c60d6 100644 --- a/languages/java/app_templates/kappjava/kappjava.kdevtemplate +++ b/languages/java/app_templates/kappjava/kappjava.kdevtemplate @@ -93,7 +93,7 @@ Dest=%{dest}/Makefile.cvs [FILE7] Type=install -Source=%{tdevelop}/template-common/kde-configure.in.in +Source=%{tdevelop}/template-common/tde-configure.in.in Dest=%{dest}/configure.in.in [MkDir3] diff --git a/parts/appwizard/common/CMakeLists.txt b/parts/appwizard/common/CMakeLists.txt index 3e333dd8..85712104 100644 --- a/parts/appwizard/common/CMakeLists.txt +++ b/parts/appwizard/common/CMakeLists.txt @@ -30,7 +30,7 @@ install( FILES ${CMAKE_CURRENT_BINARY_DIR}/gnome2.tar.gz ${CMAKE_CURRENT_BINARY_DIR}/wxwidgets.tar.gz kde-app.lsm kde-Makefile.am kde-Makefile.cvs - kde-configure.in.in kde-index.docbook + tde-configure.in.in kde-index.docbook kde-po-Makefile.am kde-doc-Makefile.am kde-doc-en-Makefile.am hi16-app-app.png hi32-app-app.png kde-app.desktop diff --git a/parts/appwizard/common/Makefile.am b/parts/appwizard/common/Makefile.am index af7ddd01..e0e448ac 100644 --- a/parts/appwizard/common/Makefile.am +++ b/parts/appwizard/common/Makefile.am @@ -34,7 +34,7 @@ scons.tar.gz: appwizarddatadir = ${kde_datadir}/kdevappwizard commondatadir = ${appwizarddatadir}/template-common commondata_DATA = admin.tar.gz gnu.tar.gz incadmin.tar.gz gnome.tar.gz gnome2.tar.gz wxwidgets.tar.gz \ - kde-app.lsm kde-Makefile.am kde-Makefile.cvs kde-configure.in.in \ + kde-app.lsm kde-Makefile.am kde-Makefile.cvs tde-configure.in.in \ kde-index.docbook kde-po-Makefile.am kde-doc-Makefile.am kde-doc-en-Makefile.am \ hi16-app-app.png hi32-app-app.png kde-app.desktop kde-part.desktop \ gnome-app.lsm gnome-Makefile.am gnome-Makefile.cvs \ diff --git a/parts/appwizard/common/scons/admin/kde.py b/parts/appwizard/common/scons/admin/kde.py index 63be3e42..e205c109 100644 --- a/parts/appwizard/common/scons/admin/kde.py +++ b/parts/appwizard/common/scons/admin/kde.py @@ -27,7 +27,7 @@ def exists(env): return True def detect_kde(env): - """ Detect the qt and kde environment using kde-config mostly """ + """ Detect the qt and kde environment using tde-config mostly """ prefix = env['ARGS'].get('prefix', None) execprefix = env['ARGS'].get('execprefix', None) @@ -43,19 +43,19 @@ def detect_kde(env): libdir = libdir+libsuffix ## Detect the kde libraries - print "Checking for kde-config : ", - kde_config = os.popen("which kde-config 2>/dev/null").read().strip() + print "Checking for tde-config : ", + kde_config = os.popen("which tde-config 2>/dev/null").read().strip() if len(kde_config): - print GREEN+"kde-config was found"+NORMAL + print GREEN+"tde-config was found"+NORMAL else: - print RED+"kde-config was NOT found in your PATH"+NORMAL + print RED+"tde-config was NOT found in your PATH"+NORMAL print "Make sure kde is installed properly" print "(missing package tdebase-devel?)" env.Exit(1) - env['TDEDIR'] = os.popen('kde-config -prefix').read().strip() + env['TDEDIR'] = os.popen('tde-config -prefix').read().strip() print "Checking for kde version : ", - kde_version = os.popen("kde-config --version|grep KDE").read().strip().split()[1] + kde_version = os.popen("tde-config --version|grep KDE").read().strip().split()[1] if int(kde_version[0]) != 3 or int(kde_version[2]) < 2: print RED+kde_version print RED+"Your kde version can be too old"+NORMAL @@ -69,7 +69,7 @@ def detect_kde(env): if qtdir: print GREEN+"qt is in "+qtdir+NORMAL else: - libdir = os.popen('kde-config --expandvars --install lib').read().strip() + libdir = os.popen('tde-config --expandvars --install lib').read().strip() libtdeuiSO = libdir+'/'+getSOfromLA(libdir+'/libtdeui.la') m = re.search('(.*)/lib/libqt.*', os.popen('ldd ' + libtdeuiSO + ' | grep libqt').read().strip().split()[2]) if m: @@ -134,7 +134,7 @@ def detect_kde(env): env.Exit(1) print "Checking for the kde includes : ", - kdeprefix = os.popen("kde-config --prefix").read().strip() + kdeprefix = os.popen("tde-config --prefix").read().strip() if not kdeincludes: kdeincludes = kdeprefix+"/include/" if os.path.isfile(kdeincludes + "/klineedit.h"): @@ -159,42 +159,42 @@ def detect_kde(env): subst_vars = lambda x: x.replace('${exec_prefix}', execprefix).replace('${datadir}',datadir).replace('${libdir}', libdir) debian_fix = lambda x: x.replace('/usr/share', '${datadir}') - env['KDEBIN'] = subst_vars(os.popen('kde-config --install exe').read().strip()) - env['KDEAPPS'] = subst_vars(os.popen('kde-config --install apps').read().strip()) - env['KDEDATA'] = subst_vars(os.popen('kde-config --install data').read().strip()) - env['KDEMODULE']= subst_vars(os.popen('kde-config --install module').read().strip()) - env['KDELOCALE']= subst_vars(os.popen('kde-config --install locale').read().strip()) - env['KDEDOC'] = subst_vars( debian_fix(os.popen('kde-config --install html').read().strip()) ) - env['KDEKCFG'] = subst_vars(os.popen('kde-config --install kcfg').read().strip()) - env['KDEXDG'] = subst_vars(os.popen('kde-config --install xdgdata-apps').read().strip()) - env['KDEXDGDIR']= subst_vars(os.popen('kde-config --install xdgdata-dirs').read().strip()) - env['KDEMENU'] = subst_vars(os.popen('kde-config --install apps').read().strip()) - env['KDEMIME'] = subst_vars(os.popen('kde-config --install mime').read().strip()) - env['KDEICONS'] = subst_vars(os.popen('kde-config --install icon').read().strip()) - env['KDESERV'] = subst_vars(os.popen('kde-config --install services').read().strip()) + env['KDEBIN'] = subst_vars(os.popen('tde-config --install exe').read().strip()) + env['KDEAPPS'] = subst_vars(os.popen('tde-config --install apps').read().strip()) + env['KDEDATA'] = subst_vars(os.popen('tde-config --install data').read().strip()) + env['KDEMODULE']= subst_vars(os.popen('tde-config --install module').read().strip()) + env['KDELOCALE']= subst_vars(os.popen('tde-config --install locale').read().strip()) + env['KDEDOC'] = subst_vars( debian_fix(os.popen('tde-config --install html').read().strip()) ) + env['KDEKCFG'] = subst_vars(os.popen('tde-config --install kcfg').read().strip()) + env['KDEXDG'] = subst_vars(os.popen('tde-config --install xdgdata-apps').read().strip()) + env['KDEXDGDIR']= subst_vars(os.popen('tde-config --install xdgdata-dirs').read().strip()) + env['KDEMENU'] = subst_vars(os.popen('tde-config --install apps').read().strip()) + env['KDEMIME'] = subst_vars(os.popen('tde-config --install mime').read().strip()) + env['KDEICONS'] = subst_vars(os.popen('tde-config --install icon').read().strip()) + env['KDESERV'] = subst_vars(os.popen('tde-config --install services').read().strip()) else: # the user has given no prefix, install as a normal kde app - env['PREFIX'] = os.popen('kde-config --prefix').read().strip() - env['KDEBIN'] = os.popen('kde-config --expandvars --install exe').read().strip() - env['KDEAPPS'] = os.popen('kde-config --expandvars --install apps').read().strip() - env['KDEDATA'] = os.popen('kde-config --expandvars --install data').read().strip() - env['KDEMODULE']= os.popen('kde-config --expandvars --install module').read().strip() - env['KDELOCALE']= os.popen('kde-config --expandvars --install locale').read().strip() - env['KDEDOC'] = os.popen('kde-config --expandvars --install html').read().strip() - env['KDEKCFG'] = os.popen('kde-config --expandvars --install kcfg').read().strip() - env['KDEXDG'] = os.popen('kde-config --expandvars --install xdgdata-apps').read().strip() - env['KDEXDGDIR']= os.popen('kde-config --expandvars --install xdgdata-dirs').read().strip() - env['KDEMENU'] = os.popen('kde-config --expandvars --install apps').read().strip() - env['KDEMIME'] = os.popen('kde-config --expandvars --install mime').read().strip() - env['KDEICONS'] = os.popen('kde-config --expandvars --install icon').read().strip() - env['KDESERV'] = os.popen('kde-config --expandvars --install services').read().strip() - - env['QTPLUGINS']=os.popen('kde-config --expandvars --install qtplugins').read().strip() + env['PREFIX'] = os.popen('tde-config --prefix').read().strip() + env['KDEBIN'] = os.popen('tde-config --expandvars --install exe').read().strip() + env['KDEAPPS'] = os.popen('tde-config --expandvars --install apps').read().strip() + env['KDEDATA'] = os.popen('tde-config --expandvars --install data').read().strip() + env['KDEMODULE']= os.popen('tde-config --expandvars --install module').read().strip() + env['KDELOCALE']= os.popen('tde-config --expandvars --install locale').read().strip() + env['KDEDOC'] = os.popen('tde-config --expandvars --install html').read().strip() + env['KDEKCFG'] = os.popen('tde-config --expandvars --install kcfg').read().strip() + env['KDEXDG'] = os.popen('tde-config --expandvars --install xdgdata-apps').read().strip() + env['KDEXDGDIR']= os.popen('tde-config --expandvars --install xdgdata-dirs').read().strip() + env['KDEMENU'] = os.popen('tde-config --expandvars --install apps').read().strip() + env['KDEMIME'] = os.popen('tde-config --expandvars --install mime').read().strip() + env['KDEICONS'] = os.popen('tde-config --expandvars --install icon').read().strip() + env['KDESERV'] = os.popen('tde-config --expandvars --install services').read().strip() + + env['QTPLUGINS']=os.popen('tde-config --expandvars --install qtplugins').read().strip() ## kde libs and includes env['KDEINCLUDEPATH']=kdeincludes if not tdelibs: - tdelibs=os.popen('kde-config --expandvars --install lib').read().strip() + tdelibs=os.popen('tde-config --expandvars --install lib').read().strip() env['KDELIBPATH']=tdelibs ## qt libs and includes diff --git a/parts/appwizard/common/kde-configure.in.in b/parts/appwizard/common/tde-configure.in.in index f1244521..f1244521 100644 --- a/parts/appwizard/common/kde-configure.in.in +++ b/parts/appwizard/common/tde-configure.in.in |