Update Debian and Ubuntu packaging for latest GIT head

44 files changed, 515 insertions, 515 deletions

diff --git a/debian/lenny/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff b/debian/lenny/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff
index bf09b9c13..826d4e236 100644
--- a/debian/lenny/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff
+++ b/debian/lenny/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff
@@ -3,12 +3,12 @@ index 7c45fcf..b933832 100644
 --- a/src/main.cpp
 +++ b/src/main.cpp
 @@ -24,6 +24,7 @@
- #include <kmessagebox.h>
+ #include <tdemessagebox.h>
  #include <tdemainwindow.h>
  #include <kapp.h>
 +#include <kuser.h>
  
- #include <klocale.h>
+ #include <tdelocale.h>
  #include <dcopclient.h>
 @@ -134,11 +135,11 @@ int main ( int argc, char *argv[] )
  	}
diff --git a/debian/lenny/tdelibs/debian/tdelibs-data-trinity.install b/debian/lenny/tdelibs/debian/tdelibs-data-trinity.install
index 33a16d62e..d99526172 100644
--- a/debian/lenny/tdelibs/debian/tdelibs-data-trinity.install
+++ b/debian/lenny/tdelibs/debian/tdelibs-data-trinity.install
@@ -23,8 +23,8 @@ debian/tmp/opt/trinity/share/apps/dcopidlng/kalyptusCxxToDcopIDL.pm
 debian/tmp/opt/trinity/share/apps/dcopidlng/kdocAstUtil.pm
 debian/tmp/opt/trinity/share/apps/dcopidlng/kdocParseDoc.pm
 debian/tmp/opt/trinity/share/apps/dcopidlng/kdocUtil.pm
-debian/tmp/opt/trinity/share/apps/kabc/countrytransl.map
-debian/tmp/opt/trinity/share/apps/kabc/formats/binary.desktop
+debian/tmp/opt/trinity/share/apps/tdeabc/countrytransl.map
+debian/tmp/opt/trinity/share/apps/tdeabc/formats/binary.desktop
 debian/tmp/opt/trinity/share/apps/katepart/katepartreadonlyui.rc
 debian/tmp/opt/trinity/share/apps/katepart/katepartui.rc
 debian/tmp/opt/trinity/share/apps/katepart/scripts/indent/script-indent-c1-test.lua
@@ -3782,10 +3782,10 @@ debian/tmp/opt/trinity/share/services/kjavaappletviewer.desktop
 debian/tmp/opt/trinity/share/services/tdemailservice.protocol
 debian/tmp/opt/trinity/share/services/tdemultipart.desktop
 debian/tmp/opt/trinity/share/services/knotify.desktop
-debian/tmp/opt/trinity/share/services/tderesources/kabc/dir.desktop
-debian/tmp/opt/trinity/share/services/tderesources/kabc/file.desktop
-debian/tmp/opt/trinity/share/services/tderesources/kabc/net.desktop
-debian/tmp/opt/trinity/share/services/tderesources/kabc/ldaptdeio.desktop
+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/tdespell_aspell.desktop
diff --git a/debian/lenny/tdelibs/debian/tdelibs4-trinity-dev.install b/debian/lenny/tdelibs/debian/tdelibs4-trinity-dev.install
index ca194e680..2e43c49ed 100644
--- a/debian/lenny/tdelibs/debian/tdelibs4-trinity-dev.install
+++ b/debian/lenny/tdelibs/debian/tdelibs4-trinity-dev.install
@@ -60,50 +60,50 @@ debian/tmp/opt/trinity/include/dom/html_misc.h
 debian/tmp/opt/trinity/include/dom/html_object.h
 debian/tmp/opt/trinity/include/dom/html_table.h
 debian/tmp/opt/trinity/include/fixx11h.h
-debian/tmp/opt/trinity/include/kabc/addressbook.h
-debian/tmp/opt/trinity/include/kabc/addresseedialog.h
-debian/tmp/opt/trinity/include/kabc/addressee.h
-debian/tmp/opt/trinity/include/kabc/addresseelist.h
-debian/tmp/opt/trinity/include/kabc/address.h
-debian/tmp/opt/trinity/include/kabc/addresslineedit.h
-debian/tmp/opt/trinity/include/kabc/agent.h
-debian/tmp/opt/trinity/include/kabc/distributionlistdialog.h
-debian/tmp/opt/trinity/include/kabc/distributionlisteditor.h
-debian/tmp/opt/trinity/include/kabc/distributionlist.h
-debian/tmp/opt/trinity/include/kabc/errorhandler.h
-debian/tmp/opt/trinity/include/kabc/field.h
-debian/tmp/opt/trinity/include/kabc/formatfactory.h
-debian/tmp/opt/trinity/include/kabc/format.h
-debian/tmp/opt/trinity/include/kabc/formatplugin.h
-debian/tmp/opt/trinity/include/kabc/geo.h
-debian/tmp/opt/trinity/include/kabc/key.h
-debian/tmp/opt/trinity/include/kabc/ldapclient.h
-debian/tmp/opt/trinity/include/kabc/ldapconfigwidget.h
-debian/tmp/opt/trinity/include/kabc/ldapurl.h
-debian/tmp/opt/trinity/include/kabc/ldifconverter.h
-debian/tmp/opt/trinity/include/kabc/ldif.h
-debian/tmp/opt/trinity/include/kabc/lock.h
-debian/tmp/opt/trinity/include/kabc/locknull.h
-debian/tmp/opt/trinity/include/kabc/phonenumber.h
-debian/tmp/opt/trinity/include/kabc/picture.h
-debian/tmp/opt/trinity/include/kabc/plugin.h
-debian/tmp/opt/trinity/include/kabc/resourcedir.h
-debian/tmp/opt/trinity/include/kabc/resourcefile.h
-debian/tmp/opt/trinity/include/kabc/resource.h
-debian/tmp/opt/trinity/include/kabc/resourceldaptdeio.h
+debian/tmp/opt/trinity/include/tdeabc/addressbook.h
+debian/tmp/opt/trinity/include/tdeabc/addresseedialog.h
+debian/tmp/opt/trinity/include/tdeabc/addressee.h
+debian/tmp/opt/trinity/include/tdeabc/addresseelist.h
+debian/tmp/opt/trinity/include/tdeabc/address.h
+debian/tmp/opt/trinity/include/tdeabc/addresslineedit.h
+debian/tmp/opt/trinity/include/tdeabc/agent.h
+debian/tmp/opt/trinity/include/tdeabc/distributionlistdialog.h
+debian/tmp/opt/trinity/include/tdeabc/distributionlisteditor.h
+debian/tmp/opt/trinity/include/tdeabc/distributionlist.h
+debian/tmp/opt/trinity/include/tdeabc/errorhandler.h
+debian/tmp/opt/trinity/include/tdeabc/field.h
+debian/tmp/opt/trinity/include/tdeabc/formatfactory.h
+debian/tmp/opt/trinity/include/tdeabc/format.h
+debian/tmp/opt/trinity/include/tdeabc/formatplugin.h
+debian/tmp/opt/trinity/include/tdeabc/geo.h
+debian/tmp/opt/trinity/include/tdeabc/key.h
+debian/tmp/opt/trinity/include/tdeabc/ldapclient.h
+debian/tmp/opt/trinity/include/tdeabc/ldapconfigwidget.h
+debian/tmp/opt/trinity/include/tdeabc/ldapurl.h
+debian/tmp/opt/trinity/include/tdeabc/ldifconverter.h
+debian/tmp/opt/trinity/include/tdeabc/ldif.h
+debian/tmp/opt/trinity/include/tdeabc/lock.h
+debian/tmp/opt/trinity/include/tdeabc/locknull.h
+debian/tmp/opt/trinity/include/tdeabc/phonenumber.h
+debian/tmp/opt/trinity/include/tdeabc/picture.h
+debian/tmp/opt/trinity/include/tdeabc/plugin.h
+debian/tmp/opt/trinity/include/tdeabc/resourcedir.h
+debian/tmp/opt/trinity/include/tdeabc/resourcefile.h
+debian/tmp/opt/trinity/include/tdeabc/resource.h
+debian/tmp/opt/trinity/include/tdeabc/resourceldaptdeio.h
 
-debian/tmp/opt/trinity/include/kabc/resourceselectdialog.h
-debian/tmp/opt/trinity/include/kabc/secrecy.h
-debian/tmp/opt/trinity/include/kabc/sortmode.h
-debian/tmp/opt/trinity/include/kabc/sound.h
-debian/tmp/opt/trinity/include/kabc/stdaddressbook.h
-debian/tmp/opt/trinity/include/kabc/timezone.h
-debian/tmp/opt/trinity/include/kabc/vcardconverter.h
-debian/tmp/opt/trinity/include/kabc/vcardformat.h
-debian/tmp/opt/trinity/include/kabc/vcardformatplugin.h
-debian/tmp/opt/trinity/include/kabc/vcard.h
-debian/tmp/opt/trinity/include/kabc/vcardline.h
-debian/tmp/opt/trinity/include/kabc/vcardparser.h
+debian/tmp/opt/trinity/include/tdeabc/resourceselectdialog.h
+debian/tmp/opt/trinity/include/tdeabc/secrecy.h
+debian/tmp/opt/trinity/include/tdeabc/sortmode.h
+debian/tmp/opt/trinity/include/tdeabc/sound.h
+debian/tmp/opt/trinity/include/tdeabc/stdaddressbook.h
+debian/tmp/opt/trinity/include/tdeabc/timezone.h
+debian/tmp/opt/trinity/include/tdeabc/vcardconverter.h
+debian/tmp/opt/trinity/include/tdeabc/vcardformat.h
+debian/tmp/opt/trinity/include/tdeabc/vcardformatplugin.h
+debian/tmp/opt/trinity/include/tdeabc/vcard.h
+debian/tmp/opt/trinity/include/tdeabc/vcardline.h
+debian/tmp/opt/trinity/include/tdeabc/vcardparser.h
 debian/tmp/opt/trinity/include/tdeaboutapplication.h
 debian/tmp/opt/trinity/include/tdeaboutdata.h
 debian/tmp/opt/trinity/include/tdeaboutdialog.h
@@ -240,7 +240,7 @@ debian/tmp/opt/trinity/include/kdialog.h
 debian/tmp/opt/trinity/include/kdirlister.h
 debian/tmp/opt/trinity/include/kdirnotify.h
 debian/tmp/opt/trinity/include/kdirnotify_stub.h
-debian/tmp/opt/trinity/include/kdiroperator.h
+debian/tmp/opt/trinity/include/tdediroperator.h
 debian/tmp/opt/trinity/include/kdirselectdialog.h
 debian/tmp/opt/trinity/include/kdirsize.h
 debian/tmp/opt/trinity/include/kdirwatch.h
@@ -253,7 +253,7 @@ debian/tmp/opt/trinity/include/kdualcolorbutton.h
 debian/tmp/opt/trinity/include/keditcl.h
 debian/tmp/opt/trinity/include/keditlistbox.h
 debian/tmp/opt/trinity/include/kedittoolbar.h
-debian/tmp/opt/trinity/include/kemailsettings.h
+debian/tmp/opt/trinity/include/tdeemailsettings.h
 debian/tmp/opt/trinity/include/kencodingfiledialog.h
 debian/tmp/opt/trinity/include/kextendedsocket.h
 debian/tmp/opt/trinity/include/kextsock.h
@@ -282,8 +282,8 @@ debian/tmp/opt/trinity/include/tdefontrequester.h
 debian/tmp/opt/trinity/include/kgenericfactory.h
 debian/tmp/opt/trinity/include/kgenericfactory.tcc
 debian/tmp/opt/trinity/include/kglobalaccel.h
-debian/tmp/opt/trinity/include/kglobal.h
-debian/tmp/opt/trinity/include/kglobalsettings.h
+debian/tmp/opt/trinity/include/tdeglobal.h
+debian/tmp/opt/trinity/include/tdeglobalsettings.h
 debian/tmp/opt/trinity/include/kguiitem.h
 debian/tmp/opt/trinity/include/khelpmenu.h
 debian/tmp/opt/trinity/include/khexedit/byteseditinterface.h
@@ -381,7 +381,7 @@ debian/tmp/opt/trinity/include/klineedit.h
 debian/tmp/opt/trinity/include/tdelistbox.h
 debian/tmp/opt/trinity/include/tdelistview.h
 debian/tmp/opt/trinity/include/tdelistviewsearchline.h
-debian/tmp/opt/trinity/include/klocale.h
+debian/tmp/opt/trinity/include/tdelocale.h
 debian/tmp/opt/trinity/include/klockfile.h
 debian/tmp/opt/trinity/include/kmacroexpander.h
 debian/tmp/opt/trinity/include/tdemainwindow.h
@@ -406,8 +406,8 @@ debian/tmp/opt/trinity/include/tdemditoolviewaccessor.h
 debian/tmp/opt/trinity/include/tdemediaplayer/playerdcopobject.h
 debian/tmp/opt/trinity/include/tdemediaplayer/player.h
 debian/tmp/opt/trinity/include/tdemediaplayer/view.h
-debian/tmp/opt/trinity/include/kmenubar.h
-debian/tmp/opt/trinity/include/kmessagebox.h
+debian/tmp/opt/trinity/include/tdemenubar.h
+debian/tmp/opt/trinity/include/tdemessagebox.h
 debian/tmp/opt/trinity/include/kmimemagic.h
 debian/tmp/opt/trinity/include/kmimesourcefactory.h
 debian/tmp/opt/trinity/include/kmimetypechooser.h
@@ -479,7 +479,7 @@ debian/tmp/opt/trinity/include/kprogressbox.h
 debian/tmp/opt/trinity/include/kpropertiesdialog.h
 debian/tmp/opt/trinity/include/kpropsdlg.h
 debian/tmp/opt/trinity/include/kprotocolinfo.h
-debian/tmp/opt/trinity/include/kprotocolmanager.h
+debian/tmp/opt/trinity/include/tdeprotocolmanager.h
 debian/tmp/opt/trinity/include/kpty.h
 debian/tmp/opt/trinity/include/kpushbutton.h
 debian/tmp/opt/trinity/include/krandomsequence.h
@@ -580,7 +580,7 @@ debian/tmp/opt/trinity/include/ksslutils.h
 debian/tmp/opt/trinity/include/ksslx509map.h
 debian/tmp/opt/trinity/include/ksslx509v3.h
 debian/tmp/opt/trinity/include/kstandarddirs.h
-debian/tmp/opt/trinity/include/kstartupinfo.h
+debian/tmp/opt/trinity/include/tdestartupinfo.h
 debian/tmp/opt/trinity/include/kstaticdeleter.h
 debian/tmp/opt/trinity/include/kstatusbar.h
 debian/tmp/opt/trinity/include/tdestdaccel.h
@@ -603,7 +603,7 @@ debian/tmp/opt/trinity/include/ktabctl.h
 debian/tmp/opt/trinity/include/ktabwidget.h
 debian/tmp/opt/trinity/include/ktar.h
 debian/tmp/opt/trinity/include/ktempdir.h
-debian/tmp/opt/trinity/include/ktempfile.h
+debian/tmp/opt/trinity/include/tdetempfile.h
 debian/tmp/opt/trinity/include/ktextbrowser.h
 debian/tmp/opt/trinity/include/ktextedit.h
 debian/tmp/opt/trinity/include/tdetexteditor/blockselectioninterface.h
diff --git a/debian/lenny/tdepim/debian/kaddressbook-trinity.install b/debian/lenny/tdepim/debian/kaddressbook-trinity.install
index eac493c1b..92e4a076f 100644
--- a/debian/lenny/tdepim/debian/kaddressbook-trinity.install
+++ b/debian/lenny/tdepim/debian/kaddressbook-trinity.install
@@ -29,7 +29,7 @@
 /opt/trinity/share/services/kabldapconfig.desktop
 /opt/trinity/share/services/kaddressbook
 /opt/trinity/share/services/kontact/kaddressbookplugin.desktop
-/opt/trinity/share/services/tderesources/kabc/imap.desktop
+/opt/trinity/share/services/tderesources/tdeabc/imap.desktop
 /opt/trinity/share/services/ldifvcardthumbnail.desktop
 /opt/trinity/share/servicetypes/dcopaddressbook.desktop
 /opt/trinity/share/servicetypes/kaddressbook_contacteditorwidget.desktop
diff --git a/debian/lenny/tdepim/debian/tdepim-tderesources-trinity.install b/debian/lenny/tdepim/debian/tdepim-tderesources-trinity.install
index 1ad10b54a..48b4fec45 100644
--- a/debian/lenny/tdepim/debian/tdepim-tderesources-trinity.install
+++ b/debian/lenny/tdepim/debian/tdepim-tderesources-trinity.install
@@ -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/kabc/kabc_groupdav.desktop
-/opt/trinity/share/services/tderesources/kabc/kabc_groupwise.desktop
-/opt/trinity/share/services/tderesources/kabc/kabc_newexchange.desktop
-/opt/trinity/share/services/tderesources/kabc/kabc_opengroupware.desktop
-/opt/trinity/share/services/tderesources/kabc/kabc_ox.desktop
-/opt/trinity/share/services/tderesources/kabc/kabc_slox.desktop
-/opt/trinity/share/services/tderesources/kabc/kabc_xmlrpc.desktop
-/opt/trinity/share/services/tderesources/kabc/kolab.desktop
-/opt/trinity/share/services/tderesources/kabc/scalix.desktop
+/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/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/kabc/kabc_carddav.desktop
+/opt/trinity/share/services/tderesources/tdeabc/kabc_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/tdesdk/debian/tdesdk-misc-trinity.install b/debian/lenny/tdesdk/debian/tdesdk-misc-trinity.install
index 9fbde2ecd..59f2ee5c9 100644
--- a/debian/lenny/tdesdk/debian/tdesdk-misc-trinity.install
+++ b/debian/lenny/tdesdk/debian/tdesdk-misc-trinity.install
@@ -3,7 +3,7 @@ debian/tmp/opt/trinity/lib/trinity/kabcformat_kdeaccounts.la
 debian/tmp/opt/trinity/lib/trinity/kabcformat_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/kabc/formats/kdeaccountsplugin.desktop
