From 4a4c882c027ded6e52dc839ddcf6b34f826e67aa Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 6 Nov 2011 02:22:09 -0600
Subject: Additional kde to tde renaming

---
 acinclude.m4                      | 24 ++++++++++++------------
 aclocal.m4                        | 24 ++++++++++++------------
 ksystemlog.kdevses                |  4 ++--
 ksystemlog/doc/Makefile           | 10 +++++-----
 ksystemlog/doc/en/Makefile        | 10 +++++-----
 ksystemlog/doc/en/index.docbook   |  2 +-
 ksystemlog/po/Makefile            | 10 +++++-----
 ksystemlog/src/Makefile.am        |  2 +-
 ksystemlog/src/ksystemlog.desktop |  2 +-
 9 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index 8d1ce33..002d75a 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -360,7 +360,7 @@ AC_DEFUN([KDE_1_CHECK_PATHS],
   fi
 
 AC_MSG_CHECKING([for KDE libraries installed])
-ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5'
+ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -ltdecore $LIBQT $KDE_TEST_RPATH 1>&5'
 
 if AC_TRY_EVAL(ac_link) && test -s conftest; then
   AC_MSG_RESULT(yes)
@@ -693,7 +693,7 @@ AC_SUBST(kde_templatesdir)
 AC_SUBST(kde_servicesdir)
 AC_SUBST(kde_servicetypesdir)
 AC_SUBST(kde_moduledir)
-AC_SUBST(kdeinitdir, '$(kde_moduledir)')
+AC_SUBST(tdeinitdir, '$(kde_moduledir)')
 AC_SUBST(kde_styledir)
 AC_SUBST(kde_widgetdir)
 if test "$kde_qtver" = 1; then
@@ -2008,8 +2008,8 @@ AC_DEFUN([KDE_CREATE_LIBS_ALIASES],
    AC_REQUIRE([K_PATH_X])
 
 if test $kde_qtver = 3; then
-   AC_SUBST(LIB_KDECORE, "-lkdecore")
-   AC_SUBST(LIB_KDEUI, "-lkdeui")
+   AC_SUBST(LIB_KDECORE, "-ltdecore")
+   AC_SUBST(LIB_KDEUI, "-ltdeui")
    AC_SUBST(LIB_KIO, "-lkio")
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KAB, "-lkab")
@@ -2017,15 +2017,15 @@ if test $kde_qtver = 3; then
    AC_SUBST(LIB_KHTML, "-lkhtml")
    AC_SUBST(LIB_KSPELL, "-lkspell")
    AC_SUBST(LIB_KPARTS, "-lkparts")
-   AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
+   AC_SUBST(LIB_KDEPRINT, "-ltdeprint")
    AC_SUBST(LIB_KUTILS, "-lkutils")
-   AC_SUBST(LIB_KDEPIM, "-lkdepim")
+   AC_SUBST(LIB_KDEPIM, "-ltdepim")
 # these are for backward compatibility
    AC_SUBST(LIB_KSYCOCA, "-lkio")
    AC_SUBST(LIB_KFILE, "-lkio")
 elif test $kde_qtver = 2; then
-   AC_SUBST(LIB_KDECORE, "-lkdecore")
-   AC_SUBST(LIB_KDEUI, "-lkdeui")
+   AC_SUBST(LIB_KDECORE, "-ltdecore")
+   AC_SUBST(LIB_KDEUI, "-ltdeui")
    AC_SUBST(LIB_KIO, "-lkio")
    AC_SUBST(LIB_KSYCOCA, "-lksycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
@@ -2034,10 +2034,10 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KHTML, "-lkhtml")
    AC_SUBST(LIB_KSPELL, "-lkspell")
    AC_SUBST(LIB_KPARTS, "-lkparts")
-   AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
+   AC_SUBST(LIB_KDEPRINT, "-ltdeprint")
 else
-   AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
-   AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)")
+   AC_SUBST(LIB_KDECORE, "-ltdecore -lXext $(LIB_QT)")
+   AC_SUBST(LIB_KDEUI, "-ltdeui $(LIB_KDECORE)")
    AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
    AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)")
    AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
