Fix tdepim packaging on Debian and Ubuntu

15 files changed, 185 insertions, 185 deletions

diff --git a/debian/lenny/tdepim/debian/rules b/debian/lenny/tdepim/debian/rules
index 96073e510..0ef053d14 100755
--- a/debian/lenny/tdepim/debian/rules
+++ b/debian/lenny/tdepim/debian/rules
@@ -62,11 +62,11 @@ DEB_DH_SHLIBDEPS_ARGS_kontact-trinity := \
 	$(foreach p,$(kontact-trinity_suggests_plugins),debian/kontact/opt/trinity/lib/trinity/libkontact_$(p)plugin.so) \
 	-dDepends	# Since -u args go first in dpkg-shlibdeps call
 
-## Move kaddressbook-trinity dependency (from libkabc_xmlrpc.so) to Recommends
+## Move kaddressbook-trinity dependency (from libtdeabc_xmlrpc.so) to Recommends
 #DEB_DH_SHLIBDEPS_ARGS_tdepim-tderesources-trinity := \
-#	-Xopt/lib/trinity/libkabc_xmlrpc.so.1 \
+#	-Xopt/lib/trinity/libtdeabc_xmlrpc.so.1 \
 #	-- -dRecommends \
-#	debian/tdepim-tderesources/opt/trinity/lib/libkabc_xmlrpc.so.1.* \
+#	debian/tdepim-tderesources/opt/trinity/lib/libtdeabc_xmlrpc.so.1.* \
 #	-dDepends
 #
 ## Move kaddressbook dependency of libkcal2b-trinity to Recommends
diff --git a/debian/lenny/tdepim/debian/tdepim-tderesources-trinity.install b/debian/lenny/tdepim/debian/tdepim-tderesources-trinity.install
index 48b4fec45..1c261d798 100644
--- a/debian/lenny/tdepim/debian/tdepim-tderesources-trinity.install
+++ b/debian/lenny/tdepim/debian/tdepim-tderesources-trinity.install
@@ -1,9 +1,9 @@
-/opt/trinity/lib/trinity/kabc_*.la
-/opt/trinity/lib/trinity/kabc_*.so
+/opt/trinity/lib/trinity/tdeabc_*.la
+/opt/trinity/lib/trinity/tdeabc_*.so
 /opt/trinity/lib/trinity/kcal_caldav.la
 /opt/trinity/lib/trinity/kcal_caldav.so
-/opt/trinity/lib/trinity/kabc_carddav.la
-/opt/trinity/lib/trinity/kabc_carddav.so
+/opt/trinity/lib/trinity/tdeabc_carddav.la
+/opt/trinity/lib/trinity/tdeabc_carddav.so
 /opt/trinity/lib/trinity/kcal_groupdav.la
 /opt/trinity/lib/trinity/kcal_groupdav.so
 /opt/trinity/lib/trinity/kcal_groupwise.la
@@ -30,24 +30,24 @@
 /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/libkabc_groupdav.so.1
-/opt/trinity/lib/libkabc_groupdav.so.1.0.0
-/opt/trinity/lib/libkabc_groupwise.so.1
-/opt/trinity/lib/libkabc_groupwise.so.1.0.0
-/opt/trinity/lib/libkabc_newexchange.so.1
-/opt/trinity/lib/libkabc_newexchange.so.1.0.0
-/opt/trinity/lib/libkabc_slox.so.0
-/opt/trinity/lib/libkabc_slox.so.0.0.0
-/opt/trinity/lib/libkabc_xmlrpc.so.1
-/opt/trinity/lib/libkabc_xmlrpc.so.1.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
+/opt/trinity/lib/libtdeabc_groupwise.so.1.0.0
+/opt/trinity/lib/libtdeabc_newexchange.so.1
+/opt/trinity/lib/libtdeabc_newexchange.so.1.0.0
+/opt/trinity/lib/libtdeabc_slox.so.0
+/opt/trinity/lib/libtdeabc_slox.so.0.0.0
+/opt/trinity/lib/libtdeabc_xmlrpc.so.1
+/opt/trinity/lib/libtdeabc_xmlrpc.so.1.0.0
 /opt/trinity/lib/libkcalkolab.so.0
 /opt/trinity/lib/libkcalkolab.so.0.0.0
 /opt/trinity/lib/libkcalscalix.so.0
 /opt/trinity/lib/libkcalscalix.so.0.0.0
 /opt/trinity/lib/libkcal_caldav.so.1
 /opt/trinity/lib/libkcal_caldav.so.1.0.0
-/opt/trinity/lib/libkabc_carddav.so.1
-/opt/trinity/lib/libkabc_carddav.so.1.0.0
+/opt/trinity/lib/libtdeabc_carddav.so.1
+/opt/trinity/lib/libtdeabc_carddav.so.1.0.0
 /opt/trinity/lib/libkcal_groupdav.so.1
 /opt/trinity/lib/libkcal_groupdav.so.1.0.0
 /opt/trinity/lib/libkcal_groupwise.so.1
@@ -74,18 +74,18 @@
 /opt/trinity/lib/libkslox.so.0.0.0
 /opt/trinity/lib/libgwsoap.so.0
 /opt/trinity/lib/libgwsoap.so.0.0.0
