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

13 files changed, 136 insertions, 136 deletions

diff --git a/ubuntu/maverick/kdenetwork/debian/kdenetwork-filesharing-trinity.install b/ubuntu/maverick/kdenetwork/debian/kdenetwork-filesharing-trinity.install
index 558a10cd3..4b0e9f5b9 100644
--- a/ubuntu/maverick/kdenetwork/debian/kdenetwork-filesharing-trinity.install
+++ b/ubuntu/maverick/kdenetwork/debian/kdenetwork-filesharing-trinity.install
@@ -1,9 +1,9 @@
-debian/tmp/opt/trinity/lib/kde3/fileshare_propsdlgplugin.la
-debian/tmp/opt/trinity/lib/kde3/fileshare_propsdlgplugin.so
-debian/tmp/opt/trinity/lib/kde3/kcm_fileshare.la
-debian/tmp/opt/trinity/lib/kde3/kcm_fileshare.so
-debian/tmp/opt/trinity/lib/kde3/kcm_kcmsambaconf.la
-debian/tmp/opt/trinity/lib/kde3/kcm_kcmsambaconf.so
+debian/tmp/opt/trinity/lib/trinity/fileshare_propsdlgplugin.la
+debian/tmp/opt/trinity/lib/trinity/fileshare_propsdlgplugin.so
+debian/tmp/opt/trinity/lib/trinity/kcm_fileshare.la
+debian/tmp/opt/trinity/lib/trinity/kcm_fileshare.so
+debian/tmp/opt/trinity/lib/trinity/kcm_kcmsambaconf.la
+debian/tmp/opt/trinity/lib/trinity/kcm_kcmsambaconf.so
 debian/tmp/opt/trinity/share/applications/kde/fileshare.desktop
 debian/tmp/opt/trinity/share/applications/kde/kcmsambaconf.desktop
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kcmsambaconf.png
diff --git a/ubuntu/maverick/kdenetwork/debian/kdenetwork-kfile-plugins-trinity.install b/ubuntu/maverick/kdenetwork/debian/kdenetwork-kfile-plugins-trinity.install
index a75e05ab5..b32a36440 100644
--- a/ubuntu/maverick/kdenetwork/debian/kdenetwork-kfile-plugins-trinity.install
+++ b/ubuntu/maverick/kdenetwork/debian/kdenetwork-kfile-plugins-trinity.install
@@ -1,3 +1,3 @@
-debian/tmp/opt/trinity/lib/kde3/kfile_torrent.la
-debian/tmp/opt/trinity/lib/kde3/kfile_torrent.so
+debian/tmp/opt/trinity/lib/trinity/kfile_torrent.la
+debian/tmp/opt/trinity/lib/trinity/kfile_torrent.so
 debian/tmp/opt/trinity/share/services/kfile_torrent.desktop
diff --git a/ubuntu/maverick/kdenetwork/debian/kdict-trinity.install b/ubuntu/maverick/kdenetwork/debian/kdict-trinity.install
index 7f67f3834..24d312686 100644
--- a/ubuntu/maverick/kdenetwork/debian/kdict-trinity.install
+++ b/ubuntu/maverick/kdenetwork/debian/kdict-trinity.install
@@ -1,8 +1,8 @@
 debian/tmp/opt/trinity/bin/kdict
-debian/tmp/opt/trinity/lib/kde3/kdict.la
-debian/tmp/opt/trinity/lib/kde3/kdict.so
-debian/tmp/opt/trinity/lib/kde3/kdict_panelapplet.la
-debian/tmp/opt/trinity/lib/kde3/kdict_panelapplet.so
+debian/tmp/opt/trinity/lib/trinity/kdict.la
+debian/tmp/opt/trinity/lib/trinity/kdict.so
+debian/tmp/opt/trinity/lib/trinity/kdict_panelapplet.la
+debian/tmp/opt/trinity/lib/trinity/kdict_panelapplet.so
 debian/tmp/opt/trinity/lib/libkdeinit_kdict.so
 debian/tmp/opt/trinity/share/applications/kde/kdict.desktop
 debian/tmp/opt/trinity/share/apps/kdict/icons/crystalsvg/16x16/actions/define_clip.png
