Fix tdelibs FTBFS on Debian and Ubuntu

5 files changed, 33 insertions, 33 deletions

diff --git a/ubuntu/maverick/tdelibs/debian/changelog b/ubuntu/maverick/tdelibs/debian/changelog
index e909d30a2..84301df5d 100644
--- a/ubuntu/maverick/tdelibs/debian/changelog
+++ b/ubuntu/maverick/tdelibs/debian/changelog
@@ -1627,7 +1627,7 @@ tdelibs (4:3.5.1-0ubuntu9) dapper; urgency=low
 
 tdelibs (4:3.5.1-0ubuntu8) dapper; urgency=low
 
-  * Add patch kubuntu_33_kabc_fix_save to fix loss of addressbook
+  * Add patch kubuntu_33_tdeabc_fix_save to fix loss of addressbook
     on exiting kontact (Closes: KDE Bug http://bugs.kde.org/118924). 
 
  -- Raphaël Pinson <raphink@ubuntu.com>  Mon,  6 Mar 2006 23:59:09 +0100
diff --git a/ubuntu/maverick/tdelibs/debian/copyright b/ubuntu/maverick/tdelibs/debian/copyright
index fe31be41a..0e7882d18 100644
--- a/ubuntu/maverick/tdelibs/debian/copyright
+++ b/ubuntu/maverick/tdelibs/debian/copyright
@@ -14,7 +14,7 @@ systems, the complete text of the BSD, GPL and LGPL licenses can be found
 in the /usr/share/common-licenses/BSD, /usr/share/common-licenses/GPL and
 /usr/share/common-licenses/LGPL files.
 
-libartskde, interfaces, kabc, kate, tdecert, tdeconf_update, tdecore, kded, tdefx,
+libartskde, interfaces, tdeabc, kate, tdecert, tdeconf_update, tdecore, kded, tdefx,
 tdeprint, tdesu, tdeui, kdewidgets, tdehtml, kimgio, kinit, tdeio, tdeioslave, kjs,
 tdeparts, ksmartcard, tdespell, kstyles, libtdemid, libtdescreensaver
 ------------------------------------------------------------------------------
diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.install b/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.install
index d99526172..1a5c0be6b 100644
--- a/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.install
+++ b/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.install
@@ -3786,7 +3786,7 @@ debian/tmp/opt/trinity/share/services/tderesources/tdeabc/dir.desktop
 debian/tmp/opt/trinity/share/services/tderesources/tdeabc/file.desktop
 debian/tmp/opt/trinity/share/services/tderesources/tdeabc/net.desktop
 debian/tmp/opt/trinity/share/services/tderesources/tdeabc/ldaptdeio.desktop
-debian/tmp/opt/trinity/share/services/tderesources/kabc_manager.desktop
+debian/tmp/opt/trinity/share/services/tderesources/tdeabc_manager.desktop
 
 debian/tmp/opt/trinity/share/services/tdespell_aspell.desktop
 debian/tmp/opt/trinity/share/services/tdespell_hspell.desktop
diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.install b/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.install
index 2e43c49ed..c5c503705 100644
--- a/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.install
+++ b/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.install
@@ -732,17 +732,17 @@ debian/tmp/opt/trinity/lib/libartskde.la
 debian/tmp/opt/trinity/lib/libartskde.so
 debian/tmp/opt/trinity/lib/libDCOP.la
 debian/tmp/opt/trinity/lib/libDCOP.so
-debian/tmp/opt/trinity/lib/libkabc_dir.la
-debian/tmp/opt/trinity/lib/libkabc_dir.so
-debian/tmp/opt/trinity/lib/libkabc_file.la
-debian/tmp/opt/trinity/lib/libkabc_file.so
-debian/tmp/opt/trinity/lib/libkabc_net.la
-debian/tmp/opt/trinity/lib/libkabc_net.so
-debian/tmp/opt/trinity/lib/libkabc.la
-debian/tmp/opt/trinity/lib/libkabc_ldaptdeio.la
-debian/tmp/opt/trinity/lib/libkabc_ldaptdeio.so
+debian/tmp/opt/trinity/lib/libtdeabc_dir.la
+debian/tmp/opt/trinity/lib/libtdeabc_dir.so
+debian/tmp/opt/trinity/lib/libtdeabc_file.la
+debian/tmp/opt/trinity/lib/libtdeabc_file.so
+debian/tmp/opt/trinity/lib/libtdeabc_net.la
+debian/tmp/opt/trinity/lib/libtdeabc_net.so
+debian/tmp/opt/trinity/lib/libtdeabc.la
+debian/tmp/opt/trinity/lib/libtdeabc_ldaptdeio.la
+debian/tmp/opt/trinity/lib/libtdeabc_ldaptdeio.so
 
-debian/tmp/opt/trinity/lib/libkabc.so
+debian/tmp/opt/trinity/lib/libtdeabc.so
 debian/tmp/opt/trinity/lib/libkatepartinterfaces.la
 debian/tmp/opt/trinity/lib/libkatepartinterfaces.so
 debian/tmp/opt/trinity/lib/libtdecore.la
diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.install b/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.install
index 83ffcabfb..34b95d4f3 100644
--- a/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.install
+++ b/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.install
@@ -58,16 +58,16 @@ debian/tmp/opt/trinity/lib/trinity/cupsdconf.la
 debian/tmp/opt/trinity/lib/trinity/cupsdconf.so
 debian/tmp/opt/trinity/lib/trinity/dcopserver.la
 debian/tmp/opt/trinity/lib/trinity/dcopserver.so
-debian/tmp/opt/trinity/lib/trinity/kabc_dir.la
-debian/tmp/opt/trinity/lib/trinity/kabc_dir.so
-debian/tmp/opt/trinity/lib/trinity/kabc_file.la
-debian/tmp/opt/trinity/lib/trinity/kabc_file.so
-debian/tmp/opt/trinity/lib/trinity/kabc_net.la
-debian/tmp/opt/trinity/lib/trinity/kabc_net.so
-debian/tmp/opt/trinity/lib/trinity/kabcformat_binary.la
-debian/tmp/opt/trinity/lib/trinity/kabcformat_binary.so
-debian/tmp/opt/trinity/lib/trinity/kabc_ldaptdeio.la
-debian/tmp/opt/trinity/lib/trinity/kabc_ldaptdeio.so
+debian/tmp/opt/trinity/lib/trinity/tdeabc_dir.la
+debian/tmp/opt/trinity/lib/trinity/tdeabc_dir.so
+debian/tmp/opt/trinity/lib/trinity/tdeabc_file.la
+debian/tmp/opt/trinity/lib/trinity/tdeabc_file.so
+debian/tmp/opt/trinity/lib/trinity/tdeabc_net.la
+debian/tmp/opt/trinity/lib/trinity/tdeabc_net.so
+debian/tmp/opt/trinity/lib/trinity/tdeabcformat_binary.la
+debian/tmp/opt/trinity/lib/trinity/tdeabcformat_binary.so
+debian/tmp/opt/trinity/lib/trinity/tdeabc_ldaptdeio.la
+debian/tmp/opt/trinity/lib/trinity/tdeabc_ldaptdeio.so
 
 debian/tmp/opt/trinity/lib/trinity/kaddprinterwizard.la
 debian/tmp/opt/trinity/lib/trinity/kaddprinterwizard.so
@@ -217,14 +217,14 @@ debian/tmp/opt/trinity/lib/libartskde.so.1
 debian/tmp/opt/trinity/lib/libartskde.so.1.2.0
 debian/tmp/opt/trinity/lib/libDCOP.so.4
 debian/tmp/opt/trinity/lib/libDCOP.so.4.2.0
-debian/tmp/opt/trinity/lib/libkabc_dir.so.1
-debian/tmp/opt/trinity/lib/libkabc_dir.so.1.0.0
-debian/tmp/opt/trinity/lib/libkabc_file.so.1
-debian/tmp/opt/trinity/lib/libkabc_file.so.1.0.0
-debian/tmp/opt/trinity/lib/libkabc_ldaptdeio.so.1
-debian/tmp/opt/trinity/lib/libkabc_ldaptdeio.so.1.0.0
-debian/tmp/opt/trinity/lib/libkabc_net.so.1
-debian/tmp/opt/trinity/lib/libkabc_net.so.1.0.0
+debian/tmp/opt/trinity/lib/libtdeabc_dir.so.1
+debian/tmp/opt/trinity/lib/libtdeabc_dir.so.1.0.0
+debian/tmp/opt/trinity/lib/libtdeabc_file.so.1
+debian/tmp/opt/trinity/lib/libtdeabc_file.so.1.0.0
+debian/tmp/opt/trinity/lib/libtdeabc_ldaptdeio.so.1
+debian/tmp/opt/trinity/lib/libtdeabc_ldaptdeio.so.1.0.0
+debian/tmp/opt/trinity/lib/libtdeabc_net.so.1
+debian/tmp/opt/trinity/lib/libtdeabc_net.so.1.0.0
 
 debian/tmp/opt/trinity/lib/libnetworkstatus.so.0
 debian/tmp/opt/trinity/lib/libnetworkstatus.so.0.0.0
@@ -233,8 +233,8 @@ debian/tmp/opt/trinity/lib/libconnectionmanager.so.0.0.0
 #debian/tmp/opt/trinity/lib/libkdemm.so.0
 #debian/tmp/opt/trinity/lib/libkdemm.so.0.0.0
 
-debian/tmp/opt/trinity/lib/libkabc.so.1
-debian/tmp/opt/trinity/lib/libkabc.so.1.2.0
+debian/tmp/opt/trinity/lib/libtdeabc.so.1
+debian/tmp/opt/trinity/lib/libtdeabc.so.1.2.0
 debian/tmp/opt/trinity/lib/libkatepartinterfaces.so.0
 debian/tmp/opt/trinity/lib/libkatepartinterfaces.so.0.0.0
 debian/tmp/opt/trinity/lib/libtdecore.so.4