-/opt/trinity/share/services/tderesources/tdeabc/kabc_groupdav.desktop
-/opt/trinity/share/services/tderesources/tdeabc/kabc_groupwise.desktop
-/opt/trinity/share/services/tderesources/tdeabc/kabc_newexchange.desktop
-/opt/trinity/share/services/tderesources/tdeabc/kabc_opengroupware.desktop
-/opt/trinity/share/services/tderesources/tdeabc/kabc_ox.desktop
-/opt/trinity/share/services/tderesources/tdeabc/kabc_slox.desktop
-/opt/trinity/share/services/tderesources/tdeabc/kabc_xmlrpc.desktop
+/opt/trinity/share/services/tderesources/tdeabc/tdeabc_groupdav.desktop
+/opt/trinity/share/services/tderesources/tdeabc/tdeabc_groupwise.desktop
+/opt/trinity/share/services/tderesources/tdeabc/tdeabc_newexchange.desktop
+/opt/trinity/share/services/tderesources/tdeabc/tdeabc_opengroupware.desktop
+/opt/trinity/share/services/tderesources/tdeabc/tdeabc_ox.desktop
+/opt/trinity/share/services/tderesources/tdeabc/tdeabc_slox.desktop
+/opt/trinity/share/services/tderesources/tdeabc/tdeabc_xmlrpc.desktop
 /opt/trinity/share/services/tderesources/tdeabc/kolab.desktop
 /opt/trinity/share/services/tderesources/tdeabc/scalix.desktop
 /opt/trinity/share/services/tderesources/kcal/exchange.desktop
 /opt/trinity/share/services/tderesources/kcal/kcal_caldav.desktop
-/opt/trinity/share/services/tderesources/tdeabc/kabc_carddav.desktop
+/opt/trinity/share/services/tderesources/tdeabc/tdeabc_carddav.desktop
 /opt/trinity/share/services/tderesources/kcal/kcal_groupdav.desktop
 /opt/trinity/share/services/tderesources/kcal/kcal_groupwise.desktop
 /opt/trinity/share/services/tderesources/kcal/kcal_newexchange.desktop
diff --git a/debian/lenny/tdepim/debian/tdepim-trinity-dev.install b/debian/lenny/tdepim/debian/tdepim-trinity-dev.install
index bec38f84a..d6d241210 100644
--- a/debian/lenny/tdepim/debian/tdepim-trinity-dev.install
+++ b/debian/lenny/tdepim/debian/tdepim-trinity-dev.install
@@ -14,16 +14,16 @@
 /opt/trinity/lib/libkabckolab.so
 /opt/trinity/lib/libkabcscalix.la
 /opt/trinity/lib/libkabcscalix.so
-/opt/trinity/lib/libkabc_groupdav.la
-/opt/trinity/lib/libkabc_groupdav.so
-/opt/trinity/lib/libkabc_groupwise.la
-/opt/trinity/lib/libkabc_groupwise.so
-/opt/trinity/lib/libkabc_newexchange.la
-/opt/trinity/lib/libkabc_newexchange.so
-/opt/trinity/lib/libkabc_slox.la
-/opt/trinity/lib/libkabc_slox.so
-/opt/trinity/lib/libkabc_xmlrpc.la
-/opt/trinity/lib/libkabc_xmlrpc.so
+/opt/trinity/lib/libtdeabc_groupdav.la
+/opt/trinity/lib/libtdeabc_groupdav.so
+/opt/trinity/lib/libtdeabc_groupwise.la
+/opt/trinity/lib/libtdeabc_groupwise.so
+/opt/trinity/lib/libtdeabc_newexchange.la
+/opt/trinity/lib/libtdeabc_newexchange.so
+/opt/trinity/lib/libtdeabc_slox.la
+/opt/trinity/lib/libtdeabc_slox.so
+/opt/trinity/lib/libtdeabc_xmlrpc.la
+/opt/trinity/lib/libtdeabc_xmlrpc.so
 /opt/trinity/lib/libkabinterfaces.la
 /opt/trinity/lib/libkabinterfaces.so
 /opt/trinity/lib/libkaddressbook.la
diff --git a/debian/squeeze/tdepim/debian/rules b/debian/squeeze/tdepim/debian/rules
index 96073e510..0ef053d14 100755
--- a/debian/squeeze/tdepim/debian/rules
+++ b/debian/squeeze/tdepim/debian/rules
@@ -62,11 +62,11 @@ DEB_DH_SHLIBDEPS_ARGS_kontact-trinity := \
 	$(foreach p,$(kontact-trinity_suggests_plugins),debian/kontact/opt/trinity/lib/trinity/libkontact_$(p)plugin.so) \
 	-dDepends	# Since -u args go first in dpkg-shlibdeps call
 
-## Move kaddressbook-trinity dependency (from libkabc_xmlrpc.so) to Recommends
+## Move kaddressbook-trinity dependency (from libtdeabc_xmlrpc.so) to Recommends
 #DEB_DH_SHLIBDEPS_ARGS_tdepim-tderesources-trinity := \
-#	-Xopt/lib/trinity/libkabc_xmlrpc.so.1 \
+#	-Xopt/lib/trinity/libtdeabc_xmlrpc.so.1 \
 #	-- -dRecommends \
-#	debian/tdepim-tderesources/opt/trinity/lib/libkabc_xmlrpc.so.1.* \
+#	debian/tdepim-tderesources/opt/trinity/lib/libtdeabc_xmlrpc.so.1.* \
 #	-dDepends
 #
 ## Move kaddressbook dependency of libkcal2b-trinity to Recommends
diff --git a/debian/squeeze/tdepim/debian/tdepim-tderesources-trinity.install b/debian/squeeze/tdepim/debian/tdepim-tderesources-trinity.install
index 48b4fec45..1c261d798 100644
--- a/debian/squeeze/tdepim/debian/tdepim-tderesources-trinity.install
+++ b/debian/squeeze/tdepim/debian/tdepim-tderesources-trinity.install
@@ -1,9 +1,9 @@
-/opt/trinity/lib/trinity/kabc_*.la
-/opt/trinity/lib/trinity/kabc_*.so
+/opt/trinity/lib/trinity/tdeabc_*.la
+/opt/trinity/lib/trinity/tdeabc_*.so
 /opt/trinity/lib/trinity/kcal_caldav.la
 /opt/trinity/lib/trinity/kcal_caldav.so