diff --git a/ubuntu/maverick/kdenetwork/debian/kdnssd-trinity.install b/ubuntu/maverick/kdenetwork/debian/kdnssd-trinity.install
index 64b6ca584..8d6a52c6b 100644
--- a/ubuntu/maverick/kdenetwork/debian/kdnssd-trinity.install
+++ b/ubuntu/maverick/kdenetwork/debian/kdnssd-trinity.install
@@ -9,7 +9,7 @@ debian/tmp/opt/trinity/share/apps/zeroconf/_webdav._tcp
 debian/tmp/opt/trinity/share/apps/zeroconf/_nfs._tcp
 debian/tmp/opt/trinity/share/apps/zeroconf/_ssh._tcp
 debian/tmp/opt/trinity/share/apps/zeroconf/_rfb._tcp
-debian/tmp/opt/trinity/lib/kde3/kio_zeroconf.so
-debian/tmp/opt/trinity/lib/kde3/kio_zeroconf.la
-debian/tmp/opt/trinity/lib/kde3/kded_dnssdwatcher.so
-debian/tmp/opt/trinity/lib/kde3/kded_dnssdwatcher.la
+debian/tmp/opt/trinity/lib/trinity/kio_zeroconf.so
+debian/tmp/opt/trinity/lib/trinity/kio_zeroconf.la
+debian/tmp/opt/trinity/lib/trinity/kded_dnssdwatcher.so
+debian/tmp/opt/trinity/lib/trinity/kded_dnssdwatcher.la
diff --git a/ubuntu/maverick/kdenetwork/debian/kget-trinity.install b/ubuntu/maverick/kdenetwork/debian/kget-trinity.install
index 5ed1b6b4b..8e508722e 100644
--- a/ubuntu/maverick/kdenetwork/debian/kget-trinity.install
+++ b/ubuntu/maverick/kdenetwork/debian/kget-trinity.install
@@ -1,6 +1,6 @@
 debian/tmp/opt/trinity/bin/kget
-debian/tmp/opt/trinity/lib/kde3/khtml_kget.la
-debian/tmp/opt/trinity/lib/kde3/khtml_kget.so
+debian/tmp/opt/trinity/lib/trinity/khtml_kget.la
+debian/tmp/opt/trinity/lib/trinity/khtml_kget.so
 debian/tmp/opt/trinity/share/applications/kde/kget.desktop
 debian/tmp/opt/trinity/share/apps/kget/eventsrc
 debian/tmp/opt/trinity/share/apps/kget/icons/crystalsvg/22x22/actions/bar0.png
diff --git a/ubuntu/maverick/kdenetwork/debian/knewsticker-trinity.install b/ubuntu/maverick/kdenetwork/debian/knewsticker-trinity.install
index 4e8a8b52f..b7b2aa7c4 100644
--- a/ubuntu/maverick/kdenetwork/debian/knewsticker-trinity.install
+++ b/ubuntu/maverick/kdenetwork/debian/knewsticker-trinity.install
@@ -1,8 +1,8 @@
 debian/tmp/opt/trinity/bin/knewstickerstub
-debian/tmp/opt/trinity/lib/kde3/knewsticker_panelapplet.la
-debian/tmp/opt/trinity/lib/kde3/knewsticker_panelapplet.so
-debian/tmp/opt/trinity/lib/kde3/libkntsrcfilepropsdlg.la
-debian/tmp/opt/trinity/lib/kde3/libkntsrcfilepropsdlg.so
+debian/tmp/opt/trinity/lib/trinity/knewsticker_panelapplet.la
+debian/tmp/opt/trinity/lib/trinity/knewsticker_panelapplet.so
+debian/tmp/opt/trinity/lib/trinity/libkntsrcfilepropsdlg.la
+debian/tmp/opt/trinity/lib/trinity/libkntsrcfilepropsdlg.so
 debian/tmp/opt/trinity/share/applications/kde/knewsticker-standalone.desktop
 debian/tmp/opt/trinity/share/applnk/.hidden/knewstickerstub.desktop
 debian/tmp/opt/trinity/share/apps/kconf_update/knewsticker.upd