+debian/tmp/opt/trinity/share/apps/tdeabc/formats/kdeaccountsplugin.desktop
 debian/tmp/opt/trinity/share/apps/kstyle/themes/scheck.themerc
 kdepalettes/kde_xpaintrc /opt/trinity/share/kdepalettes
 kdepalettes/KDE_Gimp /opt/trinity/share/kdepalettes
diff --git a/debian/squeeze/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff b/debian/squeeze/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff
index bf09b9c13..826d4e236 100644
--- a/debian/squeeze/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff
+++ b/debian/squeeze/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff
@@ -3,12 +3,12 @@ index 7c45fcf..b933832 100644
 --- a/src/main.cpp
 +++ b/src/main.cpp
 @@ -24,6 +24,7 @@
- #include <kmessagebox.h>
+ #include <tdemessagebox.h>
  #include <tdemainwindow.h>
  #include <kapp.h>
 +#include <kuser.h>
  
- #include <klocale.h>
+ #include <tdelocale.h>
  #include <dcopclient.h>
 @@ -134,11 +135,11 @@ int main ( int argc, char *argv[] )
  	}
diff --git a/debian/squeeze/tdelibs/debian/tdelibs-data-trinity.install b/debian/squeeze/tdelibs/debian/tdelibs-data-trinity.install
index 33a16d62e..d99526172 100644
--- a/debian/squeeze/tdelibs/debian/tdelibs-data-trinity.install
+++ b/debian/squeeze/tdelibs/debian/tdelibs-data-trinity.install
@@ -23,8 +23,8 @@ debian/tmp/opt/trinity/share/apps/dcopidlng/kalyptusCxxToDcopIDL.pm
 debian/tmp/opt/trinity/share/apps/dcopidlng/kdocAstUtil.pm
 debian/tmp/opt/trinity/share/apps/dcopidlng/kdocParseDoc.pm
 debian/tmp/opt/trinity/share/apps/dcopidlng/kdocUtil.pm
-debian/tmp/opt/trinity/share/apps/kabc/countrytransl.map
-debian/tmp/opt/trinity/share/apps/kabc/formats/binary.desktop
+debian/tmp/opt/trinity/share/apps/tdeabc/countrytransl.map
+debian/tmp/opt/trinity/share/apps/tdeabc/formats/binary.desktop
 debian/tmp/opt/trinity/share/apps/katepart/katepartreadonlyui.rc
 debian/tmp/opt/trinity/share/apps/katepart/katepartui.rc
 debian/tmp/opt/trinity/share/apps/katepart/scripts/indent/script-indent-c1-test.lua
@@ -3782,10 +3782,10 @@ debian/tmp/opt/trinity/share/services/kjavaappletviewer.desktop
 debian/tmp/opt/trinity/share/services/tdemailservice.protocol
 debian/tmp/opt/trinity/share/services/tdemultipart.desktop
 debian/tmp/opt/trinity/share/services/knotify.desktop
-debian/tmp/opt/trinity/share/services/tderesources/kabc/dir.desktop
-debian/tmp/opt/trinity/share/services/tderesources/kabc/file.desktop
-debian/tmp/opt/trinity/share/services/tderesources/kabc/net.desktop
-debian/tmp/opt/trinity/share/services/tderesources/kabc/ldaptdeio.desktop
+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/tdespell_aspell.desktop
diff --git a/debian/squeeze/tdelibs/debian/tdelibs4-trinity-dev.install b/debian/squeeze/tdelibs/debian/tdelibs4-trinity-dev.install
index ca194e680..2e43c49ed 100644
--- a/debian/squeeze/tdelibs/debian/tdelibs4-trinity-dev.install
+++ b/debian/squeeze/tdelibs/debian/tdelibs4-trinity-dev.install
@@ -60,50 +60,50 @@ debian/tmp/opt/trinity/include/dom/html_misc.h
 debian/tmp/opt/trinity/include/dom/html_object.h
 debian/tmp/opt/trinity/include/dom/html_table.h
 debian/tmp/opt/trinity/include/fixx11h.h
-debian/tmp/opt/trinity/include/kabc/addressbook.h
-debian/tmp/opt/trinity/include/kabc/addresseedialog.h
-debian/tmp/opt/trinity/include/kabc/addressee.h
-debian/tmp/opt/trinity/include/kabc/addresseelist.h
-debian/tmp/opt/trinity/include/kabc/address.h
-debian/tmp/opt/trinity/include/kabc/addresslineedit.h
-debian/tmp/opt/trinity/include/kabc/agent.h
-debian/tmp/opt/trinity/include/kabc/distributionlistdialog.h
-debian/tmp/opt/trinity/include/kabc/distributionlisteditor.h
-debian/tmp/opt/trinity/include/kabc/distributionlist.h
-debian/tmp/opt/trinity/include/kabc/errorhandler.h
-debian/tmp/opt/trinity/include/kabc/field.h
-debian/tmp/opt/trinity/include/kabc/formatfactory.h
-debian/tmp/opt/trinity/include/kabc/format.h
-debian/tmp/opt/trinity/include/kabc/formatplugin.h
-debian/tmp/opt/trinity/include/kabc/geo.h
-debian/tmp/opt/trinity/include/kabc/key.h
-debian/tmp/opt/trinity/include/kabc/ldapclient.h
-debian/tmp/opt/trinity/include/kabc/ldapconfigwidget.h
-debian/tmp/opt/trinity/include/kabc/ldapurl.h
-debian/tmp/opt/trinity/include/kabc/ldifconverter.h
-debian/tmp/opt/trinity/include/kabc/ldif.h
-debian/tmp/opt/trinity/include/kabc/lock.h
-debian/tmp/opt/trinity/include/kabc/locknull.h
-debian/tmp/opt/trinity/include/kabc/phonenumber.h
-debian/tmp/opt/trinity/include/kabc/picture.h
-debian/tmp/opt/trinity/include/kabc/plugin.h
-debian/tmp/opt/trinity/include/kabc/resourcedir.h
-debian/tmp/opt/trinity/include/kabc/resourcefile.h
-debian/tmp/opt/trinity/include/kabc/resource.h
-debian/tmp/opt/trinity/include/kabc/resourceldaptdeio.h
+debian/tmp/opt/trinity/include/tdeabc/addressbook.h
+debian/tmp/opt/trinity/include/tdeabc/addresseedialog.h
+debian/tmp/opt/trinity/include/tdeabc/addressee.h
+debian/tmp/opt/trinity/include/tdeabc/addresseelist.h
+debian/tmp/opt/trinity/include/tdeabc/address.h
+debian/tmp/opt/trinity/include/tdeabc/addresslineedit.h
+debian/tmp/opt/trinity/include/tdeabc/agent.h
+debian/tmp/opt/trinity/include/tdeabc/distributionlistdialog.h
+debian/tmp/opt/trinity/include/tdeabc/distributionlisteditor.h
+debian/tmp/opt/trinity/include/tdeabc/distributionlist.h
+debian/tmp/opt/trinity/include/tdeabc/errorhandler.h
+debian/tmp/opt/trinity/include/tdeabc/field.h
+debian/tmp/opt/trinity/include/tdeabc/formatfactory.h
+debian/tmp/opt/trinity/include/tdeabc/format.h
+debian/tmp/opt/trinity/include/tdeabc/formatplugin.h
+debian/tmp/opt/trinity/include/tdeabc/geo.h
+debian/tmp/opt/trinity/include/tdeabc/key.h
+debian/tmp/opt/trinity/include/tdeabc/ldapclient.h
+debian/tmp/opt/trinity/include/tdeabc/ldapconfigwidget.h
+debian/tmp/opt/trinity/include/tdeabc/ldapurl.h
+debian/tmp/opt/trinity/include/tdeabc/ldifconverter.h
+debian/tmp/opt/trinity/include/tdeabc/ldif.h
+debian/tmp/opt/trinity/include/tdeabc/lock.h
+debian/tmp/opt/trinity/include/tdeabc/locknull.h
+debian/tmp/opt/trinity/include/tdeabc/phonenumber.h
+debian/tmp/opt/trinity/include/tdeabc/picture.h
+debian/tmp/opt/trinity/include/tdeabc/plugin.h
+debian/tmp/opt/trinity/include/tdeabc/resourcedir.h
+debian/tmp/opt/trinity/include/tdeabc/resourcefile.h
+debian/tmp/opt/trinity/include/tdeabc/resource.h
+debian/tmp/opt/trinity/include/tdeabc/resourceldaptdeio.h
 
-debian/tmp/opt/trinity/include/kabc/resourceselectdialog.h
-debian/tmp/opt/trinity/include/kabc/secrecy.h
-debian/tmp/opt/trinity/include/kabc/sortmode.h
-debian/tmp/opt/trinity/include/kabc/sound.h
-debian/tmp/opt/trinity/include/kabc/stdaddressbook.h
-debian/tmp/opt/trinity/include/kabc/timezone.h
-debian/tmp/opt/trinity/include/kabc/vcardconverter.h
-debian/tmp/opt/trinity/include/kabc/vcardformat.h
-debian/tmp/opt/trinity/include/kabc/vcardformatplugin.h
-debian/tmp/opt/trinity/include/kabc/vcard.h
-debian/tmp/opt/trinity/include/kabc/vcardline.h
-debian/tmp/opt/trinity/include/kabc/vcardparser.h
+debian/tmp/opt/trinity/include/tdeabc/resourceselectdialog.h
+debian/tmp/opt/trinity/include/tdeabc/secrecy.h
+debian/tmp/opt/trinity/include/tdeabc/sortmode.h
+debian/tmp/opt/trinity/include/tdeabc/sound.h
+debian/tmp/opt/trinity/include/tdeabc/stdaddressbook.h
+debian/tmp/opt/trinity/include/tdeabc/timezone.h
+debian/tmp/opt/trinity/include/tdeabc/vcardconverter.h
+debian/tmp/opt/trinity/include/tdeabc/vcardformat.h
+debian/tmp/opt/trinity/include/tdeabc/vcardformatplugin.h
+debian/tmp/opt/trinity/include/tdeabc/vcard.h
+debian/tmp/opt/trinity/include/tdeabc/vcardline.h
+debian/tmp/opt/trinity/include/tdeabc/vcardparser.h
 debian/tmp/opt/trinity/include/tdeaboutapplication.h
 debian/tmp/opt/trinity/include/tdeaboutdata.h
 debian/tmp/opt/trinity/include/tdeaboutdialog.h
@@ -240,7 +240,7 @@ debian/tmp/opt/trinity/include/kdialog.h
 debian/tmp/opt/trinity/include/kdirlister.h
 debian/tmp/opt/trinity/include/kdirnotify.h
 debian/tmp/opt/trinity/include/kdirnotify_stub.h
-debian/tmp/opt/trinity/include/kdiroperator.h
+debian/tmp/opt/trinity/include/tdediroperator.h
 debian/tmp/opt/trinity/include/kdirselectdialog.h
 debian/tmp/opt/trinity/include/kdirsize.h
 debian/tmp/opt/trinity/include/kdirwatch.h
@@ -253,7 +253,7 @@ debian/tmp/opt/trinity/include/kdualcolorbutton.h
 debian/tmp/opt/trinity/include/keditcl.h
 debian/tmp/opt/trinity/include/keditlistbox.h
 debian/tmp/opt/trinity/include/kedittoolbar.h
-debian/tmp/opt/trinity/include/kemailsettings.h
+debian/tmp/opt/trinity/include/tdeemailsettings.h
 debian/tmp/opt/trinity/include/kencodingfiledialog.h
 debian/tmp/opt/trinity/include/kextendedsocket.h
 debian/tmp/opt/trinity/include/kextsock.h
@@ -282,8 +282,8 @@ debian/tmp/opt/trinity/include/tdefontrequester.h
 debian/tmp/opt/trinity/include/kgenericfactory.h
 debian/tmp/opt/trinity/include/kgenericfactory.tcc
 debian/tmp/opt/trinity/include/kglobalaccel.h
-debian/tmp/opt/trinity/include/kglobal.h
-debian/tmp/opt/trinity/include/kglobalsettings.h
+debian/tmp/opt/trinity/include/tdeglobal.h
+debian/tmp/opt/trinity/include/tdeglobalsettings.h
 debian/tmp/opt/trinity/include/kguiitem.h
 debian/tmp/opt/trinity/include/khelpmenu.h
 debian/tmp/opt/trinity/include/khexedit/byteseditinterface.h
@@ -381,7 +381,7 @@ debian/tmp/opt/trinity/include/klineedit.h
 debian/tmp/opt/trinity/include/tdelistbox.h
 debian/tmp/opt/trinity/include/tdelistview.h
 debian/tmp/opt/trinity/include/tdelistviewsearchline.h
-debian/tmp/opt/trinity/include/klocale.h
+debian/tmp/opt/trinity/include/tdelocale.h
 debian/tmp/opt/trinity/include/klockfile.h
 debian/tmp/opt/trinity/include/kmacroexpander.h
 debian/tmp/opt/trinity/include/tdemainwindow.h
@@ -406,8 +406,8 @@ debian/tmp/opt/trinity/include/tdemditoolviewaccessor.h
 debian/tmp/opt/trinity/include/tdemediaplayer/playerdcopobject.h
 debian/tmp/opt/trinity/include/tdemediaplayer/player.h
 debian/tmp/opt/trinity/include/tdemediaplayer/view.h
-debian/tmp/opt/trinity/include/kmenubar.h
-debian/tmp/opt/trinity/include/kmessagebox.h
+debian/tmp/opt/trinity/include/tdemenubar.h
+debian/tmp/opt/trinity/include/tdemessagebox.h
 debian/tmp/opt/trinity/include/kmimemagic.h
 debian/tmp/opt/trinity/include/kmimesourcefactory.h
 debian/tmp/opt/trinity/include/kmimetypechooser.h
@@ -479,7 +479,7 @@ debian/tmp/opt/trinity/include/kprogressbox.h
 debian/tmp/opt/trinity/include/kpropertiesdialog.h
 debian/tmp/opt/trinity/include/kpropsdlg.h
 debian/tmp/opt/trinity/include/kprotocolinfo.h
-debian/tmp/opt/trinity/include/kprotocolmanager.h
+debian/tmp/opt/trinity/include/tdeprotocolmanager.h
 debian/tmp/opt/trinity/include/kpty.h
 debian/tmp/opt/trinity/include/kpushbutton.h
 debian/tmp/opt/trinity/include/krandomsequence.h
@@ -580,7 +580,7 @@ debian/tmp/opt/trinity/include/ksslutils.h
 debian/tmp/opt/trinity/include/ksslx509map.h
 debian/tmp/opt/trinity/include/ksslx509v3.h
 debian/tmp/opt/trinity/include/kstandarddirs.h
-debian/tmp/opt/trinity/include/kstartupinfo.h
+debian/tmp/opt/trinity/include/tdestartupinfo.h
 debian/tmp/opt/trinity/include/kstaticdeleter.h
 debian/tmp/opt/trinity/include/kstatusbar.h
 debian/tmp/opt/trinity/include/tdestdaccel.h
@@ -603,7 +603,7 @@ debian/tmp/opt/trinity/include/ktabctl.h
 debian/tmp/opt/trinity/include/ktabwidget.h
 debian/tmp/opt/trinity/include/ktar.h
 debian/tmp/opt/trinity/include/ktempdir.h
-debian/tmp/opt/trinity/include/ktempfile.h
+debian/tmp/opt/trinity/include/tdetempfile.h
 debian/tmp/opt/trinity/include/ktextbrowser.h
 debian/tmp/opt/trinity/include/ktextedit.h
 debian/tmp/opt/trinity/include/tdetexteditor/blockselectioninterface.h
diff --git a/debian/squeeze/tdepim/debian/kaddressbook-trinity.install b/debian/squeeze/tdepim/debian/kaddressbook-trinity.install
index eac493c1b..92e4a076f 100644
--- a/debian/squeeze/tdepim/debian/kaddressbook-trinity.install
+++ b/debian/squeeze/tdepim/debian/kaddressbook-trinity.install
@@ -29,7 +29,7 @@
 /opt/trinity/share/services/kabldapconfig.desktop
 /opt/trinity/share/services/kaddressbook
 /opt/trinity/share/services/kontact/kaddressbookplugin.desktop
-/opt/trinity/share/services/tderesources/kabc/imap.desktop
+/opt/trinity/share/services/tderesources/tdeabc/imap.desktop
 /opt/trinity/share/services/ldifvcardthumbnail.desktop
 /opt/trinity/share/servicetypes/dcopaddressbook.desktop
 /opt/trinity/share/servicetypes/kaddressbook_contacteditorwidget.desktop