-/opt/trinity/lib/trinity/kabc_carddav.la
-/opt/trinity/lib/trinity/kabc_carddav.so
+/opt/trinity/lib/trinity/tdeabc_carddav.la
+/opt/trinity/lib/trinity/tdeabc_carddav.so
 /opt/trinity/lib/trinity/kcal_groupdav.la
 /opt/trinity/lib/trinity/kcal_groupdav.so
 /opt/trinity/lib/trinity/kcal_groupwise.la
@@ -30,24 +30,24 @@
 /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/libkabc_groupdav.so.1
-/opt/trinity/lib/libkabc_groupdav.so.1.0.0
-/opt/trinity/lib/libkabc_groupwise.so.1
-/opt/trinity/lib/libkabc_groupwise.so.1.0.0
-/opt/trinity/lib/libkabc_newexchange.so.1
-/opt/trinity/lib/libkabc_newexchange.so.1.0.0
-/opt/trinity/lib/libkabc_slox.so.0
-/opt/trinity/lib/libkabc_slox.so.0.0.0
-/opt/trinity/lib/libkabc_xmlrpc.so.1
-/opt/trinity/lib/libkabc_xmlrpc.so.1.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
+/opt/trinity/lib/libtdeabc_groupwise.so.1.0.0
+/opt/trinity/lib/libtdeabc_newexchange.so.1
+/opt/trinity/lib/libtdeabc_newexchange.so.1.0.0
+/opt/trinity/lib/libtdeabc_slox.so.0
+/opt/trinity/lib/libtdeabc_slox.so.0.0.0
+/opt/trinity/lib/libtdeabc_xmlrpc.so.1
+/opt/trinity/lib/libtdeabc_xmlrpc.so.1.0.0
 /opt/trinity/lib/libkcalkolab.so.0
 /opt/trinity/lib/libkcalkolab.so.0.0.0
 /opt/trinity/lib/libkcalscalix.so.0
 /opt/trinity/lib/libkcalscalix.so.0.0.0
 /opt/trinity/lib/libkcal_caldav.so.1
 /opt/trinity/lib/libkcal_caldav.so.1.0.0
-/opt/trinity/lib/libkabc_carddav.so.1
-/opt/trinity/lib/libkabc_carddav.so.1.0.0
+/opt/trinity/lib/libtdeabc_carddav.so.1
+/opt/trinity/lib/libtdeabc_carddav.so.1.0.0
 /opt/trinity/lib/libkcal_groupdav.so.1
 /opt/trinity/lib/libkcal_groupdav.so.1.0.0
 /opt/trinity/lib/libkcal_groupwise.so.1
@@ -74,18 +74,18 @@
 /opt/trinity/lib/libkslox.so.0.0.0
 /opt/trinity/lib/libgwsoap.so.0
 /opt/trinity/lib/libgwsoap.so.0.0.0
-/opt/trinity/share/services/tderesources/tdeabc/kabc_groupdav.desktop
-/opt/trinity/share/services/tderesources/tdeabc/kabc_groupwise.desktop
-/opt/trinity/share/services/tderesources/tdeabc/kabc_newexchange.desktop
-/opt/trinity/share/services/tderesources/tdeabc/kabc_opengroupware.desktop
-/opt/trinity/share/services/tderesources/tdeabc/kabc_ox.desktop
-/opt/trinity/share/services/tderesources/tdeabc/kabc_slox.desktop
-/opt/trinity/share/services/tderesources/tdeabc/kabc_xmlrpc.desktop
+/opt/trinity/share/services/tderesources/tdeabc/tdeabc_groupdav.desktop
+/opt/trinity/share/services/tderesources/tdeabc/tdeabc_groupwise.desktop
+/opt/trinity/share/services/tderesources/tdeabc/tdeabc_newexchange.desktop
+/opt/trinity/share/services/tderesources/tdeabc/tdeabc_opengroupware.desktop
+/opt/trinity/share/services/tderesources/tdeabc/tdeabc_ox.desktop
+/opt/trinity/share/services/tderesources/tdeabc/tdeabc_slox.desktop
+/opt/trinity/share/services/tderesources/tdeabc/tdeabc_xmlrpc.desktop
 /opt/trinity/share/services/tderesources/tdeabc/kolab.desktop
 /opt/trinity/share/services/tderesources/tdeabc/scalix.desktop
 /opt/trinity/share/services/tderesources/kcal/exchange.desktop
 /opt/trinity/share/services/tderesources/kcal/kcal_caldav.desktop
-/opt/trinity/share/services/tderesources/tdeabc/kabc_carddav.desktop
+/opt/trinity/share/services/tderesources/tdeabc/tdeabc_carddav.desktop
 /opt/trinity/share/services/tderesources/kcal/kcal_groupdav.desktop
 /opt/trinity/share/services/tderesources/kcal/kcal_groupwise.desktop
 /opt/trinity/share/services/tderesources/kcal/kcal_newexchange.desktop
diff --git a/debian/squeeze/tdepim/debian/tdepim-trinity-dev.install b/debian/squeeze/tdepim/debian/tdepim-trinity-dev.install
index bec38f84a..d6d241210 100644
--- a/debian/squeeze/tdepim/debian/tdepim-trinity-dev.install
+++ b/debian/squeeze/tdepim/debian/tdepim-trinity-dev.install
@@ -14,16 +14,16 @@
 /opt/trinity/lib/libkabckolab.so
 /opt/trinity/lib/libkabcscalix.la
 /opt/trinity/lib/libkabcscalix.so
