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

21 files changed, 410 insertions, 410 deletions

diff --git a/debian/lenny/kdebase/debian/kate-trinity.install b/debian/lenny/kdebase/debian/kate-trinity.install
index 57b1c54c5..bc586a595 100644
--- a/debian/lenny/kdebase/debian/kate-trinity.install
+++ b/debian/lenny/kdebase/debian/kate-trinity.install
@@ -1,10 +1,10 @@
 debian/tmp/etc/trinity/katerc
 debian/tmp/opt/trinity/bin/kate
 debian/tmp/opt/trinity/bin/kwrite
-debian/tmp/opt/trinity/lib/kde3/kate.la
-debian/tmp/opt/trinity/lib/kde3/kate.so
-debian/tmp/opt/trinity/lib/kde3/kwrite.la
-debian/tmp/opt/trinity/lib/kde3/kwrite.so
+debian/tmp/opt/trinity/lib/trinity/kate.la
+debian/tmp/opt/trinity/lib/trinity/kate.so
+debian/tmp/opt/trinity/lib/trinity/kwrite.la
+debian/tmp/opt/trinity/lib/trinity/kwrite.so
 debian/tmp/opt/trinity/lib/libkateinterfaces.so.0
 debian/tmp/opt/trinity/lib/libkateinterfaces.so.0.0.0
 debian/tmp/opt/trinity/lib/libkateutils.so.0
diff --git a/debian/lenny/kdebase/debian/kcontrol-trinity.install b/debian/lenny/kdebase/debian/kcontrol-trinity.install
index 80efbb54c..13151c69f 100644
--- a/debian/lenny/kdebase/debian/kcontrol-trinity.install
+++ b/debian/lenny/kdebase/debian/kcontrol-trinity.install
@@ -8,120 +8,120 @@ debian/tmp/opt/trinity/bin/kinfocenter
 debian/tmp/opt/trinity/bin/klocaldomainurifilterhelper
 debian/tmp/opt/trinity/bin/krandrtray
 debian/tmp/opt/trinity/bin/krdb
