Convert remaining references to kde3 (e.g. in paths) to trinity

19 files changed, 136 insertions, 136 deletions

diff --git a/ubuntu/maverick/kdepim/debian/akregator-trinity.install b/ubuntu/maverick/kdepim/debian/akregator-trinity.install
index 8fee8f157..e67c9c91a 100644
--- a/ubuntu/maverick/kdepim/debian/akregator-trinity.install
+++ b/ubuntu/maverick/kdepim/debian/akregator-trinity.install
@@ -1,8 +1,8 @@
 /opt/trinity/bin/akregator
-/opt/trinity/lib/kde3/libakregatorpart.la
-/opt/trinity/lib/kde3/libakregatorpart.so
-/opt/trinity/lib/kde3/libakregator_mk4storage_plugin.la
-/opt/trinity/lib/kde3/libakregator_mk4storage_plugin.so
+/opt/trinity/lib/trinity/libakregatorpart.la
+/opt/trinity/lib/trinity/libakregatorpart.so
+/opt/trinity/lib/trinity/libakregator_mk4storage_plugin.la
+/opt/trinity/lib/trinity/libakregator_mk4storage_plugin.so
 /opt/trinity/lib/libakregatorprivate.la
 /opt/trinity/lib/libakregatorprivate.so
 /opt/trinity/share/applications/kde/akregator.desktop
diff --git a/ubuntu/maverick/kdepim/debian/control b/ubuntu/maverick/kdepim/debian/control
index f12445a70..ceb8680ae 100644
--- a/ubuntu/maverick/kdepim/debian/control
+++ b/ubuntu/maverick/kdepim/debian/control
@@ -504,7 +504,7 @@ Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${perl:Depends}, gnupg
 Conflicts: libkleopatra0-trinity
-Replaces: libkdenetwork2-kde33, libkleopatra0a-trinity
+Replaces: libkdenetwork2-trinity3, libkleopatra0a-trinity
 Description: KDE GnuPG interface libraries
  This library is used by several KDE applications to interface to the
  GnuPG program.
diff --git a/ubuntu/maverick/kdepim/debian/kaddressbook-trinity.install b/ubuntu/maverick/kdepim/debian/kaddressbook-trinity.install
index ff875366f..cd87d91bd 100644
--- a/ubuntu/maverick/kdepim/debian/kaddressbook-trinity.install
+++ b/ubuntu/maverick/kdepim/debian/kaddressbook-trinity.install
@@ -1,17 +1,17 @@
 /opt/trinity/bin/kabc2mutt
 /opt/trinity/bin/kaddressbook
-/opt/trinity/lib/kde3/kcm_kabconfig.la
-/opt/trinity/lib/kde3/kcm_kabconfig.so
-/opt/trinity/lib/kde3/kcm_kabcustomfields.la
-/opt/trinity/lib/kde3/kcm_kabcustomfields.so
-/opt/trinity/lib/kde3/kcm_kabldapconfig.la
-/opt/trinity/lib/kde3/kcm_kabldapconfig.so
-/opt/trinity/lib/kde3/ldifvcardthumbnail.la
-/opt/trinity/lib/kde3/ldifvcardthumbnail.so
-/opt/trinity/lib/kde3/libkaddrbk_*.la
-/opt/trinity/lib/kde3/libkaddrbk_*.so
-/opt/trinity/lib/kde3/libkaddressbookpart.la
-/opt/trinity/lib/kde3/libkaddressbookpart.so
+/opt/trinity/lib/trinity/kcm_kabconfig.la
+/opt/trinity/lib/trinity/kcm_kabconfig.so
+/opt/trinity/lib/trinity/kcm_kabcustomfields.la
+/opt/trinity/lib/trinity/kcm_kabcustomfields.so
+/opt/trinity/lib/trinity/kcm_kabldapconfig.la
+/opt/trinity/lib/trinity/kcm_kabldapconfig.so
+/opt/trinity/lib/trinity/ldifvcardthumbnail.la
+/opt/trinity/lib/trinity/ldifvcardthumbnail.so
+/opt/trinity/lib/trinity/libkaddrbk_*.la
+/opt/trinity/lib/trinity/libkaddrbk_*.so
+/opt/trinity/lib/trinity/libkaddressbookpart.la
+/opt/trinity/lib/trinity/libkaddressbookpart.so
 /opt/trinity/lib/libkabinterfaces.so.1
 /opt/trinity/lib/libkabinterfaces.so.1.0.0
 /opt/trinity/lib/libkaddressbook.so.0