-/opt/trinity/lib/libkabc_groupdav.la
-/opt/trinity/lib/libkabc_groupdav.so
-/opt/trinity/lib/libkabc_groupwise.la
-/opt/trinity/lib/libkabc_groupwise.so
-/opt/trinity/lib/libkabc_newexchange.la
-/opt/trinity/lib/libkabc_newexchange.so
-/opt/trinity/lib/libkabc_slox.la
-/opt/trinity/lib/libkabc_slox.so
-/opt/trinity/lib/libkabc_xmlrpc.la
-/opt/trinity/lib/libkabc_xmlrpc.so
+/opt/trinity/lib/libtdeabc_groupdav.la
+/opt/trinity/lib/libtdeabc_groupdav.so
+/opt/trinity/lib/libtdeabc_groupwise.la
+/opt/trinity/lib/libtdeabc_groupwise.so
+/opt/trinity/lib/libtdeabc_newexchange.la
+/opt/trinity/lib/libtdeabc_newexchange.so
+/opt/trinity/lib/libtdeabc_slox.la
+/opt/trinity/lib/libtdeabc_slox.so
+/opt/trinity/lib/libtdeabc_xmlrpc.la
+/opt/trinity/lib/libtdeabc_xmlrpc.so
 /opt/trinity/lib/libkabinterfaces.la
 /opt/trinity/lib/libkabinterfaces.so
 /opt/trinity/lib/libkaddressbook.la
diff --git a/debian/wheezy/tdepim/debian/rules b/debian/wheezy/tdepim/debian/rules
index 96073e510..0ef053d14 100755
--- a/debian/wheezy/tdepim/debian/rules
+++ b/debian/wheezy/tdepim/debian/rules
@@ -62,11 +62,11 @@ DEB_DH_SHLIBDEPS_ARGS_kontact-trinity := \
 	$(foreach p,$(kontact-trinity_suggests_plugins),debian/kontact/opt/trinity/lib/trinity/libkontact_$(p)plugin.so) \
 	-dDepends	# Since -u args go first in dpkg-shlibdeps call
 
-## Move kaddressbook-trinity dependency (from libkabc_xmlrpc.so) to Recommends
+## Move kaddressbook-trinity dependency (from libtdeabc_xmlrpc.so) to Recommends
 #DEB_DH_SHLIBDEPS_ARGS_tdepim-tderesources-trinity := \
-#	-Xopt/lib/trinity/libkabc_xmlrpc.so.1 \
+#	-Xopt/lib/trinity/libtdeabc_xmlrpc.so.1 \
 #	-- -dRecommends \
-#	debian/tdepim-tderesources/opt/trinity/lib/libkabc_xmlrpc.so.1.* \
+#	debian/tdepim-tderesources/opt/trinity/lib/libtdeabc_xmlrpc.so.1.* \
 #	-dDepends
 #
 ## Move kaddressbook dependency of libkcal2b-trinity to Recommends
diff --git a/debian/wheezy/tdepim/debian/tdepim-tderesources-trinity.install b/debian/wheezy/tdepim/debian/tdepim-tderesources-trinity.install
index 48b4fec45..1c261d798 100644
--- a/debian/wheezy/tdepim/debian/tdepim-tderesources-trinity.install
+++ b/debian/wheezy/tdepim/debian/tdepim-tderesources-trinity.install
@@ -1,9 +1,9 @@
-/opt/trinity/lib/trinity/kabc_*.la
-/opt/trinity/lib/trinity/kabc_*.so
+/opt/trinity/lib/trinity/tdeabc_*.la
+/opt/trinity/lib/trinity/tdeabc_*.so
 /opt/trinity/lib/trinity/kcal_caldav.la
 /opt/trinity/lib/trinity/kcal_caldav.so
-/opt/trinity/lib/trinity/kabc_carddav.la
-/opt/trinity/lib/trinity/kabc_carddav.so
+/opt/trinity/lib/trinity/tdeabc_carddav.la
+/opt/trinity/lib/trinity/tdeabc_carddav.so
 /opt/trinity/lib/trinity/kcal_groupdav.la
 /opt/trinity/lib/trinity/kcal_groupdav.so
 /opt/trinity/lib/trinity/kcal_groupwise.la
@@ -30,24 +30,24 @@
 /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/libkabc_groupdav.so.1
-/opt/trinity/lib/libkabc_groupdav.so.1.0.0
-/opt/trinity/lib/libkabc_groupwise.so.1
-/opt/trinity/lib/libkabc_groupwise.so.1.0.0
-/opt/trinity/lib/libkabc_newexchange.so.1
-/opt/trinity/lib/libkabc_newexchange.so.1.0.0
-/opt/trinity/lib/libkabc_slox.so.0
-/opt/trinity/lib/libkabc_slox.so.0.0.0
-/opt/trinity/lib/libkabc_xmlrpc.so.1
-/opt/trinity/lib/libkabc_xmlrpc.so.1.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
+/opt/trinity/lib/libtdeabc_groupwise.so.1.0.0
+/opt/trinity/lib/libtdeabc_newexchange.so.1
+/opt/trinity/lib/libtdeabc_newexchange.so.1.0.0
+/opt/trinity/lib/libtdeabc_slox.so.0
+/opt/trinity/lib/libtdeabc_slox.so.0.0.0
+/opt/trinity/lib/libtdeabc_xmlrpc.so.1
+/opt/trinity/lib/libtdeabc_xmlrpc.so.1.0.0
 /opt/trinity/lib/libkcalkolab.so.0
 /opt/trinity/lib/libkcalkolab.so.0.0.0
 /opt/trinity/lib/libkcalscalix.so.0
 /opt/trinity/lib/libkcalscalix.so.0.0.0
 /opt/trinity/lib/libkcal_caldav.so.1
 /opt/trinity/lib/libkcal_caldav.so.1.0.0