diff --git a/debian/squeeze/tdepim/debian/tdepim-tderesources-trinity.install b/debian/squeeze/tdepim/debian/tdepim-tderesources-trinity.install
index 1ad10b54a..48b4fec45 100644
--- a/debian/squeeze/tdepim/debian/tdepim-tderesources-trinity.install
+++ b/debian/squeeze/tdepim/debian/tdepim-tderesources-trinity.install
@@ -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/kabc/kabc_groupdav.desktop
-/opt/trinity/share/services/tderesources/kabc/kabc_groupwise.desktop
-/opt/trinity/share/services/tderesources/kabc/kabc_newexchange.desktop
-/opt/trinity/share/services/tderesources/kabc/kabc_opengroupware.desktop
-/opt/trinity/share/services/tderesources/kabc/kabc_ox.desktop
-/opt/trinity/share/services/tderesources/kabc/kabc_slox.desktop
-/opt/trinity/share/services/tderesources/kabc/kabc_xmlrpc.desktop
-/opt/trinity/share/services/tderesources/kabc/kolab.desktop
-/opt/trinity/share/services/tderesources/kabc/scalix.desktop
+/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/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/kabc/kabc_carddav.desktop
+/opt/trinity/share/services/tderesources/tdeabc/kabc_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/tdesdk/debian/tdesdk-misc-trinity.install b/debian/squeeze/tdesdk/debian/tdesdk-misc-trinity.install
index 9fbde2ecd..59f2ee5c9 100644
--- a/debian/squeeze/tdesdk/debian/tdesdk-misc-trinity.install
+++ b/debian/squeeze/tdesdk/debian/tdesdk-misc-trinity.install
@@ -3,7 +3,7 @@ debian/tmp/opt/trinity/lib/trinity/kabcformat_kdeaccounts.la
 debian/tmp/opt/trinity/lib/trinity/kabcformat_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/kabc/formats/kdeaccountsplugin.desktop
+debian/tmp/opt/trinity/share/apps/tdeabc/formats/kdeaccountsplugin.desktop
 debian/tmp/opt/trinity/share/apps/kstyle/themes/scheck.themerc
 kdepalettes/kde_xpaintrc /opt/trinity/share/kdepalettes
 kdepalettes/KDE_Gimp /opt/trinity/share/kdepalettes
diff --git a/debian/wheezy/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff b/debian/wheezy/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff
index bf09b9c13..826d4e236 100644
--- a/debian/wheezy/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff
+++ b/debian/wheezy/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff
@@ -3,12 +3,12 @@ index 7c45fcf..b933832 100644
 --- a/src/main.cpp
 +++ b/src/main.cpp
 @@ -24,6 +24,7 @@
- #include <kmessagebox.h>
+ #include <tdemessagebox.h>
  #include <tdemainwindow.h>
  #include <kapp.h>
 +#include <kuser.h>
  
- #include <klocale.h>
+ #include <tdelocale.h>
  #include <dcopclient.h>
 @@ -134,11 +135,11 @@ int main ( int argc, char *argv[] )
  	}
diff --git a/debian/wheezy/tdelibs/debian/tdelibs-data-trinity.install b/debian/wheezy/tdelibs/debian/tdelibs-data-trinity.install
index 33a16d62e..d99526172 100644
--- a/debian/wheezy/tdelibs/debian/tdelibs-data-trinity.install
+++ b/debian/wheezy/tdelibs/debian/tdelibs-data-trinity.install
@@ -23,8 +23,8 @@ debian/tmp/opt/trinity/share/apps/dcopidlng/kalyptusCxxToDcopIDL.pm
 debian/tmp/opt/trinity/share/apps/dcopidlng/kdocAstUtil.pm
 debian/tmp/opt/trinity/share/apps/dcopidlng/kdocParseDoc.pm
 debian/tmp/opt/trinity/share/apps/dcopidlng/kdocUtil.pm
-debian/tmp/opt/trinity/share/apps/kabc/countrytransl.map
-debian/tmp/opt/trinity/share/apps/kabc/formats/binary.desktop
+debian/tmp/opt/trinity/share/apps/tdeabc/countrytransl.map
+debian/tmp/opt/trinity/share/apps/tdeabc/formats/binary.desktop
 debian/tmp/opt/trinity/share/apps/katepart/katepartreadonlyui.rc
 debian/tmp/opt/trinity/share/apps/katepart/katepartui.rc
 debian/tmp/opt/trinity/share/apps/katepart/scripts/indent/script-indent-c1-test.lua
@@ -3782,10 +3782,10 @@ debian/tmp/opt/trinity/share/services/kjavaappletviewer.desktop
 debian/tmp/opt/trinity/share/services/tdemailservice.protocol
 debian/tmp/opt/trinity/share/services/tdemultipart.desktop
 debian/tmp/opt/trinity/share/services/knotify.desktop
-debian/tmp/opt/trinity/share/services/tderesources/kabc/dir.desktop
-debian/tmp/opt/trinity/share/services/tderesources/kabc/file.desktop
-debian/tmp/opt/trinity/share/services/tderesources/kabc/net.desktop
-debian/tmp/opt/trinity/share/services/tderesources/kabc/ldaptdeio.desktop
+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/tdespell_aspell.desktop
diff --git a/debian/wheezy/tdelibs/debian/tdelibs4-trinity-dev.install b/debian/wheezy/tdelibs/debian/tdelibs4-trinity-dev.install
index ca194e680..2e43c49ed 100644
--- a/debian/wheezy/tdelibs/debian/tdelibs4-trinity-dev.install
+++ b/debian/wheezy/tdelibs/debian/tdelibs4-trinity-dev.install
@@ -60,50 +60,50 @@ debian/tmp/opt/trinity/include/dom/html_misc.h
 debian/tmp/opt/trinity/include/dom/html_object.h
 debian/tmp/opt/trinity/include/dom/html_table.h
 debian/tmp/opt/trinity/include/fixx11h.h
-debian/tmp/opt/trinity/include/kabc/addressbook.h
-debian/tmp/opt/trinity/include/kabc/addresseedialog.h
-debian/tmp/opt/trinity/include/kabc/addressee.h
-debian/tmp/opt/trinity/include/kabc/addresseelist.h
-debian/tmp/opt/trinity/include/kabc/address.h
-debian/tmp/opt/trinity/include/kabc/addresslineedit.h
-debian/tmp/opt/trinity/include/kabc/agent.h
-debian/tmp/opt/trinity/include/kabc/distributionlistdialog.h
-debian/tmp/opt/trinity/include/kabc/distributionlisteditor.h
-debian/tmp/opt/trinity/include/kabc/distributionlist.h
-debian/tmp/opt/trinity/include/kabc/errorhandler.h
-debian/tmp/opt/trinity/include/kabc/field.h
-debian/tmp/opt/trinity/include/kabc/formatfactory.h
-debian/tmp/opt/trinity/include/kabc/format.h
-debian/tmp/opt/trinity/include/kabc/formatplugin.h
-debian/tmp/opt/trinity/include/kabc/geo.h
-debian/tmp/opt/trinity/include/kabc/key.h
-debian/tmp/opt/trinity/include/kabc/ldapclient.h
-debian/tmp/opt/trinity/include/kabc/ldapconfigwidget.h
-debian/tmp/opt/trinity/include/kabc/ldapurl.h
-debian/tmp/opt/trinity/include/kabc/ldifconverter.h
-debian/tmp/opt/trinity/include/kabc/ldif.h
-debian/tmp/opt/trinity/include/kabc/lock.h
-debian/tmp/opt/trinity/include/kabc/locknull.h
-debian/tmp/opt/trinity/include/kabc/phonenumber.h
-debian/tmp/opt/trinity/include/kabc/picture.h
-debian/tmp/opt/trinity/include/kabc/plugin.h
-debian/tmp/opt/trinity/include/kabc/resourcedir.h
-debian/tmp/opt/trinity/include/kabc/resourcefile.h
-debian/tmp/opt/trinity/include/kabc/resource.h
-debian/tmp/opt/trinity/include/kabc/resourceldaptdeio.h
+debian/tmp/opt/trinity/include/tdeabc/addressbook.h
+debian/tmp/opt/trinity/include/tdeabc/addresseedialog.h
+debian/tmp/opt/trinity/include/tdeabc/addressee.h
+debian/tmp/opt/trinity/include/tdeabc/addresseelist.h
+debian/tmp/opt/trinity/include/tdeabc/address.h
+debian/tmp/opt/trinity/include/tdeabc/addresslineedit.h
+debian/tmp/opt/trinity/include/tdeabc/agent.h
+debian/tmp/opt/trinity/include/tdeabc/distributionlistdialog.h
+debian/tmp/opt/trinity/include/tdeabc/distributionlisteditor.h
+debian/tmp/opt/trinity/include/tdeabc/distributionlist.h
+debian/tmp/opt/trinity/include/tdeabc/errorhandler.h
+debian/tmp/opt/trinity/include/tdeabc/field.h
+debian/tmp/opt/trinity/include/tdeabc/formatfactory.h
+debian/tmp/opt/trinity/include/tdeabc/format.h
+debian/tmp/opt/trinity/include/tdeabc/formatplugin.h
+debian/tmp/opt/trinity/include/tdeabc/geo.h
+debian/tmp/opt/trinity/include/tdeabc/key.h
+debian/tmp/opt/trinity/include/tdeabc/ldapclient.h
+debian/tmp/opt/trinity/include/tdeabc/ldapconfigwidget.h
+debian/tmp/opt/trinity/include/tdeabc/ldapurl.h
+debian/tmp/opt/trinity/include/tdeabc/ldifconverter.h
+debian/tmp/opt/trinity/include/tdeabc/ldif.h
+debian/tmp/opt/trinity/include/tdeabc/lock.h
+debian/tmp/opt/trinity/include/tdeabc/locknull.h
+debian/tmp/opt/trinity/include/tdeabc/phonenumber.h
+debian/tmp/opt/trinity/include/tdeabc/picture.h
+debian/tmp/opt/trinity/include/tdeabc/plugin.h
+debian/tmp/opt/trinity/include/tdeabc/resourcedir.h
+debian/tmp/opt/trinity/include/tdeabc/resourcefile.h
+debian/tmp/opt/trinity/include/tdeabc/resource.h
+debian/tmp/opt/trinity/include/tdeabc/resourceldaptdeio.h
 
-debian/tmp/opt/trinity/include/kabc/resourceselectdialog.h
-debian/tmp/opt/trinity/include/kabc/secrecy.h
-debian/tmp/opt/trinity/include/kabc/sortmode.h
-debian/tmp/opt/trinity/include/kabc/sound.h
-debian/tmp/opt/trinity/include/kabc/stdaddressbook.h
-debian/tmp/opt/trinity/include/kabc/timezone.h
-debian/tmp/opt/trinity/include/kabc/vcardconverter.h
-debian/tmp/opt/trinity/include/kabc/vcardformat.h
-debian/tmp/opt/trinity/include/kabc/vcardformatplugin.h
-debian/tmp/opt/trinity/include/kabc/vcard.h
-debian/tmp/opt/trinity/include/kabc/vcardline.h
-debian/tmp/opt/trinity/include/kabc/vcardparser.h
+debian/tmp/opt/trinity/include/tdeabc/resourceselectdialog.h
+debian/tmp/opt/trinity/include/tdeabc/secrecy.h
+debian/tmp/opt/trinity/include/tdeabc/sortmode.h
+debian/tmp/opt/trinity/include/tdeabc/sound.h
+debian/tmp/opt/trinity/include/tdeabc/stdaddressbook.h
+debian/tmp/opt/trinity/include/tdeabc/timezone.h
+debian/tmp/opt/trinity/include/tdeabc/vcardconverter.h
+debian/tmp/opt/trinity/include/tdeabc/vcardformat.h
+debian/tmp/opt/trinity/include/tdeabc/vcardformatplugin.h
+debian/tmp/opt/trinity/include/tdeabc/vcard.h
+debian/tmp/opt/trinity/include/tdeabc/vcardline.h
+debian/tmp/opt/trinity/include/tdeabc/vcardparser.h
 debian/tmp/opt/trinity/include/tdeaboutapplication.h
 debian/tmp/opt/trinity/include/tdeaboutdata.h
 debian/tmp/opt/trinity/include/tdeaboutdialog.h
@@ -240,7 +240,7 @@ debian/tmp/opt/trinity/include/kdialog.h
 debian/tmp/opt/trinity/include/kdirlister.h
 debian/tmp/opt/trinity/include/kdirnotify.h
 debian/tmp/opt/trinity/include/kdirnotify_stub.h
-debian/tmp/opt/trinity/include/kdiroperator.h
+debian/tmp/opt/trinity/include/tdediroperator.h
 debian/tmp/opt/trinity/include/kdirselectdialog.h
 debian/tmp/opt/trinity/include/kdirsize.h
 debian/tmp/opt/trinity/include/kdirwatch.h
@@ -253,7 +253,7 @@ debian/tmp/opt/trinity/include/kdualcolorbutton.h
 debian/tmp/opt/trinity/include/keditcl.h
 debian/tmp/opt/trinity/include/keditlistbox.h
 debian/tmp/opt/trinity/include/kedittoolbar.h
-debian/tmp/opt/trinity/include/kemailsettings.h
+debian/tmp/opt/trinity/include/tdeemailsettings.h
 debian/tmp/opt/trinity/include/kencodingfiledialog.h
 debian/tmp/opt/trinity/include/kextendedsocket.h
 debian/tmp/opt/trinity/include/kextsock.h
@@ -282,8 +282,8 @@ debian/tmp/opt/trinity/include/tdefontrequester.h
 debian/tmp/opt/trinity/include/kgenericfactory.h
 debian/tmp/opt/trinity/include/kgenericfactory.tcc
 debian/tmp/opt/trinity/include/kglobalaccel.h
-debian/tmp/opt/trinity/include/kglobal.h
-debian/tmp/opt/trinity/include/kglobalsettings.h
+debian/tmp/opt/trinity/include/tdeglobal.h
+debian/tmp/opt/trinity/include/tdeglobalsettings.h
 debian/tmp/opt/trinity/include/kguiitem.h
 debian/tmp/opt/trinity/include/khelpmenu.h
 debian/tmp/opt/trinity/include/khexedit/byteseditinterface.h
@@ -381,7 +381,7 @@ debian/tmp/opt/trinity/include/klineedit.h
 debian/tmp/opt/trinity/include/tdelistbox.h
 debian/tmp/opt/trinity/include/tdelistview.h
 debian/tmp/opt/trinity/include/tdelistviewsearchline.h
-debian/tmp/opt/trinity/include/klocale.h
+debian/tmp/opt/trinity/include/tdelocale.h
 debian/tmp/opt/trinity/include/klockfile.h
 debian/tmp/opt/trinity/include/kmacroexpander.h
 debian/tmp/opt/trinity/include/tdemainwindow.h
@@ -406,8 +406,8 @@ debian/tmp/opt/trinity/include/tdemditoolviewaccessor.h
 debian/tmp/opt/trinity/include/tdemediaplayer/playerdcopobject.h
 debian/tmp/opt/trinity/include/tdemediaplayer/player.h
 debian/tmp/opt/trinity/include/tdemediaplayer/view.h
-debian/tmp/opt/trinity/include/kmenubar.h
-debian/tmp/opt/trinity/include/kmessagebox.h
+debian/tmp/opt/trinity/include/tdemenubar.h
+debian/tmp/opt/trinity/include/tdemessagebox.h
 debian/tmp/opt/trinity/include/kmimemagic.h
 debian/tmp/opt/trinity/include/kmimesourcefactory.h
 debian/tmp/opt/trinity/include/kmimetypechooser.h
@@ -479,7 +479,7 @@ debian/tmp/opt/trinity/include/kprogressbox.h
 debian/tmp/opt/trinity/include/kpropertiesdialog.h
 debian/tmp/opt/trinity/include/kpropsdlg.h
 debian/tmp/opt/trinity/include/kprotocolinfo.h
-debian/tmp/opt/trinity/include/kprotocolmanager.h
+debian/tmp/opt/trinity/include/tdeprotocolmanager.h
 debian/tmp/opt/trinity/include/kpty.h
 debian/tmp/opt/trinity/include/kpushbutton.h
 debian/tmp/opt/trinity/include/krandomsequence.h
@@ -580,7 +580,7 @@ debian/tmp/opt/trinity/include/ksslutils.h
 debian/tmp/opt/trinity/include/ksslx509map.h
 debian/tmp/opt/trinity/include/ksslx509v3.h
 debian/tmp/opt/trinity/include/kstandarddirs.h
-debian/tmp/opt/trinity/include/kstartupinfo.h
+debian/tmp/opt/trinity/include/tdestartupinfo.h
 debian/tmp/opt/trinity/include/kstaticdeleter.h
 debian/tmp/opt/trinity/include/kstatusbar.h
 debian/tmp/opt/trinity/include/tdestdaccel.h
@@ -603,7 +603,7 @@ debian/tmp/opt/trinity/include/ktabctl.h
 debian/tmp/opt/trinity/include/ktabwidget.h
 debian/tmp/opt/trinity/include/ktar.h
 debian/tmp/opt/trinity/include/ktempdir.h
