12 files changed, 27 insertions, 27 deletions
diff --git a/ubuntu/maverick/applications/koffice/debian/kword-data-trinity.install b/ubuntu/maverick/applications/koffice/debian/kword-data-trinity.install
index 7c702418e..2d273a850 100644
--- a/ubuntu/maverick/applications/koffice/debian/kword-data-trinity.install
+++ b/ubuntu/maverick/applications/koffice/debian/kword-data-trinity.install
@@ -10,7 +10,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kword.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kword.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kword.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kword.png
-debian/tmp/opt/trinity/share/services/kwmailmerge_kabc.desktop
+debian/tmp/opt/trinity/share/services/kwmailmerge_tdeabc.desktop
 debian/tmp/opt/trinity/share/services/kwmailmerge_kspread.desktop
 debian/tmp/opt/trinity/share/services/kword_abiword_export.desktop
 debian/tmp/opt/trinity/share/services/kword_abiword_import.desktop
diff --git a/ubuntu/maverick/applications/koffice/debian/kword-trinity.install b/ubuntu/maverick/applications/koffice/debian/kword-trinity.install
index 7f3f2f954..dfeb77b97 100644
--- a/ubuntu/maverick/applications/koffice/debian/kword-trinity.install
+++ b/ubuntu/maverick/applications/koffice/debian/kword-trinity.install
@@ -1,8 +1,8 @@
 debian/tmp/opt/trinity/bin/kword
 debian/tmp/opt/trinity/lib/trinity/kwmailmerge_classic.la
 debian/tmp/opt/trinity/lib/trinity/kwmailmerge_classic.so
-debian/tmp/opt/trinity/lib/trinity/kwmailmerge_kabc.la
-debian/tmp/opt/trinity/lib/trinity/kwmailmerge_kabc.so
+debian/tmp/opt/trinity/lib/trinity/kwmailmerge_tdeabc.la
+debian/tmp/opt/trinity/lib/trinity/kwmailmerge_tdeabc.so
 debian/tmp/opt/trinity/lib/trinity/kwmailmerge_kspread.la
 debian/tmp/opt/trinity/lib/trinity/kwmailmerge_kspread.so
 debian/tmp/opt/trinity/lib/trinity/kwmailmerge_qtsqldb.la
diff --git a/ubuntu/maverick/tdenetwork/debian/tdenetwork-trinity-dev.install b/ubuntu/maverick/tdenetwork/debian/tdenetwork-trinity-dev.install
index e1ce52d78..1cab7d38c 100644
--- a/ubuntu/maverick/tdenetwork/debian/tdenetwork-trinity-dev.install
+++ b/ubuntu/maverick/tdenetwork/debian/tdenetwork-trinity-dev.install
@@ -1,4 +1,4 @@
-debian/tmp/opt/trinity/include/kopete/kabcpersistence.h
+debian/tmp/opt/trinity/include/kopete/tdeabcpersistence.h
 debian/tmp/opt/trinity/include/kopete/kopete_export.h
 debian/tmp/opt/trinity/include/kopete/kopeteaccount.h
 debian/tmp/opt/trinity/include/kopete/kopeteaccountmanager.h
diff --git a/ubuntu/maverick/tdepim/debian/kaddressbook-trinity.install b/ubuntu/maverick/tdepim/debian/kaddressbook-trinity.install
index 92e4a076f..82a8dd9c4 100644
--- a/ubuntu/maverick/tdepim/debian/kaddressbook-trinity.install
+++ b/ubuntu/maverick/tdepim/debian/kaddressbook-trinity.install
@@ -1,4 +1,4 @@
-/opt/trinity/bin/kabc2mutt
+/opt/trinity/bin/tdeabc2mutt
 /opt/trinity/bin/kaddressbook
 /opt/trinity/lib/trinity/kcm_kabconfig.la
 /opt/trinity/lib/trinity/kcm_kabconfig.so
diff --git a/ubuntu/maverick/tdepim/debian/kaddressbook-trinity.manpages b/ubuntu/maverick/tdepim/debian/kaddressbook-trinity.manpages
index 74ba46e49..7c9dccab5 100644
--- a/ubuntu/maverick/tdepim/debian/kaddressbook-trinity.manpages
+++ b/ubuntu/maverick/tdepim/debian/kaddressbook-trinity.manpages
@@ -1,2 +1,2 @@
-debian/man/out/kabc2mutt-trinity.1
+debian/man/out/tdeabc2mutt-trinity.1
 debian/man/out/kaddressbook-trinity.1