-debian/tmp/opt/trinity/lib/kde3/fontthumbnail.la
-debian/tmp/opt/trinity/lib/kde3/fontthumbnail.so
-debian/tmp/opt/trinity/lib/kde3/kaccess.la
-debian/tmp/opt/trinity/lib/kde3/kaccess.so
-debian/tmp/opt/trinity/lib/kde3/kcm_access.la
-debian/tmp/opt/trinity/lib/kde3/kcm_access.so
-debian/tmp/opt/trinity/lib/kde3/kcm_arts.la
-debian/tmp/opt/trinity/lib/kde3/kcm_arts.so
-debian/tmp/opt/trinity/lib/kde3/kcm_background.la
-debian/tmp/opt/trinity/lib/kde3/kcm_background.so
-debian/tmp/opt/trinity/lib/kde3/kcm_bell.la
-debian/tmp/opt/trinity/lib/kde3/kcm_bell.so
-debian/tmp/opt/trinity/lib/kde3/kcm_clock.la
-debian/tmp/opt/trinity/lib/kde3/kcm_clock.so
-debian/tmp/opt/trinity/lib/kde3/kcm_colors.la
-debian/tmp/opt/trinity/lib/kde3/kcm_colors.so
-debian/tmp/opt/trinity/lib/kde3/kcm_componentchooser.la
-debian/tmp/opt/trinity/lib/kde3/kcm_componentchooser.so
-debian/tmp/opt/trinity/lib/kde3/kcm_crypto.la
-debian/tmp/opt/trinity/lib/kde3/kcm_crypto.so
-debian/tmp/opt/trinity/lib/kde3/kcm_css.la
-debian/tmp/opt/trinity/lib/kde3/kcm_css.so
-debian/tmp/opt/trinity/lib/kde3/kcm_display.la
-debian/tmp/opt/trinity/lib/kde3/kcm_display.so
-debian/tmp/opt/trinity/lib/kde3/kcm_energy.la
-debian/tmp/opt/trinity/lib/kde3/kcm_energy.so
-debian/tmp/opt/trinity/lib/kde3/kcm_filetypes.la
-debian/tmp/opt/trinity/lib/kde3/kcm_filetypes.so
-debian/tmp/opt/trinity/lib/kde3/kcm_fontinst.la
-debian/tmp/opt/trinity/lib/kde3/kcm_fontinst.so
-debian/tmp/opt/trinity/lib/kde3/kcm_fonts.la
-debian/tmp/opt/trinity/lib/kde3/kcm_fonts.so
-debian/tmp/opt/trinity/lib/kde3/kcm_icons.la
-debian/tmp/opt/trinity/lib/kde3/kcm_icons.so
-debian/tmp/opt/trinity/lib/kde3/kcm_info.la
-debian/tmp/opt/trinity/lib/kde3/kcm_info.so
-debian/tmp/opt/trinity/lib/kde3/kcm_input.la
-debian/tmp/opt/trinity/lib/kde3/kcm_input.so
-debian/tmp/opt/trinity/lib/kde3/kcm_ioslaveinfo.la
-debian/tmp/opt/trinity/lib/kde3/kcm_ioslaveinfo.so
-debian/tmp/opt/trinity/lib/kde3/kcm_joystick.la
-debian/tmp/opt/trinity/lib/kde3/kcm_joystick.so
-debian/tmp/opt/trinity/lib/kde3/kcm_kded.la
-debian/tmp/opt/trinity/lib/kde3/kcm_kded.so
-debian/tmp/opt/trinity/lib/kde3/kcm_kdm.la
-debian/tmp/opt/trinity/lib/kde3/kcm_kdm.so
-debian/tmp/opt/trinity/lib/kde3/kcm_kdnssd.so
-debian/tmp/opt/trinity/lib/kde3/kcm_kdnssd.la
-debian/tmp/opt/trinity/lib/kde3/kcm_keys.la
-debian/tmp/opt/trinity/lib/kde3/kcm_keys.so
-debian/tmp/opt/trinity/lib/kde3/kcm_kicker.la
-debian/tmp/opt/trinity/lib/kde3/kcm_kicker.so
-debian/tmp/opt/trinity/lib/kde3/kcm_kio.la
-debian/tmp/opt/trinity/lib/kde3/kcm_kio.so
-debian/tmp/opt/trinity/lib/kde3/kcm_knotify.la
-debian/tmp/opt/trinity/lib/kde3/kcm_knotify.so
-debian/tmp/opt/trinity/lib/kde3/kcm_konqhtml.la
-debian/tmp/opt/trinity/lib/kde3/kcm_konqhtml.so
-debian/tmp/opt/trinity/lib/kde3/kcm_konq.la
-debian/tmp/opt/trinity/lib/kde3/kcm_konq.so
-debian/tmp/opt/trinity/lib/kde3/kcm_kthememanager.la
-debian/tmp/opt/trinity/lib/kde3/kcm_kthememanager.so
-debian/tmp/opt/trinity/lib/kde3/kcm_kurifilt.la
-debian/tmp/opt/trinity/lib/kde3/kcm_kurifilt.so
-debian/tmp/opt/trinity/lib/kde3/kcm_iccconfig.la
-debian/tmp/opt/trinity/lib/kde3/kcm_iccconfig.so
-debian/tmp/opt/trinity/lib/kde3/kcm_launch.la
-debian/tmp/opt/trinity/lib/kde3/kcm_launch.so
-debian/tmp/opt/trinity/lib/kde3/kcm_locale.la
-debian/tmp/opt/trinity/lib/kde3/kcm_locale.so
-debian/tmp/opt/trinity/lib/kde3/kcm_nic.la
-debian/tmp/opt/trinity/lib/kde3/kcm_nic.so
-debian/tmp/opt/trinity/lib/kde3/kcm_performance.la
-debian/tmp/opt/trinity/lib/kde3/kcm_performance.so
-debian/tmp/opt/trinity/lib/kde3/kcm_privacy.la
-debian/tmp/opt/trinity/lib/kde3/kcm_privacy.so
-debian/tmp/opt/trinity/lib/kde3/kcm_randr.la
-debian/tmp/opt/trinity/lib/kde3/kcm_randr.so
-debian/tmp/opt/trinity/lib/kde3/kcm_samba.la
-debian/tmp/opt/trinity/lib/kde3/kcm_samba.so
-debian/tmp/opt/trinity/lib/kde3/kcm_screensaver.la
-debian/tmp/opt/trinity/lib/kde3/kcm_screensaver.so
-debian/tmp/opt/trinity/lib/kde3/kcm_smserver.la
-debian/tmp/opt/trinity/lib/kde3/kcm_smserver.so
-debian/tmp/opt/trinity/lib/kde3/kcm_spellchecking.la
-debian/tmp/opt/trinity/lib/kde3/kcm_spellchecking.so
-debian/tmp/opt/trinity/lib/kde3/kcm_style.la
-debian/tmp/opt/trinity/lib/kde3/kcm_style.so
-debian/tmp/opt/trinity/lib/kde3/kcm_taskbar.la
-debian/tmp/opt/trinity/lib/kde3/kcm_taskbar.so
-debian/tmp/opt/trinity/lib/kde3/kcm_usb.la
-debian/tmp/opt/trinity/lib/kde3/kcm_usb.so
-debian/tmp/opt/trinity/lib/kde3/kcm_view1394.la
-debian/tmp/opt/trinity/lib/kde3/kcm_view1394.so
-debian/tmp/opt/trinity/lib/kde3/kcm_xinerama.la
-debian/tmp/opt/trinity/lib/kde3/kcm_xinerama.so
-debian/tmp/opt/trinity/lib/kde3/kcontrol.la
-debian/tmp/opt/trinity/lib/kde3/kcontrol.so
-debian/tmp/opt/trinity/lib/kde3/kfile_font.la
-debian/tmp/opt/trinity/lib/kde3/kfile_font.so
-debian/tmp/opt/trinity/lib/kde3/kio_fonts.la
-debian/tmp/opt/trinity/lib/kde3/kio_fonts.so
-debian/tmp/opt/trinity/lib/kde3/kstyle_keramik_config.la
-debian/tmp/opt/trinity/lib/kde3/kstyle_keramik_config.so
-debian/tmp/opt/trinity/lib/kde3/libkfontviewpart.la
-debian/tmp/opt/trinity/lib/kde3/libkfontviewpart.so
-debian/tmp/opt/trinity/lib/kde3/libkshorturifilter.la
-debian/tmp/opt/trinity/lib/kde3/libkshorturifilter.so
-debian/tmp/opt/trinity/lib/kde3/libkuriikwsfilter.la
-debian/tmp/opt/trinity/lib/kde3/libkuriikwsfilter.so
-debian/tmp/opt/trinity/lib/kde3/libkurisearchfilter.la
-debian/tmp/opt/trinity/lib/kde3/libkurisearchfilter.so
-debian/tmp/opt/trinity/lib/kde3/liblocaldomainurifilter.la
-debian/tmp/opt/trinity/lib/kde3/liblocaldomainurifilter.so
+debian/tmp/opt/trinity/lib/trinity/fontthumbnail.la
+debian/tmp/opt/trinity/lib/trinity/fontthumbnail.so
+debian/tmp/opt/trinity/lib/trinity/kaccess.la
+debian/tmp/opt/trinity/lib/trinity/kaccess.so
+debian/tmp/opt/trinity/lib/trinity/kcm_access.la
+debian/tmp/opt/trinity/lib/trinity/kcm_access.so
+debian/tmp/opt/trinity/lib/trinity/kcm_arts.la
+debian/tmp/opt/trinity/lib/trinity/kcm_arts.so
+debian/tmp/opt/trinity/lib/trinity/kcm_background.la
+debian/tmp/opt/trinity/lib/trinity/kcm_background.so
+debian/tmp/opt/trinity/lib/trinity/kcm_bell.la
+debian/tmp/opt/trinity/lib/trinity/kcm_bell.so
+debian/tmp/opt/trinity/lib/trinity/kcm_clock.la
+debian/tmp/opt/trinity/lib/trinity/kcm_clock.so
+debian/tmp/opt/trinity/lib/trinity/kcm_colors.la
+debian/tmp/opt/trinity/lib/trinity/kcm_colors.so
+debian/tmp/opt/trinity/lib/trinity/kcm_componentchooser.la
+debian/tmp/opt/trinity/lib/trinity/kcm_componentchooser.so
+debian/tmp/opt/trinity/lib/trinity/kcm_crypto.la
+debian/tmp/opt/trinity/lib/trinity/kcm_crypto.so
+debian/tmp/opt/trinity/lib/trinity/kcm_css.la
+debian/tmp/opt/trinity/lib/trinity/kcm_css.so
+debian/tmp/opt/trinity/lib/trinity/kcm_display.la
+debian/tmp/opt/trinity/lib/trinity/kcm_display.so
+debian/tmp/opt/trinity/lib/trinity/kcm_energy.la
+debian/tmp/opt/trinity/lib/trinity/kcm_energy.so
+debian/tmp/opt/trinity/lib/trinity/kcm_filetypes.la
+debian/tmp/opt/trinity/lib/trinity/kcm_filetypes.so
+debian/tmp/opt/trinity/lib/trinity/kcm_fontinst.la
+debian/tmp/opt/trinity/lib/trinity/kcm_fontinst.so
+debian/tmp/opt/trinity/lib/trinity/kcm_fonts.la
+debian/tmp/opt/trinity/lib/trinity/kcm_fonts.so
+debian/tmp/opt/trinity/lib/trinity/kcm_icons.la
+debian/tmp/opt/trinity/lib/trinity/kcm_icons.so
+debian/tmp/opt/trinity/lib/trinity/kcm_info.la
+debian/tmp/opt/trinity/lib/trinity/kcm_info.so
+debian/tmp/opt/trinity/lib/trinity/kcm_input.la
+debian/tmp/opt/trinity/lib/trinity/kcm_input.so
+debian/tmp/opt/trinity/lib/trinity/kcm_ioslaveinfo.la
+debian/tmp/opt/trinity/lib/trinity/kcm_ioslaveinfo.so
+debian/tmp/opt/trinity/lib/trinity/kcm_joystick.la
+debian/tmp/opt/trinity/lib/trinity/kcm_joystick.so
+debian/tmp/opt/trinity/lib/trinity/kcm_kded.la
+debian/tmp/opt/trinity/lib/trinity/kcm_kded.so
+debian/tmp/opt/trinity/lib/trinity/kcm_kdm.la
+debian/tmp/opt/trinity/lib/trinity/kcm_kdm.so
+debian/tmp/opt/trinity/lib/trinity/kcm_kdnssd.so
+debian/tmp/opt/trinity/lib/trinity/kcm_kdnssd.la
+debian/tmp/opt/trinity/lib/trinity/kcm_keys.la
+debian/tmp/opt/trinity/lib/trinity/kcm_keys.so
+debian/tmp/opt/trinity/lib/trinity/kcm_kicker.la
+debian/tmp/opt/trinity/lib/trinity/kcm_kicker.so
+debian/tmp/opt/trinity/lib/trinity/kcm_kio.la
+debian/tmp/opt/trinity/lib/trinity/kcm_kio.so
+debian/tmp/opt/trinity/lib/trinity/kcm_knotify.la
+debian/tmp/opt/trinity/lib/trinity/kcm_knotify.so
+debian/tmp/opt/trinity/lib/trinity/kcm_konqhtml.la
+debian/tmp/opt/trinity/lib/trinity/kcm_konqhtml.so
+debian/tmp/opt/trinity/lib/trinity/kcm_konq.la
+debian/tmp/opt/trinity/lib/trinity/kcm_konq.so
+debian/tmp/opt/trinity/lib/trinity/kcm_kthememanager.la
+debian/tmp/opt/trinity/lib/trinity/kcm_kthememanager.so
+debian/tmp/opt/trinity/lib/trinity/kcm_kurifilt.la
+debian/tmp/opt/trinity/lib/trinity/kcm_kurifilt.so
+debian/tmp/opt/trinity/lib/trinity/kcm_iccconfig.la
+debian/tmp/opt/trinity/lib/trinity/kcm_iccconfig.so
+debian/tmp/opt/trinity/lib/trinity/kcm_launch.la
+debian/tmp/opt/trinity/lib/trinity/kcm_launch.so
+debian/tmp/opt/trinity/lib/trinity/kcm_locale.la
+debian/tmp/opt/trinity/lib/trinity/kcm_locale.so
+debian/tmp/opt/trinity/lib/trinity/kcm_nic.la
+debian/tmp/opt/trinity/lib/trinity/kcm_nic.so
+debian/tmp/opt/trinity/lib/trinity/kcm_performance.la
+debian/tmp/opt/trinity/lib/trinity/kcm_performance.so
+debian/tmp/opt/trinity/lib/trinity/kcm_privacy.la
+debian/tmp/opt/trinity/lib/trinity/kcm_privacy.so
+debian/tmp/opt/trinity/lib/trinity/kcm_randr.la
+debian/tmp/opt/trinity/lib/trinity/kcm_randr.so
+debian/tmp/opt/trinity/lib/trinity/kcm_samba.la
+debian/tmp/opt/trinity/lib/trinity/kcm_samba.so
+debian/tmp/opt/trinity/lib/trinity/kcm_screensaver.la
+debian/tmp/opt/trinity/lib/trinity/kcm_screensaver.so
+debian/tmp/opt/trinity/lib/trinity/kcm_smserver.la
+debian/tmp/opt/trinity/lib/trinity/kcm_smserver.so
+debian/tmp/opt/trinity/lib/trinity/kcm_spellchecking.la
+debian/tmp/opt/trinity/lib/trinity/kcm_spellchecking.so
+debian/tmp/opt/trinity/lib/trinity/kcm_style.la
+debian/tmp/opt/trinity/lib/trinity/kcm_style.so
+debian/tmp/opt/trinity/lib/trinity/kcm_taskbar.la
+debian/tmp/opt/trinity/lib/trinity/kcm_taskbar.so
+debian/tmp/opt/trinity/lib/trinity/kcm_usb.la
+debian/tmp/opt/trinity/lib/trinity/kcm_usb.so
+debian/tmp/opt/trinity/lib/trinity/kcm_view1394.la
+debian/tmp/opt/trinity/lib/trinity/kcm_view1394.so
+debian/tmp/opt/trinity/lib/trinity/kcm_xinerama.la
+debian/tmp/opt/trinity/lib/trinity/kcm_xinerama.so
+debian/tmp/opt/trinity/lib/trinity/kcontrol.la
+debian/tmp/opt/trinity/lib/trinity/kcontrol.so
+debian/tmp/opt/trinity/lib/trinity/kfile_font.la
+debian/tmp/opt/trinity/lib/trinity/kfile_font.so
+debian/tmp/opt/trinity/lib/trinity/kio_fonts.la
+debian/tmp/opt/trinity/lib/trinity/kio_fonts.so
+debian/tmp/opt/trinity/lib/trinity/kstyle_keramik_config.la
+debian/tmp/opt/trinity/lib/trinity/kstyle_keramik_config.so
+debian/tmp/opt/trinity/lib/trinity/libkfontviewpart.la
+debian/tmp/opt/trinity/lib/trinity/libkfontviewpart.so
+debian/tmp/opt/trinity/lib/trinity/libkshorturifilter.la
+debian/tmp/opt/trinity/lib/trinity/libkshorturifilter.so
+debian/tmp/opt/trinity/lib/trinity/libkuriikwsfilter.la
+debian/tmp/opt/trinity/lib/trinity/libkuriikwsfilter.so
+debian/tmp/opt/trinity/lib/trinity/libkurisearchfilter.la
+debian/tmp/opt/trinity/lib/trinity/libkurisearchfilter.so
+debian/tmp/opt/trinity/lib/trinity/liblocaldomainurifilter.la
+debian/tmp/opt/trinity/lib/trinity/liblocaldomainurifilter.so
 debian/tmp/opt/trinity/lib/libkdeinit_kaccess.so
 debian/tmp/opt/trinity/lib/libkdeinit_kcontrol.so
 debian/tmp/opt/trinity/lib/libkfontinst.so.0
diff --git a/debian/lenny/kdebase/debian/kdebase-data-trinity.install b/debian/lenny/kdebase/debian/kdebase-data-trinity.install
index c14dd7dcc..809f898bf 100644
--- a/debian/lenny/kdebase/debian/kdebase-data-trinity.install
+++ b/debian/lenny/kdebase/debian/kdebase-data-trinity.install
@@ -19,7 +19,7 @@ debian/tmp/opt/trinity/share/apps/kcminput/cursor_large_white.pcf.gz
 debian/tmp/opt/trinity/share/apps/kcminput/cursor_small_white.pcf.gz
 debian/tmp/opt/trinity/share/apps/kcminput/pics/mouse_lh.png
 debian/tmp/opt/trinity/share/apps/kcminput/pics/mouse_rh.png