@@ -2386,7 +2386,7 @@ if eval "test \"`echo $ac_cv_lib_gif`\" = yes"; then
   AC_MSG_RESULT(yes)
   AC_DEFINE_UNQUOTED(HAVE_LIBGIF, 1, [Define if you have libgif])
 else
-  AC_MSG_ERROR(You need giflib30. Please install the kdesupport package)
+  AC_MSG_ERROR(You need giflib30. Please install the tdesupport package)
 fi
 ])
 
diff --git a/aclocal.m4 b/aclocal.m4
index 72c05f0..7711c68 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -372,7 +372,7 @@ AC_DEFUN([KDE_1_CHECK_PATHS],
   fi
 
 AC_MSG_CHECKING([for KDE libraries installed])
-ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5'
+ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -ltdecore $LIBQT $KDE_TEST_RPATH 1>&5'
 
 if AC_TRY_EVAL(ac_link) && test -s conftest; then
   AC_MSG_RESULT(yes)
@@ -705,7 +705,7 @@ AC_SUBST(kde_templatesdir)
 AC_SUBST(kde_servicesdir)
 AC_SUBST(kde_servicetypesdir)
 AC_SUBST(kde_moduledir)
-AC_SUBST(kdeinitdir, '$(kde_moduledir)')
+AC_SUBST(tdeinitdir, '$(kde_moduledir)')
 AC_SUBST(kde_styledir)
 AC_SUBST(kde_widgetdir)
 if test "$kde_qtver" = 1; then
@@ -2020,8 +2020,8 @@ AC_DEFUN([KDE_CREATE_LIBS_ALIASES],
    AC_REQUIRE([K_PATH_X])
 
 if test $kde_qtver = 3; then
-   AC_SUBST(LIB_KDECORE, "-lkdecore")
-   AC_SUBST(LIB_KDEUI, "-lkdeui")
+   AC_SUBST(LIB_KDECORE, "-ltdecore")
+   AC_SUBST(LIB_KDEUI, "-ltdeui")
    AC_SUBST(LIB_KIO, "-lkio")
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KAB, "-lkab")
@@ -2029,15 +2029,15 @@ if test $kde_qtver = 3; then
    AC_SUBST(LIB_KHTML, "-lkhtml")
    AC_SUBST(LIB_KSPELL, "-lkspell")
    AC_SUBST(LIB_KPARTS, "-lkparts")
-   AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
+   AC_SUBST(LIB_KDEPRINT, "-ltdeprint")
    AC_SUBST(LIB_KUTILS, "-lkutils")
-   AC_SUBST(LIB_KDEPIM, "-lkdepim")
+   AC_SUBST(LIB_KDEPIM, "-ltdepim")
 # these are for backward compatibility
    AC_SUBST(LIB_KSYCOCA, "-lkio")
    AC_SUBST(LIB_KFILE, "-lkio")
 elif test $kde_qtver = 2; then
-   AC_SUBST(LIB_KDECORE, "-lkdecore")
-   AC_SUBST(LIB_KDEUI, "-lkdeui")
+   AC_SUBST(LIB_KDECORE, "-ltdecore")
+   AC_SUBST(LIB_KDEUI, "-ltdeui")
    AC_SUBST(LIB_KIO, "-lkio")
    AC_SUBST(LIB_KSYCOCA, "-lksycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
@@ -2046,10 +2046,10 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KHTML, "-lkhtml")
    AC_SUBST(LIB_KSPELL, "-lkspell")
    AC_SUBST(LIB_KPARTS, "-lkparts")
-   AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
+   AC_SUBST(LIB_KDEPRINT, "-ltdeprint")
 else
-   AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
-   AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)")
+   AC_SUBST(LIB_KDECORE, "-ltdecore -lXext $(LIB_QT)")
+   AC_SUBST(LIB_KDEUI, "-ltdeui $(LIB_KDECORE)")
    AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
    AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)")
    AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