diff --git a/ubuntu/maverick/kdenetwork/debian/kopete-trinity.install b/ubuntu/maverick/kdenetwork/debian/kopete-trinity.install
index 41d28544b..c4a342dc5 100644
--- a/ubuntu/maverick/kdenetwork/debian/kopete-trinity.install
+++ b/ubuntu/maverick/kdenetwork/debian/kopete-trinity.install
@@ -7,102 +7,102 @@ debian/tmp/opt/trinity/include/kde/kopete/webcamwidget.h
 debian/tmp/opt/trinity/lib/kconf_update_bin/kopete-account-kconf_update
 debian/tmp/opt/trinity/lib/kconf_update_bin/kopete-nameTracking-kconf_update
 debian/tmp/opt/trinity/lib/kconf_update_bin/kopete-pluginloader2-kconf_update
-debian/tmp/opt/trinity/lib/kde3/kcm_kopete_accountconfig.la
-debian/tmp/opt/trinity/lib/kde3/kcm_kopete_accountconfig.so
-debian/tmp/opt/trinity/lib/kde3/kcm_kopete_addbookmarks.la
-debian/tmp/opt/trinity/lib/kde3/kcm_kopete_addbookmarks.so
-debian/tmp/opt/trinity/lib/kde3/kcm_kopete_alias.la
-debian/tmp/opt/trinity/lib/kde3/kcm_kopete_alias.so
-debian/tmp/opt/trinity/lib/kde3/kcm_kopete_appearanceconfig.la
-debian/tmp/opt/trinity/lib/kde3/kcm_kopete_appearanceconfig.so
-debian/tmp/opt/trinity/lib/kde3/kcm_kopete_autoreplace.la
-debian/tmp/opt/trinity/lib/kde3/kcm_kopete_autoreplace.so
-debian/tmp/opt/trinity/lib/kde3/kcm_kopete_avdeviceconfig.la
-debian/tmp/opt/trinity/lib/kde3/kcm_kopete_avdeviceconfig.so
-debian/tmp/opt/trinity/lib/kde3/kcm_kopete_behaviorconfig.la
-debian/tmp/opt/trinity/lib/kde3/kcm_kopete_behaviorconfig.so
-debian/tmp/opt/trinity/lib/kde3/kcm_kopete_cryptography.la
-debian/tmp/opt/trinity/lib/kde3/kcm_kopete_cryptography.so
-debian/tmp/opt/trinity/lib/kde3/kcm_kopete_highlight.la
-debian/tmp/opt/trinity/lib/kde3/kcm_kopete_highlight.so
-debian/tmp/opt/trinity/lib/kde3/kcm_kopete_history.la
-debian/tmp/opt/trinity/lib/kde3/kcm_kopete_history.so
-debian/tmp/opt/trinity/lib/kde3/kcm_kopete_identityconfig.la
-debian/tmp/opt/trinity/lib/kde3/kcm_kopete_identityconfig.so
-debian/tmp/opt/trinity/lib/kde3/kcm_kopete_latex.la
-debian/tmp/opt/trinity/lib/kde3/kcm_kopete_latex.so
-debian/tmp/opt/trinity/lib/kde3/kcm_kopete_msn.la
-debian/tmp/opt/trinity/lib/kde3/kcm_kopete_msn.so
-debian/tmp/opt/trinity/lib/kde3/kcm_kopete_netmeeting.la
-debian/tmp/opt/trinity/lib/kde3/kcm_kopete_netmeeting.so
-debian/tmp/opt/trinity/lib/kde3/kcm_kopete_nowlistening.la
-debian/tmp/opt/trinity/lib/kde3/kcm_kopete_nowlistening.so
-debian/tmp/opt/trinity/lib/kde3/kcm_kopete_texteffect.la
-debian/tmp/opt/trinity/lib/kde3/kcm_kopete_texteffect.so
-debian/tmp/opt/trinity/lib/kde3/kcm_kopete_translator.la
-debian/tmp/opt/trinity/lib/kde3/kcm_kopete_translator.so
-debian/tmp/opt/trinity/lib/kde3/kcm_kopete_webpresence.la
-debian/tmp/opt/trinity/lib/kde3/kcm_kopete_webpresence.so
-debian/tmp/opt/trinity/lib/kde3/kio_jabberdisco.la
-debian/tmp/opt/trinity/lib/kde3/kio_jabberdisco.so
-debian/tmp/opt/trinity/lib/kde3/kopete_addbookmarks.la
-debian/tmp/opt/trinity/lib/kde3/kopete_addbookmarks.so
-debian/tmp/opt/trinity/lib/kde3/kopete_aim.la
-debian/tmp/opt/trinity/lib/kde3/kopete_aim.so
-debian/tmp/opt/trinity/lib/kde3/kopete_alias.la
-debian/tmp/opt/trinity/lib/kde3/kopete_alias.so
-debian/tmp/opt/trinity/lib/kde3/kopete_autoreplace.la
-debian/tmp/opt/trinity/lib/kde3/kopete_autoreplace.so
-debian/tmp/opt/trinity/lib/kde3/kopete_chatwindow.la
-debian/tmp/opt/trinity/lib/kde3/kopete_chatwindow.so
-debian/tmp/opt/trinity/lib/kde3/kopete_connectionstatus.la
-debian/tmp/opt/trinity/lib/kde3/kopete_connectionstatus.so
-debian/tmp/opt/trinity/lib/kde3/kopete_contactnotes.la
-debian/tmp/opt/trinity/lib/kde3/kopete_contactnotes.so
-debian/tmp/opt/trinity/lib/kde3/kopete_cryptography.la
-debian/tmp/opt/trinity/lib/kde3/kopete_cryptography.so
-debian/tmp/opt/trinity/lib/kde3/kopete_emailwindow.la
-debian/tmp/opt/trinity/lib/kde3/kopete_emailwindow.so
-debian/tmp/opt/trinity/lib/kde3/kopete_gadu.la
-debian/tmp/opt/trinity/lib/kde3/kopete_gadu.so
-debian/tmp/opt/trinity/lib/kde3/kopete_groupwise.la
-debian/tmp/opt/trinity/lib/kde3/kopete_groupwise.so
-debian/tmp/opt/trinity/lib/kde3/kopete_highlight.la
-debian/tmp/opt/trinity/lib/kde3/kopete_highlight.so
-debian/tmp/opt/trinity/lib/kde3/kopete_history.la
-debian/tmp/opt/trinity/lib/kde3/kopete_history.so
-debian/tmp/opt/trinity/lib/kde3/kopete_icq.la
-debian/tmp/opt/trinity/lib/kde3/kopete_icq.so
-debian/tmp/opt/trinity/lib/kde3/kopete_irc.la
-debian/tmp/opt/trinity/lib/kde3/kopete_irc.so
-debian/tmp/opt/trinity/lib/kde3/kopete_jabber.la
-debian/tmp/opt/trinity/lib/kde3/kopete_jabber.so
-debian/tmp/opt/trinity/lib/kde3/kopete_latex.la
-debian/tmp/opt/trinity/lib/kde3/kopete_latex.so
-debian/tmp/opt/trinity/lib/kde3/kopete_meanwhile.la
-debian/tmp/opt/trinity/lib/kde3/kopete_meanwhile.so
-debian/tmp/opt/trinity/lib/kde3/kopete_msn.la
-debian/tmp/opt/trinity/lib/kde3/kopete_msn.so
-debian/tmp/opt/trinity/lib/kde3/kopete_netmeeting.la
-debian/tmp/opt/trinity/lib/kde3/kopete_netmeeting.so
-debian/tmp/opt/trinity/lib/kde3/kopete_nowlistening.la
-debian/tmp/opt/trinity/lib/kde3/kopete_nowlistening.so
-debian/tmp/opt/trinity/lib/kde3/kopete_statistics.la
-debian/tmp/opt/trinity/lib/kde3/kopete_statistics.so
-debian/tmp/opt/trinity/lib/kde3/kopete_testbed.la
-debian/tmp/opt/trinity/lib/kde3/kopete_testbed.so
-debian/tmp/opt/trinity/lib/kde3/kopete_texteffect.la
-debian/tmp/opt/trinity/lib/kde3/kopete_texteffect.so
-debian/tmp/opt/trinity/lib/kde3/kopete_translator.la
-debian/tmp/opt/trinity/lib/kde3/kopete_translator.so
-debian/tmp/opt/trinity/lib/kde3/kopete_webpresence.la
-debian/tmp/opt/trinity/lib/kde3/kopete_webpresence.so
-debian/tmp/opt/trinity/lib/kde3/kopete_wp.la
-debian/tmp/opt/trinity/lib/kde3/kopete_wp.so
-debian/tmp/opt/trinity/lib/kde3/kopete_yahoo.la
-debian/tmp/opt/trinity/lib/kde3/kopete_yahoo.so
-debian/tmp/opt/trinity/lib/kde3/libkrichtexteditpart.la
-debian/tmp/opt/trinity/lib/kde3/libkrichtexteditpart.so
+debian/tmp/opt/trinity/lib/trinity/kcm_kopete_accountconfig.la
+debian/tmp/opt/trinity/lib/trinity/kcm_kopete_accountconfig.so
+debian/tmp/opt/trinity/lib/trinity/kcm_kopete_addbookmarks.la
+debian/tmp/opt/trinity/lib/trinity/kcm_kopete_addbookmarks.so
+debian/tmp/opt/trinity/lib/trinity/kcm_kopete_alias.la
+debian/tmp/opt/trinity/lib/trinity/kcm_kopete_alias.so
+debian/tmp/opt/trinity/lib/trinity/kcm_kopete_appearanceconfig.la
+debian/tmp/opt/trinity/lib/trinity/kcm_kopete_appearanceconfig.so
+debian/tmp/opt/trinity/lib/trinity/kcm_kopete_autoreplace.la
+debian/tmp/opt/trinity/lib/trinity/kcm_kopete_autoreplace.so
+debian/tmp/opt/trinity/lib/trinity/kcm_kopete_avdeviceconfig.la
+debian/tmp/opt/trinity/lib/trinity/kcm_kopete_avdeviceconfig.so
+debian/tmp/opt/trinity/lib/trinity/kcm_kopete_behaviorconfig.la
+debian/tmp/opt/trinity/lib/trinity/kcm_kopete_behaviorconfig.so
+debian/tmp/opt/trinity/lib/trinity/kcm_kopete_cryptography.la
+debian/tmp/opt/trinity/lib/trinity/kcm_kopete_cryptography.so
+debian/tmp/opt/trinity/lib/trinity/kcm_kopete_highlight.la
+debian/tmp/opt/trinity/lib/trinity/kcm_kopete_highlight.so
+debian/tmp/opt/trinity/lib/trinity/kcm_kopete_history.la
+debian/tmp/opt/trinity/lib/trinity/kcm_kopete_history.so
+debian/tmp/opt/trinity/lib/trinity/kcm_kopete_identityconfig.la
+debian/tmp/opt/trinity/lib/trinity/kcm_kopete_identityconfig.so
+debian/tmp/opt/trinity/lib/trinity/kcm_kopete_latex.la
+debian/tmp/opt/trinity/lib/trinity/kcm_kopete_latex.so
+debian/tmp/opt/trinity/lib/trinity/kcm_kopete_msn.la
+debian/tmp/opt/trinity/lib/trinity/kcm_kopete_msn.so
+debian/tmp/opt/trinity/lib/trinity/kcm_kopete_netmeeting.la
+debian/tmp/opt/trinity/lib/trinity/kcm_kopete_netmeeting.so
+debian/tmp/opt/trinity/lib/trinity/kcm_kopete_nowlistening.la
+debian/tmp/opt/trinity/lib/trinity/kcm_kopete_nowlistening.so
+debian/tmp/opt/trinity/lib/trinity/kcm_kopete_texteffect.la
+debian/tmp/opt/trinity/lib/trinity/kcm_kopete_texteffect.so
+debian/tmp/opt/trinity/lib/trinity/kcm_kopete_translator.la
+debian/tmp/opt/trinity/lib/trinity/kcm_kopete_translator.so
+debian/tmp/opt/trinity/lib/trinity/kcm_kopete_webpresence.la
+debian/tmp/opt/trinity/lib/trinity/kcm_kopete_webpresence.so
+debian/tmp/opt/trinity/lib/trinity/kio_jabberdisco.la
+debian/tmp/opt/trinity/lib/trinity/kio_jabberdisco.so
+debian/tmp/opt/trinity/lib/trinity/kopete_addbookmarks.la
+debian/tmp/opt/trinity/lib/trinity/kopete_addbookmarks.so
+debian/tmp/opt/trinity/lib/trinity/kopete_aim.la
+debian/tmp/opt/trinity/lib/trinity/kopete_aim.so
+debian/tmp/opt/trinity/lib/trinity/kopete_alias.la
+debian/tmp/opt/trinity/lib/trinity/kopete_alias.so
+debian/tmp/opt/trinity/lib/trinity/kopete_autoreplace.la
+debian/tmp/opt/trinity/lib/trinity/kopete_autoreplace.so
+debian/tmp/opt/trinity/lib/trinity/kopete_chatwindow.la
+debian/tmp/opt/trinity/lib/trinity/kopete_chatwindow.so
+debian/tmp/opt/trinity/lib/trinity/kopete_connectionstatus.la
+debian/tmp/opt/trinity/lib/trinity/kopete_connectionstatus.so
+debian/tmp/opt/trinity/lib/trinity/kopete_contactnotes.la
+debian/tmp/opt/trinity/lib/trinity/kopete_contactnotes.so
+debian/tmp/opt/trinity/lib/trinity/kopete_cryptography.la
+debian/tmp/opt/trinity/lib/trinity/kopete_cryptography.so
+debian/tmp/opt/trinity/lib/trinity/kopete_emailwindow.la
+debian/tmp/opt/trinity/lib/trinity/kopete_emailwindow.so
+debian/tmp/opt/trinity/lib/trinity/kopete_gadu.la
+debian/tmp/opt/trinity/lib/trinity/kopete_gadu.so
+debian/tmp/opt/trinity/lib/trinity/kopete_groupwise.la
+debian/tmp/opt/trinity/lib/trinity/kopete_groupwise.so
+debian/tmp/opt/trinity/lib/trinity/kopete_highlight.la
+debian/tmp/opt/trinity/lib/trinity/kopete_highlight.so
+debian/tmp/opt/trinity/lib/trinity/kopete_history.la
+debian/tmp/opt/trinity/lib/trinity/kopete_history.so
+debian/tmp/opt/trinity/lib/trinity/kopete_icq.la
+debian/tmp/opt/trinity/lib/trinity/kopete_icq.so
+debian/tmp/opt/trinity/lib/trinity/kopete_irc.la
+debian/tmp/opt/trinity/lib/trinity/kopete_irc.so
+debian/tmp/opt/trinity/lib/trinity/kopete_jabber.la
+debian/tmp/opt/trinity/lib/trinity/kopete_jabber.so
+debian/tmp/opt/trinity/lib/trinity/kopete_latex.la
+debian/tmp/opt/trinity/lib/trinity/kopete_latex.so
+debian/tmp/opt/trinity/lib/trinity/kopete_meanwhile.la
+debian/tmp/opt/trinity/lib/trinity/kopete_meanwhile.so
+debian/tmp/opt/trinity/lib/trinity/kopete_msn.la
+debian/tmp/opt/trinity/lib/trinity/kopete_msn.so
+debian/tmp/opt/trinity/lib/trinity/kopete_netmeeting.la
+debian/tmp/opt/trinity/lib/trinity/kopete_netmeeting.so
+debian/tmp/opt/trinity/lib/trinity/kopete_nowlistening.la
+debian/tmp/opt/trinity/lib/trinity/kopete_nowlistening.so
+debian/tmp/opt/trinity/lib/trinity/kopete_statistics.la
+debian/tmp/opt/trinity/lib/trinity/kopete_statistics.so
+debian/tmp/opt/trinity/lib/trinity/kopete_testbed.la
+debian/tmp/opt/trinity/lib/trinity/kopete_testbed.so
+debian/tmp/opt/trinity/lib/trinity/kopete_texteffect.la
+debian/tmp/opt/trinity/lib/trinity/kopete_texteffect.so
+debian/tmp/opt/trinity/lib/trinity/kopete_translator.la
+debian/tmp/opt/trinity/lib/trinity/kopete_translator.so
+debian/tmp/opt/trinity/lib/trinity/kopete_webpresence.la
+debian/tmp/opt/trinity/lib/trinity/kopete_webpresence.so
+debian/tmp/opt/trinity/lib/trinity/kopete_wp.la
+debian/tmp/opt/trinity/lib/trinity/kopete_wp.so
+debian/tmp/opt/trinity/lib/trinity/kopete_yahoo.la
+debian/tmp/opt/trinity/lib/trinity/kopete_yahoo.so
+debian/tmp/opt/trinity/lib/trinity/libkrichtexteditpart.la
+debian/tmp/opt/trinity/lib/trinity/libkrichtexteditpart.so
 debian/tmp/opt/trinity/lib/libkopete_msn_shared.so.0
 debian/tmp/opt/trinity/lib/libkopete_msn_shared.so.0.0.0
 debian/tmp/opt/trinity/lib/libkopete_oscar.so.2