-debian/tmp/opt/trinity/share/apps/kcmkeys/kde3.kksrc
+debian/tmp/opt/trinity/share/apps/kcmkeys/trinity.kksrc
 debian/tmp/opt/trinity/share/apps/kcmkeys/kde4.kksrc
 debian/tmp/opt/trinity/share/apps/kcmkeys/mac4.kksrc
 debian/tmp/opt/trinity/share/apps/kcmkeys/unix3.kksrc
diff --git a/debian/lenny/kdebase/debian/kdebase-kio-plugins-trinity.install b/debian/lenny/kdebase/debian/kdebase-kio-plugins-trinity.install
index 8f687a95b..962755e39 100644
--- a/debian/lenny/kdebase/debian/kdebase-kio-plugins-trinity.install
+++ b/debian/lenny/kdebase/debian/kdebase-kio-plugins-trinity.install
@@ -1,87 +1,87 @@
 debian/tmp/opt/trinity/bin/kio_media_mounthelper
 debian/tmp/opt/trinity/bin/ktrash
-debian/tmp/opt/trinity/lib/kde3/cursorthumbnail.la
-debian/tmp/opt/trinity/lib/kde3/cursorthumbnail.so
-debian/tmp/opt/trinity/lib/kde3/djvuthumbnail.la
-debian/tmp/opt/trinity/lib/kde3/djvuthumbnail.so
-debian/tmp/opt/trinity/lib/kde3/exrthumbnail.la
-debian/tmp/opt/trinity/lib/kde3/exrthumbnail.so
-debian/tmp/opt/trinity/lib/kde3/htmlthumbnail.la
-debian/tmp/opt/trinity/lib/kde3/htmlthumbnail.so
-debian/tmp/opt/trinity/lib/kde3/imagethumbnail.la
-debian/tmp/opt/trinity/lib/kde3/imagethumbnail.so
-debian/tmp/opt/trinity/lib/kde3/kcm_cgi.la
-debian/tmp/opt/trinity/lib/kde3/kcm_cgi.so
-debian/tmp/opt/trinity/lib/kde3/kcm_media.la
-debian/tmp/opt/trinity/lib/kde3/kcm_media.so
-debian/tmp/opt/trinity/lib/kde3/kded_homedirnotify.la
-debian/tmp/opt/trinity/lib/kde3/kded_homedirnotify.so
-debian/tmp/opt/trinity/lib/kde3/kded_mediamanager.la
-debian/tmp/opt/trinity/lib/kde3/kded_mediamanager.so
-debian/tmp/opt/trinity/lib/kde3/kded_medianotifier.la
-debian/tmp/opt/trinity/lib/kde3/kded_medianotifier.so
-debian/tmp/opt/trinity/lib/kde3/kded_remotedirnotify.la
-debian/tmp/opt/trinity/lib/kde3/kded_remotedirnotify.so
-debian/tmp/opt/trinity/lib/kde3/kded_systemdirnotify.la
-debian/tmp/opt/trinity/lib/kde3/kded_systemdirnotify.so
-debian/tmp/opt/trinity/lib/kde3/kfile_media.la
-debian/tmp/opt/trinity/lib/kde3/kfile_media.so
-debian/tmp/opt/trinity/lib/kde3/kfile_trash.la
-debian/tmp/opt/trinity/lib/kde3/kfile_trash.so
-debian/tmp/opt/trinity/lib/kde3/kio_about.la
-debian/tmp/opt/trinity/lib/kde3/kio_about.so
-debian/tmp/opt/trinity/lib/kde3/kio_cgi.la
-debian/tmp/opt/trinity/lib/kde3/kio_cgi.so
-debian/tmp/opt/trinity/lib/kde3/kio_filter.la
-debian/tmp/opt/trinity/lib/kde3/kio_filter.so
-debian/tmp/opt/trinity/lib/kde3/kio_finger.la
-debian/tmp/opt/trinity/lib/kde3/kio_finger.so
-debian/tmp/opt/trinity/lib/kde3/kio_fish.la
-debian/tmp/opt/trinity/lib/kde3/kio_fish.so
-debian/tmp/opt/trinity/lib/kde3/kio_floppy.la
-debian/tmp/opt/trinity/lib/kde3/kio_floppy.so
-debian/tmp/opt/trinity/lib/kde3/kio_home.la
-debian/tmp/opt/trinity/lib/kde3/kio_home.so
-debian/tmp/opt/trinity/lib/kde3/kio_info.la
-debian/tmp/opt/trinity/lib/kde3/kio_info.so
-debian/tmp/opt/trinity/lib/kde3/kio_ldap.la
-debian/tmp/opt/trinity/lib/kde3/kio_ldap.so
-debian/tmp/opt/trinity/lib/kde3/kio_mac.la
-debian/tmp/opt/trinity/lib/kde3/kio_mac.so
-debian/tmp/opt/trinity/lib/kde3/kio_man.la
-debian/tmp/opt/trinity/lib/kde3/kio_man.so
-debian/tmp/opt/trinity/lib/kde3/kio_media.la
-debian/tmp/opt/trinity/lib/kde3/kio_media.so
-debian/tmp/opt/trinity/lib/kde3/kio_nfs.la
-debian/tmp/opt/trinity/lib/kde3/kio_nfs.so
-debian/tmp/opt/trinity/lib/kde3/kio_nntp.la
-debian/tmp/opt/trinity/lib/kde3/kio_nntp.so
-debian/tmp/opt/trinity/lib/kde3/kio_pop3.la
-debian/tmp/opt/trinity/lib/kde3/kio_pop3.so
-debian/tmp/opt/trinity/lib/kde3/kio_remote.la
-debian/tmp/opt/trinity/lib/kde3/kio_remote.so
-debian/tmp/opt/trinity/lib/kde3/kio_settings.la
-debian/tmp/opt/trinity/lib/kde3/kio_settings.so
-debian/tmp/opt/trinity/lib/kde3/kio_sftp.la
-debian/tmp/opt/trinity/lib/kde3/kio_sftp.so
-debian/tmp/opt/trinity/lib/kde3/kio_smb.la
-debian/tmp/opt/trinity/lib/kde3/kio_smb.so
-debian/tmp/opt/trinity/lib/kde3/kio_smtp.la
-debian/tmp/opt/trinity/lib/kde3/kio_smtp.so
-debian/tmp/opt/trinity/lib/kde3/kio_system.la
-debian/tmp/opt/trinity/lib/kde3/kio_system.so
-debian/tmp/opt/trinity/lib/kde3/kio_tar.la
-debian/tmp/opt/trinity/lib/kde3/kio_tar.so
-debian/tmp/opt/trinity/lib/kde3/kio_thumbnail.la
-debian/tmp/opt/trinity/lib/kde3/kio_thumbnail.so
-debian/tmp/opt/trinity/lib/kde3/kio_trash.la
-debian/tmp/opt/trinity/lib/kde3/kio_trash.so
-debian/tmp/opt/trinity/lib/kde3/libkmanpart.la
-debian/tmp/opt/trinity/lib/kde3/libkmanpart.so
-debian/tmp/opt/trinity/lib/kde3/media_propsdlgplugin.la
-debian/tmp/opt/trinity/lib/kde3/media_propsdlgplugin.so
-debian/tmp/opt/trinity/lib/kde3/textthumbnail.la
-debian/tmp/opt/trinity/lib/kde3/textthumbnail.so
+debian/tmp/opt/trinity/lib/trinity/cursorthumbnail.la
+debian/tmp/opt/trinity/lib/trinity/cursorthumbnail.so
+debian/tmp/opt/trinity/lib/trinity/djvuthumbnail.la
+debian/tmp/opt/trinity/lib/trinity/djvuthumbnail.so
+debian/tmp/opt/trinity/lib/trinity/exrthumbnail.la
+debian/tmp/opt/trinity/lib/trinity/exrthumbnail.so
+debian/tmp/opt/trinity/lib/trinity/htmlthumbnail.la
+debian/tmp/opt/trinity/lib/trinity/htmlthumbnail.so
+debian/tmp/opt/trinity/lib/trinity/imagethumbnail.la
+debian/tmp/opt/trinity/lib/trinity/imagethumbnail.so
+debian/tmp/opt/trinity/lib/trinity/kcm_cgi.la
+debian/tmp/opt/trinity/lib/trinity/kcm_cgi.so
+debian/tmp/opt/trinity/lib/trinity/kcm_media.la
+debian/tmp/opt/trinity/lib/trinity/kcm_media.so
+debian/tmp/opt/trinity/lib/trinity/kded_homedirnotify.la
+debian/tmp/opt/trinity/lib/trinity/kded_homedirnotify.so
+debian/tmp/opt/trinity/lib/trinity/kded_mediamanager.la
+debian/tmp/opt/trinity/lib/trinity/kded_mediamanager.so
+debian/tmp/opt/trinity/lib/trinity/kded_medianotifier.la
+debian/tmp/opt/trinity/lib/trinity/kded_medianotifier.so
+debian/tmp/opt/trinity/lib/trinity/kded_remotedirnotify.la
+debian/tmp/opt/trinity/lib/trinity/kded_remotedirnotify.so
+debian/tmp/opt/trinity/lib/trinity/kded_systemdirnotify.la
+debian/tmp/opt/trinity/lib/trinity/kded_systemdirnotify.so
+debian/tmp/opt/trinity/lib/trinity/kfile_media.la
+debian/tmp/opt/trinity/lib/trinity/kfile_media.so
+debian/tmp/opt/trinity/lib/trinity/kfile_trash.la
+debian/tmp/opt/trinity/lib/trinity/kfile_trash.so
+debian/tmp/opt/trinity/lib/trinity/kio_about.la
+debian/tmp/opt/trinity/lib/trinity/kio_about.so
+debian/tmp/opt/trinity/lib/trinity/kio_cgi.la
+debian/tmp/opt/trinity/lib/trinity/kio_cgi.so
+debian/tmp/opt/trinity/lib/trinity/kio_filter.la
+debian/tmp/opt/trinity/lib/trinity/kio_filter.so
+debian/tmp/opt/trinity/lib/trinity/kio_finger.la
+debian/tmp/opt/trinity/lib/trinity/kio_finger.so
+debian/tmp/opt/trinity/lib/trinity/kio_fish.la
+debian/tmp/opt/trinity/lib/trinity/kio_fish.so
+debian/tmp/opt/trinity/lib/trinity/kio_floppy.la
+debian/tmp/opt/trinity/lib/trinity/kio_floppy.so
+debian/tmp/opt/trinity/lib/trinity/kio_home.la
+debian/tmp/opt/trinity/lib/trinity/kio_home.so
+debian/tmp/opt/trinity/lib/trinity/kio_info.la
+debian/tmp/opt/trinity/lib/trinity/kio_info.so
+debian/tmp/opt/trinity/lib/trinity/kio_ldap.la
+debian/tmp/opt/trinity/lib/trinity/kio_ldap.so
+debian/tmp/opt/trinity/lib/trinity/kio_mac.la
+debian/tmp/opt/trinity/lib/trinity/kio_mac.so
+debian/tmp/opt/trinity/lib/trinity/kio_man.la
+debian/tmp/opt/trinity/lib/trinity/kio_man.so
+debian/tmp/opt/trinity/lib/trinity/kio_media.la
+debian/tmp/opt/trinity/lib/trinity/kio_media.so
+debian/tmp/opt/trinity/lib/trinity/kio_nfs.la
+debian/tmp/opt/trinity/lib/trinity/kio_nfs.so
+debian/tmp/opt/trinity/lib/trinity/kio_nntp.la
+debian/tmp/opt/trinity/lib/trinity/kio_nntp.so
+debian/tmp/opt/trinity/lib/trinity/kio_pop3.la
+debian/tmp/opt/trinity/lib/trinity/kio_pop3.so
+debian/tmp/opt/trinity/lib/trinity/kio_remote.la
+debian/tmp/opt/trinity/lib/trinity/kio_remote.so
+debian/tmp/opt/trinity/lib/trinity/kio_settings.la
+debian/tmp/opt/trinity/lib/trinity/kio_settings.so
+debian/tmp/opt/trinity/lib/trinity/kio_sftp.la
+debian/tmp/opt/trinity/lib/trinity/kio_sftp.so
+debian/tmp/opt/trinity/lib/trinity/kio_smb.la
+debian/tmp/opt/trinity/lib/trinity/kio_smb.so
+debian/tmp/opt/trinity/lib/trinity/kio_smtp.la
+debian/tmp/opt/trinity/lib/trinity/kio_smtp.so
+debian/tmp/opt/trinity/lib/trinity/kio_system.la
+debian/tmp/opt/trinity/lib/trinity/kio_system.so
+debian/tmp/opt/trinity/lib/trinity/kio_tar.la
+debian/tmp/opt/trinity/lib/trinity/kio_tar.so
+debian/tmp/opt/trinity/lib/trinity/kio_thumbnail.la
+debian/tmp/opt/trinity/lib/trinity/kio_thumbnail.so
+debian/tmp/opt/trinity/lib/trinity/kio_trash.la
+debian/tmp/opt/trinity/lib/trinity/kio_trash.so
+debian/tmp/opt/trinity/lib/trinity/libkmanpart.la
+debian/tmp/opt/trinity/lib/trinity/libkmanpart.so
+debian/tmp/opt/trinity/lib/trinity/media_propsdlgplugin.la
+debian/tmp/opt/trinity/lib/trinity/media_propsdlgplugin.so
+debian/tmp/opt/trinity/lib/trinity/textthumbnail.la
+debian/tmp/opt/trinity/lib/trinity/textthumbnail.so
 debian/tmp/opt/trinity/share/applications/kde/kcmcgi.desktop
 debian/tmp/opt/trinity/share/apps/kio_finger/kio_finger.css
 debian/tmp/opt/trinity/share/apps/kio_finger/kio_finger.pl