-debian/tmp/opt/trinity/include/ktempfile.h
+debian/tmp/opt/trinity/include/tdetempfile.h
 debian/tmp/opt/trinity/include/ktextbrowser.h
 debian/tmp/opt/trinity/include/ktextedit.h
 debian/tmp/opt/trinity/include/tdetexteditor/blockselectioninterface.h
diff --git a/debian/wheezy/tdepim/debian/kaddressbook-trinity.install b/debian/wheezy/tdepim/debian/kaddressbook-trinity.install
index eac493c1b..92e4a076f 100644
--- a/debian/wheezy/tdepim/debian/kaddressbook-trinity.install
+++ b/debian/wheezy/tdepim/debian/kaddressbook-trinity.install
@@ -29,7 +29,7 @@
 /opt/trinity/share/services/kabldapconfig.desktop
 /opt/trinity/share/services/kaddressbook
 /opt/trinity/share/services/kontact/kaddressbookplugin.desktop
-/opt/trinity/share/services/tderesources/kabc/imap.desktop
+/opt/trinity/share/services/tderesources/tdeabc/imap.desktop
 /opt/trinity/share/services/ldifvcardthumbnail.desktop
 /opt/trinity/share/servicetypes/dcopaddressbook.desktop
 /opt/trinity/share/servicetypes/kaddressbook_contacteditorwidget.desktop
diff --git a/debian/wheezy/tdepim/debian/tdepim-tderesources-trinity.install b/debian/wheezy/tdepim/debian/tdepim-tderesources-trinity.install
index 1ad10b54a..48b4fec45 100644
--- a/debian/wheezy/tdepim/debian/tdepim-tderesources-trinity.install
+++ b/debian/wheezy/tdepim/debian/tdepim-tderesources-trinity.install
@@ -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/kabc/kabc_groupdav.desktop
-/opt/trinity/share/services/tderesources/kabc/kabc_groupwise.desktop
-/opt/trinity/share/services/tderesources/kabc/kabc_newexchange.desktop
-/opt/trinity/share/services/tderesources/kabc/kabc_opengroupware.desktop
-/opt/trinity/share/services/tderesources/kabc/kabc_ox.desktop
-/opt/trinity/share/services/tderesources/kabc/kabc_slox.desktop
-/opt/trinity/share/services/tderesources/kabc/kabc_xmlrpc.desktop
-/opt/trinity/share/services/tderesources/kabc/kolab.desktop
-/opt/trinity/share/services/tderesources/kabc/scalix.desktop
+/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/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/kabc/kabc_carddav.desktop
+/opt/trinity/share/services/tderesources/tdeabc/kabc_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/tdesdk/debian/tdesdk-misc-trinity.install b/debian/wheezy/tdesdk/debian/tdesdk-misc-trinity.install
index 9fbde2ecd..59f2ee5c9 100644
--- a/debian/wheezy/tdesdk/debian/tdesdk-misc-trinity.install
+++ b/debian/wheezy/tdesdk/debian/tdesdk-misc-trinity.install
@@ -3,7 +3,7 @@ debian/tmp/opt/trinity/lib/trinity/kabcformat_kdeaccounts.la
 debian/tmp/opt/trinity/lib/trinity/kabcformat_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/kabc/formats/kdeaccountsplugin.desktop
+debian/tmp/opt/trinity/share/apps/tdeabc/formats/kdeaccountsplugin.desktop
 debian/tmp/opt/trinity/share/apps/kstyle/themes/scheck.themerc
 kdepalettes/kde_xpaintrc /opt/trinity/share/kdepalettes
 kdepalettes/KDE_Gimp /opt/trinity/share/kdepalettes
diff --git a/ubuntu/lucid_automake/kdelibs/debian/kdelibs-data-kde3.install b/ubuntu/lucid_automake/kdelibs/debian/kdelibs-data-kde3.install
index eee340dc0..30a8ea2d4 100644
--- a/ubuntu/lucid_automake/kdelibs/debian/kdelibs-data-kde3.install
+++ b/ubuntu/lucid_automake/kdelibs/debian/kdelibs-data-kde3.install
@@ -23,8 +23,8 @@ debian/tmp/opt/kde3/share/apps/dcopidlng/kalyptusCxxToDcopIDL.pm
 debian/tmp/opt/kde3/share/apps/dcopidlng/kdocAstUtil.pm
 debian/tmp/opt/kde3/share/apps/dcopidlng/kdocParseDoc.pm
 debian/tmp/opt/kde3/share/apps/dcopidlng/kdocUtil.pm
-debian/tmp/opt/kde3/share/apps/kabc/countrytransl.map
-debian/tmp/opt/kde3/share/apps/kabc/formats/binary.desktop
+debian/tmp/opt/kde3/share/apps/tdeabc/countrytransl.map
+debian/tmp/opt/kde3/share/apps/tdeabc/formats/binary.desktop
 debian/tmp/opt/kde3/share/apps/katepart/katepartreadonlyui.rc
 debian/tmp/opt/kde3/share/apps/katepart/katepartui.rc
 debian/tmp/opt/kde3/share/apps/katepart/scripts/indent/script-indent-c1-test.lua
@@ -3583,10 +3583,10 @@ debian/tmp/opt/kde3/share/services/kjavaappletviewer.desktop
 debian/tmp/opt/kde3/share/services/tdemailservice.protocol
 debian/tmp/opt/kde3/share/services/tdemultipart.desktop
 debian/tmp/opt/kde3/share/services/knotify.desktop
-debian/tmp/opt/kde3/share/services/tderesources/kabc/dir.desktop
-debian/tmp/opt/kde3/share/services/tderesources/kabc/file.desktop
-debian/tmp/opt/kde3/share/services/tderesources/kabc/net.desktop
-debian/tmp/opt/kde3/share/services/tderesources/kabc/ldapkio.desktop
+debian/tmp/opt/kde3/share/services/tderesources/tdeabc/dir.desktop
+debian/tmp/opt/kde3/share/services/tderesources/tdeabc/file.desktop
+debian/tmp/opt/kde3/share/services/tderesources/tdeabc/net.desktop
+debian/tmp/opt/kde3/share/services/tderesources/tdeabc/ldapkio.desktop
 debian/tmp/opt/kde3/share/services/tderesources/kabc_manager.desktop
 
 debian/tmp/opt/kde3/share/services/tdespell_aspell.desktop
diff --git a/ubuntu/lucid_automake/kdelibs/debian/kdelibs4-kde3-dev.install b/ubuntu/lucid_automake/kdelibs/debian/kdelibs4-kde3-dev.install
index 0a96b4e79..f23a7c572 100644
--- a/ubuntu/lucid_automake/kdelibs/debian/kdelibs4-kde3-dev.install
+++ b/ubuntu/lucid_automake/kdelibs/debian/kdelibs4-kde3-dev.install
@@ -60,50 +60,50 @@ debian/tmp/opt/kde3/include/tde/dom/html_misc.h
 debian/tmp/opt/kde3/include/tde/dom/html_object.h
 debian/tmp/opt/kde3/include/tde/dom/html_table.h
 debian/tmp/opt/kde3/include/tde/fixx11h.h
-debian/tmp/opt/kde3/include/tde/kabc/addressbook.h
-debian/tmp/opt/kde3/include/tde/kabc/addresseedialog.h
-debian/tmp/opt/kde3/include/tde/kabc/addressee.h
-debian/tmp/opt/kde3/include/tde/kabc/addresseelist.h
-debian/tmp/opt/kde3/include/tde/kabc/address.h
-debian/tmp/opt/kde3/include/tde/kabc/addresslineedit.h
-debian/tmp/opt/kde3/include/tde/kabc/agent.h
-debian/tmp/opt/kde3/include/tde/kabc/distributionlistdialog.h
-debian/tmp/opt/kde3/include/tde/kabc/distributionlisteditor.h
-debian/tmp/opt/kde3/include/tde/kabc/distributionlist.h
-debian/tmp/opt/kde3/include/tde/kabc/errorhandler.h
-debian/tmp/opt/kde3/include/tde/kabc/field.h
-debian/tmp/opt/kde3/include/tde/kabc/formatfactory.h
-debian/tmp/opt/kde3/include/tde/kabc/format.h
-debian/tmp/opt/kde3/include/tde/kabc/formatplugin.h
-debian/tmp/opt/kde3/include/tde/kabc/geo.h
-debian/tmp/opt/kde3/include/tde/kabc/key.h
-debian/tmp/opt/kde3/include/tde/kabc/ldapclient.h
-debian/tmp/opt/kde3/include/tde/kabc/ldapconfigwidget.h
-debian/tmp/opt/kde3/include/tde/kabc/ldapurl.h
-debian/tmp/opt/kde3/include/tde/kabc/ldifconverter.h
-debian/tmp/opt/kde3/include/tde/kabc/ldif.h
-debian/tmp/opt/kde3/include/tde/kabc/lock.h
-debian/tmp/opt/kde3/include/tde/kabc/locknull.h
-debian/tmp/opt/kde3/include/tde/kabc/phonenumber.h
-debian/tmp/opt/kde3/include/tde/kabc/picture.h
-debian/tmp/opt/kde3/include/tde/kabc/plugin.h
-debian/tmp/opt/kde3/include/tde/kabc/resourcedir.h
-debian/tmp/opt/kde3/include/tde/kabc/resourcefile.h
-debian/tmp/opt/kde3/include/tde/kabc/resource.h
-debian/tmp/opt/kde3/include/tde/kabc/resourceldapkio.h
+debian/tmp/opt/kde3/include/tde/tdeabc/addressbook.h
+debian/tmp/opt/kde3/include/tde/tdeabc/addresseedialog.h
+debian/tmp/opt/kde3/include/tde/tdeabc/addressee.h
+debian/tmp/opt/kde3/include/tde/tdeabc/addresseelist.h
+debian/tmp/opt/kde3/include/tde/tdeabc/address.h
+debian/tmp/opt/kde3/include/tde/tdeabc/addresslineedit.h
+debian/tmp/opt/kde3/include/tde/tdeabc/agent.h
+debian/tmp/opt/kde3/include/tde/tdeabc/distributionlistdialog.h
+debian/tmp/opt/kde3/include/tde/tdeabc/distributionlisteditor.h
+debian/tmp/opt/kde3/include/tde/tdeabc/distributionlist.h
+debian/tmp/opt/kde3/include/tde/tdeabc/errorhandler.h
+debian/tmp/opt/kde3/include/tde/tdeabc/field.h
+debian/tmp/opt/kde3/include/tde/tdeabc/formatfactory.h
+debian/tmp/opt/kde3/include/tde/tdeabc/format.h
+debian/tmp/opt/kde3/include/tde/tdeabc/formatplugin.h
+debian/tmp/opt/kde3/include/tde/tdeabc/geo.h
+debian/tmp/opt/kde3/include/tde/tdeabc/key.h
+debian/tmp/opt/kde3/include/tde/tdeabc/ldapclient.h
+debian/tmp/opt/kde3/include/tde/tdeabc/ldapconfigwidget.h
+debian/tmp/opt/kde3/include/tde/tdeabc/ldapurl.h
+debian/tmp/opt/kde3/include/tde/tdeabc/ldifconverter.h
+debian/tmp/opt/kde3/include/tde/tdeabc/ldif.h
+debian/tmp/opt/kde3/include/tde/tdeabc/lock.h
+debian/tmp/opt/kde3/include/tde/tdeabc/locknull.h
+debian/tmp/opt/kde3/include/tde/tdeabc/phonenumber.h
+debian/tmp/opt/kde3/include/tde/tdeabc/picture.h
+debian/tmp/opt/kde3/include/tde/tdeabc/plugin.h
+debian/tmp/opt/kde3/include/tde/tdeabc/resourcedir.h
+debian/tmp/opt/kde3/include/tde/tdeabc/resourcefile.h
+debian/tmp/opt/kde3/include/tde/tdeabc/resource.h
+debian/tmp/opt/kde3/include/tde/tdeabc/resourceldapkio.h
 
-debian/tmp/opt/kde3/include/tde/kabc/resourceselectdialog.h
-debian/tmp/opt/kde3/include/tde/kabc/secrecy.h
-debian/tmp/opt/kde3/include/tde/kabc/sortmode.h
-debian/tmp/opt/kde3/include/tde/kabc/sound.h
-debian/tmp/opt/kde3/include/tde/kabc/stdaddressbook.h
-debian/tmp/opt/kde3/include/tde/kabc/timezone.h
-debian/tmp/opt/kde3/include/tde/kabc/vcardconverter.h
-debian/tmp/opt/kde3/include/tde/kabc/vcardformat.h
-debian/tmp/opt/kde3/include/tde/kabc/vcardformatplugin.h
-debian/tmp/opt/kde3/include/tde/kabc/vcard.h
-debian/tmp/opt/kde3/include/tde/kabc/vcardline.h
-debian/tmp/opt/kde3/include/tde/kabc/vcardparser.h
+debian/tmp/opt/kde3/include/tde/tdeabc/resourceselectdialog.h
+debian/tmp/opt/kde3/include/tde/tdeabc/secrecy.h
+debian/tmp/opt/kde3/include/tde/tdeabc/sortmode.h
+debian/tmp/opt/kde3/include/tde/tdeabc/sound.h
+debian/tmp/opt/kde3/include/tde/tdeabc/stdaddressbook.h
+debian/tmp/opt/kde3/include/tde/tdeabc/timezone.h
+debian/tmp/opt/kde3/include/tde/tdeabc/vcardconverter.h
+debian/tmp/opt/kde3/include/tde/tdeabc/vcardformat.h
+debian/tmp/opt/kde3/include/tde/tdeabc/vcardformatplugin.h
+debian/tmp/opt/kde3/include/tde/tdeabc/vcard.h
+debian/tmp/opt/kde3/include/tde/tdeabc/vcardline.h
+debian/tmp/opt/kde3/include/tde/tdeabc/vcardparser.h
 debian/tmp/opt/kde3/include/tde/tdeaboutapplication.h
 debian/tmp/opt/kde3/include/tde/tdeaboutdata.h
 debian/tmp/opt/kde3/include/tde/tdeaboutdialog.h
@@ -238,7 +238,7 @@ debian/tmp/opt/kde3/include/tde/kdialog.h
 debian/tmp/opt/kde3/include/tde/kdirlister.h
 debian/tmp/opt/kde3/include/tde/kdirnotify.h
 debian/tmp/opt/kde3/include/tde/kdirnotify_stub.h
-debian/tmp/opt/kde3/include/tde/kdiroperator.h
+debian/tmp/opt/kde3/include/tde/tdediroperator.h
 debian/tmp/opt/kde3/include/tde/kdirselectdialog.h
 debian/tmp/opt/kde3/include/tde/kdirsize.h
 debian/tmp/opt/kde3/include/tde/kdirwatch.h
@@ -251,7 +251,7 @@ debian/tmp/opt/kde3/include/tde/kdualcolorbutton.h
 debian/tmp/opt/kde3/include/tde/keditcl.h
 debian/tmp/opt/kde3/include/tde/keditlistbox.h
 debian/tmp/opt/kde3/include/tde/kedittoolbar.h
-debian/tmp/opt/kde3/include/tde/kemailsettings.h
+debian/tmp/opt/kde3/include/tde/tdeemailsettings.h
 debian/tmp/opt/kde3/include/tde/kencodingfiledialog.h
 debian/tmp/opt/kde3/include/tde/kextendedsocket.h
 debian/tmp/opt/kde3/include/tde/kextsock.h
@@ -280,8 +280,8 @@ debian/tmp/opt/kde3/include/tde/tdefontrequester.h
 debian/tmp/opt/kde3/include/tde/kgenericfactory.h
 debian/tmp/opt/kde3/include/tde/kgenericfactory.tcc
 debian/tmp/opt/kde3/include/tde/kglobalaccel.h
-debian/tmp/opt/kde3/include/tde/kglobal.h
-debian/tmp/opt/kde3/include/tde/kglobalsettings.h
+debian/tmp/opt/kde3/include/tde/tdeglobal.h
+debian/tmp/opt/kde3/include/tde/tdeglobalsettings.h
 debian/tmp/opt/kde3/include/tde/kguiitem.h
 debian/tmp/opt/kde3/include/tde/khelpmenu.h
 debian/tmp/opt/kde3/include/tde/khexedit/byteseditinterface.h
@@ -379,7 +379,7 @@ debian/tmp/opt/kde3/include/tde/klineedit.h
 debian/tmp/opt/kde3/include/tde/tdelistbox.h
 debian/tmp/opt/kde3/include/tde/tdelistview.h
 debian/tmp/opt/kde3/include/tde/tdelistviewsearchline.h
-debian/tmp/opt/kde3/include/tde/klocale.h
+debian/tmp/opt/kde3/include/tde/tdelocale.h
 debian/tmp/opt/kde3/include/tde/klockfile.h
 debian/tmp/opt/kde3/include/tde/kmacroexpander.h
 debian/tmp/opt/kde3/include/tde/tdemainwindow.h
@@ -404,8 +404,8 @@ debian/tmp/opt/kde3/include/tde/tdemditoolviewaccessor.h
 debian/tmp/opt/kde3/include/tde/tdemediaplayer/playerdcopobject.h
 debian/tmp/opt/kde3/include/tde/tdemediaplayer/player.h
 debian/tmp/opt/kde3/include/tde/tdemediaplayer/view.h