diff --git a/ubuntu/maverick/kdepim/debian/karm-trinity.install b/ubuntu/maverick/kdepim/debian/karm-trinity.install
index 4ed24ce22..aab595c42 100644
--- a/ubuntu/maverick/kdepim/debian/karm-trinity.install
+++ b/ubuntu/maverick/kdepim/debian/karm-trinity.install
@@ -2,8 +2,8 @@
 /opt/trinity/lib/libkarm.so
 /opt/trinity/lib/libkarm.so.0
 /opt/trinity/lib/libkarm.so.0.0.0
-/opt/trinity/lib/kde3/libkarmpart.la
-/opt/trinity/lib/kde3/libkarmpart.so
+/opt/trinity/lib/trinity/libkarmpart.la
+/opt/trinity/lib/trinity/libkarmpart.so
 /opt/trinity/share/applications/kde/karm.desktop
 /opt/trinity/share/applnk/Utilities/karm.desktop
 /opt/trinity/share/apps/karm
diff --git a/ubuntu/maverick/kdepim/debian/kdepim-kfile-plugins-trinity.install b/ubuntu/maverick/kdepim/debian/kdepim-kfile-plugins-trinity.install
index afae2323d..3f39aaf87 100644
--- a/ubuntu/maverick/kdepim/debian/kdepim-kfile-plugins-trinity.install
+++ b/ubuntu/maverick/kdepim/debian/kdepim-kfile-plugins-trinity.install
@@ -1,6 +1,6 @@
-/opt/trinity/lib/kde3/kfile_ics.la
-/opt/trinity/lib/kde3/kfile_ics.so
-/opt/trinity/lib/kde3/kfile_vcf.la
-/opt/trinity/lib/kde3/kfile_vcf.so
+/opt/trinity/lib/trinity/kfile_ics.la
+/opt/trinity/lib/trinity/kfile_ics.so
+/opt/trinity/lib/trinity/kfile_vcf.la
+/opt/trinity/lib/trinity/kfile_vcf.so
 /opt/trinity/share/services/kfile_ics.desktop
 /opt/trinity/share/services/kfile_vcf.desktop
diff --git a/ubuntu/maverick/kdepim/debian/kdepim-kio-plugins-trinity.install b/ubuntu/maverick/kdepim/debian/kdepim-kio-plugins-trinity.install
index c08b844a5..f9cc8ca27 100644
--- a/ubuntu/maverick/kdepim/debian/kdepim-kio-plugins-trinity.install
+++ b/ubuntu/maverick/kdepim/debian/kdepim-kio-plugins-trinity.install
@@ -1,13 +1,13 @@
-/opt/trinity/lib/kde3/kio_groupwise.la
-/opt/trinity/lib/kde3/kio_groupwise.so
-/opt/trinity/lib/kde3/kio_imap4.la
-/opt/trinity/lib/kde3/kio_imap4.so
-/opt/trinity/lib/kde3/kio_mbox.la
-/opt/trinity/lib/kde3/kio_mbox.so
-/opt/trinity/lib/kde3/kio_scalix.la
-/opt/trinity/lib/kde3/kio_scalix.so
-/opt/trinity/lib/kde3/kio_sieve.la
-/opt/trinity/lib/kde3/kio_sieve.so
+/opt/trinity/lib/trinity/kio_groupwise.la
+/opt/trinity/lib/trinity/kio_groupwise.so
+/opt/trinity/lib/trinity/kio_imap4.la
+/opt/trinity/lib/trinity/kio_imap4.so
+/opt/trinity/lib/trinity/kio_mbox.la
+/opt/trinity/lib/trinity/kio_mbox.so
+/opt/trinity/lib/trinity/kio_scalix.la
+/opt/trinity/lib/trinity/kio_scalix.so
+/opt/trinity/lib/trinity/kio_sieve.la
+/opt/trinity/lib/trinity/kio_sieve.so
 /opt/trinity/share/services/groupwise.protocol
 /opt/trinity/share/services/groupwises.protocol
 /opt/trinity/share/services/imap4.protocol
