From d1d170a1657f04309d9f84461d8406799ed1a379 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= <slavek.banko@axis.cz>
Date: Tue, 3 Sep 2013 19:56:53 +0200
Subject: [PATCH] Additional k => tde renaming and fixes

---
 acinclude.m4    | 18 +++++++++---------
 admin           |  2 +-
 bookreader.spec |  2 +-
 src/Makefile.am |  4 ++--
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index 5c4227c..8463dab 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2010,30 +2010,30 @@ AC_DEFUN([KDE_CREATE_LIBS_ALIASES],
 if test $kde_qtver = 3; then
    AC_SUBST(LIB_TDECORE, "-ltdecore")
    AC_SUBST(LIB_TDEUI, "-ltdeui")
-   AC_SUBST(LIB_KIO, "-ltdeio")
+   AC_SUBST(LIB_TDEIO, "-ltdeio")
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_TDEABC, "-ltdeabc")
    AC_SUBST(LIB_TDEHTML, "-ltdehtml")
-   AC_SUBST(LIB_KSPELL, "-ltdespell")
-   AC_SUBST(LIB_KPARTS, "-ltdeparts")
+   AC_SUBST(LIB_TDESPELL, "-ltdespell")
+   AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
    AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
-   AC_SUBST(LIB_KUTILS, "-ltdeutils")
+   AC_SUBST(LIB_TDEUTILS, "-ltdeutils")
    AC_SUBST(LIB_TDEPIM, "-ltdepim")
 # these are for backward compatibility
-   AC_SUBST(LIB_KSYCOCA, "-ltdeio")
+   AC_SUBST(LIB_TDESYCOCA, "-ltdeio")
    AC_SUBST(LIB_TDEFILE, "-ltdeio")
 elif test $kde_qtver = 2; then
    AC_SUBST(LIB_TDECORE, "-ltdecore")
    AC_SUBST(LIB_TDEUI, "-ltdeui")
-   AC_SUBST(LIB_KIO, "-ltdeio")
-   AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
+   AC_SUBST(LIB_TDEIO, "-ltdeio")
+   AC_SUBST(LIB_TDESYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_TDEFILE, "-ltdefile")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_TDEHTML, "-ltdehtml")
-   AC_SUBST(LIB_KSPELL, "-ltdespell")
-   AC_SUBST(LIB_KPARTS, "-ltdeparts")
+   AC_SUBST(LIB_TDESPELL, "-ltdespell")
+   AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
    AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
 else
    AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
diff --git a/admin b/admin
index b4d585c..6b7f722 160000
--- a/admin
+++ b/admin
@@ -1 +1 @@
-Subproject commit b4d585c643d92787bfa17b935ce00b09960ee360
+Subproject commit 6b7f7225eff4c49b2dd71804d5fdacb03efcf461
diff --git a/bookreader.spec b/bookreader.spec
index 007756f..977a953 100644
--- a/bookreader.spec
+++ b/bookreader.spec
@@ -1,5 +1,5 @@
 # This spec file was generated by KDevelop 
-# Please report any problem to KDevelop Team <tdevelop-devel@tdevelop.org> 
+# Please report any problem to KDevelop Team <kdevelop-devel@kdevelop.org> 
 # Thanks to Matthias Saou for his explanations on http://freshrpms.net/docs/fight.html
 
 Name: bookreader
diff --git a/src/Makefile.am b/src/Makefile.am
index 4bb48f7..1fcaf48 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -8,7 +8,7 @@ bin_PROGRAMS = bookreader bookreader_client
 INCLUDES         = $(all_includes)
 
 # the library search path. 
-bookreader_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+bookreader_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 # the libraries to link against.
 bookreader_LDADD   = $(LIB_TDEFILE) $(LIB_TDEPRINT)
@@ -23,7 +23,7 @@ noinst_HEADERS = bookreader.h bookwidget.h theme.h renderer.h bookmark.h \
 	bookmarksdlg.h
 
 # client stuff
-bookreader_client_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+bookreader_client_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 bookreader_client_LDADD   = $(LIB_TDECORE)
 bookreader_client_SOURCES = bookreader_client.cpp