From 00687776d72e7b321e36e035054490002e592be0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Tue, 3 Sep 2013 19:58:07 +0200 Subject: [PATCH] Additional k => tde renaming and fixes --- Makefile.in | 8 ++++---- acinclude.m4 | 16 ++++++++-------- aclocal.m4 | 16 ++++++++-------- admin | 2 +- doc/Makefile.in | 8 ++++---- doc/en/Makefile.in | 8 ++++---- ksensors.kdevelop => ksensors.tdevelop | 0 po/Makefile.in | 8 ++++---- src/Makefile.in | 8 ++++---- src/pics/Makefile.in | 8 ++++---- src/sounds/Makefile.in | 8 ++++---- 11 files changed, 45 insertions(+), 45 deletions(-) rename ksensors.kdevelop => ksensors.tdevelop (100%) diff --git a/Makefile.in b/Makefile.in index 68dd530..ea24a86 100644 --- a/Makefile.in +++ b/Makefile.in @@ -158,10 +158,10 @@ LIB_KFILE = @LIB_KFILE@ LIB_KFM = @LIB_KFM@ LIB_TDEHTML = @LIB_TDEHTML@ LIB_KIMGIO = @LIB_KIMGIO@ -LIB_KIO = @LIB_KIO@ -LIB_KPARTS = @LIB_KPARTS@ -LIB_KSPELL = @LIB_KSPELL@ -LIB_KSYCOCA = @LIB_KSYCOCA@ +LIB_TDEIO = @LIB_TDEIO@ +LIB_TDEPARTS = @LIB_TDEPARTS@ +LIB_TDESPELL = @LIB_TDESPELL@ +LIB_TDESYCOCA = @LIB_TDESYCOCA@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ diff --git a/acinclude.m4 b/acinclude.m4 index 3f9ba53..af6e467 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1988,28 +1988,28 @@ 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_KABC, "-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") # these are for backward compatibility - AC_SUBST(LIB_KSYCOCA, "-ltdeio") + AC_SUBST(LIB_TDESYCOCA, "-ltdeio") AC_SUBST(LIB_KFILE, "-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_KFILE, "-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/aclocal.m4 b/aclocal.m4 index f928602..f22fb37 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -2000,28 +2000,28 @@ 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_KABC, "-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") # these are for backward compatibility - AC_SUBST(LIB_KSYCOCA, "-ltdeio") + AC_SUBST(LIB_TDESYCOCA, "-ltdeio") AC_SUBST(LIB_KFILE, "-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_KFILE, "-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/doc/Makefile.in b/doc/Makefile.in index 9a93e4b..910e616 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -161,10 +161,10 @@ LIB_KFILE = @LIB_KFILE@ LIB_KFM = @LIB_KFM@ LIB_TDEHTML = @LIB_TDEHTML@ LIB_KIMGIO = @LIB_KIMGIO@ -LIB_KIO = @LIB_KIO@ -LIB_KPARTS = @LIB_KPARTS@ -LIB_KSPELL = @LIB_KSPELL@ -LIB_KSYCOCA = @LIB_KSYCOCA@ +LIB_TDEIO = @LIB_TDEIO@ +LIB_TDEPARTS = @LIB_TDEPARTS@ +LIB_TDESPELL = @LIB_TDESPELL@ +LIB_TDESYCOCA = @LIB_TDESYCOCA@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ diff --git a/doc/en/Makefile.in b/doc/en/Makefile.in index f4749f9..448ab7f 100644 --- a/doc/en/Makefile.in +++ b/doc/en/Makefile.in @@ -158,10 +158,10 @@ LIB_KFILE = @LIB_KFILE@ LIB_KFM = @LIB_KFM@ LIB_TDEHTML = @LIB_TDEHTML@ LIB_KIMGIO = @LIB_KIMGIO@ -LIB_KIO = @LIB_KIO@ -LIB_KPARTS = @LIB_KPARTS@ -LIB_KSPELL = @LIB_KSPELL@ -LIB_KSYCOCA = @LIB_KSYCOCA@ +LIB_TDEIO = @LIB_TDEIO@ +LIB_TDEPARTS = @LIB_TDEPARTS@ +LIB_TDESPELL = @LIB_TDESPELL@ +LIB_TDESYCOCA = @LIB_TDESYCOCA@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ diff --git a/ksensors.kdevelop b/ksensors.tdevelop similarity index 100% rename from ksensors.kdevelop rename to ksensors.tdevelop diff --git a/po/Makefile.in b/po/Makefile.in index fe48c51..37f9aa6 100644 --- a/po/Makefile.in +++ b/po/Makefile.in @@ -158,10 +158,10 @@ LIB_KFILE = @LIB_KFILE@ LIB_KFM = @LIB_KFM@ LIB_TDEHTML = @LIB_TDEHTML@ LIB_KIMGIO = @LIB_KIMGIO@ -LIB_KIO = @LIB_KIO@ -LIB_KPARTS = @LIB_KPARTS@ -LIB_KSPELL = @LIB_KSPELL@ -LIB_KSYCOCA = @LIB_KSYCOCA@ +LIB_TDEIO = @LIB_TDEIO@ +LIB_TDEPARTS = @LIB_TDEPARTS@ +LIB_TDESPELL = @LIB_TDESPELL@ +LIB_TDESYCOCA = @LIB_TDESYCOCA@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ diff --git a/src/Makefile.in b/src/Makefile.in index 1a51988..71e2bd7 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -158,10 +158,10 @@ LIB_KFILE = @LIB_KFILE@ LIB_KFM = @LIB_KFM@ LIB_TDEHTML = @LIB_TDEHTML@ LIB_KIMGIO = @LIB_KIMGIO@ -LIB_KIO = @LIB_KIO@ -LIB_KPARTS = @LIB_KPARTS@ -LIB_KSPELL = @LIB_KSPELL@ -LIB_KSYCOCA = @LIB_KSYCOCA@ +LIB_TDEIO = @LIB_TDEIO@ +LIB_TDEPARTS = @LIB_TDEPARTS@ +LIB_TDESPELL = @LIB_TDESPELL@ +LIB_TDESYCOCA = @LIB_TDESYCOCA@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ diff --git a/src/pics/Makefile.in b/src/pics/Makefile.in index a94f787..9c58e27 100644 --- a/src/pics/Makefile.in +++ b/src/pics/Makefile.in @@ -160,10 +160,10 @@ LIB_KFILE = @LIB_KFILE@ LIB_KFM = @LIB_KFM@ LIB_TDEHTML = @LIB_TDEHTML@ LIB_KIMGIO = @LIB_KIMGIO@ -LIB_KIO = @LIB_KIO@ -LIB_KPARTS = @LIB_KPARTS@ -LIB_KSPELL = @LIB_KSPELL@ -LIB_KSYCOCA = @LIB_KSYCOCA@ +LIB_TDEIO = @LIB_TDEIO@ +LIB_TDEPARTS = @LIB_TDEPARTS@ +LIB_TDESPELL = @LIB_TDESPELL@ +LIB_TDESYCOCA = @LIB_TDESYCOCA@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ diff --git a/src/sounds/Makefile.in b/src/sounds/Makefile.in index 6427562..088adc5 100644 --- a/src/sounds/Makefile.in +++ b/src/sounds/Makefile.in @@ -160,10 +160,10 @@ LIB_KFILE = @LIB_KFILE@ LIB_KFM = @LIB_KFM@ LIB_TDEHTML = @LIB_TDEHTML@ LIB_KIMGIO = @LIB_KIMGIO@ -LIB_KIO = @LIB_KIO@ -LIB_KPARTS = @LIB_KPARTS@ -LIB_KSPELL = @LIB_KSPELL@ -LIB_KSYCOCA = @LIB_KSYCOCA@ +LIB_TDEIO = @LIB_TDEIO@ +LIB_TDEPARTS = @LIB_TDEPARTS@ +LIB_TDESPELL = @LIB_TDESPELL@ +LIB_TDESYCOCA = @LIB_TDESYCOCA@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@