diff --git a/ubuntu/maverick/kdepim/debian/kdepim-kresources-trinity.install b/ubuntu/maverick/kdepim/debian/kdepim-kresources-trinity.install
index 4fc5fef60..588b690b1 100644
--- a/ubuntu/maverick/kdepim/debian/kdepim-kresources-trinity.install
+++ b/ubuntu/maverick/kdepim/debian/kdepim-kresources-trinity.install
@@ -1,31 +1,31 @@
-/opt/trinity/lib/kde3/kabc_*.la
-/opt/trinity/lib/kde3/kabc_*.so
-/opt/trinity/lib/kde3/kcal_caldav.la
-/opt/trinity/lib/kde3/kcal_caldav.so
-/opt/trinity/lib/kde3/kabc_carddav.la
-/opt/trinity/lib/kde3/kabc_carddav.so
-/opt/trinity/lib/kde3/kcal_groupdav.la
-/opt/trinity/lib/kde3/kcal_groupdav.so
-/opt/trinity/lib/kde3/kcal_groupwise.la
-/opt/trinity/lib/kde3/kcal_groupwise.so
-/opt/trinity/lib/kde3/kcal_kolab.la
-/opt/trinity/lib/kde3/kcal_kolab.so
-/opt/trinity/lib/kde3/kcal_scalix.la
-/opt/trinity/lib/kde3/kcal_scalix.so
-/opt/trinity/lib/kde3/kcal_newexchange.la
-/opt/trinity/lib/kde3/kcal_newexchange.so
-/opt/trinity/lib/kde3/kcal_resourcefeatureplan.la
-/opt/trinity/lib/kde3/kcal_resourcefeatureplan.so
-/opt/trinity/lib/kde3/kcal_slox.la
-/opt/trinity/lib/kde3/kcal_slox.so
-/opt/trinity/lib/kde3/kcal_xmlrpc.la
-/opt/trinity/lib/kde3/kcal_xmlrpc.so
-/opt/trinity/lib/kde3/knotes_kolab.la
-/opt/trinity/lib/kde3/knotes_kolab.so
-/opt/trinity/lib/kde3/knotes_scalix.la
-/opt/trinity/lib/kde3/knotes_scalix.so
-/opt/trinity/lib/kde3/knotes_xmlrpc.la
-/opt/trinity/lib/kde3/knotes_xmlrpc.so
+/opt/trinity/lib/trinity/kabc_*.la
+/opt/trinity/lib/trinity/kabc_*.so
+/opt/trinity/lib/trinity/kcal_caldav.la
+/opt/trinity/lib/trinity/kcal_caldav.so
+/opt/trinity/lib/trinity/kabc_carddav.la
+/opt/trinity/lib/trinity/kabc_carddav.so
+/opt/trinity/lib/trinity/kcal_groupdav.la
+/opt/trinity/lib/trinity/kcal_groupdav.so
+/opt/trinity/lib/trinity/kcal_groupwise.la
+/opt/trinity/lib/trinity/kcal_groupwise.so
+/opt/trinity/lib/trinity/kcal_kolab.la
+/opt/trinity/lib/trinity/kcal_kolab.so
+/opt/trinity/lib/trinity/kcal_scalix.la
+/opt/trinity/lib/trinity/kcal_scalix.so
+/opt/trinity/lib/trinity/kcal_newexchange.la
+/opt/trinity/lib/trinity/kcal_newexchange.so
+/opt/trinity/lib/trinity/kcal_resourcefeatureplan.la
+/opt/trinity/lib/trinity/kcal_resourcefeatureplan.so
+/opt/trinity/lib/trinity/kcal_slox.la
+/opt/trinity/lib/trinity/kcal_slox.so
+/opt/trinity/lib/trinity/kcal_xmlrpc.la
+/opt/trinity/lib/trinity/kcal_xmlrpc.so
+/opt/trinity/lib/trinity/knotes_kolab.la
+/opt/trinity/lib/trinity/knotes_kolab.so
+/opt/trinity/lib/trinity/knotes_scalix.la
+/opt/trinity/lib/trinity/knotes_scalix.so
+/opt/trinity/lib/trinity/knotes_xmlrpc.la
+/opt/trinity/lib/trinity/knotes_xmlrpc.so
 /opt/trinity/lib/libkabckolab.so.0
 /opt/trinity/lib/libkabckolab.so.0.0.0
 /opt/trinity/lib/libkabcscalix.so.0