diff --git a/ubuntu/maverick/kdenetwork/debian/kpf-trinity.install b/ubuntu/maverick/kdenetwork/debian/kpf-trinity.install
index b1936b1ad..1ea904b80 100644
--- a/ubuntu/maverick/kdenetwork/debian/kpf-trinity.install
+++ b/ubuntu/maverick/kdenetwork/debian/kpf-trinity.install
@@ -1,7 +1,7 @@
-debian/tmp/opt/trinity/lib/kde3/kpf_panelapplet.la
-debian/tmp/opt/trinity/lib/kde3/kpf_panelapplet.so
-debian/tmp/opt/trinity/lib/kde3/kpfpropertiesdialog.la
-debian/tmp/opt/trinity/lib/kde3/kpfpropertiesdialog.so
+debian/tmp/opt/trinity/lib/trinity/kpf_panelapplet.la
+debian/tmp/opt/trinity/lib/trinity/kpf_panelapplet.so
+debian/tmp/opt/trinity/lib/trinity/kpfpropertiesdialog.la
+debian/tmp/opt/trinity/lib/trinity/kpfpropertiesdialog.so
 debian/tmp/opt/trinity/share/apps/kicker/applets/kpfapplet.desktop
 debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpf/common
 debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpf/index.cache.bz2