-debian/tmp/opt/kde3/include/tde/kmenubar.h
-debian/tmp/opt/kde3/include/tde/kmessagebox.h
+debian/tmp/opt/kde3/include/tde/tdemenubar.h
+debian/tmp/opt/kde3/include/tde/tdemessagebox.h
 debian/tmp/opt/kde3/include/tde/kmimemagic.h
 debian/tmp/opt/kde3/include/tde/kmimesourcefactory.h
 debian/tmp/opt/kde3/include/tde/kmimetypechooser.h
@@ -477,7 +477,7 @@ debian/tmp/opt/kde3/include/tde/kprogressbox.h
 debian/tmp/opt/kde3/include/tde/kpropertiesdialog.h
 debian/tmp/opt/kde3/include/tde/kpropsdlg.h
 debian/tmp/opt/kde3/include/tde/kprotocolinfo.h
-debian/tmp/opt/kde3/include/tde/kprotocolmanager.h
+debian/tmp/opt/kde3/include/tde/tdeprotocolmanager.h
 debian/tmp/opt/kde3/include/tde/kpty.h
 debian/tmp/opt/kde3/include/tde/kpushbutton.h
 debian/tmp/opt/kde3/include/tde/krandomsequence.h
@@ -578,7 +578,7 @@ debian/tmp/opt/kde3/include/tde/ksslutils.h
 debian/tmp/opt/kde3/include/tde/ksslx509map.h
 debian/tmp/opt/kde3/include/tde/ksslx509v3.h
 debian/tmp/opt/kde3/include/tde/kstandarddirs.h
-debian/tmp/opt/kde3/include/tde/kstartupinfo.h
+debian/tmp/opt/kde3/include/tde/tdestartupinfo.h
 debian/tmp/opt/kde3/include/tde/kstaticdeleter.h
 debian/tmp/opt/kde3/include/tde/kstatusbar.h
 debian/tmp/opt/kde3/include/tde/tdestdaccel.h
@@ -601,7 +601,7 @@ debian/tmp/opt/kde3/include/tde/ktabctl.h
 debian/tmp/opt/kde3/include/tde/ktabwidget.h
 debian/tmp/opt/kde3/include/tde/ktar.h
 debian/tmp/opt/kde3/include/tde/ktempdir.h
-debian/tmp/opt/kde3/include/tde/ktempfile.h
+debian/tmp/opt/kde3/include/tde/tdetempfile.h
 debian/tmp/opt/kde3/include/tde/ktextbrowser.h
 debian/tmp/opt/kde3/include/tde/ktextedit.h
 debian/tmp/opt/kde3/include/tde/tdetexteditor/blockselectioninterface.h
diff --git a/ubuntu/lucid_automake/kdelibs/debian/patches/kubuntu_19_debianize_useragent.diff b/ubuntu/lucid_automake/kdelibs/debian/patches/kubuntu_19_debianize_useragent.diff
index a8e8a4ab1..3c0e3595e 100644
--- a/ubuntu/lucid_automake/kdelibs/debian/patches/kubuntu_19_debianize_useragent.diff
+++ b/ubuntu/lucid_automake/kdelibs/debian/patches/kubuntu_19_debianize_useragent.diff
@@ -1,5 +1,5 @@
---- a/tdeio/tdeio/kprotocolmanager.cpp
-+++ b/tdeio/tdeio/kprotocolmanager.cpp
+--- a/tdeio/tdeio/tdeprotocolmanager.cpp
++++ b/tdeio/tdeio/tdeprotocolmanager.cpp
 @@ -450,14 +450,19 @@
       return d->useragent;
  
diff --git a/ubuntu/lucid_automake/kdepim/debian/kaddressbook-kde3.install b/ubuntu/lucid_automake/kdepim/debian/kaddressbook-kde3.install
index 2541f63e1..b36a230a5 100644
--- a/ubuntu/lucid_automake/kdepim/debian/kaddressbook-kde3.install
+++ b/ubuntu/lucid_automake/kdepim/debian/kaddressbook-kde3.install
@@ -29,7 +29,7 @@
 /opt/kde3/share/services/kabldapconfig.desktop
 /opt/kde3/share/services/kaddressbook
 /opt/kde3/share/services/kontact/kaddressbookplugin.desktop
-/opt/kde3/share/services/tderesources/kabc/imap.desktop
+/opt/kde3/share/services/tderesources/tdeabc/imap.desktop
 /opt/kde3/share/services/ldifvcardthumbnail.desktop
 /opt/kde3/share/servicetypes/dcopaddressbook.desktop
 /opt/kde3/share/servicetypes/kaddressbook_contacteditorwidget.desktop
diff --git a/ubuntu/lucid_automake/kdepim/debian/kdepim-tderesources-kde3.install b/ubuntu/lucid_automake/kdepim/debian/kdepim-tderesources-kde3.install
index a17538fe3..39c94e33b 100644
--- a/ubuntu/lucid_automake/kdepim/debian/kdepim-tderesources-kde3.install
+++ b/ubuntu/lucid_automake/kdepim/debian/kdepim-tderesources-kde3.install
@@ -74,18 +74,18 @@
 /opt/kde3/lib/libkslox.so.0.0.0
 /opt/kde3/lib/libgwsoap.so.0
 /opt/kde3/lib/libgwsoap.so.0.0.0
-/opt/kde3/share/services/tderesources/kabc/kabc_groupdav.desktop
-/opt/kde3/share/services/tderesources/kabc/kabc_groupwise.desktop
-/opt/kde3/share/services/tderesources/kabc/kabc_newexchange.desktop
-/opt/kde3/share/services/tderesources/kabc/kabc_opengroupware.desktop
-/opt/kde3/share/services/tderesources/kabc/kabc_ox.desktop
-/opt/kde3/share/services/tderesources/kabc/kabc_slox.desktop
-/opt/kde3/share/services/tderesources/kabc/kabc_xmlrpc.desktop
-/opt/kde3/share/services/tderesources/kabc/kolab.desktop
-/opt/kde3/share/services/tderesources/kabc/scalix.desktop
+/opt/kde3/share/services/tderesources/tdeabc/kabc_groupdav.desktop
+/opt/kde3/share/services/tderesources/tdeabc/kabc_groupwise.desktop
+/opt/kde3/share/services/tderesources/tdeabc/kabc_newexchange.desktop
+/opt/kde3/share/services/tderesources/tdeabc/kabc_opengroupware.desktop
+/opt/kde3/share/services/tderesources/tdeabc/kabc_ox.desktop
+/opt/kde3/share/services/tderesources/tdeabc/kabc_slox.desktop
+/opt/kde3/share/services/tderesources/tdeabc/kabc_xmlrpc.desktop
+/opt/kde3/share/services/tderesources/tdeabc/kolab.desktop
+/opt/kde3/share/services/tderesources/tdeabc/scalix.desktop
 /opt/kde3/share/services/tderesources/kcal/exchange.desktop
 /opt/kde3/share/services/tderesources/kcal/kcal_caldav.desktop
-/opt/kde3/share/services/tderesources/kabc/kabc_carddav.desktop
+/opt/kde3/share/services/tderesources/tdeabc/kabc_carddav.desktop
 /opt/kde3/share/services/tderesources/kcal/kcal_groupdav.desktop
 /opt/kde3/share/services/tderesources/kcal/kcal_groupwise.desktop
 /opt/kde3/share/services/tderesources/kcal/kcal_newexchange.desktop
diff --git a/ubuntu/lucid_automake/kdesdk/debian/kdesdk-misc-kde3.install b/ubuntu/lucid_automake/kdesdk/debian/kdesdk-misc-kde3.install
index 39d07410e..b2d7f97a2 100644
--- a/ubuntu/lucid_automake/kdesdk/debian/kdesdk-misc-kde3.install
+++ b/ubuntu/lucid_automake/kdesdk/debian/kdesdk-misc-kde3.install
@@ -3,7 +3,7 @@ debian/tmp/opt/kde3/lib/kde3/kabcformat_kdeaccounts.la
 debian/tmp/opt/kde3/lib/kde3/kabcformat_kdeaccounts.so
 debian/tmp/opt/kde3/lib/kde3/plugins/styles/scheck.so
 debian/tmp/opt/kde3/lib/kde3/plugins/styles/scheck.la
-debian/tmp/opt/kde3/share/apps/kabc/formats/kdeaccountsplugin.desktop
+debian/tmp/opt/kde3/share/apps/tdeabc/formats/kdeaccountsplugin.desktop
 debian/tmp/opt/kde3/share/apps/kstyle/themes/scheck.themerc
 kdepalettes/kde_xpaintrc /opt/kde3/share/kdepalettes
 kdepalettes/KDE_Gimp /opt/kde3/share/kdepalettes
diff --git a/ubuntu/maverick/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff b/ubuntu/maverick/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff
index bf09b9c13..826d4e236 100644
--- a/ubuntu/maverick/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff
+++ b/ubuntu/maverick/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff
@@ -3,12 +3,12 @@ index 7c45fcf..b933832 100644
 --- a/src/main.cpp
 +++ b/src/main.cpp
 @@ -24,6 +24,7 @@
- #include <kmessagebox.h>
+ #include <tdemessagebox.h>
  #include <tdemainwindow.h>
  #include <kapp.h>
 +#include <kuser.h>
  
- #include <klocale.h>
+ #include <tdelocale.h>
  #include <dcopclient.h>
 @@ -134,11 +135,11 @@ int main ( int argc, char *argv[] )
  	}
diff --git a/ubuntu/maverick/tdelibs/debian/patches/kubuntu_19_debianize_useragent.diff b/ubuntu/maverick/tdelibs/debian/patches/kubuntu_19_debianize_useragent.diff
index faa57c5ba..184591207 100644
--- a/ubuntu/maverick/tdelibs/debian/patches/kubuntu_19_debianize_useragent.diff
+++ b/ubuntu/maverick/tdelibs/debian/patches/kubuntu_19_debianize_useragent.diff
@@ -1,5 +1,5 @@
---- a/tdeio/tdeio/kprotocolmanager.cpp
-+++ b/tdeio/tdeio/kprotocolmanager.cpp
+--- a/tdeio/tdeio/tdeprotocolmanager.cpp
++++ b/tdeio/tdeio/tdeprotocolmanager.cpp
 @@ -450,14 +450,19 @@
       return d->useragent;
  
diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.install b/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.install
index 33a16d62e..d99526172 100644
--- a/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.install
+++ b/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.install
@@ -23,8 +23,8 @@ debian/tmp/opt/trinity/share/apps/dcopidlng/kalyptusCxxToDcopIDL.pm
 debian/tmp/opt/trinity/share/apps/dcopidlng/kdocAstUtil.pm
 debian/tmp/opt/trinity/share/apps/dcopidlng/kdocParseDoc.pm
 debian/tmp/opt/trinity/share/apps/dcopidlng/kdocUtil.pm
-debian/tmp/opt/trinity/share/apps/kabc/countrytransl.map
-debian/tmp/opt/trinity/share/apps/kabc/formats/binary.desktop
+debian/tmp/opt/trinity/share/apps/tdeabc/countrytransl.map
+debian/tmp/opt/trinity/share/apps/tdeabc/formats/binary.desktop
 debian/tmp/opt/trinity/share/apps/katepart/katepartreadonlyui.rc
 debian/tmp/opt/trinity/share/apps/katepart/katepartui.rc
 debian/tmp/opt/trinity/share/apps/katepart/scripts/indent/script-indent-c1-test.lua
@@ -3782,10 +3782,10 @@ debian/tmp/opt/trinity/share/services/kjavaappletviewer.desktop
 debian/tmp/opt/trinity/share/services/tdemailservice.protocol
 debian/tmp/opt/trinity/share/services/tdemultipart.desktop
 debian/tmp/opt/trinity/share/services/knotify.desktop
-debian/tmp/opt/trinity/share/services/tderesources/kabc/dir.desktop
-debian/tmp/opt/trinity/share/services/tderesources/kabc/file.desktop
-debian/tmp/opt/trinity/share/services/tderesources/kabc/net.desktop
-debian/tmp/opt/trinity/share/services/tderesources/kabc/ldaptdeio.desktop
+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/tdespell_aspell.desktop
diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.install b/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.install
index ca194e680..2e43c49ed 100644
--- a/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.install
+++ b/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.install
@@ -60,50 +60,50 @@ debian/tmp/opt/trinity/include/dom/html_misc.h
 debian/tmp/opt/trinity/include/dom/html_object.h
 debian/tmp/opt/trinity/include/dom/html_table.h
 debian/tmp/opt/trinity/include/fixx11h.h
-debian/tmp/opt/trinity/include/kabc/addressbook.h
-debian/tmp/opt/trinity/include/kabc/addresseedialog.h
-debian/tmp/opt/trinity/include/kabc/addressee.h
-debian/tmp/opt/trinity/include/kabc/addresseelist.h
-debian/tmp/opt/trinity/include/kabc/address.h
-debian/tmp/opt/trinity/include/kabc/addresslineedit.h
-debian/tmp/opt/trinity/include/kabc/agent.h
-debian/tmp/opt/trinity/include/kabc/distributionlistdialog.h
-debian/tmp/opt/trinity/include/kabc/distributionlisteditor.h
-debian/tmp/opt/trinity/include/kabc/distributionlist.h
-debian/tmp/opt/trinity/include/kabc/errorhandler.h
-debian/tmp/opt/trinity/include/kabc/field.h
-debian/tmp/opt/trinity/include/kabc/formatfactory.h
-debian/tmp/opt/trinity/include/kabc/format.h
-debian/tmp/opt/trinity/include/kabc/formatplugin.h
-debian/tmp/opt/trinity/include/kabc/geo.h
-debian/tmp/opt/trinity/include/kabc/key.h
-debian/tmp/opt/trinity/include/kabc/ldapclient.h
-debian/tmp/opt/trinity/include/kabc/ldapconfigwidget.h
-debian/tmp/opt/trinity/include/kabc/ldapurl.h
-debian/tmp/opt/trinity/include/kabc/ldifconverter.h
-debian/tmp/opt/trinity/include/kabc/ldif.h
-debian/tmp/opt/trinity/include/kabc/lock.h
-debian/tmp/opt/trinity/include/kabc/locknull.h
-debian/tmp/opt/trinity/include/kabc/phonenumber.h
-debian/tmp/opt/trinity/include/kabc/picture.h
-debian/tmp/opt/trinity/include/kabc/plugin.h
-debian/tmp/opt/trinity/include/kabc/resourcedir.h
-debian/tmp/opt/trinity/include/kabc/resourcefile.h
-debian/tmp/opt/trinity/include/kabc/resource.h
-debian/tmp/opt/trinity/include/kabc/resourceldaptdeio.h
+debian/tmp/opt/trinity/include/tdeabc/addressbook.h
+debian/tmp/opt/trinity/include/tdeabc/addresseedialog.h
+debian/tmp/opt/trinity/include/tdeabc/addressee.h
+debian/tmp/opt/trinity/include/tdeabc/addresseelist.h
+debian/tmp/opt/trinity/include/tdeabc/address.h
+debian/tmp/opt/trinity/include/tdeabc/addresslineedit.h
+debian/tmp/opt/trinity/include/tdeabc/agent.h
+debian/tmp/opt/trinity/include/tdeabc/distributionlistdialog.h
+debian/tmp/opt/trinity/include/tdeabc/distributionlisteditor.h
+debian/tmp/opt/trinity/include/tdeabc/distributionlist.h
+debian/tmp/opt/trinity/include/tdeabc/errorhandler.h
+debian/tmp/opt/trinity/include/tdeabc/field.h
+debian/tmp/opt/trinity/include/tdeabc/formatfactory.h
+debian/tmp/opt/trinity/include/tdeabc/format.h
+debian/tmp/opt/trinity/include/tdeabc/formatplugin.h
+debian/tmp/opt/trinity/include/tdeabc/geo.h
+debian/tmp/opt/trinity/include/tdeabc/key.h
+debian/tmp/opt/trinity/include/tdeabc/ldapclient.h
+debian/tmp/opt/trinity/include/tdeabc/ldapconfigwidget.h
+debian/tmp/opt/trinity/include/tdeabc/ldapurl.h
+debian/tmp/opt/trinity/include/tdeabc/ldifconverter.h
+debian/tmp/opt/trinity/include/tdeabc/ldif.h
+debian/tmp/opt/trinity/include/tdeabc/lock.h
+debian/tmp/opt/trinity/include/tdeabc/locknull.h
+debian/tmp/opt/trinity/include/tdeabc/phonenumber.h
+debian/tmp/opt/trinity/include/tdeabc/picture.h
+debian/tmp/opt/trinity/include/tdeabc/plugin.h
+debian/tmp/opt/trinity/include/tdeabc/resourcedir.h
+debian/tmp/opt/trinity/include/tdeabc/resourcefile.h
+debian/tmp/opt/trinity/include/tdeabc/resource.h
+debian/tmp/opt/trinity/include/tdeabc/resourceldaptdeio.h
 