-/opt/trinity/lib/libkabc_carddav.so.1
-/opt/trinity/lib/libkabc_carddav.so.1.0.0
+/opt/trinity/lib/libtdeabc_carddav.so.1
+/opt/trinity/lib/libtdeabc_carddav.so.1.0.0
 /opt/trinity/lib/libkcal_groupdav.so.1
 /opt/trinity/lib/libkcal_groupdav.so.1.0.0
 /opt/trinity/lib/libkcal_groupwise.so.1
@@ -74,18 +74,18 @@
 /opt/trinity/lib/libkslox.so.0.0.0
 /opt/trinity/lib/libgwsoap.so.0
 /opt/trinity/lib/libgwsoap.so.0.0.0
-/opt/trinity/share/services/tderesources/tdeabc/kabc_groupdav.desktop
-/opt/trinity/share/services/tderesources/tdeabc/kabc_groupwise.desktop
-/opt/trinity/share/services/tderesources/tdeabc/kabc_newexchange.desktop
-/opt/trinity/share/services/tderesources/tdeabc/kabc_opengroupware.desktop
-/opt/trinity/share/services/tderesources/tdeabc/kabc_ox.desktop
-/opt/trinity/share/services/tderesources/tdeabc/kabc_slox.desktop
-/opt/trinity/share/services/tderesources/tdeabc/kabc_xmlrpc.desktop
+/opt/trinity/share/services/tderesources/tdeabc/tdeabc_groupdav.desktop
+/opt/trinity/share/services/tderesources/tdeabc/tdeabc_groupwise.desktop
+/opt/trinity/share/services/tderesources/tdeabc/tdeabc_newexchange.desktop
+/opt/trinity/share/services/tderesources/tdeabc/tdeabc_opengroupware.desktop
+/opt/trinity/share/services/tderesources/tdeabc/tdeabc_ox.desktop
+/opt/trinity/share/services/tderesources/tdeabc/tdeabc_slox.desktop
+/opt/trinity/share/services/tderesources/tdeabc/tdeabc_xmlrpc.desktop
 /opt/trinity/share/services/tderesources/tdeabc/kolab.desktop
 /opt/trinity/share/services/tderesources/tdeabc/scalix.desktop
 /opt/trinity/share/services/tderesources/kcal/exchange.desktop
 /opt/trinity/share/services/tderesources/kcal/kcal_caldav.desktop
-/opt/trinity/share/services/tderesources/tdeabc/kabc_carddav.desktop
+/opt/trinity/share/services/tderesources/tdeabc/tdeabc_carddav.desktop
 /opt/trinity/share/services/tderesources/kcal/kcal_groupdav.desktop
 /opt/trinity/share/services/tderesources/kcal/kcal_groupwise.desktop
 /opt/trinity/share/services/tderesources/kcal/kcal_newexchange.desktop
diff --git a/debian/wheezy/tdepim/debian/tdepim-trinity-dev.install b/debian/wheezy/tdepim/debian/tdepim-trinity-dev.install
index bec38f84a..d6d241210 100644
--- a/debian/wheezy/tdepim/debian/tdepim-trinity-dev.install
+++ b/debian/wheezy/tdepim/debian/tdepim-trinity-dev.install
@@ -14,16 +14,16 @@
 /opt/trinity/lib/libkabckolab.so
 /opt/trinity/lib/libkabcscalix.la
 /opt/trinity/lib/libkabcscalix.so
-/opt/trinity/lib/libkabc_groupdav.la
-/opt/trinity/lib/libkabc_groupdav.so
-/opt/trinity/lib/libkabc_groupwise.la
-/opt/trinity/lib/libkabc_groupwise.so
-/opt/trinity/lib/libkabc_newexchange.la
-/opt/trinity/lib/libkabc_newexchange.so
-/opt/trinity/lib/libkabc_slox.la
-/opt/trinity/lib/libkabc_slox.so
-/opt/trinity/lib/libkabc_xmlrpc.la
-/opt/trinity/lib/libkabc_xmlrpc.so
+/opt/trinity/lib/libtdeabc_groupdav.la
+/opt/trinity/lib/libtdeabc_groupdav.so
+/opt/trinity/lib/libtdeabc_groupwise.la
+/opt/trinity/lib/libtdeabc_groupwise.so
+/opt/trinity/lib/libtdeabc_newexchange.la
+/opt/trinity/lib/libtdeabc_newexchange.so
+/opt/trinity/lib/libtdeabc_slox.la
+/opt/trinity/lib/libtdeabc_slox.so
+/opt/trinity/lib/libtdeabc_xmlrpc.la
+/opt/trinity/lib/libtdeabc_xmlrpc.so
 /opt/trinity/lib/libkabinterfaces.la
 /opt/trinity/lib/libkabinterfaces.so
 /opt/trinity/lib/libkaddressbook.la
diff --git a/ubuntu/maverick/tdepim/debian/rules b/ubuntu/maverick/tdepim/debian/rules
index 96073e510..0ef053d14 100755
--- a/ubuntu/maverick/tdepim/debian/rules
+++ b/ubuntu/maverick/tdepim/debian/rules
@@ -62,11 +62,11 @@ DEB_DH_SHLIBDEPS_ARGS_kontact-trinity := \
 	$(foreach p,$(kontact-trinity_suggests_plugins),debian/kontact/opt/trinity/lib/trinity/libkontact_$(p)plugin.so) \
 	-dDepends	# Since -u args go first in dpkg-shlibdeps call
 
-## Move kaddressbook-trinity dependency (from libkabc_xmlrpc.so) to Recommends
+## Move kaddressbook-trinity dependency (from libtdeabc_xmlrpc.so) to Recommends
 #DEB_DH_SHLIBDEPS_ARGS_tdepim-tderesources-trinity := \
-#	-Xopt/lib/trinity/libkabc_xmlrpc.so.1 \
+#	-Xopt/lib/trinity/libtdeabc_xmlrpc.so.1 \
 #	-- -dRecommends \