diff --git a/debian/lenny/kdebase/debian/kdebase-trinity-bin.install b/debian/lenny/kdebase/debian/kdebase-trinity-bin.install
index b9c6ae694..0f209cc40 100644
--- a/debian/lenny/kdebase/debian/kdebase-trinity-bin.install
+++ b/debian/lenny/kdebase/debian/kdebase-trinity-bin.install
@@ -19,28 +19,28 @@ debian/tmp/opt/trinity/bin/krandom.kss
 debian/tmp/opt/trinity/bin/ksystraycmd
 debian/tmp/opt/trinity/bin/kxkb
 debian/tmp/opt/trinity/lib/kconf_update_bin/khotkeys_update
-debian/tmp/opt/trinity/lib/kde3/kcminit.la
-debian/tmp/opt/trinity/lib/kde3/kcminit.so
-debian/tmp/opt/trinity/lib/kde3/kcminit_startup.la
-debian/tmp/opt/trinity/lib/kde3/kcminit_startup.so
-debian/tmp/opt/trinity/lib/kde3/kcm_keyboard.la
-debian/tmp/opt/trinity/lib/kde3/kcm_keyboard.so
-debian/tmp/opt/trinity/lib/kde3/kcm_khotkeys_init.la
-debian/tmp/opt/trinity/lib/kde3/kcm_khotkeys_init.so
-debian/tmp/opt/trinity/lib/kde3/kcm_khotkeys.la
-debian/tmp/opt/trinity/lib/kde3/kcm_khotkeys.so
-debian/tmp/opt/trinity/lib/kde3/kded_khotkeys.la
-debian/tmp/opt/trinity/lib/kde3/kded_khotkeys.so
-debian/tmp/opt/trinity/lib/kde3/kgreet_classic.la
-debian/tmp/opt/trinity/lib/kde3/kgreet_classic.so
-debian/tmp/opt/trinity/lib/kde3/kgreet_winbind.la
-debian/tmp/opt/trinity/lib/kde3/kgreet_winbind.so
-debian/tmp/opt/trinity/lib/kde3/khotkeys.la
-debian/tmp/opt/trinity/lib/kde3/khotkeys.so
-debian/tmp/opt/trinity/lib/kde3/khotkeys_arts.la
-debian/tmp/opt/trinity/lib/kde3/khotkeys_arts.so
-debian/tmp/opt/trinity/lib/kde3/kxkb.la
-debian/tmp/opt/trinity/lib/kde3/kxkb.so
+debian/tmp/opt/trinity/lib/trinity/kcminit.la
+debian/tmp/opt/trinity/lib/trinity/kcminit.so
+debian/tmp/opt/trinity/lib/trinity/kcminit_startup.la
+debian/tmp/opt/trinity/lib/trinity/kcminit_startup.so
+debian/tmp/opt/trinity/lib/trinity/kcm_keyboard.la
+debian/tmp/opt/trinity/lib/trinity/kcm_keyboard.so
+debian/tmp/opt/trinity/lib/trinity/kcm_khotkeys_init.la
+debian/tmp/opt/trinity/lib/trinity/kcm_khotkeys_init.so
+debian/tmp/opt/trinity/lib/trinity/kcm_khotkeys.la
+debian/tmp/opt/trinity/lib/trinity/kcm_khotkeys.so
+debian/tmp/opt/trinity/lib/trinity/kded_khotkeys.la
+debian/tmp/opt/trinity/lib/trinity/kded_khotkeys.so
+debian/tmp/opt/trinity/lib/trinity/kgreet_classic.la
+debian/tmp/opt/trinity/lib/trinity/kgreet_classic.so
+debian/tmp/opt/trinity/lib/trinity/kgreet_winbind.la
+debian/tmp/opt/trinity/lib/trinity/kgreet_winbind.so
+debian/tmp/opt/trinity/lib/trinity/khotkeys.la
+debian/tmp/opt/trinity/lib/trinity/khotkeys.so
+debian/tmp/opt/trinity/lib/trinity/khotkeys_arts.la
+debian/tmp/opt/trinity/lib/trinity/khotkeys_arts.so
+debian/tmp/opt/trinity/lib/trinity/kxkb.la
+debian/tmp/opt/trinity/lib/trinity/kxkb.so
 debian/tmp/opt/trinity/lib/libkdeinit_kcminit.so
 debian/tmp/opt/trinity/lib/libkdeinit_kcminit_startup.la
 debian/tmp/opt/trinity/lib/libkdeinit_kcminit_startup.so
@@ -60,10 +60,10 @@ debian/tmp/opt/trinity/share/apps/drkonqi/presets/developerrc
 debian/tmp/opt/trinity/share/apps/drkonqi/presets/enduserrc
 debian/tmp/opt/trinity/share/apps/kconf_update/khotkeys_32b1_update.upd
 debian/tmp/opt/trinity/share/apps/kconf_update/khotkeys_printscreen.upd
-debian/tmp/opt/trinity/share/apps/kconf_update/konqueror_gestures_kde321_update.upd
+debian/tmp/opt/trinity/share/apps/kconf_update/konqueror_gestures_trinity21_update.upd
 debian/tmp/opt/trinity/share/apps/kdcop/kdcopui.rc
-debian/tmp/opt/trinity/share/apps/khotkeys/kde32b1.khotkeys
-debian/tmp/opt/trinity/share/apps/khotkeys/konqueror_gestures_kde321.khotkeys
+debian/tmp/opt/trinity/share/apps/khotkeys/trinity2b1.khotkeys
+debian/tmp/opt/trinity/share/apps/khotkeys/konqueror_gestures_trinity21.khotkeys
 debian/tmp/opt/trinity/share/apps/khotkeys/printscreen.khotkeys
 debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdcop/common
 debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdcop/index.cache.bz2
diff --git a/debian/lenny/kdebase/debian/kdepasswd-trinity.install b/debian/lenny/kdebase/debian/kdepasswd-trinity.install
index 76677a204..cbf6a5ed1 100644
--- a/debian/lenny/kdebase/debian/kdepasswd-trinity.install
+++ b/debian/lenny/kdebase/debian/kdepasswd-trinity.install
@@ -1,6 +1,6 @@
 debian/tmp/opt/trinity/bin/kdepasswd
-debian/tmp/opt/trinity/lib/kde3/kcm_useraccount.la
-debian/tmp/opt/trinity/lib/kde3/kcm_useraccount.so
+debian/tmp/opt/trinity/lib/trinity/kcm_useraccount.la
+debian/tmp/opt/trinity/lib/trinity/kcm_useraccount.so
 debian/tmp/opt/trinity/share/applications/kde/kcm_useraccount.desktop
 debian/tmp/opt/trinity/share/applications/kde/kdepasswd.desktop
 debian/tmp/opt/trinity/share/apps/kdm/pics/users/Apple.png
diff --git a/debian/lenny/kdebase/debian/kdeprint-trinity.install b/debian/lenny/kdebase/debian/kdeprint-trinity.install
index 47d500f4b..bd25acf54 100644
--- a/debian/lenny/kdebase/debian/kdeprint-trinity.install
+++ b/debian/lenny/kdebase/debian/kdeprint-trinity.install
@@ -1,16 +1,16 @@
 debian/tmp/opt/trinity/bin/kdeprintfax
 debian/tmp/opt/trinity/bin/kjobviewer
 debian/tmp/opt/trinity/bin/kprinter
