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

pull/1/head
Timothy Pearson 12 years ago
parent 799765ceef
commit 0923f15537

@ -18,6 +18,6 @@ Modules
Search Search
-Make search smaller and on the right -Make search smaller and on the right
-Grep docs? -Grep docs?
-Tie into kconfigXT somehow? -Tie into tdeconfigXT somehow?
-Look at Spotlight -Look at Spotlight
-Task oriented? -Task oriented?

@ -602,7 +602,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
fi fi
if test -n "$trinity2ornewer"; then if test -n "$trinity2ornewer"; then
KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)]) KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)]) KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
fi fi
if test -n "$trinity3ornewer"; then if test -n "$trinity3ornewer"; then
@ -1788,7 +1788,7 @@ if test "$kde_qtver" = 1; then
kde_check_lib="libtdecore.la" kde_check_lib="libtdecore.la"
else else
kde_check_header="ksharedptr.h" kde_check_header="ksharedptr.h"
kde_check_lib="libkio.la" kde_check_lib="libtdeio.la"
fi fi
if test -z "$1"; then if test -z "$1"; then
@ -2094,7 +2094,7 @@ elif test $kde_qtver = 2; then
AC_SUBST(LIB_KIO, "-lkio") AC_SUBST(LIB_KIO, "-lkio")
AC_SUBST(LIB_KSYCOCA, "-ltdesycoca") AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KFILE, "-lkfile") AC_SUBST(LIB_KFILE, "-ltdefile")
AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KHTML, "-ltdehtml") AC_SUBST(LIB_KHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-ltdespell") AC_SUBST(LIB_KSPELL, "-ltdespell")
@ -2104,7 +2104,7 @@ else
AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)") AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)")
AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)") AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)")
AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_TDEUI)") AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)")
AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)") AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)")
fi fi
]) ])

8
aclocal.m4 vendored

@ -614,7 +614,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
fi fi
if test -n "$trinity2ornewer"; then if test -n "$trinity2ornewer"; then
KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)]) KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)]) KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
fi fi
if test -n "$trinity3ornewer"; then if test -n "$trinity3ornewer"; then
@ -1800,7 +1800,7 @@ if test "$kde_qtver" = 1; then
kde_check_lib="libtdecore.la" kde_check_lib="libtdecore.la"
else else
kde_check_header="ksharedptr.h" kde_check_header="ksharedptr.h"
kde_check_lib="libkio.la" kde_check_lib="libtdeio.la"
fi fi
if test -z "$1"; then if test -z "$1"; then
@ -2106,7 +2106,7 @@ elif test $kde_qtver = 2; then
AC_SUBST(LIB_KIO, "-lkio") AC_SUBST(LIB_KIO, "-lkio")
AC_SUBST(LIB_KSYCOCA, "-ltdesycoca") AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KFILE, "-lkfile") AC_SUBST(LIB_KFILE, "-ltdefile")
AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KHTML, "-ltdehtml") AC_SUBST(LIB_KHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-ltdespell") AC_SUBST(LIB_KSPELL, "-ltdespell")
@ -2116,7 +2116,7 @@ else
AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)") AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)")
AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)") AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)")
AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_TDEUI)") AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)")
AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)") AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)")
fi fi
]) ])

@ -28,4 +28,4 @@ Also don't forget to install the ui file.
And the desktop file. And the desktop file.
-share/applications/tde/systemsettings.desktop -share/applications/tde/systemsettings.desktop
When you change (or install) any of the first three files make sure to run kbuildsycoca to re-generate the cache files or log out and back in. When you change (or install) any of the first three files make sure to run tdebuildsycoca to re-generate the cache files or log out and back in.

@ -1,5 +1,5 @@
#temporary till KDE4 and it can be renamed #temporary till KDE4 and it can be renamed
xdg_apps_DATA = audioencoding.desktop defaultapplication.desktop kcmfontinst.desktop kcm_knetworkconfmodule_ss.desktop laptop.desktop medianotifications.desktop xdg_apps_DATA = audioencoding.desktop defaultapplication.desktop kcmfontinst.desktop kcm_knetwortdeconfmodule_ss.desktop laptop.desktop medianotifications.desktop
xdg_menu_DATA = system-settings.menu xdg_menu_DATA = system-settings.menu
@ -33,4 +33,4 @@ tde-settings-windowbehavior.directory \
system-settings.directory system-settings.directory
#install-data-local: #install-data-local:
# kbuildsycoca # tdebuildsycoca

@ -1,6 +1,6 @@
[Desktop Entry] [Desktop Entry]
Encoding=UTF-8 Encoding=UTF-8
Exec=kcmshell audiocd Exec=tdecmshell audiocd
Icon=cdaudio_unmount Icon=cdaudio_unmount
Type=Application Type=Application