diff --git a/ubuntu/maverick/kdepim/debian/kdepim-wizards-trinity.install b/ubuntu/maverick/kdepim/debian/kdepim-wizards-trinity.install
index 31efd9d35..465782c25 100644
--- a/ubuntu/maverick/kdepim/debian/kdepim-wizards-trinity.install
+++ b/ubuntu/maverick/kdepim/debian/kdepim-wizards-trinity.install
@@ -6,18 +6,18 @@
 /opt/trinity/bin/scalixadmin
 /opt/trinity/bin/scalixwizard
 /opt/trinity/bin/sloxwizard
-/opt/trinity/lib/kde3/libegroupwarewizard.la
-/opt/trinity/lib/kde3/libegroupwarewizard.so
-/opt/trinity/lib/kde3/libexchangewizard.la
-/opt/trinity/lib/kde3/libexchangewizard.so
-/opt/trinity/lib/kde3/libgroupwisewizard.la
-/opt/trinity/lib/kde3/libgroupwisewizard.so
-/opt/trinity/lib/kde3/libkolabwizard.la
-/opt/trinity/lib/kde3/libkolabwizard.so
-/opt/trinity/lib/kde3/libscalixwizard.la
-/opt/trinity/lib/kde3/libscalixwizard.so
-/opt/trinity/lib/kde3/libsloxwizard.la
-/opt/trinity/lib/kde3/libsloxwizard.so
+/opt/trinity/lib/trinity/libegroupwarewizard.la
+/opt/trinity/lib/trinity/libegroupwarewizard.so
+/opt/trinity/lib/trinity/libexchangewizard.la
+/opt/trinity/lib/trinity/libexchangewizard.so
+/opt/trinity/lib/trinity/libgroupwisewizard.la
+/opt/trinity/lib/trinity/libgroupwisewizard.so
+/opt/trinity/lib/trinity/libkolabwizard.la
+/opt/trinity/lib/trinity/libkolabwizard.so
+/opt/trinity/lib/trinity/libscalixwizard.la
+/opt/trinity/lib/trinity/libscalixwizard.so
+/opt/trinity/lib/trinity/libsloxwizard.la
+/opt/trinity/lib/trinity/libsloxwizard.so
 /opt/trinity/share/applications/kde/groupwarewizard.desktop
 /opt/trinity/share/config.kcfg/egroupware.kcfg
 /opt/trinity/share/config.kcfg/groupwise.kcfg
diff --git a/ubuntu/maverick/kdepim/debian/kitchensync-trinity.install b/ubuntu/maverick/kdepim/debian/kitchensync-trinity.install
index 76d998e5a..cdf89734d 100644
--- a/ubuntu/maverick/kdepim/debian/kitchensync-trinity.install
+++ b/ubuntu/maverick/kdepim/debian/kitchensync-trinity.install
@@ -1,6 +1,6 @@
 /opt/trinity/bin/kitchensync
-/opt/trinity/lib/kde3/libkitchensyncpart.la
-/opt/trinity/lib/kde3/libkitchensyncpart.so
+/opt/trinity/lib/trinity/libkitchensyncpart.la
+/opt/trinity/lib/trinity/libkitchensyncpart.so
 /opt/trinity/share/apps/kitchensync
 /opt/trinity/lib/libkitchensync.so.0
 /opt/trinity/lib/libkitchensync.so.0.0.0
diff --git a/ubuntu/maverick/kdepim/debian/kleopatra-trinity.install b/ubuntu/maverick/kdepim/debian/kleopatra-trinity.install
index 5dd2c26d2..46ad1b0e9 100644
--- a/ubuntu/maverick/kdepim/debian/kleopatra-trinity.install
+++ b/ubuntu/maverick/kdepim/debian/kleopatra-trinity.install
@@ -1,7 +1,7 @@
 /opt/trinity/bin/kleopatra
 /opt/trinity/bin/kwatchgnupg