-debian/tmp/opt/trinity/lib/kde3/kcm_printmgr.la
-debian/tmp/opt/trinity/lib/kde3/kcm_printmgr.so
-debian/tmp/opt/trinity/lib/kde3/kio_print.la
-debian/tmp/opt/trinity/lib/kde3/kio_print.so
-debian/tmp/opt/trinity/lib/kde3/kjobviewer.la
-debian/tmp/opt/trinity/lib/kde3/kjobviewer.so
-debian/tmp/opt/trinity/lib/kde3/kprinter.la
-debian/tmp/opt/trinity/lib/kde3/kprinter.so
-debian/tmp/opt/trinity/lib/kde3/libkdeprint_part.la
-debian/tmp/opt/trinity/lib/kde3/libkdeprint_part.so
+debian/tmp/opt/trinity/lib/trinity/kcm_printmgr.la
+debian/tmp/opt/trinity/lib/trinity/kcm_printmgr.so
+debian/tmp/opt/trinity/lib/trinity/kio_print.la
+debian/tmp/opt/trinity/lib/trinity/kio_print.so
+debian/tmp/opt/trinity/lib/trinity/kjobviewer.la
+debian/tmp/opt/trinity/lib/trinity/kjobviewer.so
+debian/tmp/opt/trinity/lib/trinity/kprinter.la
+debian/tmp/opt/trinity/lib/trinity/kprinter.so
+debian/tmp/opt/trinity/lib/trinity/libkdeprint_part.la
+debian/tmp/opt/trinity/lib/trinity/libkdeprint_part.so
 debian/tmp/opt/trinity/lib/libkdeinit_kjobviewer.so
 debian/tmp/opt/trinity/lib/libkdeinit_kprinter.so
 debian/tmp/opt/trinity/share/applications/kde/kdeprintfax.desktop
diff --git a/debian/lenny/kdebase/debian/kdesktop-trinity.install b/debian/lenny/kdebase/debian/kdesktop-trinity.install
index 80be1a40b..aa950c6d5 100644
--- a/debian/lenny/kdebase/debian/kdesktop-trinity.install
+++ b/debian/lenny/kdebase/debian/kdesktop-trinity.install
@@ -6,8 +6,8 @@ debian/tmp/opt/trinity/bin/kdeeject
 debian/tmp/opt/trinity/bin/kdesktop
 debian/tmp/opt/trinity/bin/kdesktop_lock
 debian/tmp/opt/trinity/bin/kwebdesktop
-debian/tmp/opt/trinity/lib/kde3/kdesktop.la
-debian/tmp/opt/trinity/lib/kde3/kdesktop.so
+debian/tmp/opt/trinity/lib/trinity/kdesktop.la
+debian/tmp/opt/trinity/lib/trinity/kdesktop.so
 debian/tmp/opt/trinity/lib/libkdeinit_kdesktop.so
 debian/tmp/opt/trinity/share/apps/kdesktop/DesktopLinks/Home.desktop usr/share/apps/kdesktop/unused/
 debian/tmp/opt/trinity/share/apps/kdesktop/DesktopLinks/System.desktop usr/share/apps/kdesktop/unused/
diff --git a/debian/lenny/kdebase/debian/kfind-trinity.install b/debian/lenny/kdebase/debian/kfind-trinity.install
index decd1eb05..f26a9ba14 100644
--- a/debian/lenny/kdebase/debian/kfind-trinity.install
+++ b/debian/lenny/kdebase/debian/kfind-trinity.install
@@ -1,6 +1,6 @@
 debian/tmp/opt/trinity/bin/kfind
-debian/tmp/opt/trinity/lib/kde3/libkfindpart.la
-debian/tmp/opt/trinity/lib/kde3/libkfindpart.so
+debian/tmp/opt/trinity/lib/trinity/libkfindpart.la
+debian/tmp/opt/trinity/lib/trinity/libkfindpart.so
 debian/tmp/opt/trinity/share/applications/kde/Kfind.desktop
 debian/tmp/opt/trinity/share/apps/kfindpart/icons/locolor/22x22/actions/archive.png
 debian/tmp/opt/trinity/share/apps/kfindpart/icons/locolor/22x22/actions/delete.png
diff --git a/debian/lenny/kdebase/debian/khelpcenter-trinity.install b/debian/lenny/kdebase/debian/khelpcenter-trinity.install
index 30f22c1ac..8e219a21f 100644
--- a/debian/lenny/kdebase/debian/khelpcenter-trinity.install
+++ b/debian/lenny/kdebase/debian/khelpcenter-trinity.install
@@ -4,8 +4,8 @@ debian/tmp/opt/trinity/bin/khc_htsearch.pl
 debian/tmp/opt/trinity/bin/khc_indexbuilder
 debian/tmp/opt/trinity/bin/khc_mansearch.pl
 debian/tmp/opt/trinity/bin/khelpcenter
-debian/tmp/opt/trinity/lib/kde3/khelpcenter.la
-debian/tmp/opt/trinity/lib/kde3/khelpcenter.so
+debian/tmp/opt/trinity/lib/trinity/khelpcenter.la
+debian/tmp/opt/trinity/lib/trinity/khelpcenter.so
 debian/tmp/opt/trinity/lib/libkdeinit_khelpcenter.so
 debian/tmp/opt/trinity/share/applications/kde/Help.desktop
 debian/tmp/opt/trinity/share/apps/khelpcenter/glossary.html.in
diff --git a/debian/lenny/kdebase/debian/kicker-trinity.install b/debian/lenny/kdebase/debian/kicker-trinity.install
index bdd61e69e..bdd7a8a8b 100644
--- a/debian/lenny/kdebase/debian/kicker-trinity.install
+++ b/debian/lenny/kdebase/debian/kicker-trinity.install
@@ -3,60 +3,60 @@ debian/tmp/opt/trinity/bin/extensionproxy
 debian/tmp/opt/trinity/bin/kasbar
 debian/tmp/opt/trinity/bin/kicker
 debian/tmp/opt/trinity/lib/kconf_update_bin/kicker-3.4-reverseLayout