diff --git a/ubuntu/maverick/kdenetwork/debian/krfb-trinity.install b/ubuntu/maverick/kdenetwork/debian/krfb-trinity.install
index 656ba7d45..5bae6725b 100644
--- a/ubuntu/maverick/kdenetwork/debian/krfb-trinity.install
+++ b/ubuntu/maverick/kdenetwork/debian/krfb-trinity.install
@@ -1,9 +1,9 @@
 debian/tmp/opt/trinity/bin/krfb
 debian/tmp/opt/trinity/bin/krfb_httpd
-debian/tmp/opt/trinity/lib/kde3/kcm_krfb.la
-debian/tmp/opt/trinity/lib/kde3/kcm_krfb.so
-debian/tmp/opt/trinity/lib/kde3/kded_kinetd.la
-debian/tmp/opt/trinity/lib/kde3/kded_kinetd.so
+debian/tmp/opt/trinity/lib/trinity/kcm_krfb.la
+debian/tmp/opt/trinity/lib/trinity/kcm_krfb.so
+debian/tmp/opt/trinity/lib/trinity/kded_kinetd.la
+debian/tmp/opt/trinity/lib/trinity/kded_kinetd.so
 debian/tmp/opt/trinity/share/applications/kde/kcmkrfb.desktop
 debian/tmp/opt/trinity/share/applications/kde/krfb.desktop
 debian/tmp/opt/trinity/share/apps/kinetd/eventsrc