-/opt/trinity/lib/kde3/kcm_kleopatra.la
-/opt/trinity/lib/kde3/kcm_kleopatra.so
+/opt/trinity/lib/trinity/kcm_kleopatra.la
+/opt/trinity/lib/trinity/kcm_kleopatra.so
 /opt/trinity/share/applications/kde/kleopatra_import.desktop
 /opt/trinity/share/apps/kleopatra
 /opt/trinity/share/apps/kwatchgnupg
diff --git a/ubuntu/maverick/kdepim/debian/kmail-trinity.install b/ubuntu/maverick/kdepim/debian/kmail-trinity.install
index b7436c3b2..c6a5999d2 100644
--- a/ubuntu/maverick/kdepim/debian/kmail-trinity.install
+++ b/ubuntu/maverick/kdepim/debian/kmail-trinity.install
@@ -2,18 +2,18 @@
 /etc/trinity/kmail.antivirusrc
 /opt/trinity/bin/kmail
 /opt/trinity/bin/kmail_*.sh
-/opt/trinity/lib/kde3/kcm_kmail.la
-/opt/trinity/lib/kde3/kcm_kmail.so
-/opt/trinity/lib/kde3/libkmail_bodypartformatter_application_octetstream.la
-/opt/trinity/lib/kde3/libkmail_bodypartformatter_application_octetstream.so
-/opt/trinity/lib/kde3/libkmail_bodypartformatter_text_calendar.la
-/opt/trinity/lib/kde3/libkmail_bodypartformatter_text_calendar.so
-/opt/trinity/lib/kde3/libkmail_bodypartformatter_text_vcard.la
-/opt/trinity/lib/kde3/libkmail_bodypartformatter_text_vcard.so
-/opt/trinity/lib/kde3/libkmail_bodypartformatter_text_xdiff.la
-/opt/trinity/lib/kde3/libkmail_bodypartformatter_text_xdiff.so
-/opt/trinity/lib/kde3/libkmailpart.la
-/opt/trinity/lib/kde3/libkmailpart.so
+/opt/trinity/lib/trinity/kcm_kmail.la
+/opt/trinity/lib/trinity/kcm_kmail.so
+/opt/trinity/lib/trinity/libkmail_bodypartformatter_application_octetstream.la
+/opt/trinity/lib/trinity/libkmail_bodypartformatter_application_octetstream.so
+/opt/trinity/lib/trinity/libkmail_bodypartformatter_text_calendar.la
+/opt/trinity/lib/trinity/libkmail_bodypartformatter_text_calendar.so
+/opt/trinity/lib/trinity/libkmail_bodypartformatter_text_vcard.la
+/opt/trinity/lib/trinity/libkmail_bodypartformatter_text_vcard.so
+/opt/trinity/lib/trinity/libkmail_bodypartformatter_text_xdiff.la
+/opt/trinity/lib/trinity/libkmail_bodypartformatter_text_xdiff.so
+/opt/trinity/lib/trinity/libkmailpart.la
+/opt/trinity/lib/trinity/libkmailpart.so
 /opt/trinity/lib/libkmailprivate.la
 /opt/trinity/lib/libkmailprivate.so
 /opt/trinity/share/applications/kde/KMail.desktop
diff --git a/ubuntu/maverick/kdepim/debian/knode-trinity.install b/ubuntu/maverick/kdepim/debian/knode-trinity.install
index 5a7619adc..5017248f9 100644
--- a/ubuntu/maverick/kdepim/debian/knode-trinity.install
+++ b/ubuntu/maverick/kdepim/debian/knode-trinity.install
@@ -1,8 +1,8 @@
 /opt/trinity/bin/knode
-/opt/trinity/lib/kde3/kcm_knode.la
-/opt/trinity/lib/kde3/kcm_knode.so
-/opt/trinity/lib/kde3/libknodepart.la
-/opt/trinity/lib/kde3/libknodepart.so
+/opt/trinity/lib/trinity/kcm_knode.la
+/opt/trinity/lib/trinity/kcm_knode.so
+/opt/trinity/lib/trinity/libknodepart.la
+/opt/trinity/lib/trinity/libknodepart.so
 /opt/trinity/lib/libknodecommon.la
 /opt/trinity/lib/libknodecommon.so
 /opt/trinity/lib/libknodecommon.so.3