-debian/tmp/opt/trinity/lib/kde3/appletproxy.la
-debian/tmp/opt/trinity/lib/kde3/appletproxy.so
-debian/tmp/opt/trinity/lib/kde3/clock_panelapplet.la
-debian/tmp/opt/trinity/lib/kde3/clock_panelapplet.so
-debian/tmp/opt/trinity/lib/kde3/dockbar_panelextension.la
-debian/tmp/opt/trinity/lib/kde3/dockbar_panelextension.so
-debian/tmp/opt/trinity/lib/kde3/extensionproxy.la
-debian/tmp/opt/trinity/lib/kde3/extensionproxy.so
-debian/tmp/opt/trinity/lib/kde3/kasbar_panelextension.la
-debian/tmp/opt/trinity/lib/kde3/kasbar_panelextension.so
-debian/tmp/opt/trinity/lib/kde3/kicker.la
-debian/tmp/opt/trinity/lib/kde3/kickermenu_find.la
-debian/tmp/opt/trinity/lib/kde3/kickermenu_find.so
-debian/tmp/opt/trinity/lib/kde3/kickermenu_kate.so
-debian/tmp/opt/trinity/lib/kde3/kickermenu_kate.la
-debian/tmp/opt/trinity/lib/kde3/kickermenu_kdeprint.la
-debian/tmp/opt/trinity/lib/kde3/kickermenu_kdeprint.so
-debian/tmp/opt/trinity/lib/kde3/kickermenu_konqueror.la
-debian/tmp/opt/trinity/lib/kde3/kickermenu_konqueror.so
-debian/tmp/opt/trinity/lib/kde3/kickermenu_konsole.la
-debian/tmp/opt/trinity/lib/kde3/kickermenu_konsole.so
-debian/tmp/opt/trinity/lib/kde3/kickermenu_prefmenu.la
-debian/tmp/opt/trinity/lib/kde3/kickermenu_prefmenu.so
-debian/tmp/opt/trinity/lib/kde3/kickermenu_recentdocs.la
-debian/tmp/opt/trinity/lib/kde3/kickermenu_recentdocs.so
-debian/tmp/opt/trinity/lib/kde3/kickermenu_remotemenu.la
-debian/tmp/opt/trinity/lib/kde3/kickermenu_remotemenu.so
-debian/tmp/opt/trinity/lib/kde3/kickermenu_systemmenu.la
-debian/tmp/opt/trinity/lib/kde3/kickermenu_systemmenu.so
-debian/tmp/opt/trinity/lib/kde3/kicker.so
-debian/tmp/opt/trinity/lib/kde3/launcher_panelapplet.la
-debian/tmp/opt/trinity/lib/kde3/launcher_panelapplet.so
-debian/tmp/opt/trinity/lib/kde3/lockout_panelapplet.la
-debian/tmp/opt/trinity/lib/kde3/lockout_panelapplet.so
-debian/tmp/opt/trinity/lib/kde3/media_panelapplet.la
-debian/tmp/opt/trinity/lib/kde3/media_panelapplet.so
-debian/tmp/opt/trinity/lib/kde3/menu_panelapplet.la
-debian/tmp/opt/trinity/lib/kde3/menu_panelapplet.so
-debian/tmp/opt/trinity/lib/kde3/minipager_panelapplet.la
-debian/tmp/opt/trinity/lib/kde3/minipager_panelapplet.so
-debian/tmp/opt/trinity/lib/kde3/naughty_panelapplet.la
-debian/tmp/opt/trinity/lib/kde3/naughty_panelapplet.so
-debian/tmp/opt/trinity/lib/kde3/run_panelapplet.la
-debian/tmp/opt/trinity/lib/kde3/run_panelapplet.so
-debian/tmp/opt/trinity/lib/kde3/sidebar_panelextension.la
-debian/tmp/opt/trinity/lib/kde3/sidebar_panelextension.so
-debian/tmp/opt/trinity/lib/kde3/systemtray_panelapplet.la
-debian/tmp/opt/trinity/lib/kde3/systemtray_panelapplet.so
-debian/tmp/opt/trinity/lib/kde3/taskbar_panelapplet.la
-debian/tmp/opt/trinity/lib/kde3/taskbar_panelapplet.so
-debian/tmp/opt/trinity/lib/kde3/taskbar_panelextension.la
-debian/tmp/opt/trinity/lib/kde3/taskbar_panelextension.so
-debian/tmp/opt/trinity/lib/kde3/trash_panelapplet.la
-debian/tmp/opt/trinity/lib/kde3/trash_panelapplet.so
+debian/tmp/opt/trinity/lib/trinity/appletproxy.la
+debian/tmp/opt/trinity/lib/trinity/appletproxy.so
+debian/tmp/opt/trinity/lib/trinity/clock_panelapplet.la
+debian/tmp/opt/trinity/lib/trinity/clock_panelapplet.so
+debian/tmp/opt/trinity/lib/trinity/dockbar_panelextension.la
+debian/tmp/opt/trinity/lib/trinity/dockbar_panelextension.so
+debian/tmp/opt/trinity/lib/trinity/extensionproxy.la
+debian/tmp/opt/trinity/lib/trinity/extensionproxy.so
+debian/tmp/opt/trinity/lib/trinity/kasbar_panelextension.la
+debian/tmp/opt/trinity/lib/trinity/kasbar_panelextension.so
+debian/tmp/opt/trinity/lib/trinity/kicker.la
+debian/tmp/opt/trinity/lib/trinity/kickermenu_find.la
+debian/tmp/opt/trinity/lib/trinity/kickermenu_find.so
+debian/tmp/opt/trinity/lib/trinity/kickermenu_kate.so
+debian/tmp/opt/trinity/lib/trinity/kickermenu_kate.la
+debian/tmp/opt/trinity/lib/trinity/kickermenu_kdeprint.la
+debian/tmp/opt/trinity/lib/trinity/kickermenu_kdeprint.so
+debian/tmp/opt/trinity/lib/trinity/kickermenu_konqueror.la
+debian/tmp/opt/trinity/lib/trinity/kickermenu_konqueror.so
+debian/tmp/opt/trinity/lib/trinity/kickermenu_konsole.la
+debian/tmp/opt/trinity/lib/trinity/kickermenu_konsole.so
+debian/tmp/opt/trinity/lib/trinity/kickermenu_prefmenu.la
+debian/tmp/opt/trinity/lib/trinity/kickermenu_prefmenu.so
+debian/tmp/opt/trinity/lib/trinity/kickermenu_recentdocs.la
+debian/tmp/opt/trinity/lib/trinity/kickermenu_recentdocs.so
+debian/tmp/opt/trinity/lib/trinity/kickermenu_remotemenu.la
+debian/tmp/opt/trinity/lib/trinity/kickermenu_remotemenu.so
+debian/tmp/opt/trinity/lib/trinity/kickermenu_systemmenu.la
+debian/tmp/opt/trinity/lib/trinity/kickermenu_systemmenu.so
+debian/tmp/opt/trinity/lib/trinity/kicker.so
+debian/tmp/opt/trinity/lib/trinity/launcher_panelapplet.la
+debian/tmp/opt/trinity/lib/trinity/launcher_panelapplet.so
+debian/tmp/opt/trinity/lib/trinity/lockout_panelapplet.la
+debian/tmp/opt/trinity/lib/trinity/lockout_panelapplet.so
+debian/tmp/opt/trinity/lib/trinity/media_panelapplet.la
+debian/tmp/opt/trinity/lib/trinity/media_panelapplet.so
+debian/tmp/opt/trinity/lib/trinity/menu_panelapplet.la
+debian/tmp/opt/trinity/lib/trinity/menu_panelapplet.so
+debian/tmp/opt/trinity/lib/trinity/minipager_panelapplet.la
+debian/tmp/opt/trinity/lib/trinity/minipager_panelapplet.so
+debian/tmp/opt/trinity/lib/trinity/naughty_panelapplet.la
+debian/tmp/opt/trinity/lib/trinity/naughty_panelapplet.so
+debian/tmp/opt/trinity/lib/trinity/run_panelapplet.la
+debian/tmp/opt/trinity/lib/trinity/run_panelapplet.so
+debian/tmp/opt/trinity/lib/trinity/sidebar_panelextension.la
+debian/tmp/opt/trinity/lib/trinity/sidebar_panelextension.so
+debian/tmp/opt/trinity/lib/trinity/systemtray_panelapplet.la
+debian/tmp/opt/trinity/lib/trinity/systemtray_panelapplet.so
+debian/tmp/opt/trinity/lib/trinity/taskbar_panelapplet.la
+debian/tmp/opt/trinity/lib/trinity/taskbar_panelapplet.so
+debian/tmp/opt/trinity/lib/trinity/taskbar_panelextension.la
+debian/tmp/opt/trinity/lib/trinity/taskbar_panelextension.so
+debian/tmp/opt/trinity/lib/trinity/trash_panelapplet.la
+debian/tmp/opt/trinity/lib/trinity/trash_panelapplet.so
 debian/tmp/opt/trinity/lib/libkasbar.so.1
 debian/tmp/opt/trinity/lib/libkasbar.so.1.0.0
 debian/tmp/opt/trinity/lib/libkdeinit_appletproxy.so
diff --git a/debian/lenny/kdebase/debian/klipper-trinity.install b/debian/lenny/kdebase/debian/klipper-trinity.install
index 7fe18bc3e..e84bf502b 100644
--- a/debian/lenny/kdebase/debian/klipper-trinity.install
+++ b/debian/lenny/kdebase/debian/klipper-trinity.install
@@ -1,13 +1,13 @@
 debian/tmp/etc/trinity/klipperrc
 debian/tmp/opt/trinity/bin/klipper
-debian/tmp/opt/trinity/lib/kde3/klipper.la
-debian/tmp/opt/trinity/lib/kde3/klipper_panelapplet.la
-debian/tmp/opt/trinity/lib/kde3/klipper_panelapplet.so
-debian/tmp/opt/trinity/lib/kde3/klipper.so
+debian/tmp/opt/trinity/lib/trinity/klipper.la
+debian/tmp/opt/trinity/lib/trinity/klipper_panelapplet.la
+debian/tmp/opt/trinity/lib/trinity/klipper_panelapplet.so
+debian/tmp/opt/trinity/lib/trinity/klipper.so
 debian/tmp/opt/trinity/lib/libkdeinit_klipper.so
 debian/tmp/opt/trinity/share/applications/kde/klipper.desktop
 debian/tmp/opt/trinity/share/apps/kconf_update/klipper-1-2.pl
-debian/tmp/opt/trinity/share/apps/kconf_update/klipper-kde31.sh
+debian/tmp/opt/trinity/share/apps/kconf_update/klipper-trinity1.sh
 debian/tmp/opt/trinity/share/apps/kconf_update/klipperrc.upd
 debian/tmp/opt/trinity/share/apps/kconf_update/klippershortcuts.upd
 debian/tmp/opt/trinity/share/apps/kicker/applets/klipper.desktop
diff --git a/debian/lenny/kdebase/debian/kmenuedit-trinity.install b/debian/lenny/kdebase/debian/kmenuedit-trinity.install
index 3b9a39025..140ea409b 100644
--- a/debian/lenny/kdebase/debian/kmenuedit-trinity.install
+++ b/debian/lenny/kdebase/debian/kmenuedit-trinity.install
@@ -1,9 +1,9 @@
 debian/tmp/opt/trinity/bin/kcontroledit
 debian/tmp/opt/trinity/bin/kmenuedit
-debian/tmp/opt/trinity/lib/kde3/kcontroledit.la
-debian/tmp/opt/trinity/lib/kde3/kcontroledit.so
-debian/tmp/opt/trinity/lib/kde3/kmenuedit.la
-debian/tmp/opt/trinity/lib/kde3/kmenuedit.so
+debian/tmp/opt/trinity/lib/trinity/kcontroledit.la
+debian/tmp/opt/trinity/lib/trinity/kcontroledit.so
+debian/tmp/opt/trinity/lib/trinity/kmenuedit.la
+debian/tmp/opt/trinity/lib/trinity/kmenuedit.so
 debian/tmp/opt/trinity/lib/libkdeinit_kcontroledit.so
 debian/tmp/opt/trinity/lib/libkdeinit_kmenuedit.so
 debian/tmp/opt/trinity/share/applications/kde/kmenuedit.desktop
diff --git a/debian/lenny/kdebase/debian/konqueror-nsplugins-trinity.install b/debian/lenny/kdebase/debian/konqueror-nsplugins-trinity.install
index 0aa202226..9064613b0 100644
--- a/debian/lenny/kdebase/debian/konqueror-nsplugins-trinity.install
+++ b/debian/lenny/kdebase/debian/konqueror-nsplugins-trinity.install
@@ -1,8 +1,8 @@
 debian/tmp/opt/trinity/bin/nspluginscan
 debian/tmp/opt/trinity/bin/nspluginviewer
-debian/tmp/opt/trinity/lib/kde3/kcm_nsplugins.la
-debian/tmp/opt/trinity/lib/kde3/kcm_nsplugins.so
-debian/tmp/opt/trinity/lib/kde3/libnsplugin.la
-debian/tmp/opt/trinity/lib/kde3/libnsplugin.so
+debian/tmp/opt/trinity/lib/trinity/kcm_nsplugins.la
+debian/tmp/opt/trinity/lib/trinity/kcm_nsplugins.so
+debian/tmp/opt/trinity/lib/trinity/libnsplugin.la
+debian/tmp/opt/trinity/lib/trinity/libnsplugin.so
 debian/tmp/opt/trinity/share/applications/kde/khtml_plugins.desktop
 debian/tmp/opt/trinity/share/apps/plugin/nspluginpart.rc
diff --git a/debian/lenny/kdebase/debian/konqueror-trinity.install b/debian/lenny/kdebase/debian/konqueror-trinity.install
index cdbc543c6..11d8a57c1 100644
--- a/debian/lenny/kdebase/debian/konqueror-trinity.install
+++ b/debian/lenny/kdebase/debian/konqueror-trinity.install
@@ -3,40 +3,40 @@ debian/tmp/opt/trinity/bin/kbookmarkmerger
 debian/tmp/opt/trinity/bin/keditbookmarks
 debian/tmp/opt/trinity/bin/kfmclient
 debian/tmp/opt/trinity/bin/konqueror