diff --git a/ubuntu/maverick/kdenetwork/debian/ksirc-trinity.install b/ubuntu/maverick/kdenetwork/debian/ksirc-trinity.install
index bdc0728f3..30d9f29b3 100644
--- a/ubuntu/maverick/kdenetwork/debian/ksirc-trinity.install
+++ b/ubuntu/maverick/kdenetwork/debian/ksirc-trinity.install
@@ -1,8 +1,8 @@
 debian/tmp/etc/trinity/ksircrc
 debian/tmp/opt/trinity/bin/dsirc
 debian/tmp/opt/trinity/bin/ksirc
-debian/tmp/opt/trinity/lib/kde3/ksirc.la
-debian/tmp/opt/trinity/lib/kde3/ksirc.so
+debian/tmp/opt/trinity/lib/trinity/ksirc.la
+debian/tmp/opt/trinity/lib/trinity/ksirc.so
 debian/tmp/opt/trinity/lib/libkdeinit_ksirc.so
 debian/tmp/opt/trinity/share/applications/kde/ksirc.desktop
 debian/tmp/opt/trinity/share/apps/ksirc/autodcc.pl
diff --git a/ubuntu/maverick/kdenetwork/debian/ktalkd-trinity.install b/ubuntu/maverick/kdenetwork/debian/ktalkd-trinity.install
index 46ec62753..4206a1618 100644
--- a/ubuntu/maverick/kdenetwork/debian/ktalkd-trinity.install
+++ b/ubuntu/maverick/kdenetwork/debian/ktalkd-trinity.install
@@ -1,8 +1,8 @@
 debian/tmp/etc/trinity/ktalkdrc
 debian/tmp/opt/trinity/bin/ktalkdlg
 debian/tmp/opt/trinity/bin/mail.local