-#	debian/tdepim-tderesources/opt/trinity/lib/libkabc_xmlrpc.so.1.* \
+#	debian/tdepim-tderesources/opt/trinity/lib/libtdeabc_xmlrpc.so.1.* \
 #	-dDepends
 #
 ## Move kaddressbook dependency of libkcal2b-trinity to Recommends
diff --git a/ubuntu/maverick/tdepim/debian/tdepim-tderesources-trinity.install b/ubuntu/maverick/tdepim/debian/tdepim-tderesources-trinity.install
index 48b4fec45..1c261d798 100644
--- a/ubuntu/maverick/tdepim/debian/tdepim-tderesources-trinity.install
+++ b/ubuntu/maverick/tdepim/debian/tdepim-tderesources-trinity.install
@@ -1,9 +1,9 @@
-/opt/trinity/lib/trinity/kabc_*.la
-/opt/trinity/lib/trinity/kabc_*.so
+/opt/trinity/lib/trinity/tdeabc_*.la
+/opt/trinity/lib/trinity/tdeabc_*.so
 /opt/trinity/lib/trinity/kcal_caldav.la
 /opt/trinity/lib/trinity/kcal_caldav.so
-/opt/trinity/lib/trinity/kabc_carddav.la
-/opt/trinity/lib/trinity/kabc_carddav.so
+/opt/trinity/lib/trinity/tdeabc_carddav.la
+/opt/trinity/lib/trinity/tdeabc_carddav.so
 /opt/trinity/lib/trinity/kcal_groupdav.la
 /opt/trinity/lib/trinity/kcal_groupdav.so
 /opt/trinity/lib/trinity/kcal_groupwise.la
@@ -30,24 +30,24 @@
 /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/libkabc_groupdav.so.1
-/opt/trinity/lib/libkabc_groupdav.so.1.0.0
-/opt/trinity/lib/libkabc_groupwise.so.1
-/opt/trinity/lib/libkabc_groupwise.so.1.0.0
-/opt/trinity/lib/libkabc_newexchange.so.1
-/opt/trinity/lib/libkabc_newexchange.so.1.0.0
-/opt/trinity/lib/libkabc_slox.so.0
-/opt/trinity/lib/libkabc_slox.so.0.0.0
-/opt/trinity/lib/libkabc_xmlrpc.so.1
-/opt/trinity/lib/libkabc_xmlrpc.so.1.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
+/opt/trinity/lib/libtdeabc_groupwise.so.1.0.0
+/opt/trinity/lib/libtdeabc_newexchange.so.1
+/opt/trinity/lib/libtdeabc_newexchange.so.1.0.0
+/opt/trinity/lib/libtdeabc_slox.so.0
+/opt/trinity/lib/libtdeabc_slox.so.0.0.0
+/opt/trinity/lib/libtdeabc_xmlrpc.so.1
+/opt/trinity/lib/libtdeabc_xmlrpc.so.1.0.0
 /opt/trinity/lib/libkcalkolab.so.0
 /opt/trinity/lib/libkcalkolab.so.0.0.0
 /opt/trinity/lib/libkcalscalix.so.0
 /opt/trinity/lib/libkcalscalix.so.0.0.0
 /opt/trinity/lib/libkcal_caldav.so.1
 /opt/trinity/lib/libkcal_caldav.so.1.0.0
-/opt/trinity/lib/libkabc_carddav.so.1
-/opt/trinity/lib/libkabc_carddav.so.1.0.0
+/opt/trinity/lib/libtdeabc_carddav.so.1
+/opt/trinity/lib/libtdeabc_carddav.so.1.0.0
 /opt/trinity/lib/libkcal_groupdav.so.1
 /opt/trinity/lib/libkcal_groupdav.so.1.0.0
 /opt/trinity/lib/libkcal_groupwise.so.1
@@ -74,18 +74,18 @@
 /opt/trinity/lib/libkslox.so.0.0.0
 /opt/trinity/lib/libgwsoap.so.0
 /opt/trinity/lib/libgwsoap.so.0.0.0
-/opt/trinity/share/services/tderesources/tdeabc/kabc_groupdav.desktop
-/opt/trinity/share/services/tderesources/tdeabc/kabc_groupwise.desktop
-/opt/trinity/share/services/tderesources/tdeabc/kabc_newexchange.desktop
-/opt/trinity/share/services/tderesources/tdeabc/kabc_opengroupware.desktop
-/opt/trinity/share/services/tderesources/tdeabc/kabc_ox.desktop
-/opt/trinity/share/services/tderesources/tdeabc/kabc_slox.desktop
-/opt/trinity/share/services/tderesources/tdeabc/kabc_xmlrpc.desktop
+/opt/trinity/share/services/tderesources/tdeabc/tdeabc_groupdav.desktop
+/opt/trinity/share/services/tderesources/tdeabc/tdeabc_groupwise.desktop
+/opt/trinity/share/services/tderesources/tdeabc/tdeabc_newexchange.desktop
+/opt/trinity/share/services/tderesources/tdeabc/tdeabc_opengroupware.desktop
+/opt/trinity/share/services/tderesources/tdeabc/tdeabc_ox.desktop
+/opt/trinity/share/services/tderesources/tdeabc/tdeabc_slox.desktop
+/opt/trinity/share/services/tderesources/tdeabc/tdeabc_xmlrpc.desktop
 /opt/trinity/share/services/tderesources/tdeabc/kolab.desktop
 /opt/trinity/share/services/tderesources/tdeabc/scalix.desktop
 /opt/trinity/share/services/tderesources/kcal/exchange.desktop
 /opt/trinity/share/services/tderesources/kcal/kcal_caldav.desktop