-debian/tmp/opt/trinity/lib/kde3/kcm_history.la
-debian/tmp/opt/trinity/lib/kde3/kcm_history.so
-debian/tmp/opt/trinity/lib/kde3/kded_konqy_preloader.la
-debian/tmp/opt/trinity/lib/kde3/kded_konqy_preloader.so
-debian/tmp/opt/trinity/lib/kde3/keditbookmarks.la
-debian/tmp/opt/trinity/lib/kde3/keditbookmarks.so
-debian/tmp/opt/trinity/lib/kde3/kfmclient.la
-debian/tmp/opt/trinity/lib/kde3/kfmclient.so
-debian/tmp/opt/trinity/lib/kde3/konq_aboutpage.la
-debian/tmp/opt/trinity/lib/kde3/konq_aboutpage.so
-debian/tmp/opt/trinity/lib/kde3/konq_iconview.la
-debian/tmp/opt/trinity/lib/kde3/konq_iconview.so
-debian/tmp/opt/trinity/lib/kde3/konq_listview.la
-debian/tmp/opt/trinity/lib/kde3/konq_listview.so
-debian/tmp/opt/trinity/lib/kde3/konq_remoteencoding.la
-debian/tmp/opt/trinity/lib/kde3/konq_remoteencoding.so
-debian/tmp/opt/trinity/lib/kde3/konq_shellcmdplugin.la
-debian/tmp/opt/trinity/lib/kde3/konq_shellcmdplugin.so
-debian/tmp/opt/trinity/lib/kde3/konq_sidebar.la
-debian/tmp/opt/trinity/lib/kde3/konq_sidebar.so
-debian/tmp/opt/trinity/lib/kde3/konq_sidebartree_bookmarks.la
-debian/tmp/opt/trinity/lib/kde3/konq_sidebartree_bookmarks.so
-debian/tmp/opt/trinity/lib/kde3/konq_sidebartree_dirtree.la
-debian/tmp/opt/trinity/lib/kde3/konq_sidebartree_dirtree.so
-debian/tmp/opt/trinity/lib/kde3/konq_sidebartree_history.la
-debian/tmp/opt/trinity/lib/kde3/konq_sidebartree_history.so
-debian/tmp/opt/trinity/lib/kde3/konqsidebar_tree.la
-debian/tmp/opt/trinity/lib/kde3/konqsidebar_tree.so
-debian/tmp/opt/trinity/lib/kde3/konqsidebar_web.la
-debian/tmp/opt/trinity/lib/kde3/konqsidebar_web.so
-debian/tmp/opt/trinity/lib/kde3/konqueror.la
-debian/tmp/opt/trinity/lib/kde3/konqueror.so
-debian/tmp/opt/trinity/lib/kde3/libkhtmlkttsdplugin.la
-debian/tmp/opt/trinity/lib/kde3/libkhtmlkttsdplugin.so
+debian/tmp/opt/trinity/lib/trinity/kcm_history.la
+debian/tmp/opt/trinity/lib/trinity/kcm_history.so
+debian/tmp/opt/trinity/lib/trinity/kded_konqy_preloader.la
+debian/tmp/opt/trinity/lib/trinity/kded_konqy_preloader.so
+debian/tmp/opt/trinity/lib/trinity/keditbookmarks.la
+debian/tmp/opt/trinity/lib/trinity/keditbookmarks.so
+debian/tmp/opt/trinity/lib/trinity/kfmclient.la
+debian/tmp/opt/trinity/lib/trinity/kfmclient.so
+debian/tmp/opt/trinity/lib/trinity/konq_aboutpage.la
+debian/tmp/opt/trinity/lib/trinity/konq_aboutpage.so
+debian/tmp/opt/trinity/lib/trinity/konq_iconview.la
+debian/tmp/opt/trinity/lib/trinity/konq_iconview.so
+debian/tmp/opt/trinity/lib/trinity/konq_listview.la
+debian/tmp/opt/trinity/lib/trinity/konq_listview.so
+debian/tmp/opt/trinity/lib/trinity/konq_remoteencoding.la
+debian/tmp/opt/trinity/lib/trinity/konq_remoteencoding.so
+debian/tmp/opt/trinity/lib/trinity/konq_shellcmdplugin.la
+debian/tmp/opt/trinity/lib/trinity/konq_shellcmdplugin.so
+debian/tmp/opt/trinity/lib/trinity/konq_sidebar.la
+debian/tmp/opt/trinity/lib/trinity/konq_sidebar.so
+debian/tmp/opt/trinity/lib/trinity/konq_sidebartree_bookmarks.la
+debian/tmp/opt/trinity/lib/trinity/konq_sidebartree_bookmarks.so
+debian/tmp/opt/trinity/lib/trinity/konq_sidebartree_dirtree.la
+debian/tmp/opt/trinity/lib/trinity/konq_sidebartree_dirtree.so
+debian/tmp/opt/trinity/lib/trinity/konq_sidebartree_history.la
+debian/tmp/opt/trinity/lib/trinity/konq_sidebartree_history.so
+debian/tmp/opt/trinity/lib/trinity/konqsidebar_tree.la
+debian/tmp/opt/trinity/lib/trinity/konqsidebar_tree.so
+debian/tmp/opt/trinity/lib/trinity/konqsidebar_web.la
+debian/tmp/opt/trinity/lib/trinity/konqsidebar_web.so
+debian/tmp/opt/trinity/lib/trinity/konqueror.la
+debian/tmp/opt/trinity/lib/trinity/konqueror.so
+debian/tmp/opt/trinity/lib/trinity/libkhtmlkttsdplugin.la
+debian/tmp/opt/trinity/lib/trinity/libkhtmlkttsdplugin.so
 debian/tmp/opt/trinity/lib/libkdeinit_keditbookmarks.so
 debian/tmp/opt/trinity/lib/libkdeinit_kfmclient.so
 debian/tmp/opt/trinity/lib/libkdeinit_konqueror.so
@@ -121,7 +121,7 @@ debian/tmp/opt/trinity/share/apps/konqueror/about/tips.html
 debian/tmp/opt/trinity/share/apps/konqueror/about/top-right-konqueror.png
 debian/tmp/opt/trinity/share/apps/konqueror/icons/crystalsvg/16x16/actions/kde1.png
 debian/tmp/opt/trinity/share/apps/konqueror/icons/crystalsvg/16x16/actions/kde2.png
-debian/tmp/opt/trinity/share/apps/konqueror/icons/crystalsvg/16x16/actions/kde3.png
+debian/tmp/opt/trinity/share/apps/konqueror/icons/crystalsvg/16x16/actions/trinity.png
 debian/tmp/opt/trinity/share/apps/konqueror/icons/crystalsvg/16x16/actions/kde4.png
 debian/tmp/opt/trinity/share/apps/konqueror/icons/crystalsvg/16x16/actions/kde5.png
 debian/tmp/opt/trinity/share/apps/konqueror/icons/crystalsvg/16x16/actions/kde6.png
diff --git a/debian/lenny/kdebase/debian/konsole-trinity.install b/debian/lenny/kdebase/debian/konsole-trinity.install
index e1a6c0ce1..0fb1e3a22 100644
--- a/debian/lenny/kdebase/debian/konsole-trinity.install
+++ b/debian/lenny/kdebase/debian/konsole-trinity.install
@@ -1,12 +1,12 @@
 debian/tmp/opt/trinity/bin/konsole
-debian/tmp/opt/trinity/lib/kde3/kcm_konsole.la
-debian/tmp/opt/trinity/lib/kde3/kcm_konsole.so
-debian/tmp/opt/trinity/lib/kde3/kded_kwrited.la
-debian/tmp/opt/trinity/lib/kde3/kded_kwrited.so
-debian/tmp/opt/trinity/lib/kde3/konsole.la
-debian/tmp/opt/trinity/lib/kde3/konsole.so
-debian/tmp/opt/trinity/lib/kde3/libkonsolepart.la
-debian/tmp/opt/trinity/lib/kde3/libkonsolepart.so
+debian/tmp/opt/trinity/lib/trinity/kcm_konsole.la
+debian/tmp/opt/trinity/lib/trinity/kcm_konsole.so
+debian/tmp/opt/trinity/lib/trinity/kded_kwrited.la
+debian/tmp/opt/trinity/lib/trinity/kded_kwrited.so
+debian/tmp/opt/trinity/lib/trinity/konsole.la
+debian/tmp/opt/trinity/lib/trinity/konsole.so
+debian/tmp/opt/trinity/lib/trinity/libkonsolepart.la
+debian/tmp/opt/trinity/lib/trinity/libkonsolepart.so
 debian/tmp/opt/trinity/lib/libkdeinit_konsole.so
 debian/tmp/opt/trinity/share/applications/kde/konsole.desktop
 debian/tmp/opt/trinity/share/applications/kde/konsolesu.desktop
diff --git a/debian/lenny/kdebase/debian/ksmserver-trinity.install b/debian/lenny/kdebase/debian/ksmserver-trinity.install
index 529dc6f40..f5200691f 100644
--- a/debian/lenny/kdebase/debian/ksmserver-trinity.install
+++ b/debian/lenny/kdebase/debian/ksmserver-trinity.install
@@ -1,7 +1,7 @@
 debian/tmp/opt/trinity/bin/ksmserver
 debian/tmp/opt/trinity/bin/startkde
-debian/tmp/opt/trinity/lib/kde3/ksmserver.la
-debian/tmp/opt/trinity/lib/kde3/ksmserver.so
+debian/tmp/opt/trinity/lib/trinity/ksmserver.la
+debian/tmp/opt/trinity/lib/trinity/ksmserver.so
 debian/tmp/opt/trinity/lib/libkdeinit_ksmserver.so
 debian/tmp/opt/trinity/share/apps/kconf_update/ksmserver.upd
 debian/tmp/opt/trinity/share/apps/kconf_update/move_session_config.sh
diff --git a/debian/lenny/kdebase/debian/ksplash-trinity.install b/debian/lenny/kdebase/debian/ksplash-trinity.install
index ffdd61a5c..5c77fa766 100644
--- a/debian/lenny/kdebase/debian/ksplash-trinity.install
+++ b/debian/lenny/kdebase/debian/ksplash-trinity.install
@@ -1,13 +1,13 @@
 debian/tmp/opt/trinity/bin/ksplash
 debian/tmp/opt/trinity/bin/ksplashsimple
-debian/tmp/opt/trinity/lib/kde3/kcm_ksplashthemes.la
-debian/tmp/opt/trinity/lib/kde3/kcm_ksplashthemes.so
-debian/tmp/opt/trinity/lib/kde3/ksplashdefault.la
-debian/tmp/opt/trinity/lib/kde3/ksplashdefault.so
-debian/tmp/opt/trinity/lib/kde3/ksplashredmond.la
-debian/tmp/opt/trinity/lib/kde3/ksplashredmond.so
-debian/tmp/opt/trinity/lib/kde3/ksplashstandard.la
-debian/tmp/opt/trinity/lib/kde3/ksplashstandard.so
+debian/tmp/opt/trinity/lib/trinity/kcm_ksplashthemes.la
+debian/tmp/opt/trinity/lib/trinity/kcm_ksplashthemes.so
+debian/tmp/opt/trinity/lib/trinity/ksplashdefault.la
+debian/tmp/opt/trinity/lib/trinity/ksplashdefault.so
+debian/tmp/opt/trinity/lib/trinity/ksplashredmond.la
+debian/tmp/opt/trinity/lib/trinity/ksplashredmond.so
+debian/tmp/opt/trinity/lib/trinity/ksplashstandard.la
+debian/tmp/opt/trinity/lib/trinity/ksplashstandard.so
 debian/tmp/opt/trinity/lib/libksplashthemes.so.0
 debian/tmp/opt/trinity/lib/libksplashthemes.so.0.0.0
 debian/tmp/opt/trinity/share/applications/kde/ksplashthememgr.desktop