-debian/tmp/opt/trinity/lib/kde3/kcm_ktalkd.la
-debian/tmp/opt/trinity/lib/kde3/kcm_ktalkd.so
+debian/tmp/opt/trinity/lib/trinity/kcm_ktalkd.la
+debian/tmp/opt/trinity/lib/trinity/kcm_ktalkd.so
 debian/tmp/opt/trinity/share/applications/kde/kcmktalkd.desktop
 debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/kcmtalkd/common
 debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/kcmtalkd/index.cache.bz2
diff --git a/ubuntu/maverick/kdenetwork/debian/kwifimanager-trinity.install b/ubuntu/maverick/kdenetwork/debian/kwifimanager-trinity.install
index c0c494e5f..ce735f6fa 100644
--- a/ubuntu/maverick/kdenetwork/debian/kwifimanager-trinity.install
+++ b/ubuntu/maverick/kdenetwork/debian/kwifimanager-trinity.install
@@ -1,6 +1,6 @@
 debian/tmp/opt/trinity/bin/kwifimanager
-debian/tmp/opt/trinity/lib/kde3/kcm_wifi.la
-debian/tmp/opt/trinity/lib/kde3/kcm_wifi.so
+debian/tmp/opt/trinity/lib/trinity/kcm_wifi.la
+debian/tmp/opt/trinity/lib/trinity/kcm_wifi.so
 debian/tmp/opt/trinity/lib/libkwireless.la
 debian/tmp/opt/trinity/lib/libkwireless.so
 debian/tmp/opt/trinity/share/applications/kde/kcmwifi.desktop