-/opt/trinity/share/services/tderesources/tdeabc/kabc_carddav.desktop
+/opt/trinity/share/services/tderesources/tdeabc/tdeabc_carddav.desktop
 /opt/trinity/share/services/tderesources/kcal/kcal_groupdav.desktop
 /opt/trinity/share/services/tderesources/kcal/kcal_groupwise.desktop
 /opt/trinity/share/services/tderesources/kcal/kcal_newexchange.desktop
diff --git a/ubuntu/maverick/tdepim/debian/tdepim-trinity-dev.install b/ubuntu/maverick/tdepim/debian/tdepim-trinity-dev.install
index bec38f84a..d6d241210 100644
--- a/ubuntu/maverick/tdepim/debian/tdepim-trinity-dev.install
+++ b/ubuntu/maverick/tdepim/debian/tdepim-trinity-dev.install
@@ -14,16 +14,16 @@
 /opt/trinity/lib/libkabckolab.so
 /opt/trinity/lib/libkabcscalix.la
 /opt/trinity/lib/libkabcscalix.so
-/opt/trinity/lib/libkabc_groupdav.la
-/opt/trinity/lib/libkabc_groupdav.so
-/opt/trinity/lib/libkabc_groupwise.la
-/opt/trinity/lib/libkabc_groupwise.so
-/opt/trinity/lib/libkabc_newexchange.la
-/opt/trinity/lib/libkabc_newexchange.so
-/opt/trinity/lib/libkabc_slox.la
-/opt/trinity/lib/libkabc_slox.so
-/opt/trinity/lib/libkabc_xmlrpc.la
-/opt/trinity/lib/libkabc_xmlrpc.so
+/opt/trinity/lib/libtdeabc_groupdav.la
+/opt/trinity/lib/libtdeabc_groupdav.so
+/opt/trinity/lib/libtdeabc_groupwise.la
+/opt/trinity/lib/libtdeabc_groupwise.so
+/opt/trinity/lib/libtdeabc_newexchange.la
+/opt/trinity/lib/libtdeabc_newexchange.so
+/opt/trinity/lib/libtdeabc_slox.la
+/opt/trinity/lib/libtdeabc_slox.so
+/opt/trinity/lib/libtdeabc_xmlrpc.la
+/opt/trinity/lib/libtdeabc_xmlrpc.so
 /opt/trinity/lib/libkabinterfaces.la
 /opt/trinity/lib/libkabinterfaces.so
 /opt/trinity/lib/libkaddressbook.la
diff --git a/ubuntu/precise/tdepim/debian/rules b/ubuntu/precise/tdepim/debian/rules
index 96073e510..0ef053d14 100755
--- a/ubuntu/precise/tdepim/debian/rules
+++ b/ubuntu/precise/tdepim/debian/rules
@@ -62,11 +62,11 @@ DEB_DH_SHLIBDEPS_ARGS_kontact-trinity := \
 	$(foreach p,$(kontact-trinity_suggests_plugins),debian/kontact/opt/trinity/lib/trinity/libkontact_$(p)plugin.so) \
 	-dDepends	# Since -u args go first in dpkg-shlibdeps call
 
-## Move kaddressbook-trinity dependency (from libkabc_xmlrpc.so) to Recommends
+## Move kaddressbook-trinity dependency (from libtdeabc_xmlrpc.so) to Recommends
 #DEB_DH_SHLIBDEPS_ARGS_tdepim-tderesources-trinity := \
-#	-Xopt/lib/trinity/libkabc_xmlrpc.so.1 \
+#	-Xopt/lib/trinity/libtdeabc_xmlrpc.so.1 \
 #	-- -dRecommends \
-#	debian/tdepim-tderesources/opt/trinity/lib/libkabc_xmlrpc.so.1.* \
+#	debian/tdepim-tderesources/opt/trinity/lib/libtdeabc_xmlrpc.so.1.* \
 #	-dDepends
 #
 ## Move kaddressbook dependency of libkcal2b-trinity to Recommends
diff --git a/ubuntu/precise/tdepim/debian/tdepim-tderesources-trinity.install b/ubuntu/precise/tdepim/debian/tdepim-tderesources-trinity.install
index 48b4fec45..1c261d798 100644
--- a/ubuntu/precise/tdepim/debian/tdepim-tderesources-trinity.install
+++ b/ubuntu/precise/tdepim/debian/tdepim-tderesources-trinity.install
@@ -1,9 +1,9 @@
-/opt/trinity/lib/trinity/kabc_*.la
-/opt/trinity/lib/trinity/kabc_*.so
+/opt/trinity/lib/trinity/tdeabc_*.la
+/opt/trinity/lib/trinity/tdeabc_*.so
 /opt/trinity/lib/trinity/kcal_caldav.la
 /opt/trinity/lib/trinity/kcal_caldav.so
-/opt/trinity/lib/trinity/kabc_carddav.la
-/opt/trinity/lib/trinity/kabc_carddav.so
+/opt/trinity/lib/trinity/tdeabc_carddav.la
+/opt/trinity/lib/trinity/tdeabc_carddav.so
 /opt/trinity/lib/trinity/kcal_groupdav.la
 /opt/trinity/lib/trinity/kcal_groupdav.so
 /opt/trinity/lib/trinity/kcal_groupwise.la
@@ -30,24 +30,24 @@
 /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/libkabc_groupdav.so.1
