summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--acinclude.m424
-rw-r--r--aclocal.m424
m---------admin0
-rw-r--r--libkipi/libkipi/Makefile.am2
-rw-r--r--po/ca/libkipi.po2
-rw-r--r--po/de/libkipi.po2
-rw-r--r--po/it/libkipi.po2
-rw-r--r--po/pt/libkipi.po2
8 files changed, 29 insertions, 29 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index e3f7dfd..6728b1f 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/aclocal.m4 b/aclocal.m4
index e0d7fec..494cae7 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -2082,35 +2082,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
-Subproject b4d585c643d92787bfa17b935ce00b09960ee36
+Subproject 6b7f7225eff4c49b2dd71804d5fdacb03efcf46
diff --git a/libkipi/libkipi/Makefile.am b/libkipi/libkipi/Makefile.am
index 1db417e..8a43bbb 100644
--- a/libkipi/libkipi/Makefile.am
+++ b/libkipi/libkipi/Makefile.am
@@ -18,7 +18,7 @@ libkipiinclude_HEADERS = interface.h plugin.h pluginloader.h imageinfo.h imageco
libkipi_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) \
-version-info 1:1:1 -no-undefined
-libkipi_la_LIBADD = $(LIB_KIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT)
+libkipi_la_LIBADD = $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT)
libkipiincludedir = $(includedir)/libkipi
diff --git a/po/ca/libkipi.po b/po/ca/libkipi.po
index ee61206..20148db 100644
--- a/po/ca/libkipi.po
+++ b/po/ca/libkipi.po
@@ -6,7 +6,7 @@ msgstr ""
"POT-Creation-Date: 2006-10-03 08:51+0200\n"
"PO-Revision-Date: 2005-04-29 17:01+0200\n"
"Last-Translator: Albert Astals Cid <astals11@terra.es>\n"
-"Language-Team: Catalan <tde-i18n-ca@kde.org>\n"
+"Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/po/de/libkipi.po b/po/de/libkipi.po
index 1d0c4ca..b1eb3b5 100644
--- a/po/de/libkipi.po
+++ b/po/de/libkipi.po
@@ -9,7 +9,7 @@ msgstr ""
"POT-Creation-Date: 2006-10-03 08:51+0200\n"
"PO-Revision-Date: 2006-07-06 20:15+0200\n"
"Last-Translator: Thomas Reitelbach <tr@erdfunkstelle.de>\n"
-"Language-Team: German <tde-i18n-de@kde.org>\n"
+"Language-Team: German <kde-i18n-de@kde.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/po/it/libkipi.po b/po/it/libkipi.po
index 4a846fc..53977d1 100644
--- a/po/it/libkipi.po
+++ b/po/it/libkipi.po
@@ -6,7 +6,7 @@ msgstr ""
"POT-Creation-Date: 2006-10-03 08:51+0200\n"
"PO-Revision-Date: 2005-05-15 01:46+0200\n"
"Last-Translator: Federico Zenith <zenith@chemeng.ntnu.no>\n"
-"Language-Team: Italian <tde-i18n-it@kde.org>\n"
+"Language-Team: Italian <kde-i18n-it@kde.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/po/pt/libkipi.po b/po/pt/libkipi.po
index e9980e0..f425a2b 100644
--- a/po/pt/libkipi.po
+++ b/po/pt/libkipi.po
@@ -4,7 +4,7 @@ msgstr ""
"POT-Creation-Date: 2006-10-03 08:51+0200\n"
"PO-Revision-Date: 2005-06-05 23:03+0100\n"
"Last-Translator: Pedro Morais <morais@kde.org>\n"
-"Language-Team: pt <tde-i18n-pt@kde.org>\n"
+"Language-Team: pt <kde-i18n-pt@kde.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"