-debian/tmp/opt/trinity/include/kabc/resourceselectdialog.h
-debian/tmp/opt/trinity/include/kabc/secrecy.h
-debian/tmp/opt/trinity/include/kabc/sortmode.h
-debian/tmp/opt/trinity/include/kabc/sound.h
-debian/tmp/opt/trinity/include/kabc/stdaddressbook.h
-debian/tmp/opt/trinity/include/kabc/timezone.h
-debian/tmp/opt/trinity/include/kabc/vcardconverter.h
-debian/tmp/opt/trinity/include/kabc/vcardformat.h
-debian/tmp/opt/trinity/include/kabc/vcardformatplugin.h
-debian/tmp/opt/trinity/include/kabc/vcard.h
-debian/tmp/opt/trinity/include/kabc/vcardline.h
-debian/tmp/opt/trinity/include/kabc/vcardparser.h
+debian/tmp/opt/trinity/include/tdeabc/resourceselectdialog.h
+debian/tmp/opt/trinity/include/tdeabc/secrecy.h
+debian/tmp/opt/trinity/include/tdeabc/sortmode.h
+debian/tmp/opt/trinity/include/tdeabc/sound.h
+debian/tmp/opt/trinity/include/tdeabc/stdaddressbook.h
+debian/tmp/opt/trinity/include/tdeabc/timezone.h
+debian/tmp/opt/trinity/include/tdeabc/vcardconverter.h
+debian/tmp/opt/trinity/include/tdeabc/vcardformat.h
+debian/tmp/opt/trinity/include/tdeabc/vcardformatplugin.h
+debian/tmp/opt/trinity/include/tdeabc/vcard.h
+debian/tmp/opt/trinity/include/tdeabc/vcardline.h
+debian/tmp/opt/trinity/include/tdeabc/vcardparser.h
 debian/tmp/opt/trinity/include/tdeaboutapplication.h
 debian/tmp/opt/trinity/include/tdeaboutdata.h
 debian/tmp/opt/trinity/include/tdeaboutdialog.h
@@ -240,7 +240,7 @@ debian/tmp/opt/trinity/include/kdialog.h
 debian/tmp/opt/trinity/include/kdirlister.h
 debian/tmp/opt/trinity/include/kdirnotify.h
 debian/tmp/opt/trinity/include/kdirnotify_stub.h
-debian/tmp/opt/trinity/include/kdiroperator.h
+debian/tmp/opt/trinity/include/tdediroperator.h
 debian/tmp/opt/trinity/include/kdirselectdialog.h
 debian/tmp/opt/trinity/include/kdirsize.h
 debian/tmp/opt/trinity/include/kdirwatch.h
@@ -253,7 +253,7 @@ debian/tmp/opt/trinity/include/kdualcolorbutton.h
 debian/tmp/opt/trinity/include/keditcl.h
 debian/tmp/opt/trinity/include/keditlistbox.h
 debian/tmp/opt/trinity/include/kedittoolbar.h
-debian/tmp/opt/trinity/include/kemailsettings.h
+debian/tmp/opt/trinity/include/tdeemailsettings.h
 debian/tmp/opt/trinity/include/kencodingfiledialog.h
 debian/tmp/opt/trinity/include/kextendedsocket.h
 debian/tmp/opt/trinity/include/kextsock.h
@@ -282,8 +282,8 @@ debian/tmp/opt/trinity/include/tdefontrequester.h
 debian/tmp/opt/trinity/include/kgenericfactory.h
 debian/tmp/opt/trinity/include/kgenericfactory.tcc
 debian/tmp/opt/trinity/include/kglobalaccel.h
-debian/tmp/opt/trinity/include/kglobal.h
-debian/tmp/opt/trinity/include/kglobalsettings.h
+debian/tmp/opt/trinity/include/tdeglobal.h
+debian/tmp/opt/trinity/include/tdeglobalsettings.h
 debian/tmp/opt/trinity/include/kguiitem.h
 debian/tmp/opt/trinity/include/khelpmenu.h
 debian/tmp/opt/trinity/include/khexedit/byteseditinterface.h
@@ -381,7 +381,7 @@ debian/tmp/opt/trinity/include/klineedit.h
 debian/tmp/opt/trinity/include/tdelistbox.h
 debian/tmp/opt/trinity/include/tdelistview.h
 debian/tmp/opt/trinity/include/tdelistviewsearchline.h
-debian/tmp/opt/trinity/include/klocale.h
+debian/tmp/opt/trinity/include/tdelocale.h
 debian/tmp/opt/trinity/include/klockfile.h
 debian/tmp/opt/trinity/include/kmacroexpander.h
 debian/tmp/opt/trinity/include/tdemainwindow.h
@@ -406,8 +406,8 @@ debian/tmp/opt/trinity/include/tdemditoolviewaccessor.h
 debian/tmp/opt/trinity/include/tdemediaplayer/playerdcopobject.h
 debian/tmp/opt/trinity/include/tdemediaplayer/player.h
 debian/tmp/opt/trinity/include/tdemediaplayer/view.h
-debian/tmp/opt/trinity/include/kmenubar.h
-debian/tmp/opt/trinity/include/kmessagebox.h
+debian/tmp/opt/trinity/include/tdemenubar.h
+debian/tmp/opt/trinity/include/tdemessagebox.h
 debian/tmp/opt/trinity/include/kmimemagic.h
 debian/tmp/opt/trinity/include/kmimesourcefactory.h
 debian/tmp/opt/trinity/include/kmimetypechooser.h
@@ -479,7 +479,7 @@ debian/tmp/opt/trinity/include/kprogressbox.h
 debian/tmp/opt/trinity/include/kpropertiesdialog.h
 debian/tmp/opt/trinity/include/kpropsdlg.h
 debian/tmp/opt/trinity/include/kprotocolinfo.h
-debian/tmp/opt/trinity/include/kprotocolmanager.h
+debian/tmp/opt/trinity/include/tdeprotocolmanager.h
 debian/tmp/opt/trinity/include/kpty.h
 debian/tmp/opt/trinity/include/kpushbutton.h
 debian/tmp/opt/trinity/include/krandomsequence.h
@@ -580,7 +580,7 @@ debian/tmp/opt/trinity/include/ksslutils.h
 debian/tmp/opt/trinity/include/ksslx509map.h
 debian/tmp/opt/trinity/include/ksslx509v3.h
 debian/tmp/opt/trinity/include/kstandarddirs.h
-debian/tmp/opt/trinity/include/kstartupinfo.h
+debian/tmp/opt/trinity/include/tdestartupinfo.h
 debian/tmp/opt/trinity/include/kstaticdeleter.h
 debian/tmp/opt/trinity/include/kstatusbar.h
 debian/tmp/opt/trinity/include/tdestdaccel.h
@@ -603,7 +603,7 @@ debian/tmp/opt/trinity/include/ktabctl.h
 debian/tmp/opt/trinity/include/ktabwidget.h
 debian/tmp/opt/trinity/include/ktar.h
 debian/tmp/opt/trinity/include/ktempdir.h
-debian/tmp/opt/trinity/include/ktempfile.h
+debian/tmp/opt/trinity/include/tdetempfile.h
 debian/tmp/opt/trinity/include/ktextbrowser.h
 debian/tmp/opt/trinity/include/ktextedit.h
 debian/tmp/opt/trinity/include/tdetexteditor/blockselectioninterface.h
diff --git a/ubuntu/maverick/tdepim/debian/kaddressbook-trinity.install b/ubuntu/maverick/tdepim/debian/kaddressbook-trinity.install
index eac493c1b..92e4a076f 100644
--- a/ubuntu/maverick/tdepim/debian/kaddressbook-trinity.install
+++ b/ubuntu/maverick/tdepim/debian/kaddressbook-trinity.install
@@ -29,7 +29,7 @@
 /opt/trinity/share/services/kabldapconfig.desktop
 /opt/trinity/share/services/kaddressbook
 /opt/trinity/share/services/kontact/kaddressbookplugin.desktop
-/opt/trinity/share/services/tderesources/kabc/imap.desktop
+/opt/trinity/share/services/tderesources/tdeabc/imap.desktop
 /opt/trinity/share/services/ldifvcardthumbnail.desktop
 /opt/trinity/share/servicetypes/dcopaddressbook.desktop
 /opt/trinity/share/servicetypes/kaddressbook_contacteditorwidget.desktop
diff --git a/ubuntu/maverick/tdepim/debian/tdepim-tderesources-trinity.install b/ubuntu/maverick/tdepim/debian/tdepim-tderesources-trinity.install
index 1ad10b54a..48b4fec45 100644
--- a/ubuntu/maverick/tdepim/debian/tdepim-tderesources-trinity.install
+++ b/ubuntu/maverick/tdepim/debian/tdepim-tderesources-trinity.install
@@ -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/kabc/kabc_groupdav.desktop
-/opt/trinity/share/services/tderesources/kabc/kabc_groupwise.desktop
-/opt/trinity/share/services/tderesources/kabc/kabc_newexchange.desktop
-/opt/trinity/share/services/tderesources/kabc/kabc_opengroupware.desktop
-/opt/trinity/share/services/tderesources/kabc/kabc_ox.desktop
-/opt/trinity/share/services/tderesources/kabc/kabc_slox.desktop
-/opt/trinity/share/services/tderesources/kabc/kabc_xmlrpc.desktop
-/opt/trinity/share/services/tderesources/kabc/kolab.desktop
-/opt/trinity/share/services/tderesources/kabc/scalix.desktop
+/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/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/kabc/kabc_carddav.desktop
+/opt/trinity/share/services/tderesources/tdeabc/kabc_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/tdesdk/debian/tdesdk-misc-trinity.install b/ubuntu/maverick/tdesdk/debian/tdesdk-misc-trinity.install
index 9fbde2ecd..59f2ee5c9 100644
--- a/ubuntu/maverick/tdesdk/debian/tdesdk-misc-trinity.install
+++ b/ubuntu/maverick/tdesdk/debian/tdesdk-misc-trinity.install
@@ -3,7 +3,7 @@ debian/tmp/opt/trinity/lib/trinity/kabcformat_kdeaccounts.la
 debian/tmp/opt/trinity/lib/trinity/kabcformat_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/kabc/formats/kdeaccountsplugin.desktop
+debian/tmp/opt/trinity/share/apps/tdeabc/formats/kdeaccountsplugin.desktop
 debian/tmp/opt/trinity/share/apps/kstyle/themes/scheck.themerc
 kdepalettes/kde_xpaintrc /opt/trinity/share/kdepalettes
 kdepalettes/KDE_Gimp /opt/trinity/share/kdepalettes
diff --git a/ubuntu/maverick_automake/kdelibs/debian/kdelibs-data-kde3.install b/ubuntu/maverick_automake/kdelibs/debian/kdelibs-data-kde3.install
index eee340dc0..30a8ea2d4 100644
--- a/ubuntu/maverick_automake/kdelibs/debian/kdelibs-data-kde3.install
+++ b/ubuntu/maverick_automake/kdelibs/debian/kdelibs-data-kde3.install
@@ -23,8 +23,8 @@ debian/tmp/opt/kde3/share/apps/dcopidlng/kalyptusCxxToDcopIDL.pm
 debian/tmp/opt/kde3/share/apps/dcopidlng/kdocAstUtil.pm
 debian/tmp/opt/kde3/share/apps/dcopidlng/kdocParseDoc.pm
 debian/tmp/opt/kde3/share/apps/dcopidlng/kdocUtil.pm
-debian/tmp/opt/kde3/share/apps/kabc/countrytransl.map
-debian/tmp/opt/kde3/share/apps/kabc/formats/binary.desktop
+debian/tmp/opt/kde3/share/apps/tdeabc/countrytransl.map
+debian/tmp/opt/kde3/share/apps/tdeabc/formats/binary.desktop
 debian/tmp/opt/kde3/share/apps/katepart/katepartreadonlyui.rc
 debian/tmp/opt/kde3/share/apps/katepart/katepartui.rc
 debian/tmp/opt/kde3/share/apps/katepart/scripts/indent/script-indent-c1-test.lua
@@ -3583,10 +3583,10 @@ debian/tmp/opt/kde3/share/services/kjavaappletviewer.desktop
 debian/tmp/opt/kde3/share/services/tdemailservice.protocol
 debian/tmp/opt/kde3/share/services/tdemultipart.desktop
 debian/tmp/opt/kde3/share/services/knotify.desktop
-debian/tmp/opt/kde3/share/services/tderesources/kabc/dir.desktop
-debian/tmp/opt/kde3/share/services/tderesources/kabc/file.desktop
-debian/tmp/opt/kde3/share/services/tderesources/kabc/net.desktop
-debian/tmp/opt/kde3/share/services/tderesources/kabc/ldapkio.desktop
+debian/tmp/opt/kde3/share/services/tderesources/tdeabc/dir.desktop
+debian/tmp/opt/kde3/share/services/tderesources/tdeabc/file.desktop
+debian/tmp/opt/kde3/share/services/tderesources/tdeabc/net.desktop
+debian/tmp/opt/kde3/share/services/tderesources/tdeabc/ldapkio.desktop
 debian/tmp/opt/kde3/share/services/tderesources/kabc_manager.desktop
 
 debian/tmp/opt/kde3/share/services/tdespell_aspell.desktop
diff --git a/ubuntu/maverick_automake/kdelibs/debian/kdelibs4-kde3-dev.install b/ubuntu/maverick_automake/kdelibs/debian/kdelibs4-kde3-dev.install
index 0a96b4e79..f23a7c572 100644
--- a/ubuntu/maverick_automake/kdelibs/debian/kdelibs4-kde3-dev.install
+++ b/ubuntu/maverick_automake/kdelibs/debian/kdelibs4-kde3-dev.install
@@ -60,50 +60,50 @@ debian/tmp/opt/kde3/include/tde/dom/html_misc.h
 debian/tmp/opt/kde3/include/tde/dom/html_object.h
 debian/tmp/opt/kde3/include/tde/dom/html_table.h
 debian/tmp/opt/kde3/include/tde/fixx11h.h
-debian/tmp/opt/kde3/include/tde/kabc/addressbook.h
-debian/tmp/opt/kde3/include/tde/kabc/addresseedialog.h
-debian/tmp/opt/kde3/include/tde/kabc/addressee.h
-debian/tmp/opt/kde3/include/tde/kabc/addresseelist.h
-debian/tmp/opt/kde3/include/tde/kabc/address.h
-debian/tmp/opt/kde3/include/tde/kabc/addresslineedit.h
-debian/tmp/opt/kde3/include/tde/kabc/agent.h
-debian/tmp/opt/kde3/include/tde/kabc/distributionlistdialog.h
-debian/tmp/opt/kde3/include/tde/kabc/distributionlisteditor.h
-debian/tmp/opt/kde3/include/tde/kabc/distributionlist.h
-debian/tmp/opt/kde3/include/tde/kabc/errorhandler.h
-debian/tmp/opt/kde3/include/tde/kabc/field.h
-debian/tmp/opt/kde3/include/tde/kabc/formatfactory.h
-debian/tmp/opt/kde3/include/tde/kabc/format.h
-debian/tmp/opt/kde3/include/tde/kabc/formatplugin.h
-debian/tmp/opt/kde3/include/tde/kabc/geo.h
-debian/tmp/opt/kde3/include/tde/kabc/key.h
-debian/tmp/opt/kde3/include/tde/kabc/ldapclient.h
-debian/tmp/opt/kde3/include/tde/kabc/ldapconfigwidget.h
-debian/tmp/opt/kde3/include/tde/kabc/ldapurl.h
-debian/tmp/opt/kde3/include/tde/kabc/ldifconverter.h
-debian/tmp/opt/kde3/include/tde/kabc/ldif.h
-debian/tmp/opt/kde3/include/tde/kabc/lock.h
-debian/tmp/opt/kde3/include/tde/kabc/locknull.h
-debian/tmp/opt/kde3/include/tde/kabc/phonenumber.h
-debian/tmp/opt/kde3/include/tde/kabc/picture.h
-debian/tmp/opt/kde3/include/tde/kabc/plugin.h
-debian/tmp/opt/kde3/include/tde/kabc/resourcedir.h
-debian/tmp/opt/kde3/include/tde/kabc/resourcefile.h
-debian/tmp/opt/kde3/include/tde/kabc/resource.h
-debian/tmp/opt/kde3/include/tde/kabc/resourceldapkio.h
+debian/tmp/opt/kde3/include/tde/tdeabc/addressbook.h
+debian/tmp/opt/kde3/include/tde/tdeabc/addresseedialog.h
+debian/tmp/opt/kde3/include/tde/tdeabc/addressee.h
+debian/tmp/opt/kde3/include/tde/tdeabc/addresseelist.h
+debian/tmp/opt/kde3/include/tde/tdeabc/address.h
+debian/tmp/opt/kde3/include/tde/tdeabc/addresslineedit.h
+debian/tmp/opt/kde3/include/tde/tdeabc/agent.h
+debian/tmp/opt/kde3/include/tde/tdeabc/distributionlistdialog.h
+debian/tmp/opt/kde3/include/tde/tdeabc/distributionlisteditor.h
+debian/tmp/opt/kde3/include/tde/tdeabc/distributionlist.h
+debian/tmp/opt/kde3/include/tde/tdeabc/errorhandler.h
+debian/tmp/opt/kde3/include/tde/tdeabc/field.h
+debian/tmp/opt/kde3/include/tde/tdeabc/formatfactory.h
+debian/tmp/opt/kde3/include/tde/tdeabc/format.h
+debian/tmp/opt/kde3/include/tde/tdeabc/formatplugin.h
+debian/tmp/opt/kde3/include/tde/tdeabc/geo.h
+debian/tmp/opt/kde3/include/tde/tdeabc/key.h
+debian/tmp/opt/kde3/include/tde/tdeabc/ldapclient.h
+debian/tmp/opt/kde3/include/tde/tdeabc/ldapconfigwidget.h
+debian/tmp/opt/kde3/include/tde/tdeabc/ldapurl.h
+debian/tmp/opt/kde3/include/tde/tdeabc/ldifconverter.h
+debian/tmp/opt/kde3/include/tde/tdeabc/ldif.h
+debian/tmp/opt/kde3/include/tde/tdeabc/lock.h
+debian/tmp/opt/kde3/include/tde/tdeabc/locknull.h
+debian/tmp/opt/kde3/include/tde/tdeabc/phonenumber.h
+debian/tmp/opt/kde3/include/tde/tdeabc/picture.h
+debian/tmp/opt/kde3/include/tde/tdeabc/plugin.h
+debian/tmp/opt/kde3/include/tde/tdeabc/resourcedir.h
+debian/tmp/opt/kde3/include/tde/tdeabc/resourcefile.h
+debian/tmp/opt/kde3/include/tde/tdeabc/resource.h
+debian/tmp/opt/kde3/include/tde/tdeabc/resourceldapkio.h
 