-/opt/trinity/lib/libkabc_groupdav.so.1.0.0
-/opt/trinity/lib/libkabc_groupwise.so.1
-/opt/trinity/lib/libkabc_groupwise.so.1.0.0
-/opt/trinity/lib/libkabc_newexchange.so.1
-/opt/trinity/lib/libkabc_newexchange.so.1.0.0
-/opt/trinity/lib/libkabc_slox.so.0
-/opt/trinity/lib/libkabc_slox.so.0.0.0
-/opt/trinity/lib/libkabc_xmlrpc.so.1
-/opt/trinity/lib/libkabc_xmlrpc.so.1.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
+/opt/trinity/lib/libtdeabc_groupwise.so.1.0.0
+/opt/trinity/lib/libtdeabc_newexchange.so.1
+/opt/trinity/lib/libtdeabc_newexchange.so.1.0.0
+/opt/trinity/lib/libtdeabc_slox.so.0
+/opt/trinity/lib/libtdeabc_slox.so.0.0.0
+/opt/trinity/lib/libtdeabc_xmlrpc.so.1
+/opt/trinity/lib/libtdeabc_xmlrpc.so.1.0.0
 /opt/trinity/lib/libkcalkolab.so.0
 /opt/trinity/lib/libkcalkolab.so.0.0.0
 /opt/trinity/lib/libkcalscalix.so.0
 /opt/trinity/lib/libkcalscalix.so.0.0.0
 /opt/trinity/lib/libkcal_caldav.so.1
 /opt/trinity/lib/libkcal_caldav.so.1.0.0
-/opt/trinity/lib/libkabc_carddav.so.1
-/opt/trinity/lib/libkabc_carddav.so.1.0.0
+/opt/trinity/lib/libtdeabc_carddav.so.1
+/opt/trinity/lib/libtdeabc_carddav.so.1.0.0
 /opt/trinity/lib/libkcal_groupdav.so.1
 /opt/trinity/lib/libkcal_groupdav.so.1.0.0
 /opt/trinity/lib/libkcal_groupwise.so.1
@@ -74,18 +74,18 @@
 /opt/trinity/lib/libkslox.so.0.0.0
 /opt/trinity/lib/libgwsoap.so.0
 /opt/trinity/lib/libgwsoap.so.0.0.0
-/opt/trinity/share/services/tderesources/tdeabc/kabc_groupdav.desktop
-/opt/trinity/share/services/tderesources/tdeabc/kabc_groupwise.desktop
-/opt/trinity/share/services/tderesources/tdeabc/kabc_newexchange.desktop
-/opt/trinity/share/services/tderesources/tdeabc/kabc_opengroupware.desktop
-/opt/trinity/share/services/tderesources/tdeabc/kabc_ox.desktop
-/opt/trinity/share/services/tderesources/tdeabc/kabc_slox.desktop
-/opt/trinity/share/services/tderesources/tdeabc/kabc_xmlrpc.desktop
+/opt/trinity/share/services/tderesources/tdeabc/tdeabc_groupdav.desktop
+/opt/trinity/share/services/tderesources/tdeabc/tdeabc_groupwise.desktop
+/opt/trinity/share/services/tderesources/tdeabc/tdeabc_newexchange.desktop
+/opt/trinity/share/services/tderesources/tdeabc/tdeabc_opengroupware.desktop
+/opt/trinity/share/services/tderesources/tdeabc/tdeabc_ox.desktop
+/opt/trinity/share/services/tderesources/tdeabc/tdeabc_slox.desktop
+/opt/trinity/share/services/tderesources/tdeabc/tdeabc_xmlrpc.desktop
 /opt/trinity/share/services/tderesources/tdeabc/kolab.desktop
 /opt/trinity/share/services/tderesources/tdeabc/scalix.desktop
 /opt/trinity/share/services/tderesources/kcal/exchange.desktop
 /opt/trinity/share/services/tderesources/kcal/kcal_caldav.desktop
-/opt/trinity/share/services/tderesources/tdeabc/kabc_carddav.desktop
+/opt/trinity/share/services/tderesources/tdeabc/tdeabc_carddav.desktop
 /opt/trinity/share/services/tderesources/kcal/kcal_groupdav.desktop
 /opt/trinity/share/services/tderesources/kcal/kcal_groupwise.desktop
 /opt/trinity/share/services/tderesources/kcal/kcal_newexchange.desktop
diff --git a/ubuntu/precise/tdepim/debian/tdepim-trinity-dev.install b/ubuntu/precise/tdepim/debian/tdepim-trinity-dev.install
index bec38f84a..d6d241210 100644
--- a/ubuntu/precise/tdepim/debian/tdepim-trinity-dev.install
+++ b/ubuntu/precise/tdepim/debian/tdepim-trinity-dev.install
@@ -14,16 +14,16 @@
 /opt/trinity/lib/libkabckolab.so
 /opt/trinity/lib/libkabcscalix.la
 /opt/trinity/lib/libkabcscalix.so
-/opt/trinity/lib/libkabc_groupdav.la
-/opt/trinity/lib/libkabc_groupdav.so
-/opt/trinity/lib/libkabc_groupwise.la
-/opt/trinity/lib/libkabc_groupwise.so
-/opt/trinity/lib/libkabc_newexchange.la
-/opt/trinity/lib/libkabc_newexchange.so
-/opt/trinity/lib/libkabc_slox.la
-/opt/trinity/lib/libkabc_slox.so
-/opt/trinity/lib/libkabc_xmlrpc.la
-/opt/trinity/lib/libkabc_xmlrpc.so
+/opt/trinity/lib/libtdeabc_groupdav.la
+/opt/trinity/lib/libtdeabc_groupdav.so
+/opt/trinity/lib/libtdeabc_groupwise.la
+/opt/trinity/lib/libtdeabc_groupwise.so
+/opt/trinity/lib/libtdeabc_newexchange.la
+/opt/trinity/lib/libtdeabc_newexchange.so
+/opt/trinity/lib/libtdeabc_slox.la
+/opt/trinity/lib/libtdeabc_slox.so
+/opt/trinity/lib/libtdeabc_xmlrpc.la
+/opt/trinity/lib/libtdeabc_xmlrpc.so
 /opt/trinity/lib/libkabinterfaces.la
 /opt/trinity/lib/libkabinterfaces.so
 /opt/trinity/lib/libkaddressbook.la