diff --git a/ubuntu/maverick/kdepim/debian/knotes-trinity.install b/ubuntu/maverick/kdepim/debian/knotes-trinity.install
index 976a34a44..741d0c822 100644
--- a/ubuntu/maverick/kdepim/debian/knotes-trinity.install
+++ b/ubuntu/maverick/kdepim/debian/knotes-trinity.install
@@ -1,6 +1,6 @@
 /opt/trinity/bin/knotes
-/opt/trinity/lib/kde3/knotes_local.la
-/opt/trinity/lib/kde3/knotes_local.so
+/opt/trinity/lib/trinity/knotes_local.la
+/opt/trinity/lib/trinity/knotes_local.so
 /opt/trinity/lib/libknotes.so
 /opt/trinity/lib/libknotes.so.0
 /opt/trinity/lib/libknotes.so.0.0.0
diff --git a/ubuntu/maverick/kdepim/debian/kontact-trinity.install b/ubuntu/maverick/kdepim/debian/kontact-trinity.install
index e7e97a798..93065d1f8 100644
--- a/ubuntu/maverick/kdepim/debian/kontact-trinity.install
+++ b/ubuntu/maverick/kdepim/debian/kontact-trinity.install
@@ -1,18 +1,18 @@
 /opt/trinity/bin/kontact
-/opt/trinity/lib/kde3/kcm_kmailsummary.la
-/opt/trinity/lib/kde3/kcm_kmailsummary.so
-/opt/trinity/lib/kde3/kcm_kontact.la
-/opt/trinity/lib/kde3/kcm_kontact.so
-/opt/trinity/lib/kde3/kcm_kontactknt.la
-/opt/trinity/lib/kde3/kcm_kontactknt.so
-/opt/trinity/lib/kde3/kcm_kontactsummary.la
-/opt/trinity/lib/kde3/kcm_kontactsummary.so
-/opt/trinity/lib/kde3/kcm_korgsummary.la
-/opt/trinity/lib/kde3/kcm_korgsummary.so
-/opt/trinity/lib/kde3/kcm_sdsummary.la
-/opt/trinity/lib/kde3/kcm_sdsummary.so
-/opt/trinity/lib/kde3/libkontact_*.la
-/opt/trinity/lib/kde3/libkontact_*.so
+/opt/trinity/lib/trinity/kcm_kmailsummary.la
+/opt/trinity/lib/trinity/kcm_kmailsummary.so
+/opt/trinity/lib/trinity/kcm_kontact.la
+/opt/trinity/lib/trinity/kcm_kontact.so
+/opt/trinity/lib/trinity/kcm_kontactknt.la
+/opt/trinity/lib/trinity/kcm_kontactknt.so
+/opt/trinity/lib/trinity/kcm_kontactsummary.la
+/opt/trinity/lib/trinity/kcm_kontactsummary.so
+/opt/trinity/lib/trinity/kcm_korgsummary.la
+/opt/trinity/lib/trinity/kcm_korgsummary.so
+/opt/trinity/lib/trinity/kcm_sdsummary.la
+/opt/trinity/lib/trinity/kcm_sdsummary.so
+/opt/trinity/lib/trinity/libkontact_*.la
+/opt/trinity/lib/trinity/libkontact_*.so
 /opt/trinity/lib/libkontact.so.1
 /opt/trinity/lib/libkontact.so.1.0.0
 /opt/trinity/lib/libkpinterfaces.so.1
diff --git a/ubuntu/maverick/kdepim/debian/korganizer-trinity.install b/ubuntu/maverick/kdepim/debian/korganizer-trinity.install
index addb79f24..6b6ce856b 100644
--- a/ubuntu/maverick/kdepim/debian/korganizer-trinity.install
+++ b/ubuntu/maverick/kdepim/debian/korganizer-trinity.install
@@ -1,12 +1,12 @@
 /opt/trinity/bin/ical2vcal
 /opt/trinity/bin/korgac
 /opt/trinity/bin/korganizer