-debian/tmp/opt/kde3/include/tde/kabc/resourceselectdialog.h
-debian/tmp/opt/kde3/include/tde/kabc/secrecy.h
-debian/tmp/opt/kde3/include/tde/kabc/sortmode.h
-debian/tmp/opt/kde3/include/tde/kabc/sound.h
-debian/tmp/opt/kde3/include/tde/kabc/stdaddressbook.h
-debian/tmp/opt/kde3/include/tde/kabc/timezone.h
-debian/tmp/opt/kde3/include/tde/kabc/vcardconverter.h
-debian/tmp/opt/kde3/include/tde/kabc/vcardformat.h
-debian/tmp/opt/kde3/include/tde/kabc/vcardformatplugin.h
-debian/tmp/opt/kde3/include/tde/kabc/vcard.h
-debian/tmp/opt/kde3/include/tde/kabc/vcardline.h
-debian/tmp/opt/kde3/include/tde/kabc/vcardparser.h
+debian/tmp/opt/kde3/include/tde/tdeabc/resourceselectdialog.h
+debian/tmp/opt/kde3/include/tde/tdeabc/secrecy.h
+debian/tmp/opt/kde3/include/tde/tdeabc/sortmode.h
+debian/tmp/opt/kde3/include/tde/tdeabc/sound.h
+debian/tmp/opt/kde3/include/tde/tdeabc/stdaddressbook.h
+debian/tmp/opt/kde3/include/tde/tdeabc/timezone.h
+debian/tmp/opt/kde3/include/tde/tdeabc/vcardconverter.h
+debian/tmp/opt/kde3/include/tde/tdeabc/vcardformat.h
+debian/tmp/opt/kde3/include/tde/tdeabc/vcardformatplugin.h
+debian/tmp/opt/kde3/include/tde/tdeabc/vcard.h
+debian/tmp/opt/kde3/include/tde/tdeabc/vcardline.h
+debian/tmp/opt/kde3/include/tde/tdeabc/vcardparser.h
 debian/tmp/opt/kde3/include/tde/tdeaboutapplication.h
 debian/tmp/opt/kde3/include/tde/tdeaboutdata.h
 debian/tmp/opt/kde3/include/tde/tdeaboutdialog.h
@@ -238,7 +238,7 @@ debian/tmp/opt/kde3/include/tde/kdialog.h
 debian/tmp/opt/kde3/include/tde/kdirlister.h
 debian/tmp/opt/kde3/include/tde/kdirnotify.h
 debian/tmp/opt/kde3/include/tde/kdirnotify_stub.h
-debian/tmp/opt/kde3/include/tde/kdiroperator.h
+debian/tmp/opt/kde3/include/tde/tdediroperator.h
 debian/tmp/opt/kde3/include/tde/kdirselectdialog.h
 debian/tmp/opt/kde3/include/tde/kdirsize.h
 debian/tmp/opt/kde3/include/tde/kdirwatch.h
@@ -251,7 +251,7 @@ debian/tmp/opt/kde3/include/tde/kdualcolorbutton.h
 debian/tmp/opt/kde3/include/tde/keditcl.h
 debian/tmp/opt/kde3/include/tde/keditlistbox.h
 debian/tmp/opt/kde3/include/tde/kedittoolbar.h
-debian/tmp/opt/kde3/include/tde/kemailsettings.h
+debian/tmp/opt/kde3/include/tde/tdeemailsettings.h
 debian/tmp/opt/kde3/include/tde/kencodingfiledialog.h
 debian/tmp/opt/kde3/include/tde/kextendedsocket.h
 debian/tmp/opt/kde3/include/tde/kextsock.h
@@ -280,8 +280,8 @@ debian/tmp/opt/kde3/include/tde/tdefontrequester.h
 debian/tmp/opt/kde3/include/tde/kgenericfactory.h
 debian/tmp/opt/kde3/include/tde/kgenericfactory.tcc
 debian/tmp/opt/kde3/include/tde/kglobalaccel.h
-debian/tmp/opt/kde3/include/tde/kglobal.h
-debian/tmp/opt/kde3/include/tde/kglobalsettings.h
+debian/tmp/opt/kde3/include/tde/tdeglobal.h
+debian/tmp/opt/kde3/include/tde/tdeglobalsettings.h
 debian/tmp/opt/kde3/include/tde/kguiitem.h
 debian/tmp/opt/kde3/include/tde/khelpmenu.h
 debian/tmp/opt/kde3/include/tde/khexedit/byteseditinterface.h
@@ -379,7 +379,7 @@ debian/tmp/opt/kde3/include/tde/klineedit.h
 debian/tmp/opt/kde3/include/tde/tdelistbox.h
 debian/tmp/opt/kde3/include/tde/tdelistview.h
 debian/tmp/opt/kde3/include/tde/tdelistviewsearchline.h
-debian/tmp/opt/kde3/include/tde/klocale.h
+debian/tmp/opt/kde3/include/tde/tdelocale.h
 debian/tmp/opt/kde3/include/tde/klockfile.h
 debian/tmp/opt/kde3/include/tde/kmacroexpander.h
 debian/tmp/opt/kde3/include/tde/tdemainwindow.h
@@ -404,8 +404,8 @@ debian/tmp/opt/kde3/include/tde/tdemditoolviewaccessor.h
 debian/tmp/opt/kde3/include/tde/tdemediaplayer/playerdcopobject.h
 debian/tmp/opt/kde3/include/tde/tdemediaplayer/player.h
 debian/tmp/opt/kde3/include/tde/tdemediaplayer/view.h
-debian/tmp/opt/kde3/include/tde/kmenubar.h
-debian/tmp/opt/kde3/include/tde/kmessagebox.h
+debian/tmp/opt/kde3/include/tde/tdemenubar.h
+debian/tmp/opt/kde3/include/tde/tdemessagebox.h
 debian/tmp/opt/kde3/include/tde/kmimemagic.h
 debian/tmp/opt/kde3/include/tde/kmimesourcefactory.h
 debian/tmp/opt/kde3/include/tde/kmimetypechooser.h
@@ -477,7 +477,7 @@ debian/tmp/opt/kde3/include/tde/kprogressbox.h
 debian/tmp/opt/kde3/include/tde/kpropertiesdialog.h
 debian/tmp/opt/kde3/include/tde/kpropsdlg.h
 debian/tmp/opt/kde3/include/tde/kprotocolinfo.h
-debian/tmp/opt/kde3/include/tde/kprotocolmanager.h
+debian/tmp/opt/kde3/include/tde/tdeprotocolmanager.h
 debian/tmp/opt/kde3/include/tde/kpty.h
 debian/tmp/opt/kde3/include/tde/kpushbutton.h
 debian/tmp/opt/kde3/include/tde/krandomsequence.h
@@ -578,7 +578,7 @@ debian/tmp/opt/kde3/include/tde/ksslutils.h
 debian/tmp/opt/kde3/include/tde/ksslx509map.h
 debian/tmp/opt/kde3/include/tde/ksslx509v3.h
 debian/tmp/opt/kde3/include/tde/kstandarddirs.h
-debian/tmp/opt/kde3/include/tde/kstartupinfo.h
+debian/tmp/opt/kde3/include/tde/tdestartupinfo.h
 debian/tmp/opt/kde3/include/tde/kstaticdeleter.h
 debian/tmp/opt/kde3/include/tde/kstatusbar.h
 debian/tmp/opt/kde3/include/tde/tdestdaccel.h
@@ -601,7 +601,7 @@ debian/tmp/opt/kde3/include/tde/ktabctl.h
 debian/tmp/opt/kde3/include/tde/ktabwidget.h
 debian/tmp/opt/kde3/include/tde/ktar.h
 debian/tmp/opt/kde3/include/tde/ktempdir.h
-debian/tmp/opt/kde3/include/tde/ktempfile.h
+debian/tmp/opt/kde3/include/tde/tdetempfile.h
 debian/tmp/opt/kde3/include/tde/ktextbrowser.h
 debian/tmp/opt/kde3/include/tde/ktextedit.h
 debian/tmp/opt/kde3/include/tde/tdetexteditor/blockselectioninterface.h
diff --git a/ubuntu/maverick_automake/kdelibs/debian/patches/kubuntu_19_debianize_useragent.diff b/ubuntu/maverick_automake/kdelibs/debian/patches/kubuntu_19_debianize_useragent.diff
index a8e8a4ab1..3c0e3595e 100644
--- a/ubuntu/maverick_automake/kdelibs/debian/patches/kubuntu_19_debianize_useragent.diff
+++ b/ubuntu/maverick_automake/kdelibs/debian/patches/kubuntu_19_debianize_useragent.diff
@@ -1,5 +1,5 @@
---- a/tdeio/tdeio/kprotocolmanager.cpp
-+++ b/tdeio/tdeio/kprotocolmanager.cpp
+--- a/tdeio/tdeio/tdeprotocolmanager.cpp
++++ b/tdeio/tdeio/tdeprotocolmanager.cpp
 @@ -450,14 +450,19 @@
       return d->useragent;
  
diff --git a/ubuntu/maverick_automake/kdepim/debian/kaddressbook-kde3.install b/ubuntu/maverick_automake/kdepim/debian/kaddressbook-kde3.install
index 2541f63e1..b36a230a5 100644
--- a/ubuntu/maverick_automake/kdepim/debian/kaddressbook-kde3.install
+++ b/ubuntu/maverick_automake/kdepim/debian/kaddressbook-kde3.install
@@ -29,7 +29,7 @@
 /opt/kde3/share/services/kabldapconfig.desktop
 /opt/kde3/share/services/kaddressbook
 /opt/kde3/share/services/kontact/kaddressbookplugin.desktop
-/opt/kde3/share/services/tderesources/kabc/imap.desktop
+/opt/kde3/share/services/tderesources/tdeabc/imap.desktop
 /opt/kde3/share/services/ldifvcardthumbnail.desktop
 /opt/kde3/share/servicetypes/dcopaddressbook.desktop
 /opt/kde3/share/servicetypes/kaddressbook_contacteditorwidget.desktop
diff --git a/ubuntu/maverick_automake/kdepim/debian/kdepim-tderesources-kde3.install b/ubuntu/maverick_automake/kdepim/debian/kdepim-tderesources-kde3.install
index a17538fe3..39c94e33b 100644
--- a/ubuntu/maverick_automake/kdepim/debian/kdepim-tderesources-kde3.install
+++ b/ubuntu/maverick_automake/kdepim/debian/kdepim-tderesources-kde3.install
@@ -74,18 +74,18 @@
 /opt/kde3/lib/libkslox.so.0.0.0
 /opt/kde3/lib/libgwsoap.so.0
 /opt/kde3/lib/libgwsoap.so.0.0.0
-/opt/kde3/share/services/tderesources/kabc/kabc_groupdav.desktop
-/opt/kde3/share/services/tderesources/kabc/kabc_groupwise.desktop
-/opt/kde3/share/services/tderesources/kabc/kabc_newexchange.desktop
-/opt/kde3/share/services/tderesources/kabc/kabc_opengroupware.desktop
-/opt/kde3/share/services/tderesources/kabc/kabc_ox.desktop
-/opt/kde3/share/services/tderesources/kabc/kabc_slox.desktop
-/opt/kde3/share/services/tderesources/kabc/kabc_xmlrpc.desktop
-/opt/kde3/share/services/tderesources/kabc/kolab.desktop
-/opt/kde3/share/services/tderesources/kabc/scalix.desktop
+/opt/kde3/share/services/tderesources/tdeabc/kabc_groupdav.desktop
+/opt/kde3/share/services/tderesources/tdeabc/kabc_groupwise.desktop
+/opt/kde3/share/services/tderesources/tdeabc/kabc_newexchange.desktop
+/opt/kde3/share/services/tderesources/tdeabc/kabc_opengroupware.desktop
+/opt/kde3/share/services/tderesources/tdeabc/kabc_ox.desktop
+/opt/kde3/share/services/tderesources/tdeabc/kabc_slox.desktop
+/opt/kde3/share/services/tderesources/tdeabc/kabc_xmlrpc.desktop
+/opt/kde3/share/services/tderesources/tdeabc/kolab.desktop
+/opt/kde3/share/services/tderesources/tdeabc/scalix.desktop
 /opt/kde3/share/services/tderesources/kcal/exchange.desktop
 /opt/kde3/share/services/tderesources/kcal/kcal_caldav.desktop
-/opt/kde3/share/services/tderesources/kabc/kabc_carddav.desktop
+/opt/kde3/share/services/tderesources/tdeabc/kabc_carddav.desktop
 /opt/kde3/share/services/tderesources/kcal/kcal_groupdav.desktop
 /opt/kde3/share/services/tderesources/kcal/kcal_groupwise.desktop
 /opt/kde3/share/services/tderesources/kcal/kcal_newexchange.desktop
diff --git a/ubuntu/maverick_automake/kdesdk/debian/kdesdk-misc-kde3.install b/ubuntu/maverick_automake/kdesdk/debian/kdesdk-misc-kde3.install
index 39d07410e..b2d7f97a2 100644
--- a/ubuntu/maverick_automake/kdesdk/debian/kdesdk-misc-kde3.install
+++ b/ubuntu/maverick_automake/kdesdk/debian/kdesdk-misc-kde3.install
@@ -3,7 +3,7 @@ debian/tmp/opt/kde3/lib/kde3/kabcformat_kdeaccounts.la
 debian/tmp/opt/kde3/lib/kde3/kabcformat_kdeaccounts.so
 debian/tmp/opt/kde3/lib/kde3/plugins/styles/scheck.so
 debian/tmp/opt/kde3/lib/kde3/plugins/styles/scheck.la
-debian/tmp/opt/kde3/share/apps/kabc/formats/kdeaccountsplugin.desktop
+debian/tmp/opt/kde3/share/apps/tdeabc/formats/kdeaccountsplugin.desktop
 debian/tmp/opt/kde3/share/apps/kstyle/themes/scheck.themerc
 kdepalettes/kde_xpaintrc /opt/kde3/share/kdepalettes
 kdepalettes/KDE_Gimp /opt/kde3/share/kdepalettes
diff --git a/ubuntu/precise/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff b/ubuntu/precise/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff
index bf09b9c13..826d4e236 100644
--- a/ubuntu/precise/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff
+++ b/ubuntu/precise/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff
@@ -3,12 +3,12 @@ index 7c45fcf..b933832 100644
 --- a/src/main.cpp
 +++ b/src/main.cpp
 @@ -24,6 +24,7 @@
- #include <kmessagebox.h>
+ #include <tdemessagebox.h>
  #include <tdemainwindow.h>
  #include <kapp.h>
 +#include <kuser.h>
  
- #include <klocale.h>
+ #include <tdelocale.h>
  #include <dcopclient.h>
 @@ -134,11 +135,11 @@ int main ( int argc, char *argv[] )
  	}
diff --git a/ubuntu/precise/tdelibs/debian/patches/kubuntu_19_debianize_useragent.diff b/ubuntu/precise/tdelibs/debian/patches/kubuntu_19_debianize_useragent.diff
index faa57c5ba..184591207 100644
--- a/ubuntu/precise/tdelibs/debian/patches/kubuntu_19_debianize_useragent.diff
+++ b/ubuntu/precise/tdelibs/debian/patches/kubuntu_19_debianize_useragent.diff
@@ -1,5 +1,5 @@
---- a/tdeio/tdeio/kprotocolmanager.cpp
-+++ b/tdeio/tdeio/kprotocolmanager.cpp
+--- a/tdeio/tdeio/tdeprotocolmanager.cpp
++++ b/tdeio/tdeio/tdeprotocolmanager.cpp
 @@ -450,14 +450,19 @@
       return d->useragent;
  
diff --git a/ubuntu/precise/tdelibs/debian/tdelibs-data-trinity.install b/ubuntu/precise/tdelibs/debian/tdelibs-data-trinity.install
index 33a16d62e..d99526172 100644
--- a/ubuntu/precise/tdelibs/debian/tdelibs-data-trinity.install
+++ b/ubuntu/precise/tdelibs/debian/tdelibs-data-trinity.install
@@ -23,8 +23,8 @@ debian/tmp/opt/trinity/share/apps/dcopidlng/kalyptusCxxToDcopIDL.pm
 debian/tmp/opt/trinity/share/apps/dcopidlng/kdocAstUtil.pm
 debian/tmp/opt/trinity/share/apps/dcopidlng/kdocParseDoc.pm
 debian/tmp/opt/trinity/share/apps/dcopidlng/kdocUtil.pm