diff --git a/ubuntu/maverick/tdepim/debian/libkcal2b-trinity.install b/ubuntu/maverick/tdepim/debian/libkcal2b-trinity.install
index 211c15b4d..8f9263fcd 100644
--- a/ubuntu/maverick/tdepim/debian/libkcal2b-trinity.install
+++ b/ubuntu/maverick/tdepim/debian/libkcal2b-trinity.install
@@ -1,5 +1,5 @@
-/opt/trinity/lib/trinity/kcal_kabc.la
-/opt/trinity/lib/trinity/kcal_kabc.so
+/opt/trinity/lib/trinity/kcal_tdeabc.la
+/opt/trinity/lib/trinity/kcal_tdeabc.so
 /opt/trinity/lib/trinity/kcal_localdir.la
 /opt/trinity/lib/trinity/kcal_localdir.so
 /opt/trinity/lib/trinity/kcal_local.la
@@ -14,7 +14,7 @@
 /opt/trinity/lib/libkholidays.so.1.0.0
 /opt/trinity/share/apps/libkholidays
 /opt/trinity/share/services/tderesources/kcal/imap.desktop
-/opt/trinity/share/services/tderesources/kcal/kabc.desktop
+/opt/trinity/share/services/tderesources/kcal/tdeabc.desktop
 /opt/trinity/share/services/tderesources/kcal/local.desktop
 /opt/trinity/share/services/tderesources/kcal/localdir.desktop
 /opt/trinity/share/services/tderesources/kcal/remote.desktop
diff --git a/ubuntu/maverick/tdepim/debian/man/kaddressbook-trinity.man b/ubuntu/maverick/tdepim/debian/man/kaddressbook-trinity.man
index 04d47b403..a2a85fd85 100644
--- a/ubuntu/maverick/tdepim/debian/man/kaddressbook-trinity.man
+++ b/ubuntu/maverick/tdepim/debian/man/kaddressbook-trinity.man
@@ -7,14 +7,14 @@ kaddressbook \- The KDE Address Book
 .SH DESCRIPTION
 \fBKAddressBook\fP is the main address book application for KDE; it enables
 you to manage your contacts efficiently and comfortably.  Since it is based
-on the kabc library it supports resources, which can be used to load and save
+on the tdeabc library it supports resources, which can be used to load and save
 your contacts to many different locations -- not just the local file system,
 but also to LDAP servers and SQL databases.
 
 The user interface is similar to MS Outlook and it supports different views
 to represent the contact data differently; it also provides an incremental
 search over all fields and a jump button bar to quickly access single entries.
-Since the underlying kabc library uses the vCard format (specified in RFC 2426)
+Since the underlying tdeabc library uses the vCard format (specified in RFC 2426)
 as its default storage medium, KAddressBook mainly reflects the supported
 entry fields in its graphical user interface.
 .SH PROGRAM OPTIONS
diff --git a/ubuntu/maverick/tdepim/debian/man/kabc2mutt-trinity.man b/ubuntu/maverick/tdepim/debian/man/tdeabc2mutt-trinity.man
index b62278dc6..d80289461 100644
--- a/ubuntu/maverick/tdepim/debian/man/kabc2mutt-trinity.man
+++ b/ubuntu/maverick/tdepim/debian/man/tdeabc2mutt-trinity.man
@@ -1,11 +1,11 @@
-.TH KABC2MUTT 1
+.TH TDEABC2MUTT 1
 .SH NAME
-kabc2mutt \- kabc to mutt converter
+tdeabc2mutt \- tdeabc to mutt converter
 .SH SYNOPSIS
-.B kabc2mutt
+.B tdeabc2mutt
 .I [Qt-options] [KDE-options] [options]
 .SH DESCRIPTION
-kabc2mutt converts the KDE address book's entries to Mutt format.
+tdeabc2mutt converts the KDE address book's entries to Mutt format.
 .SH PROGRAM OPTIONS
 .TP
 .B --query \fI<substring>\fB
diff --git a/ubuntu/maverick/tdepim/debian/rules b/ubuntu/maverick/tdepim/debian/rules
index 40a941388..48c8b7fa2 100755
--- a/ubuntu/maverick/tdepim/debian/rules
+++ b/ubuntu/maverick/tdepim/debian/rules
@@ -71,9 +71,9 @@ DEB_DH_SHLIBDEPS_ARGS_kontact-trinity := \
 #
 ## Move kaddressbook dependency of libkcal2b-trinity to Recommends
 #DEB_DH_SHLIBDEPS_ARGS_libkcal2b-trinity := \