-/opt/trinity/lib/kde3/kcm_korganizer.la
-/opt/trinity/lib/kde3/kcm_korganizer.so
-/opt/trinity/lib/kde3/libkorg_*.la
-/opt/trinity/lib/kde3/libkorg_*.so
-/opt/trinity/lib/kde3/libkorganizerpart.la
-/opt/trinity/lib/kde3/libkorganizerpart.so
+/opt/trinity/lib/trinity/kcm_korganizer.la
+/opt/trinity/lib/trinity/kcm_korganizer.so
+/opt/trinity/lib/trinity/libkorg_*.la
+/opt/trinity/lib/trinity/libkorg_*.so
+/opt/trinity/lib/trinity/libkorganizerpart.la
+/opt/trinity/lib/trinity/libkorganizerpart.so
 /opt/trinity/lib/libkocorehelper.so.1
 /opt/trinity/lib/libkocorehelper.so.1.0.0
 /opt/trinity/lib/libkorg_stdprinting.so.1
diff --git a/ubuntu/maverick/kdepim/debian/libkcal2b-trinity.install b/ubuntu/maverick/kdepim/debian/libkcal2b-trinity.install
index d871d449a..ca6e71652 100644
--- a/ubuntu/maverick/kdepim/debian/libkcal2b-trinity.install
+++ b/ubuntu/maverick/kdepim/debian/libkcal2b-trinity.install
@@ -1,11 +1,11 @@
-/opt/trinity/lib/kde3/kcal_kabc.la
-/opt/trinity/lib/kde3/kcal_kabc.so
-/opt/trinity/lib/kde3/kcal_localdir.la
-/opt/trinity/lib/kde3/kcal_localdir.so
-/opt/trinity/lib/kde3/kcal_local.la
-/opt/trinity/lib/kde3/kcal_local.so
-/opt/trinity/lib/kde3/kcal_remote.la
-/opt/trinity/lib/kde3/kcal_remote.so
+/opt/trinity/lib/trinity/kcal_kabc.la
+/opt/trinity/lib/trinity/kcal_kabc.so
+/opt/trinity/lib/trinity/kcal_localdir.la
+/opt/trinity/lib/trinity/kcal_localdir.so
+/opt/trinity/lib/trinity/kcal_local.la
+/opt/trinity/lib/trinity/kcal_local.so
+/opt/trinity/lib/trinity/kcal_remote.la
+/opt/trinity/lib/trinity/kcal_remote.so
 /opt/trinity/lib/libkcal.so.2
 /opt/trinity/lib/libkcal.so.2.0.0
 /opt/trinity/lib/libkcal_resourceremote.so.1
diff --git a/ubuntu/maverick/kdepim/debian/libkdepim1a-trinity.install b/ubuntu/maverick/kdepim/debian/libkdepim1a-trinity.install
index 0d4e75cb4..b7799470a 100644
--- a/ubuntu/maverick/kdepim/debian/libkdepim1a-trinity.install
+++ b/ubuntu/maverick/kdepim/debian/libkdepim1a-trinity.install
@@ -1,7 +1,7 @@
-/opt/trinity/lib/kde3/plugins/designer/kdepimwidgets.la
-/opt/trinity/lib/kde3/plugins/designer/kdepimwidgets.so
-/opt/trinity/lib/kde3/plugins/designer/kpartsdesignerplugin.la
-/opt/trinity/lib/kde3/plugins/designer/kpartsdesignerplugin.so
+/opt/trinity/lib/trinity/plugins/designer/kdepimwidgets.la
+/opt/trinity/lib/trinity/plugins/designer/kdepimwidgets.so
+/opt/trinity/lib/trinity/plugins/designer/kpartsdesignerplugin.la
+/opt/trinity/lib/trinity/plugins/designer/kpartsdesignerplugin.so
 /opt/trinity/lib/libkdepim.so.1
 /opt/trinity/lib/libkdepim.so.1.0.0
 /opt/trinity/share/apps/kdepimwidgets