-debian/tmp/opt/trinity/share/apps/kabc/countrytransl.map
-debian/tmp/opt/trinity/share/apps/kabc/formats/binary.desktop
+debian/tmp/opt/trinity/share/apps/tdeabc/countrytransl.map
+debian/tmp/opt/trinity/share/apps/tdeabc/formats/binary.desktop
 debian/tmp/opt/trinity/share/apps/katepart/katepartreadonlyui.rc
 debian/tmp/opt/trinity/share/apps/katepart/katepartui.rc
 debian/tmp/opt/trinity/share/apps/katepart/scripts/indent/script-indent-c1-test.lua
@@ -3782,10 +3782,10 @@ debian/tmp/opt/trinity/share/services/kjavaappletviewer.desktop
 debian/tmp/opt/trinity/share/services/tdemailservice.protocol
 debian/tmp/opt/trinity/share/services/tdemultipart.desktop
 debian/tmp/opt/trinity/share/services/knotify.desktop
-debian/tmp/opt/trinity/share/services/tderesources/kabc/dir.desktop
-debian/tmp/opt/trinity/share/services/tderesources/kabc/file.desktop
-debian/tmp/opt/trinity/share/services/tderesources/kabc/net.desktop
-debian/tmp/opt/trinity/share/services/tderesources/kabc/ldaptdeio.desktop
+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/tdespell_aspell.desktop
diff --git a/ubuntu/precise/tdelibs/debian/tdelibs4-trinity-dev.install b/ubuntu/precise/tdelibs/debian/tdelibs4-trinity-dev.install
index ca194e680..2e43c49ed 100644
--- a/ubuntu/precise/tdelibs/debian/tdelibs4-trinity-dev.install
+++ b/ubuntu/precise/tdelibs/debian/tdelibs4-trinity-dev.install
@@ -60,50 +60,50 @@ debian/tmp/opt/trinity/include/dom/html_misc.h
 debian/tmp/opt/trinity/include/dom/html_object.h
 debian/tmp/opt/trinity/include/dom/html_table.h
 debian/tmp/opt/trinity/include/fixx11h.h
-debian/tmp/opt/trinity/include/kabc/addressbook.h
-debian/tmp/opt/trinity/include/kabc/addresseedialog.h
-debian/tmp/opt/trinity/include/kabc/addressee.h
-debian/tmp/opt/trinity/include/kabc/addresseelist.h
-debian/tmp/opt/trinity/include/kabc/address.h
-debian/tmp/opt/trinity/include/kabc/addresslineedit.h
-debian/tmp/opt/trinity/include/kabc/agent.h
-debian/tmp/opt/trinity/include/kabc/distributionlistdialog.h
-debian/tmp/opt/trinity/include/kabc/distributionlisteditor.h
-debian/tmp/opt/trinity/include/kabc/distributionlist.h
-debian/tmp/opt/trinity/include/kabc/errorhandler.h
-debian/tmp/opt/trinity/include/kabc/field.h
-debian/tmp/opt/trinity/include/kabc/formatfactory.h
-debian/tmp/opt/trinity/include/kabc/format.h
-debian/tmp/opt/trinity/include/kabc/formatplugin.h
-debian/tmp/opt/trinity/include/kabc/geo.h
-debian/tmp/opt/trinity/include/kabc/key.h
-debian/tmp/opt/trinity/include/kabc/ldapclient.h
-debian/tmp/opt/trinity/include/kabc/ldapconfigwidget.h
-debian/tmp/opt/trinity/include/kabc/ldapurl.h
-debian/tmp/opt/trinity/include/kabc/ldifconverter.h
-debian/tmp/opt/trinity/include/kabc/ldif.h
-debian/tmp/opt/trinity/include/kabc/lock.h
-debian/tmp/opt/trinity/include/kabc/locknull.h
-debian/tmp/opt/trinity/include/kabc/phonenumber.h
-debian/tmp/opt/trinity/include/kabc/picture.h
-debian/tmp/opt/trinity/include/kabc/plugin.h
-debian/tmp/opt/trinity/include/kabc/resourcedir.h
-debian/tmp/opt/trinity/include/kabc/resourcefile.h
-debian/tmp/opt/trinity/include/kabc/resource.h
-debian/tmp/opt/trinity/include/kabc/resourceldaptdeio.h
+debian/tmp/opt/trinity/include/tdeabc/addressbook.h
+debian/tmp/opt/trinity/include/tdeabc/addresseedialog.h
+debian/tmp/opt/trinity/include/tdeabc/addressee.h
+debian/tmp/opt/trinity/include/tdeabc/addresseelist.h
+debian/tmp/opt/trinity/include/tdeabc/address.h
+debian/tmp/opt/trinity/include/tdeabc/addresslineedit.h
+debian/tmp/opt/trinity/include/tdeabc/agent.h
+debian/tmp/opt/trinity/include/tdeabc/distributionlistdialog.h
+debian/tmp/opt/trinity/include/tdeabc/distributionlisteditor.h
+debian/tmp/opt/trinity/include/tdeabc/distributionlist.h
+debian/tmp/opt/trinity/include/tdeabc/errorhandler.h
+debian/tmp/opt/trinity/include/tdeabc/field.h
+debian/tmp/opt/trinity/include/tdeabc/formatfactory.h
+debian/tmp/opt/trinity/include/tdeabc/format.h
+debian/tmp/opt/trinity/include/tdeabc/formatplugin.h
+debian/tmp/opt/trinity/include/tdeabc/geo.h
+debian/tmp/opt/trinity/include/tdeabc/key.h
+debian/tmp/opt/trinity/include/tdeabc/ldapclient.h
+debian/tmp/opt/trinity/include/tdeabc/ldapconfigwidget.h
+debian/tmp/opt/trinity/include/tdeabc/ldapurl.h
+debian/tmp/opt/trinity/include/tdeabc/ldifconverter.h
+debian/tmp/opt/trinity/include/tdeabc/ldif.h
+debian/tmp/opt/trinity/include/tdeabc/lock.h
+debian/tmp/opt/trinity/include/tdeabc/locknull.h
+debian/tmp/opt/trinity/include/tdeabc/phonenumber.h
+debian/tmp/opt/trinity/include/tdeabc/picture.h
+debian/tmp/opt/trinity/include/tdeabc/plugin.h
+debian/tmp/opt/trinity/include/tdeabc/resourcedir.h
+debian/tmp/opt/trinity/include/tdeabc/resourcefile.h
+debian/tmp/opt/trinity/include/tdeabc/resource.h
+debian/tmp/opt/trinity/include/tdeabc/resourceldaptdeio.h
 
-debian/tmp/opt/trinity/include/kabc/resourceselectdialog.h
-debian/tmp/opt/trinity/include/kabc/secrecy.h
-debian/tmp/opt/trinity/include/kabc/sortmode.h
-debian/tmp/opt/trinity/include/kabc/sound.h
-debian/tmp/opt/trinity/include/kabc/stdaddressbook.h
-debian/tmp/opt/trinity/include/kabc/timezone.h
-debian/tmp/opt/trinity/include/kabc/vcardconverter.h
-debian/tmp/opt/trinity/include/kabc/vcardformat.h
-debian/tmp/opt/trinity/include/kabc/vcardformatplugin.h
-debian/tmp/opt/trinity/include/kabc/vcard.h
-debian/tmp/opt/trinity/include/kabc/vcardline.h
-debian/tmp/opt/trinity/include/kabc/vcardparser.h
+debian/tmp/opt/trinity/include/tdeabc/resourceselectdialog.h
+debian/tmp/opt/trinity/include/tdeabc/secrecy.h
+debian/tmp/opt/trinity/include/tdeabc/sortmode.h
+debian/tmp/opt/trinity/include/tdeabc/sound.h
+debian/tmp/opt/trinity/include/tdeabc/stdaddressbook.h
+debian/tmp/opt/trinity/include/tdeabc/timezone.h
+debian/tmp/opt/trinity/include/tdeabc/vcardconverter.h
+debian/tmp/opt/trinity/include/tdeabc/vcardformat.h
+debian/tmp/opt/trinity/include/tdeabc/vcardformatplugin.h
+debian/tmp/opt/trinity/include/tdeabc/vcard.h
+debian/tmp/opt/trinity/include/tdeabc/vcardline.h
+debian/tmp/opt/trinity/include/tdeabc/vcardparser.h
 debian/tmp/opt/trinity/include/tdeaboutapplication.h
 debian/tmp/opt/trinity/include/tdeaboutdata.h
 debian/tmp/opt/trinity/include/tdeaboutdialog.h
@@ -240,7 +240,7 @@ debian/tmp/opt/trinity/include/kdialog.h
 debian/tmp/opt/trinity/include/kdirlister.h
 debian/tmp/opt/trinity/include/kdirnotify.h
 debian/tmp/opt/trinity/include/kdirnotify_stub.h
-debian/tmp/opt/trinity/include/kdiroperator.h
+debian/tmp/opt/trinity/include/tdediroperator.h
 debian/tmp/opt/trinity/include/kdirselectdialog.h
 debian/tmp/opt/trinity/include/kdirsize.h
 debian/tmp/opt/trinity/include/kdirwatch.h
@@ -253,7 +253,7 @@ debian/tmp/opt/trinity/include/kdualcolorbutton.h
 debian/tmp/opt/trinity/include/keditcl.h
 debian/tmp/opt/trinity/include/keditlistbox.h
 debian/tmp/opt/trinity/include/kedittoolbar.h
-debian/tmp/opt/trinity/include/kemailsettings.h
+debian/tmp/opt/trinity/include/tdeemailsettings.h
 debian/tmp/opt/trinity/include/kencodingfiledialog.h
 debian/tmp/opt/trinity/include/kextendedsocket.h
 debian/tmp/opt/trinity/include/kextsock.h
@@ -282,8 +282,8 @@ debian/tmp/opt/trinity/include/tdefontrequester.h
 debian/tmp/opt/trinity/include/kgenericfactory.h
 debian/tmp/opt/trinity/include/kgenericfactory.tcc
 debian/tmp/opt/trinity/include/kglobalaccel.h
-debian/tmp/opt/trinity/include/kglobal.h
-debian/tmp/opt/trinity/include/kglobalsettings.h
+debian/tmp/opt/trinity/include/tdeglobal.h
+debian/tmp/opt/trinity/include/tdeglobalsettings.h
 debian/tmp/opt/trinity/include/kguiitem.h
 debian/tmp/opt/trinity/include/khelpmenu.h
 debian/tmp/opt/trinity/include/khexedit/byteseditinterface.h
@@ -381,7 +381,7 @@ debian/tmp/opt/trinity/include/klineedit.h
 debian/tmp/opt/trinity/include/tdelistbox.h
 debian/tmp/opt/trinity/include/tdelistview.h
 debian/tmp/opt/trinity/include/tdelistviewsearchline.h
-debian/tmp/opt/trinity/include/klocale.h
+debian/tmp/opt/trinity/include/tdelocale.h
 debian/tmp/opt/trinity/include/klockfile.h
 debian/tmp/opt/trinity/include/kmacroexpander.h
 debian/tmp/opt/trinity/include/tdemainwindow.h
@@ -406,8 +406,8 @@ debian/tmp/opt/trinity/include/tdemditoolviewaccessor.h
 debian/tmp/opt/trinity/include/tdemediaplayer/playerdcopobject.h
 debian/tmp/opt/trinity/include/tdemediaplayer/player.h
 debian/tmp/opt/trinity/include/tdemediaplayer/view.h
-debian/tmp/opt/trinity/include/kmenubar.h
-debian/tmp/opt/trinity/include/kmessagebox.h
+debian/tmp/opt/trinity/include/tdemenubar.h
+debian/tmp/opt/trinity/include/tdemessagebox.h
 debian/tmp/opt/trinity/include/kmimemagic.h
 debian/tmp/opt/trinity/include/kmimesourcefactory.h
 debian/tmp/opt/trinity/include/kmimetypechooser.h
@@ -479,7 +479,7 @@ debian/tmp/opt/trinity/include/kprogressbox.h
 debian/tmp/opt/trinity/include/kpropertiesdialog.h
 debian/tmp/opt/trinity/include/kpropsdlg.h
 debian/tmp/opt/trinity/include/kprotocolinfo.h
-debian/tmp/opt/trinity/include/kprotocolmanager.h
+debian/tmp/opt/trinity/include/tdeprotocolmanager.h
 debian/tmp/opt/trinity/include/kpty.h
 debian/tmp/opt/trinity/include/kpushbutton.h
 debian/tmp/opt/trinity/include/krandomsequence.h
@@ -580,7 +580,7 @@ debian/tmp/opt/trinity/include/ksslutils.h
 debian/tmp/opt/trinity/include/ksslx509map.h
 debian/tmp/opt/trinity/include/ksslx509v3.h
 debian/tmp/opt/trinity/include/kstandarddirs.h
-debian/tmp/opt/trinity/include/kstartupinfo.h
+debian/tmp/opt/trinity/include/tdestartupinfo.h
 debian/tmp/opt/trinity/include/kstaticdeleter.h
 debian/tmp/opt/trinity/include/kstatusbar.h
 debian/tmp/opt/trinity/include/tdestdaccel.h
@@ -603,7 +603,7 @@ debian/tmp/opt/trinity/include/ktabctl.h
 debian/tmp/opt/trinity/include/ktabwidget.h
 debian/tmp/opt/trinity/include/ktar.h
 debian/tmp/opt/trinity/include/ktempdir.h
-debian/tmp/opt/trinity/include/ktempfile.h
+debian/tmp/opt/trinity/include/tdetempfile.h
 debian/tmp/opt/trinity/include/ktextbrowser.h
 debian/tmp/opt/trinity/include/ktextedit.h
 debian/tmp/opt/trinity/include/tdetexteditor/blockselectioninterface.h
diff --git a/ubuntu/precise/tdepim/debian/kaddressbook-trinity.install b/ubuntu/precise/tdepim/debian/kaddressbook-trinity.install
index eac493c1b..92e4a076f 100644
--- a/ubuntu/precise/tdepim/debian/kaddressbook-trinity.install
+++ b/ubuntu/precise/tdepim/debian/kaddressbook-trinity.install
@@ -29,7 +29,7 @@
 /opt/trinity/share/services/kabldapconfig.desktop
 /opt/trinity/share/services/kaddressbook
 /opt/trinity/share/services/kontact/kaddressbookplugin.desktop
-/opt/trinity/share/services/tderesources/kabc/imap.desktop
+/opt/trinity/share/services/tderesources/tdeabc/imap.desktop
 /opt/trinity/share/services/ldifvcardthumbnail.desktop
 /opt/trinity/share/servicetypes/dcopaddressbook.desktop
 /opt/trinity/share/servicetypes/kaddressbook_contacteditorwidget.desktop
diff --git a/ubuntu/precise/tdepim/debian/tdepim-tderesources-trinity.install b/ubuntu/precise/tdepim/debian/tdepim-tderesources-trinity.install
index 1ad10b54a..48b4fec45 100644
--- a/ubuntu/precise/tdepim/debian/tdepim-tderesources-trinity.install
+++ b/ubuntu/precise/tdepim/debian/tdepim-tderesources-trinity.install
@@ -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/kabc/kabc_groupdav.desktop
-/opt/trinity/share/services/tderesources/kabc/kabc_groupwise.desktop
-/opt/trinity/share/services/tderesources/kabc/kabc_newexchange.desktop
-/opt/trinity/share/services/tderesources/kabc/kabc_opengroupware.desktop
-/opt/trinity/share/services/tderesources/kabc/kabc_ox.desktop
-/opt/trinity/share/services/tderesources/kabc/kabc_slox.desktop
-/opt/trinity/share/services/tderesources/kabc/kabc_xmlrpc.desktop
-/opt/trinity/share/services/tderesources/kabc/kolab.desktop
-/opt/trinity/share/services/tderesources/kabc/scalix.desktop
+/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/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/kabc/kabc_carddav.desktop
+/opt/trinity/share/services/tderesources/tdeabc/kabc_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/tdesdk/debian/tdesdk-misc-trinity.install b/ubuntu/precise/tdesdk/debian/tdesdk-misc-trinity.install
index 9fbde2ecd..59f2ee5c9 100644
--- a/ubuntu/precise/tdesdk/debian/tdesdk-misc-trinity.install
+++ b/ubuntu/precise/tdesdk/debian/tdesdk-misc-trinity.install
@@ -3,7 +3,7 @@ debian/tmp/opt/trinity/lib/trinity/kabcformat_kdeaccounts.la
 debian/tmp/opt/trinity/lib/trinity/kabcformat_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/kabc/formats/kdeaccountsplugin.desktop
+debian/tmp/opt/trinity/share/apps/tdeabc/formats/kdeaccountsplugin.desktop
 debian/tmp/opt/trinity/share/apps/kstyle/themes/scheck.themerc
 kdepalettes/kde_xpaintrc /opt/trinity/share/kdepalettes
 kdepalettes/KDE_Gimp /opt/trinity/share/kdepalettes