@ -1,6 +1,6 @@
[Desktop Entry] [Desktop Entry]
Encoding=UTF-8 Encoding=UTF-8
Exec=kcmshell defaultapplication Exec=tdecmshell defaultapplication
Icon=blockdevice Icon=blockdevice
Type=Application Type=Application

@ -3,12 +3,12 @@ X-TDE-RootOnly=true
## Keep this out of kcontrol ## Keep this out of kcontrol
#Categories=Qt;TDE;Settings;X-TDE-settings-network;Configuration-TDE-Network-mdk; #Categories=Qt;TDE;Settings;X-TDE-settings-network;Configuration-TDE-Network-mdk;
X-TDE-ModuleType=Library X-TDE-ModuleType=Library
X-TDE-Library=knetworkconfmodule X-TDE-Library=knetwortdeconfmodule
X-TDE-FactoryName=knetworkconfmodule X-TDE-FactoryName=knetwortdeconfmodule
Type=Application Type=Application
Exec=kcmshell kcm_knetworkconfmodule Exec=tdecmshell kcm_knetwortdeconfmodule
Icon=knetworkconf Icon=knetwortdeconf
DocPath=knetworkconf/index.html DocPath=knetwortdeconf/index.html
Comment=Configure Network Settings Comment=Configure Network Settings
Comment[ar]=إعداد تعيينات الشبكة Comment[ar]=إعداد تعيينات الشبكة

@ -1,5 +1,5 @@
[Desktop Entry] [Desktop Entry]
Exec=kcmshell kcmfontinst Exec=tdecmshell kcmfontinst
Icon=fonts Icon=fonts
Type=Application Type=Application
DocPath=kcontrol/kcmfontinst/index.html DocPath=kcontrol/kcmfontinst/index.html

@ -2,7 +2,7 @@
X-TDE-Library=laptop X-TDE-Library=laptop
X-TDE-FactoryName=laptop X-TDE-FactoryName=laptop
X-TDE-Init=laptop X-TDE-Init=laptop
Exec=kcmshell laptop Exec=tdecmshell laptop
Icon=laptop_battery Icon=laptop_battery
Type=Application Type=Application
DocPath=kcontrol/laptop/index.html DocPath=kcontrol/laptop/index.html

@ -3,7 +3,7 @@ Encoding=UTF-8
Type=Application Type=Application
#DocPath= #DocPath=
Icon=system Icon=system
Exec=kcmshell media Exec=tdecmshell media
X-TDE-Library=media X-TDE-Library=media

@ -290,7 +290,7 @@ https://wiki.kubuntu.org/KubuntuSystemSettingsUsability
<Directory>tde-settings-networksettings.directory</Directory> <Directory>tde-settings-networksettings.directory</Directory>
<Layout> <Layout>
<Filename>tde-kcm_knetworkconfmodule_ss.desktop</Filename> <Filename>tde-kcm_knetwortdeconfmodule_ss.desktop</Filename>
<Filename>tde-proxy.desktop</Filename> <Filename>tde-proxy.desktop</Filename>
<Filename>tde-netpref.desktop</Filename> <Filename>tde-netpref.desktop</Filename>
<Filename>tde-kcm_tdednssd.desktop</Filename> <Filename>tde-kcm_tdednssd.desktop</Filename>
@ -298,7 +298,7 @@ https://wiki.kubuntu.org/KubuntuSystemSettingsUsability
</Layout> </Layout>
<Include> <Include>
<Filename>tde-kcm_knetworkconfmodule_ss.desktop</Filename> <Filename>tde-kcm_knetwortdeconfmodule_ss.desktop</Filename>
<Filename>tde-proxy.desktop</Filename> <Filename>tde-proxy.desktop</Filename>
<Filename>tde-netpref.desktop</Filename> <Filename>tde-netpref.desktop</Filename>
<Filename>tde-kcm_tdednssd.desktop</Filename> <Filename>tde-kcm_tdednssd.desktop</Filename>

@ -66,7 +66,7 @@ class TDECModuleMenuPrivate;
* *
* example.menu should be installed in xdg/menus/ so that ksyscoco will find * example.menu should be installed in xdg/menus/ so that ksyscoco will find
* it. See the above url for example menus. After changing the menu you need * it. See the above url for example menus. After changing the menu you need
* to run "kbuildsycoca" to regenerate the cache as ksyscoco will cache the * to run "tdebuildsycoca" to regenerate the cache as ksyscoco will cache the
* menu and is a file that doesn't change on users. * menu and is a file that doesn't change on users.
*/ */

Loading…
Cancel
Save