diff --git a/ubuntu/maverick/kdepim/debian/libkpimexchange1-trinity.install b/ubuntu/maverick/kdepim/debian/libkpimexchange1-trinity.install
index abf65f60c..f5b098575 100644
--- a/ubuntu/maverick/kdepim/debian/libkpimexchange1-trinity.install
+++ b/ubuntu/maverick/kdepim/debian/libkpimexchange1-trinity.install
@@ -1,4 +1,4 @@
-/opt/trinity/lib/kde3/resourcecalendarexchange.la
-/opt/trinity/lib/kde3/resourcecalendarexchange.so
+/opt/trinity/lib/trinity/resourcecalendarexchange.la
+/opt/trinity/lib/trinity/resourcecalendarexchange.so
 /opt/trinity/lib/libkpimexchange.so.1
 /opt/trinity/lib/libkpimexchange.so.1.0.0
diff --git a/ubuntu/maverick/kdepim/debian/rules b/ubuntu/maverick/kdepim/debian/rules
index 11b332f36..6d8c87f14 100755
--- a/ubuntu/maverick/kdepim/debian/rules
+++ b/ubuntu/maverick/kdepim/debian/rules
@@ -3,9 +3,9 @@
 # Set LD_LIBRARY_PATH to the installed library directory to allow dh_shlibdeps to function
 # Also include the main Trinity path
 ifeq ("$(LD_LIBRARY_PATH)", "")
-LD_LIBRARY_PATH=debian/tmp/opt/trinity/lib:debian/tmp/opt/trinity/lib/kde3
+LD_LIBRARY_PATH=debian/tmp/opt/trinity/lib:debian/tmp/opt/trinity/lib/trinity
 else
-LD_LIBRARY_PATH += :debian/tmp/opt/trinity/lib:debian/tmp/opt/trinity/lib/kde3
+LD_LIBRARY_PATH += :debian/tmp/opt/trinity/lib:debian/tmp/opt/trinity/lib/trinity
 endif
 export LD_LIBRARY_PATH
 
@@ -49,11 +49,11 @@ kontact-trinity_recommends_plugins := korganizer-trinity specialdates
 kontact-trinity_suggests_plugins := journal kpilot-trinity todo
 
 DEB_DH_SHLIBDEPS_ARGS_kontact-trinity := \
-	$(foreach p,$(kontact-trinity_recommends_plugins) $(kontact-trinity_suggests_plugins),-Xopt/trinity/lib/kde3/libkontact_$(p)plugin.so) \
+	$(foreach p,$(kontact-trinity_recommends_plugins) $(kontact-trinity_suggests_plugins),-Xopt/trinity/lib/trinity/libkontact_$(p)plugin.so) \
 	-- -dRecommends \
-	$(foreach p,$(kontact-trinity_recommends_plugins),debian/kontact/opt/trinity/lib/kde3/libkontact_$(p)plugin.so) \
+	$(foreach p,$(kontact-trinity_recommends_plugins),debian/kontact/opt/trinity/lib/trinity/libkontact_$(p)plugin.so) \
 	-dSuggests \
-	$(foreach p,$(kontact-trinity_suggests_plugins),debian/kontact/opt/trinity/lib/kde3/libkontact_$(p)plugin.so) \
+	$(foreach p,$(kontact-trinity_suggests_plugins),debian/kontact/opt/trinity/lib/trinity/libkontact_$(p)plugin.so) \
 	-dDepends	# Since -u args go first in dpkg-shlibdeps call
 
 ## Move kaddressbook-trinity dependency (from libkabc_xmlrpc.so) to Recommends
@@ -65,9 +65,9 @@ DEB_DH_SHLIBDEPS_ARGS_kontact-trinity := \
 #
 ## Move kaddressbook dependency of libkcal2b-trinity to Recommends
 #DEB_DH_SHLIBDEPS_ARGS_libkcal2b-trinity := \
-#	-Xopt/trinity/lib/kde3/kcal_kabc.so \
+#	-Xopt/trinity/lib/trinity/kcal_kabc.so \
 #	-- -dRecommends \
-#	debian/libkcal2b/opt/trinity/lib/kde3/kcal_kabc.so \
+#	debian/libkcal2b/opt/trinity/lib/trinity/kcal_kabc.so \
 #	-dDepends
 
 test-shlibdeps: