From fdcee30e5c5468f9ba69988353f3793d2cdb0a38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Tue, 3 Sep 2013 19:58:29 +0200 Subject: [PATCH] Additional k => tde renaming and fixes --- AUTHORS | 2 +- acinclude.m4 | 24 ++++++++++++------------ admin | 2 +- configure.in | 2 +- configure.in.in | 2 +- po/sv.po | 6 +++--- src/parsers/Makefile.am | 2 +- 7 files changed, 20 insertions(+), 20 deletions(-) diff --git a/AUTHORS b/AUTHORS index def936c..334cc42 100644 --- a/AUTHORS +++ b/AUTHORS @@ -8,7 +8,7 @@ Jalub Stachowski David Maciejak RPM support Emmanuel Bouthenot - Inclusion of kio-apt in Debian + Inclusion of tdeio-apt in Debian Daniel Nylander Swedish translation diff --git a/acinclude.m4 b/acinclude.m4 index fa8f294..c8e2c6b 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2070,35 +2070,35 @@ if test $kde_qtver = 3; then AC_SUBST(LIB_KDED, $lib_kded) AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDEUI, "-ltdeui") - AC_SUBST(LIB_KIO, "-ltdeio") + AC_SUBST(LIB_TDEIO, "-ltdeio") AC_SUBST(LIB_KJS, "-lkjs") 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") - AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy") + AC_SUBST(LIB_TDEIMPROXY, "-ltdeimproxy") AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff") - AC_SUBST(LIB_KDNSSD, "-ltdednssd") - AC_SUBST(LIB_KUNITTEST, "-ltdeunittest") + AC_SUBST(LIB_TDEDNSSD, "-ltdednssd") + AC_SUBST(LIB_TDEUNITTEST, "-ltdeunittest") # 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/configure.in b/configure.in index 90bc526..3e58ff3 100644 --- a/configure.in +++ b/configure.in @@ -40,7 +40,7 @@ dnl Perform program name transformation AC_ARG_PROGRAM dnl Automake doc recommends to do this only here. (Janos) -AM_INIT_AUTOMAKE(kio-apt, 0.13.2) dnl searches for some needed programs +AM_INIT_AUTOMAKE(tdeio-apt, 0.13.2) dnl searches for some needed programs KDE_SET_PREFIX diff --git a/configure.in.in b/configure.in.in index 3260178..fcc6e16 100644 --- a/configure.in.in +++ b/configure.in.in @@ -1,6 +1,6 @@ #MIN_CONFIG(3.0.0) -AM_INIT_AUTOMAKE(kio-apt, 0.13.2) +AM_INIT_AUTOMAKE(tdeio-apt, 0.13.2) AC_C_BIGENDIAN AC_CHECK_KDEMAXPATHLEN diff --git a/po/sv.po b/po/sv.po index cb0c78d..d22407a 100644 --- a/po/sv.po +++ b/po/sv.po @@ -1,11 +1,11 @@ -# Swedish translation of kio-apt. +# Swedish translation of tdeio-apt. # Copyright (C) 2006 Free Software Foundation, Inc. -# This file is distributed under the same license as the kio-apt package. +# This file is distributed under the same license as the tdeio-apt package. # Daniel Nylander , 2006. # msgid "" msgstr "" -"Project-Id-Version: kio-apt 0.13\n" +"Project-Id-Version: tdeio-apt 0.13\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2003-12-31 02:15+0100\n" "PO-Revision-Date: 2006-06-25 23:34+0100\n" diff --git a/src/parsers/Makefile.am b/src/parsers/Makefile.am index 9893dd4..a20f28e 100644 --- a/src/parsers/Makefile.am +++ b/src/parsers/Makefile.am @@ -4,4 +4,4 @@ libparsers_la_LDFLAGS = -avoid-version $(all_libraries) noinst_LTLIBRARIES = libparsers.la noinst_HEADERS = parsers.h qhtmlstream.h libparsers_la_SOURCES = list.cpp search.cpp policy.cpp show.cpp parsers.cpp filesearch.cpp -libparsers_la_LIBADD = $(LIB_KIO) +libparsers_la_LIBADD = $(LIB_TDEIO)