diff --git a/debian/lenny/kdebase/debian/ksysguard-trinity.install b/debian/lenny/kdebase/debian/ksysguard-trinity.install
index 92f82c2b0..34702ed3f 100644
--- a/debian/lenny/kdebase/debian/ksysguard-trinity.install
+++ b/debian/lenny/kdebase/debian/ksysguard-trinity.install
@@ -1,7 +1,7 @@
 debian/tmp/opt/trinity/bin/kpm
 debian/tmp/opt/trinity/bin/ksysguard
-debian/tmp/opt/trinity/lib/kde3/sysguard_panelapplet.la
-debian/tmp/opt/trinity/lib/kde3/sysguard_panelapplet.so
+debian/tmp/opt/trinity/lib/trinity/sysguard_panelapplet.la
+debian/tmp/opt/trinity/lib/trinity/sysguard_panelapplet.so
 debian/tmp/opt/trinity/lib/libksgrd.so.1
 debian/tmp/opt/trinity/lib/libksgrd.so.1.2.0
 debian/tmp/opt/trinity/share/applications/kde/ksysguard.desktop
diff --git a/debian/lenny/kdebase/debian/kwin-trinity.install b/debian/lenny/kdebase/debian/kwin-trinity.install
index be00554be..b92c0c4a2 100644
--- a/debian/lenny/kdebase/debian/kwin-trinity.install
+++ b/debian/lenny/kdebase/debian/kwin-trinity.install
@@ -4,46 +4,46 @@ debian/tmp/opt/trinity/bin/kwin_killer_helper
 debian/tmp/opt/trinity/bin/kwin_rules_dialog
 debian/tmp/opt/trinity/lib/kconf_update_bin/kwin_update_default_rules
 debian/tmp/opt/trinity/lib/kconf_update_bin/kwin_update_window_settings
-debian/tmp/opt/trinity/lib/kde3/kcm_kwindecoration.la
-debian/tmp/opt/trinity/lib/kde3/kcm_kwindecoration.so
-debian/tmp/opt/trinity/lib/kde3/kcm_kwinoptions.la
-debian/tmp/opt/trinity/lib/kde3/kcm_kwinoptions.so
-debian/tmp/opt/trinity/lib/kde3/kcm_kwinrules.la
-debian/tmp/opt/trinity/lib/kde3/kcm_kwinrules.so
-debian/tmp/opt/trinity/lib/kde3/kwin3_b2.la
-debian/tmp/opt/trinity/lib/kde3/kwin3_b2.so
-debian/tmp/opt/trinity/lib/kde3/kwin3_default.la
-debian/tmp/opt/trinity/lib/kde3/kwin3_default.so
-debian/tmp/opt/trinity/lib/kde3/kwin3_keramik.la
-debian/tmp/opt/trinity/lib/kde3/kwin3_keramik.so
-debian/tmp/opt/trinity/lib/kde3/kwin3_laptop.la
-debian/tmp/opt/trinity/lib/kde3/kwin3_laptop.so
-debian/tmp/opt/trinity/lib/kde3/kwin3_modernsys.la
-debian/tmp/opt/trinity/lib/kde3/kwin3_modernsys.so
-debian/tmp/opt/trinity/lib/kde3/kwin3_plastik.la
-debian/tmp/opt/trinity/lib/kde3/kwin3_plastik.so
-debian/tmp/opt/trinity/lib/kde3/kwin3_quartz.la
-debian/tmp/opt/trinity/lib/kde3/kwin3_quartz.so
-debian/tmp/opt/trinity/lib/kde3/kwin3_redmond.la
-debian/tmp/opt/trinity/lib/kde3/kwin3_redmond.so
-debian/tmp/opt/trinity/lib/kde3/kwin3_web.la
-debian/tmp/opt/trinity/lib/kde3/kwin3_web.so
-debian/tmp/opt/trinity/lib/kde3/kwin_b2_config.la
-debian/tmp/opt/trinity/lib/kde3/kwin_b2_config.so
-debian/tmp/opt/trinity/lib/kde3/kwin_default_config.la
-debian/tmp/opt/trinity/lib/kde3/kwin_default_config.so
-debian/tmp/opt/trinity/lib/kde3/kwin_keramik_config.la
-debian/tmp/opt/trinity/lib/kde3/kwin_keramik_config.so
-debian/tmp/opt/trinity/lib/kde3/kwin.la
-debian/tmp/opt/trinity/lib/kde3/kwin_modernsys_config.la
-debian/tmp/opt/trinity/lib/kde3/kwin_modernsys_config.so
-debian/tmp/opt/trinity/lib/kde3/kwin_plastik_config.la
-debian/tmp/opt/trinity/lib/kde3/kwin_plastik_config.so
-debian/tmp/opt/trinity/lib/kde3/kwin_quartz_config.la
-debian/tmp/opt/trinity/lib/kde3/kwin_quartz_config.so
-debian/tmp/opt/trinity/lib/kde3/kwin_rules_dialog.la
-debian/tmp/opt/trinity/lib/kde3/kwin_rules_dialog.so
-debian/tmp/opt/trinity/lib/kde3/kwin.so
+debian/tmp/opt/trinity/lib/trinity/kcm_kwindecoration.la
+debian/tmp/opt/trinity/lib/trinity/kcm_kwindecoration.so
+debian/tmp/opt/trinity/lib/trinity/kcm_kwinoptions.la
+debian/tmp/opt/trinity/lib/trinity/kcm_kwinoptions.so
+debian/tmp/opt/trinity/lib/trinity/kcm_kwinrules.la
+debian/tmp/opt/trinity/lib/trinity/kcm_kwinrules.so
+debian/tmp/opt/trinity/lib/trinity/kwin3_b2.la
+debian/tmp/opt/trinity/lib/trinity/kwin3_b2.so
+debian/tmp/opt/trinity/lib/trinity/kwin3_default.la
+debian/tmp/opt/trinity/lib/trinity/kwin3_default.so
+debian/tmp/opt/trinity/lib/trinity/kwin3_keramik.la
+debian/tmp/opt/trinity/lib/trinity/kwin3_keramik.so
+debian/tmp/opt/trinity/lib/trinity/kwin3_laptop.la
+debian/tmp/opt/trinity/lib/trinity/kwin3_laptop.so
+debian/tmp/opt/trinity/lib/trinity/kwin3_modernsys.la
+debian/tmp/opt/trinity/lib/trinity/kwin3_modernsys.so
+debian/tmp/opt/trinity/lib/trinity/kwin3_plastik.la
+debian/tmp/opt/trinity/lib/trinity/kwin3_plastik.so
+debian/tmp/opt/trinity/lib/trinity/kwin3_quartz.la
+debian/tmp/opt/trinity/lib/trinity/kwin3_quartz.so
+debian/tmp/opt/trinity/lib/trinity/kwin3_redmond.la
+debian/tmp/opt/trinity/lib/trinity/kwin3_redmond.so
+debian/tmp/opt/trinity/lib/trinity/kwin3_web.la
+debian/tmp/opt/trinity/lib/trinity/kwin3_web.so
+debian/tmp/opt/trinity/lib/trinity/kwin_b2_config.la
+debian/tmp/opt/trinity/lib/trinity/kwin_b2_config.so
+debian/tmp/opt/trinity/lib/trinity/kwin_default_config.la
+debian/tmp/opt/trinity/lib/trinity/kwin_default_config.so
+debian/tmp/opt/trinity/lib/trinity/kwin_keramik_config.la
+debian/tmp/opt/trinity/lib/trinity/kwin_keramik_config.so
+debian/tmp/opt/trinity/lib/trinity/kwin.la
+debian/tmp/opt/trinity/lib/trinity/kwin_modernsys_config.la
+debian/tmp/opt/trinity/lib/trinity/kwin_modernsys_config.so
+debian/tmp/opt/trinity/lib/trinity/kwin_plastik_config.la
+debian/tmp/opt/trinity/lib/trinity/kwin_plastik_config.so
+debian/tmp/opt/trinity/lib/trinity/kwin_quartz_config.la
+debian/tmp/opt/trinity/lib/trinity/kwin_quartz_config.so
+debian/tmp/opt/trinity/lib/trinity/kwin_rules_dialog.la
+debian/tmp/opt/trinity/lib/trinity/kwin_rules_dialog.so
+debian/tmp/opt/trinity/lib/trinity/kwin.so
 debian/tmp/opt/trinity/lib/libkdecorations.so.1
 debian/tmp/opt/trinity/lib/libkdecorations.so.1.0.0
 debian/tmp/opt/trinity/lib/libkdeinit_kwin_rules_dialog.so
diff --git a/debian/lenny/kdebase/debian/libkonq4-trinity.install b/debian/lenny/kdebase/debian/libkonq4-trinity.install
index 1f89a216f..77ea07f1a 100644
--- a/debian/lenny/kdebase/debian/libkonq4-trinity.install
+++ b/debian/lenny/kdebase/debian/libkonq4-trinity.install
@@ -1,7 +1,7 @@
-debian/tmp/opt/trinity/lib/kde3/kded_favicons.la
-debian/tmp/opt/trinity/lib/kde3/kded_favicons.so
-debian/tmp/opt/trinity/lib/kde3/konq_sound.la
-debian/tmp/opt/trinity/lib/kde3/konq_sound.so
+debian/tmp/opt/trinity/lib/trinity/kded_favicons.la
+debian/tmp/opt/trinity/lib/trinity/kded_favicons.so
+debian/tmp/opt/trinity/lib/trinity/konq_sound.la
+debian/tmp/opt/trinity/lib/trinity/konq_sound.so
 debian/tmp/opt/trinity/lib/libkonq.so.4
 debian/tmp/opt/trinity/lib/libkonq.so.4.2.0
 debian/tmp/opt/trinity/share/apps/kbookmark/directory_bookmarkbar.desktop