@@ -2398,7 +2398,7 @@ if eval "test \"`echo $ac_cv_lib_gif`\" = yes"; then
   AC_MSG_RESULT(yes)
   AC_DEFINE_UNQUOTED(HAVE_LIBGIF, 1, [Define if you have libgif])
 else
-  AC_MSG_ERROR(You need giflib30. Please install the kdesupport package)
+  AC_MSG_ERROR(You need giflib30. Please install the tdesupport package)
 fi
 ])
 
diff --git a/ksystemlog.kdevses b/ksystemlog.kdevses
index bfb0c59..fe38730 100644
--- a/ksystemlog.kdevses
+++ b/ksystemlog.kdevses
@@ -62,7 +62,7 @@
   <Doc19 NumberOfViews="1" URL="file:///mnt/boulot/devel/playground/sysadmin/ksystemlog/src/view.cpp" >
    <View0 line="33" Type="Source" />
   </Doc19>
-  <Doc20 NumberOfViews="1" URL="file:///usr/share/doc/HTML/en/kdelibs-apidocs/kdeui/html/classKListViewItem.html" >
+  <Doc20 NumberOfViews="1" URL="file:///usr/share/doc/HTML/en/kdelibs-apidocs/tdeui/html/classKListViewItem.html" >
    <View0 Type="Documentation" />
   </Doc20>
   <Doc21 NumberOfViews="1" URL="file:///mnt/boulot/devel/playground/sysadmin/ksystemlog/src/apache/apacheReader.h" >
@@ -119,7 +119,7 @@
   <Doc38 NumberOfViews="1" URL="file:///mnt/boulot/devel/playground/sysadmin/ksystemlog/src/logManager.cpp" >
    <View0 line="246" Type="Source" />
   </Doc38>
-  <Doc39 NumberOfViews="1" URL="file:///usr/share/doc/HTML/en/kdelibs-apidocs/kdeui/html/classKAction.html" >
+  <Doc39 NumberOfViews="1" URL="file:///usr/share/doc/HTML/en/kdelibs-apidocs/tdeui/html/classKAction.html" >
    <View0 Type="Documentation" />
   </Doc39>
  </DocsAndViews>
diff --git a/ksystemlog/doc/Makefile b/ksystemlog/doc/Makefile
index 4c65d2c..dd9b746 100644
--- a/ksystemlog/doc/Makefile
+++ b/ksystemlog/doc/Makefile
@@ -120,10 +120,10 @@ LIBUTIL = -lutil
 LIBZ = -lz
 LIB_KAB = -lkab
 LIB_KABC = -lkabc
-LIB_KDECORE = -lkdecore
-LIB_KDEPIM = -lkdepim
-LIB_KDEPRINT = -lkdeprint
-LIB_KDEUI = -lkdeui
+LIB_KDECORE = -ltdecore
+LIB_KDEPIM = -ltdepim
+LIB_KDEPRINT = -ltdeprint
+LIB_KDEUI = -ltdeui
 LIB_KFILE = -lkio
 LIB_KFM = 
 LIB_KHTML = -lkhtml
@@ -236,7 +236,7 @@ kde_styledir = ${libdir}/trinity/plugins/styles
 kde_templatesdir = ${datadir}/templates
 kde_wallpaperdir = ${datadir}/wallpapers
 kde_widgetdir = /usr/lib/trinity/plugins/designer
-kdeinitdir = $(kde_moduledir)
+tdeinitdir = $(kde_moduledir)
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
 localstatedir = ${prefix}/var
diff --git a/ksystemlog/doc/en/Makefile b/ksystemlog/doc/en/Makefile
index bae7da8..6eb18f2 100644
--- a/ksystemlog/doc/en/Makefile
+++ b/ksystemlog/doc/en/Makefile
@@ -117,10 +117,10 @@ LIBUTIL = -lutil
 LIBZ = -lz
 LIB_KAB = -lkab
 LIB_KABC = -lkabc
-LIB_KDECORE = -lkdecore
-LIB_KDEPIM = -lkdepim
-LIB_KDEPRINT = -lkdeprint
-LIB_KDEUI = -lkdeui
+LIB_KDECORE = -ltdecore
+LIB_KDEPIM = -ltdepim
+LIB_KDEPRINT = -ltdeprint
+LIB_KDEUI = -ltdeui
 LIB_KFILE = -lkio
 LIB_KFM = 
 LIB_KHTML = -lkhtml