-#	-Xopt/trinity/lib/trinity/kcal_kabc.so \
+#	-Xopt/trinity/lib/trinity/kcal_tdeabc.so \
 #	-- -dRecommends \
-#	debian/libkcal2b/opt/trinity/lib/trinity/kcal_kabc.so \
+#	debian/libkcal2b/opt/trinity/lib/trinity/kcal_tdeabc.so \
 #	-dDepends
 
 test-shlibdeps:
diff --git a/ubuntu/maverick/tdepim/debian/tdepim-tderesources-trinity.install b/ubuntu/maverick/tdepim/debian/tdepim-tderesources-trinity.install
index 1c261d798..5abc460d5 100644
--- a/ubuntu/maverick/tdepim/debian/tdepim-tderesources-trinity.install
+++ b/ubuntu/maverick/tdepim/debian/tdepim-tderesources-trinity.install
@@ -26,10 +26,10 @@
 /opt/trinity/lib/trinity/knotes_scalix.so
 /opt/trinity/lib/trinity/knotes_xmlrpc.la
 /opt/trinity/lib/trinity/knotes_xmlrpc.so
-/opt/trinity/lib/libkabckolab.so.0
-/opt/trinity/lib/libkabckolab.so.0.0.0
-/opt/trinity/lib/libkabcscalix.so.0
-/opt/trinity/lib/libkabcscalix.so.0.0.0
+/opt/trinity/lib/libtdeabckolab.so.0
+/opt/trinity/lib/libtdeabckolab.so.0.0.0
+/opt/trinity/lib/libtdeabcscalix.so.0
+/opt/trinity/lib/libtdeabcscalix.so.0.0.0
 /opt/trinity/lib/libtdeabc_groupdav.so.1
 /opt/trinity/lib/libtdeabc_groupdav.so.1.0.0
 /opt/trinity/lib/libtdeabc_groupwise.so.1
diff --git a/ubuntu/maverick/tdepim/debian/tdepim-trinity-dev.install b/ubuntu/maverick/tdepim/debian/tdepim-trinity-dev.install
index 8f1732c2b..d4ba64ba4 100644
--- a/ubuntu/maverick/tdepim/debian/tdepim-trinity-dev.install
+++ b/ubuntu/maverick/tdepim/debian/tdepim-trinity-dev.install
@@ -10,10 +10,10 @@
 /opt/trinity/include/kmailpartIface.h
 /opt/trinity/include/kontact
 /opt/trinity/include/korganizer
-/opt/trinity/lib/libkabckolab.la
-/opt/trinity/lib/libkabckolab.so
-/opt/trinity/lib/libkabcscalix.la
-/opt/trinity/lib/libkabcscalix.so
+/opt/trinity/lib/libtdeabckolab.la
+/opt/trinity/lib/libtdeabckolab.so
+/opt/trinity/lib/libtdeabcscalix.la
+/opt/trinity/lib/libtdeabcscalix.so
 /opt/trinity/lib/libtdeabc_groupdav.la
 /opt/trinity/lib/libtdeabc_groupdav.so
 /opt/trinity/lib/libtdeabc_groupwise.la
diff --git a/ubuntu/maverick/tdesdk/debian/tdesdk-misc-trinity.install b/ubuntu/maverick/tdesdk/debian/tdesdk-misc-trinity.install
index 661568771..38dbfc076 100644
--- a/ubuntu/maverick/tdesdk/debian/tdesdk-misc-trinity.install
+++ b/ubuntu/maverick/tdesdk/debian/tdesdk-misc-trinity.install
@@ -1,6 +1,6 @@
 debian/tmp/opt/trinity/include/kprofilemethod.h
-debian/tmp/opt/trinity/lib/trinity/kabcformat_kdeaccounts.la
-debian/tmp/opt/trinity/lib/trinity/kabcformat_kdeaccounts.so
+debian/tmp/opt/trinity/lib/trinity/tdeabcformat_kdeaccounts.la
+debian/tmp/opt/trinity/lib/trinity/tdeabcformat_kdeaccounts.so
 debian/tmp/opt/trinity/lib/trinity/plugins/styles/scheck.so
 debian/tmp/opt/trinity/lib/trinity/plugins/styles/scheck.la
 debian/tmp/opt/trinity/share/apps/tdeabc/formats/kdeaccountsplugin.desktop