diff --git a/ubuntu/maverick/kdenetwork/debian/lisa-trinity.install b/ubuntu/maverick/kdenetwork/debian/lisa-trinity.install
index e1e073d3f..e6a53ecf2 100644
--- a/ubuntu/maverick/kdenetwork/debian/lisa-trinity.install
+++ b/ubuntu/maverick/kdenetwork/debian/lisa-trinity.install
@@ -1,7 +1,7 @@
-debian/tmp/opt/trinity/lib/kde3/kcm_lanbrowser.la
-debian/tmp/opt/trinity/lib/kde3/kcm_lanbrowser.so
-debian/tmp/opt/trinity/lib/kde3/kio_lan.la
-debian/tmp/opt/trinity/lib/kde3/kio_lan.so
+debian/tmp/opt/trinity/lib/trinity/kcm_lanbrowser.la
+debian/tmp/opt/trinity/lib/trinity/kcm_lanbrowser.so
+debian/tmp/opt/trinity/lib/trinity/kio_lan.la
+debian/tmp/opt/trinity/lib/trinity/kio_lan.so
 debian/tmp/opt/trinity/share/applnk/.hidden/kcmkiolan.desktop
 debian/tmp/opt/trinity/share/applnk/.hidden/kcmlisa.desktop
 debian/tmp/opt/trinity/share/applnk/.hidden/kcmreslisa.desktop