@@ -233,7 +233,7 @@ kde_styledir = ${libdir}/trinity/plugins/styles
 kde_templatesdir = ${datadir}/templates
 kde_wallpaperdir = ${datadir}/wallpapers
 kde_widgetdir = /usr/lib/trinity/plugins/designer
-kdeinitdir = $(kde_moduledir)
+tdeinitdir = $(kde_moduledir)
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
 localstatedir = ${prefix}/var
diff --git a/ksystemlog/doc/en/index.docbook b/ksystemlog/doc/en/index.docbook
index 47b1b92..e21754b 100644
--- a/ksystemlog/doc/en/index.docbook
+++ b/ksystemlog/doc/en/index.docbook
@@ -488,7 +488,7 @@ application -->
 
 <!--
 List any special requirements for your application here. This should include:
-.Libraries or other software that is not included in kdesupport,
+.Libraries or other software that is not included in tdesupport,
 kdelibs, or kdebase.
 .Hardware requirements like amount of RAM, disk space, graphics card
 capabilities, screen resolution, special expansion cards, etc.
diff --git a/ksystemlog/po/Makefile b/ksystemlog/po/Makefile
index a72ae7d..3909970 100644
--- a/ksystemlog/po/Makefile
+++ b/ksystemlog/po/Makefile
@@ -117,10 +117,10 @@ LIBUTIL = -lutil
 LIBZ = -lz
 LIB_KAB = -lkab
 LIB_KABC = -lkabc
-LIB_KDECORE = -lkdecore
-LIB_KDEPIM = -lkdepim
-LIB_KDEPRINT = -lkdeprint
-LIB_KDEUI = -lkdeui
+LIB_KDECORE = -ltdecore
+LIB_KDEPIM = -ltdepim
+LIB_KDEPRINT = -ltdeprint
+LIB_KDEUI = -ltdeui
 LIB_KFILE = -lkio
 LIB_KFM = 
 LIB_KHTML = -lkhtml
@@ -233,7 +233,7 @@ kde_styledir = ${libdir}/trinity/plugins/styles
 kde_templatesdir = ${datadir}/templates
 kde_wallpaperdir = ${datadir}/wallpapers
 kde_widgetdir = /usr/lib/trinity/plugins/designer
-kdeinitdir = $(kde_moduledir)
+tdeinitdir = $(kde_moduledir)
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
 localstatedir = ${prefix}/var
diff --git a/ksystemlog/src/Makefile.am b/ksystemlog/src/Makefile.am
index adcfabd..6b21160 100644
--- a/ksystemlog/src/Makefile.am
+++ b/ksystemlog/src/Makefile.am
@@ -14,7 +14,7 @@ INCLUDES = -I$(top_srcdir)/ksystemlog/src      -I$(top_builddir)/ksystemlog/src/
 	-I$(top_srcdir)/ksystemlog/src/system  -I$(top_srcdir)/ksystemlog/src/xorg $(all_includes)
 
 # the library search path. 
-ksystemlog_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor -lkutils
+ksystemlog_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor -lkutils
 
 # the libraries to link against.
 ksystemlog_LDADD = \
diff --git a/ksystemlog/src/ksystemlog.desktop b/ksystemlog/src/ksystemlog.desktop
index 5117f82..d1b694a 100644
--- a/ksystemlog/src/ksystemlog.desktop
+++ b/ksystemlog/src/ksystemlog.desktop
@@ -3,7 +3,7 @@ Encoding=UTF-8
 Name=KSystemLog
 Name[sv]=Ksystemlogg
 Name[tr]=KSistemGünlüğü
-Exec=kdesu ksystemlog %i %m -caption "%c"
+Exec=tdesu ksystemlog %i %m -caption "%c"
 Icon=ksystemlog
 Type=Application
 DocPath=ksystemlog/ksystemlog.html
-- 
cgit v1.2.3

