summaryrefslogtreecommitdiffstats
path: root/debian/lenny
diff options
context:
space:
mode:
Diffstat (limited to 'debian/lenny')
-rw-r--r--debian/lenny/applications/amarok.cmake/debian/amarok-engine-xine-trinity.install4
-rw-r--r--debian/lenny/applications/amarok.cmake/debian/amarok-engine-yauap-trinity.install4
-rw-r--r--debian/lenny/applications/amarok.cmake/debian/amarok-trinity.install44
-rw-r--r--debian/lenny/applications/amarok/debian/amarok-engine-xine-trinity.install4
-rw-r--r--debian/lenny/applications/amarok/debian/amarok-engine-yauap-trinity.install4
-rw-r--r--debian/lenny/applications/amarok/debian/amarok-trinity.install44
-rw-r--r--debian/lenny/applications/k3b/debian/k3b-trinity.install4
-rw-r--r--debian/lenny/applications/k3b/debian/libk3b3-extracodecs-trinity.install4
-rw-r--r--debian/lenny/applications/k3b/debian/libk3b3-trinity.install44
-rw-r--r--debian/lenny/applications/kaffeine/debian/kaffeine-gstreamer-trinity.install4
-rw-r--r--debian/lenny/applications/kaffeine/debian/kaffeine-trinity.install8
-rw-r--r--debian/lenny/applications/kchmviewer/debian/dirs2
-rw-r--r--debian/lenny/applications/kde-guidance/debian/kde-guidance-trinity.install52
-rwxr-xr-xdebian/lenny/applications/kde-guidance/debian/rules2
-rwxr-xr-xdebian/lenny/applications/kdesvn/debian/rules28
-rwxr-xr-xdebian/lenny/applications/kerry/debian/rules4
-rw-r--r--debian/lenny/applications/kmplayer/debian/kmplayer-konq-plugins-trinity.install4
-rw-r--r--debian/lenny/applications/kmplayer/debian/kmplayer-trinity.install2
-rwxr-xr-xdebian/lenny/applications/kmyfirewall/debian/rules2
-rw-r--r--debian/lenny/applications/kmymoney/debian/kmymoney2-trinity.install4
-rw-r--r--debian/lenny/applications/koffice/debian/chalk-trinity.install286
-rw-r--r--debian/lenny/applications/koffice/debian/karbon-trinity.install88
-rw-r--r--debian/lenny/applications/koffice/debian/kchart-trinity.install36
-rw-r--r--debian/lenny/applications/koffice/debian/kexi-trinity.install76
-rw-r--r--debian/lenny/applications/koffice/debian/kformula-trinity.install12
-rw-r--r--debian/lenny/applications/koffice/debian/kivio-trinity.install36
-rw-r--r--debian/lenny/applications/koffice/debian/koffice-libs-trinity.install72
-rw-r--r--debian/lenny/applications/koffice/debian/koshell-trinity.install4
-rw-r--r--debian/lenny/applications/koffice/debian/kplato-trinity.install8
-rw-r--r--debian/lenny/applications/koffice/debian/kpresenter-trinity.install48
-rw-r--r--debian/lenny/applications/koffice/debian/kspread-trinity.install72
-rw-r--r--debian/lenny/applications/koffice/debian/kthesaurus-trinity.install6
-rw-r--r--debian/lenny/applications/koffice/debian/kugar-trinity.install20
-rw-r--r--debian/lenny/applications/koffice/debian/kword-trinity.install136
-rw-r--r--debian/lenny/applications/ktechlab/debian/debiandirs2
-rw-r--r--debian/lenny/applications/kwin-style-crystal/debian/dirs2
-rw-r--r--debian/lenny/kdeaccessibility/debian/kbstate-trinity.install4
-rw-r--r--debian/lenny/kdeaccessibility/debian/ksayit-trinity.install4
-rw-r--r--debian/lenny/kdeaccessibility/debian/kttsd-contrib-plugins-trinity.install8
-rw-r--r--debian/lenny/kdeaccessibility/debian/kttsd-trinity.install56
-rw-r--r--debian/lenny/kdeaccessibility/debian/kttsd-trinity.install.kfreebsd-amd6452
-rw-r--r--debian/lenny/kdeaccessibility/debian/kttsd-trinity.install.kfreebsd-i38652
-rw-r--r--debian/lenny/kdeaddons/debian/kaddressbook-plugins-trinity.install8
-rw-r--r--debian/lenny/kdeaddons/debian/kate-plugins-trinity.install60
-rw-r--r--debian/lenny/kdeaddons/debian/kdeaddons-kfile-plugins-trinity.install36
-rw-r--r--debian/lenny/kdeaddons/debian/kicker-applets-trinity.install20
-rw-r--r--debian/lenny/kdeaddons/debian/konq-plugins-trinity.install108
-rw-r--r--debian/lenny/kdeaddons/debian/kontact-plugins-trinity.install8
-rw-r--r--debian/lenny/kdeaddons/debian/noatun-plugins-trinity.install60
-rw-r--r--debian/lenny/kdeadmin/debian/kdeadmin-kfile-plugins-trinity.install8
-rw-r--r--debian/lenny/kdeadmin/debian/knetworkconf-trinity.install4
-rw-r--r--debian/lenny/kdeadmin/debian/lilo-config-trinity.install4
-rw-r--r--debian/lenny/kdeartwork/debian/kdeartwork-style-trinity.install6
-rw-r--r--debian/lenny/kdeartwork/debian/kdeartwork-theme-window-trinity.install2
-rw-r--r--debian/lenny/kdebase/debian/kate-trinity.install8
-rw-r--r--debian/lenny/kdebase/debian/kcontrol-trinity.install228
-rw-r--r--debian/lenny/kdebase/debian/kdebase-data-trinity.install2
-rw-r--r--debian/lenny/kdebase/debian/kdebase-kio-plugins-trinity.install164
-rw-r--r--debian/lenny/kdebase/debian/kdebase-trinity-bin.install50
-rw-r--r--debian/lenny/kdebase/debian/kdepasswd-trinity.install4
-rw-r--r--debian/lenny/kdebase/debian/kdeprint-trinity.install20
-rw-r--r--debian/lenny/kdebase/debian/kdesktop-trinity.install4
-rw-r--r--debian/lenny/kdebase/debian/kfind-trinity.install4
-rw-r--r--debian/lenny/kdebase/debian/khelpcenter-trinity.install4
-rw-r--r--debian/lenny/kdebase/debian/kicker-trinity.install108
-rw-r--r--debian/lenny/kdebase/debian/klipper-trinity.install10
-rw-r--r--debian/lenny/kdebase/debian/kmenuedit-trinity.install8
-rw-r--r--debian/lenny/kdebase/debian/konqueror-nsplugins-trinity.install8
-rw-r--r--debian/lenny/kdebase/debian/konqueror-trinity.install70
-rw-r--r--debian/lenny/kdebase/debian/konsole-trinity.install16
-rw-r--r--debian/lenny/kdebase/debian/ksmserver-trinity.install4
-rw-r--r--debian/lenny/kdebase/debian/ksplash-trinity.install16
-rw-r--r--debian/lenny/kdebase/debian/ksysguard-trinity.install4
-rw-r--r--debian/lenny/kdebase/debian/kwin-trinity.install80
-rw-r--r--debian/lenny/kdebase/debian/libkonq4-trinity.install8
-rw-r--r--debian/lenny/kdebindings/debian/konqueror-kjsembed-plugin-trinity.install4
-rw-r--r--debian/lenny/kdebindings/debian/libkjsembed1-trinity.install16
-rw-r--r--debian/lenny/kdeedu/debian/keduca-trinity.install4
-rw-r--r--debian/lenny/kdeedu/debian/kig-trinity.install12
-rw-r--r--debian/lenny/kdeedu/debian/kmplot-trinity.install4
-rw-r--r--debian/lenny/kdegames/debian/atlantik-trinity.install4
-rw-r--r--debian/lenny/kdegames/debian/kolf-trinity.install4
-rw-r--r--debian/lenny/kdegraphics.automake/debian/kamera-trinity.install8
-rw-r--r--debian/lenny/kdegraphics.automake/debian/kdegraphics-kfile-plugins-trinity.install76
-rw-r--r--debian/lenny/kdegraphics.automake/debian/kdvi-trinity.install4
-rw-r--r--debian/lenny/kdegraphics.automake/debian/kfaxview-trinity.install4
-rw-r--r--debian/lenny/kdegraphics.automake/debian/kgamma-trinity.install4
-rw-r--r--debian/lenny/kdegraphics.automake/debian/kghostview-trinity.install4
-rw-r--r--debian/lenny/kdegraphics.automake/debian/kmrml-trinity.install20
-rw-r--r--debian/lenny/kdegraphics.automake/debian/kpdf-trinity.install4
-rw-r--r--debian/lenny/kdegraphics.automake/debian/kpovmodeler-trinity.install4
-rw-r--r--debian/lenny/kdegraphics.automake/debian/ksvg-trinity.install12
-rw-r--r--debian/lenny/kdegraphics.automake/debian/kuickshow-trinity.install4
-rw-r--r--debian/lenny/kdegraphics.automake/debian/kview-trinity.install48
-rw-r--r--debian/lenny/kdegraphics.automake/debian/kviewshell-trinity.install12
-rw-r--r--debian/lenny/kdegraphics/debian/kamera-trinity.install8
-rw-r--r--debian/lenny/kdegraphics/debian/kdegraphics-kfile-plugins-trinity.install76
-rw-r--r--debian/lenny/kdegraphics/debian/kdvi-trinity.install4
-rw-r--r--debian/lenny/kdegraphics/debian/kfaxview-trinity.install4
-rw-r--r--debian/lenny/kdegraphics/debian/kgamma-trinity.install4
-rw-r--r--debian/lenny/kdegraphics/debian/kghostview-trinity.install4
-rw-r--r--debian/lenny/kdegraphics/debian/kmrml-trinity.install20
-rw-r--r--debian/lenny/kdegraphics/debian/kpdf-trinity.install4
-rw-r--r--debian/lenny/kdegraphics/debian/kpovmodeler-trinity.install4
-rw-r--r--debian/lenny/kdegraphics/debian/ksvg-trinity.install12
-rw-r--r--debian/lenny/kdegraphics/debian/kuickshow-trinity.install4
-rw-r--r--debian/lenny/kdegraphics/debian/kview-trinity.install48
-rw-r--r--debian/lenny/kdegraphics/debian/kviewshell-trinity.install12
-rw-r--r--debian/lenny/kdelibs/debian/kdelibs-data-trinity.install2
-rw-r--r--debian/lenny/kdelibs/debian/kdelibs4c2a-trinity.install312
-rw-r--r--debian/lenny/kdelibs/debian/trinitylibs.conf2
-rw-r--r--debian/lenny/kdemultimedia/debian/kaboodle-trinity.install4
-rw-r--r--debian/lenny/kdemultimedia/debian/kdemultimedia-kfile-plugins-trinity.install44
-rw-r--r--debian/lenny/kdemultimedia/debian/kdemultimedia-kio-plugins-trinity.install24
-rw-r--r--debian/lenny/kdemultimedia/debian/kmid-trinity.install4
-rw-r--r--debian/lenny/kdemultimedia/debian/kmix-trinity.install12
-rw-r--r--debian/lenny/kdemultimedia/debian/krec-trinity.install20
-rw-r--r--debian/lenny/kdemultimedia/debian/libarts1-xine-trinity.install4
-rw-r--r--debian/lenny/kdemultimedia/debian/libkcddb1-trinity.install4
-rw-r--r--debian/lenny/kdemultimedia/debian/noatun-trinity.install72
-rw-r--r--debian/lenny/kdenetwork/debian/kdenetwork-filesharing-trinity.install12
-rw-r--r--debian/lenny/kdenetwork/debian/kdenetwork-kfile-plugins-trinity.install4
-rw-r--r--debian/lenny/kdenetwork/debian/kdict-trinity.install8
-rw-r--r--debian/lenny/kdenetwork/debian/kdnssd-trinity.install8
-rw-r--r--debian/lenny/kdenetwork/debian/kget-trinity.install4
-rw-r--r--debian/lenny/kdenetwork/debian/knewsticker-trinity.install8
-rw-r--r--debian/lenny/kdenetwork/debian/kopete-trinity.install192
-rw-r--r--debian/lenny/kdenetwork/debian/kpf-trinity.install8
-rw-r--r--debian/lenny/kdenetwork/debian/krfb-trinity.install8
-rw-r--r--debian/lenny/kdenetwork/debian/ksirc-trinity.install4
-rw-r--r--debian/lenny/kdenetwork/debian/ktalkd-trinity.install4
-rw-r--r--debian/lenny/kdenetwork/debian/kwifimanager-trinity.install4
-rw-r--r--debian/lenny/kdenetwork/debian/lisa-trinity.install8
-rw-r--r--debian/lenny/kdepim/debian/akregator-trinity.install8
-rw-r--r--debian/lenny/kdepim/debian/control2
-rw-r--r--debian/lenny/kdepim/debian/kaddressbook-trinity.install24
-rw-r--r--debian/lenny/kdepim/debian/karm-trinity.install4
-rw-r--r--debian/lenny/kdepim/debian/kdepim-kfile-plugins-trinity.install8
-rw-r--r--debian/lenny/kdepim/debian/kdepim-kio-plugins-trinity.install20
-rw-r--r--debian/lenny/kdepim/debian/kdepim-kresources-trinity.install56
-rw-r--r--debian/lenny/kdepim/debian/kdepim-wizards-trinity.install24
-rw-r--r--debian/lenny/kdepim/debian/kitchensync-trinity.install4
-rw-r--r--debian/lenny/kdepim/debian/kleopatra-trinity.install4
-rw-r--r--debian/lenny/kdepim/debian/kmail-trinity.install24
-rw-r--r--debian/lenny/kdepim/debian/knode-trinity.install8
-rw-r--r--debian/lenny/kdepim/debian/knotes-trinity.install4
-rw-r--r--debian/lenny/kdepim/debian/kontact-trinity.install28
-rw-r--r--debian/lenny/kdepim/debian/korganizer-trinity.install12
-rw-r--r--debian/lenny/kdepim/debian/libkcal2b-trinity.install16
-rw-r--r--debian/lenny/kdepim/debian/libkdepim1a-trinity.install8
-rw-r--r--debian/lenny/kdepim/debian/libkpimexchange1-trinity.install4
-rwxr-xr-xdebian/lenny/kdepim/debian/rules14
-rw-r--r--debian/lenny/kdesdk/debian/cervisia-trinity.install8
-rw-r--r--debian/lenny/kdesdk/debian/kbabel-trinity.install96
-rw-r--r--debian/lenny/kdesdk/debian/kbugbuster-trinity.install4
-rw-r--r--debian/lenny/kdesdk/debian/kdesdk-kfile-plugins-trinity.install12
-rw-r--r--debian/lenny/kdesdk/debian/kdesdk-kio-plugins-trinity.install8
-rw-r--r--debian/lenny/kdesdk/debian/kdesdk-misc-trinity.install8
-rw-r--r--debian/lenny/kdesdk/debian/kompare-trinity.install8
-rw-r--r--debian/lenny/kdesdk/debian/kuiviewer-trinity.install8
-rw-r--r--debian/lenny/kdesdk/debian/libcvsservice0-trinity.install8
-rw-r--r--debian/lenny/kdetoys/debian/eyesapplet-trinity.install4
-rw-r--r--debian/lenny/kdetoys/debian/fifteenapplet-trinity.install4
-rw-r--r--debian/lenny/kdetoys/debian/kmoon-trinity.install4
-rw-r--r--debian/lenny/kdetoys/debian/kweather-trinity.install16
-rw-r--r--debian/lenny/kdetoys/debian/kworldclock-trinity.install4
-rw-r--r--debian/lenny/kdeutils/debian/ark-trinity.install8
-rw-r--r--debian/lenny/kdeutils/debian/kcalc-trinity.install4
-rw-r--r--debian/lenny/kdeutils/debian/kcharselect-trinity.install4
-rw-r--r--debian/lenny/kdeutils/debian/kdelirc-trinity.install8
-rw-r--r--debian/lenny/kdeutils/debian/kdf-trinity.install4
-rw-r--r--debian/lenny/kdeutils/debian/kedit-trinity.install4
-rw-r--r--debian/lenny/kdeutils/debian/khexedit-trinity.install8
-rw-r--r--debian/lenny/kdeutils/debian/klaptopdaemon-trinity.install8
-rw-r--r--debian/lenny/kdeutils/debian/kmilo-legacy-trinity.install24
-rw-r--r--debian/lenny/kdeutils/debian/kmilo-trinity.install8
-rw-r--r--debian/lenny/kdeutils/debian/kregexpeditor-trinity.install4
-rw-r--r--debian/lenny/kdeutils/debian/ksim-trinity.install4
-rw-r--r--debian/lenny/kdeutils/debian/kwalletmanager-trinity.install4
-rw-r--r--debian/lenny/kdevelop.cmake/debian/kdevelop-trinity.install2
-rw-r--r--debian/lenny/kdevelop/debian/kdevelop-trinity.install2
-rw-r--r--debian/lenny/kdewebdev/debian/kfilereplace-trinity.install4
-rw-r--r--debian/lenny/kdewebdev/debian/kimagemapeditor-trinity.install4
-rw-r--r--debian/lenny/kdewebdev/debian/klinkstatus-trinity.install4
-rw-r--r--debian/lenny/kdewebdev/debian/kommander-trinity.install4
-rw-r--r--debian/lenny/kdewebdev/debian/kxsldbg-trinity.install4
-rw-r--r--debian/lenny/kdewebdev/debian/quanta-trinity.install8
-rwxr-xr-xdebian/lenny/libraries/kipi-plugins/debian/kipi-plugins-trinity.install2
-rwxr-xr-xdebian/lenny/libraries/python-trinity/debian/rules2
189 files changed, 2158 insertions, 2158 deletions
diff --git a/debian/lenny/applications/amarok.cmake/debian/amarok-engine-xine-trinity.install b/debian/lenny/applications/amarok.cmake/debian/amarok-engine-xine-trinity.install
index 6b23c8378..c5e46604f 100644
--- a/debian/lenny/applications/amarok.cmake/debian/amarok-engine-xine-trinity.install
+++ b/debian/lenny/applications/amarok.cmake/debian/amarok-engine-xine-trinity.install
@@ -1,4 +1,4 @@
debian/tmp/opt/trinity/share/services/amarok_xine-engine.desktop
debian/tmp/opt/trinity/share/config.kcfg/xinecfg.kcfg
-debian/tmp/opt/trinity/lib/kde3/libamarok_xine-engine.so
-debian/tmp/opt/trinity/lib/kde3/libamarok_xine-engine.la
+debian/tmp/opt/trinity/lib/trinity/libamarok_xine-engine.so
+debian/tmp/opt/trinity/lib/trinity/libamarok_xine-engine.la
diff --git a/debian/lenny/applications/amarok.cmake/debian/amarok-engine-yauap-trinity.install b/debian/lenny/applications/amarok.cmake/debian/amarok-engine-yauap-trinity.install
index 9a7c007c6..ab71ca6f9 100644
--- a/debian/lenny/applications/amarok.cmake/debian/amarok-engine-yauap-trinity.install
+++ b/debian/lenny/applications/amarok.cmake/debian/amarok-engine-yauap-trinity.install
@@ -1,3 +1,3 @@
debian/tmp/opt/trinity/share/services/amarok_yauap-engine_plugin.desktop
-debian/tmp/opt/trinity/lib/kde3/libamarok_yauap-engine_plugin.la
-debian/tmp/opt/trinity/lib/kde3/libamarok_yauap-engine_plugin.so
+debian/tmp/opt/trinity/lib/trinity/libamarok_yauap-engine_plugin.la
+debian/tmp/opt/trinity/lib/trinity/libamarok_yauap-engine_plugin.so
diff --git a/debian/lenny/applications/amarok.cmake/debian/amarok-trinity.install b/debian/lenny/applications/amarok.cmake/debian/amarok-trinity.install
index 50181a39e..f5aeb567f 100644
--- a/debian/lenny/applications/amarok.cmake/debian/amarok-trinity.install
+++ b/debian/lenny/applications/amarok.cmake/debian/amarok-trinity.install
@@ -7,31 +7,31 @@ debian/tmp/opt/trinity/share/servicetypes/amarok_codecinstall.desktop
debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/amarok_append.desktop
debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/amarok_addaspodcast.desktop
debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/amarok_play_audiocd.desktop
-debian/tmp/opt/trinity/lib/kde3/libamarok_void-engine_plugin.la
-debian/tmp/opt/trinity/lib/kde3/libamarok_void-engine_plugin.so
-debian/tmp/opt/trinity/lib/kde3/libamarok_generic-mediadevice.la
-debian/tmp/opt/trinity/lib/kde3/libamarok_generic-mediadevice.so
-debian/tmp/opt/trinity/lib/kde3/libamarok_ifp-mediadevice.la
-debian/tmp/opt/trinity/lib/kde3/libamarok_ifp-mediadevice.so
-debian/tmp/opt/trinity/lib/kde3/libamarok_ipod-mediadevice.la
-debian/tmp/opt/trinity/lib/kde3/libamarok_ipod-mediadevice.so
-debian/tmp/opt/trinity/lib/kde3/libamarok_njb-mediadevice.la
-debian/tmp/opt/trinity/lib/kde3/libamarok_njb-mediadevice.so
-debian/tmp/opt/trinity/lib/kde3/libamarok_smb-device.la
-debian/tmp/opt/trinity/lib/kde3/libamarok_smb-device.so
-debian/tmp/opt/trinity/lib/kde3/libamarok_massstorage-device.la
-debian/tmp/opt/trinity/lib/kde3/libamarok_massstorage-device.so
-debian/tmp/opt/trinity/lib/kde3/libamarok_nfs-device.la
-debian/tmp/opt/trinity/lib/kde3/libamarok_nfs-device.so
-debian/tmp/opt/trinity/lib/kde3/libamarok_daap-mediadevice.la
-debian/tmp/opt/trinity/lib/kde3/libamarok_daap-mediadevice.so
+debian/tmp/opt/trinity/lib/trinity/libamarok_void-engine_plugin.la
+debian/tmp/opt/trinity/lib/trinity/libamarok_void-engine_plugin.so
+debian/tmp/opt/trinity/lib/trinity/libamarok_generic-mediadevice.la
+debian/tmp/opt/trinity/lib/trinity/libamarok_generic-mediadevice.so
+debian/tmp/opt/trinity/lib/trinity/libamarok_ifp-mediadevice.la
+debian/tmp/opt/trinity/lib/trinity/libamarok_ifp-mediadevice.so
+debian/tmp/opt/trinity/lib/trinity/libamarok_ipod-mediadevice.la
+debian/tmp/opt/trinity/lib/trinity/libamarok_ipod-mediadevice.so
+debian/tmp/opt/trinity/lib/trinity/libamarok_njb-mediadevice.la
+debian/tmp/opt/trinity/lib/trinity/libamarok_njb-mediadevice.so
+debian/tmp/opt/trinity/lib/trinity/libamarok_smb-device.la
+debian/tmp/opt/trinity/lib/trinity/libamarok_smb-device.so
+debian/tmp/opt/trinity/lib/trinity/libamarok_massstorage-device.la
+debian/tmp/opt/trinity/lib/trinity/libamarok_massstorage-device.so
+debian/tmp/opt/trinity/lib/trinity/libamarok_nfs-device.la
+debian/tmp/opt/trinity/lib/trinity/libamarok_nfs-device.so
+debian/tmp/opt/trinity/lib/trinity/libamarok_daap-mediadevice.la
+debian/tmp/opt/trinity/lib/trinity/libamarok_daap-mediadevice.so
#libkarma is not in MAIN yet
-#debian/tmp/opt/trinity/lib/kde3/libamarok_riokarma-mediadevice.la
-#debian/tmp/opt/trinity/lib/kde3/libamarok_riokarma-mediadevice.so
+#debian/tmp/opt/trinity/lib/trinity/libamarok_riokarma-mediadevice.la
+#debian/tmp/opt/trinity/lib/trinity/libamarok_riokarma-mediadevice.so
-debian/tmp/opt/trinity/lib/kde3/libamarok_mtp-mediadevice.la
-debian/tmp/opt/trinity/lib/kde3/libamarok_mtp-mediadevice.so
+debian/tmp/opt/trinity/lib/trinity/libamarok_mtp-mediadevice.la
+debian/tmp/opt/trinity/lib/trinity/libamarok_mtp-mediadevice.so
debian/tmp/opt/trinity/lib/ruby_lib/* /opt/trinity/lib/ruby_lib/
debian/tmp/opt/trinity/lib/libamarok.so.0
debian/tmp/opt/trinity/lib/libamarok.so.0.0.0
diff --git a/debian/lenny/applications/amarok/debian/amarok-engine-xine-trinity.install b/debian/lenny/applications/amarok/debian/amarok-engine-xine-trinity.install
index 6b23c8378..c5e46604f 100644
--- a/debian/lenny/applications/amarok/debian/amarok-engine-xine-trinity.install
+++ b/debian/lenny/applications/amarok/debian/amarok-engine-xine-trinity.install
@@ -1,4 +1,4 @@
debian/tmp/opt/trinity/share/services/amarok_xine-engine.desktop
debian/tmp/opt/trinity/share/config.kcfg/xinecfg.kcfg
-debian/tmp/opt/trinity/lib/kde3/libamarok_xine-engine.so
-debian/tmp/opt/trinity/lib/kde3/libamarok_xine-engine.la
+debian/tmp/opt/trinity/lib/trinity/libamarok_xine-engine.so
+debian/tmp/opt/trinity/lib/trinity/libamarok_xine-engine.la
diff --git a/debian/lenny/applications/amarok/debian/amarok-engine-yauap-trinity.install b/debian/lenny/applications/amarok/debian/amarok-engine-yauap-trinity.install
index 9a7c007c6..ab71ca6f9 100644
--- a/debian/lenny/applications/amarok/debian/amarok-engine-yauap-trinity.install
+++ b/debian/lenny/applications/amarok/debian/amarok-engine-yauap-trinity.install
@@ -1,3 +1,3 @@
debian/tmp/opt/trinity/share/services/amarok_yauap-engine_plugin.desktop
-debian/tmp/opt/trinity/lib/kde3/libamarok_yauap-engine_plugin.la
-debian/tmp/opt/trinity/lib/kde3/libamarok_yauap-engine_plugin.so
+debian/tmp/opt/trinity/lib/trinity/libamarok_yauap-engine_plugin.la
+debian/tmp/opt/trinity/lib/trinity/libamarok_yauap-engine_plugin.so
diff --git a/debian/lenny/applications/amarok/debian/amarok-trinity.install b/debian/lenny/applications/amarok/debian/amarok-trinity.install
index 50181a39e..f5aeb567f 100644
--- a/debian/lenny/applications/amarok/debian/amarok-trinity.install
+++ b/debian/lenny/applications/amarok/debian/amarok-trinity.install
@@ -7,31 +7,31 @@ debian/tmp/opt/trinity/share/servicetypes/amarok_codecinstall.desktop
debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/amarok_append.desktop
debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/amarok_addaspodcast.desktop
debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/amarok_play_audiocd.desktop
-debian/tmp/opt/trinity/lib/kde3/libamarok_void-engine_plugin.la
-debian/tmp/opt/trinity/lib/kde3/libamarok_void-engine_plugin.so
-debian/tmp/opt/trinity/lib/kde3/libamarok_generic-mediadevice.la
-debian/tmp/opt/trinity/lib/kde3/libamarok_generic-mediadevice.so
-debian/tmp/opt/trinity/lib/kde3/libamarok_ifp-mediadevice.la
-debian/tmp/opt/trinity/lib/kde3/libamarok_ifp-mediadevice.so
-debian/tmp/opt/trinity/lib/kde3/libamarok_ipod-mediadevice.la
-debian/tmp/opt/trinity/lib/kde3/libamarok_ipod-mediadevice.so
-debian/tmp/opt/trinity/lib/kde3/libamarok_njb-mediadevice.la
-debian/tmp/opt/trinity/lib/kde3/libamarok_njb-mediadevice.so
-debian/tmp/opt/trinity/lib/kde3/libamarok_smb-device.la
-debian/tmp/opt/trinity/lib/kde3/libamarok_smb-device.so
-debian/tmp/opt/trinity/lib/kde3/libamarok_massstorage-device.la
-debian/tmp/opt/trinity/lib/kde3/libamarok_massstorage-device.so
-debian/tmp/opt/trinity/lib/kde3/libamarok_nfs-device.la
-debian/tmp/opt/trinity/lib/kde3/libamarok_nfs-device.so
-debian/tmp/opt/trinity/lib/kde3/libamarok_daap-mediadevice.la
-debian/tmp/opt/trinity/lib/kde3/libamarok_daap-mediadevice.so
+debian/tmp/opt/trinity/lib/trinity/libamarok_void-engine_plugin.la
+debian/tmp/opt/trinity/lib/trinity/libamarok_void-engine_plugin.so
+debian/tmp/opt/trinity/lib/trinity/libamarok_generic-mediadevice.la
+debian/tmp/opt/trinity/lib/trinity/libamarok_generic-mediadevice.so
+debian/tmp/opt/trinity/lib/trinity/libamarok_ifp-mediadevice.la
+debian/tmp/opt/trinity/lib/trinity/libamarok_ifp-mediadevice.so
+debian/tmp/opt/trinity/lib/trinity/libamarok_ipod-mediadevice.la
+debian/tmp/opt/trinity/lib/trinity/libamarok_ipod-mediadevice.so
+debian/tmp/opt/trinity/lib/trinity/libamarok_njb-mediadevice.la
+debian/tmp/opt/trinity/lib/trinity/libamarok_njb-mediadevice.so
+debian/tmp/opt/trinity/lib/trinity/libamarok_smb-device.la
+debian/tmp/opt/trinity/lib/trinity/libamarok_smb-device.so
+debian/tmp/opt/trinity/lib/trinity/libamarok_massstorage-device.la
+debian/tmp/opt/trinity/lib/trinity/libamarok_massstorage-device.so
+debian/tmp/opt/trinity/lib/trinity/libamarok_nfs-device.la
+debian/tmp/opt/trinity/lib/trinity/libamarok_nfs-device.so
+debian/tmp/opt/trinity/lib/trinity/libamarok_daap-mediadevice.la
+debian/tmp/opt/trinity/lib/trinity/libamarok_daap-mediadevice.so
#libkarma is not in MAIN yet
-#debian/tmp/opt/trinity/lib/kde3/libamarok_riokarma-mediadevice.la
-#debian/tmp/opt/trinity/lib/kde3/libamarok_riokarma-mediadevice.so
+#debian/tmp/opt/trinity/lib/trinity/libamarok_riokarma-mediadevice.la
+#debian/tmp/opt/trinity/lib/trinity/libamarok_riokarma-mediadevice.so
-debian/tmp/opt/trinity/lib/kde3/libamarok_mtp-mediadevice.la
-debian/tmp/opt/trinity/lib/kde3/libamarok_mtp-mediadevice.so
+debian/tmp/opt/trinity/lib/trinity/libamarok_mtp-mediadevice.la
+debian/tmp/opt/trinity/lib/trinity/libamarok_mtp-mediadevice.so
debian/tmp/opt/trinity/lib/ruby_lib/* /opt/trinity/lib/ruby_lib/
debian/tmp/opt/trinity/lib/libamarok.so.0
debian/tmp/opt/trinity/lib/libamarok.so.0.0.0
diff --git a/debian/lenny/applications/k3b/debian/k3b-trinity.install b/debian/lenny/applications/k3b/debian/k3b-trinity.install
index e2601f7be..8e0b27b98 100644
--- a/debian/lenny/applications/k3b/debian/k3b-trinity.install
+++ b/debian/lenny/applications/k3b/debian/k3b-trinity.install
@@ -1,5 +1,5 @@
debian/tmp/opt/trinity/bin/*
debian/tmp/opt/trinity/share/applications/*
debian/k3b.xpm /opt/trinity/share/pixmaps/
-debian/tmp/opt/trinity/lib/kde3/kfile_k3b.so
-debian/tmp/opt/trinity/lib/kde3/kfile_k3b.la
+debian/tmp/opt/trinity/lib/trinity/kfile_k3b.so
+debian/tmp/opt/trinity/lib/trinity/kfile_k3b.la
diff --git a/debian/lenny/applications/k3b/debian/libk3b3-extracodecs-trinity.install b/debian/lenny/applications/k3b/debian/libk3b3-extracodecs-trinity.install
index 5e8cf796c..d806398ef 100644
--- a/debian/lenny/applications/k3b/debian/libk3b3-extracodecs-trinity.install
+++ b/debian/lenny/applications/k3b/debian/libk3b3-extracodecs-trinity.install
@@ -1,2 +1,2 @@
-debian/tmp/opt/trinity/lib/kde3/libk3bmaddecoder.*
-debian/tmp/opt/trinity/lib/kde3/libk3bffmpegdecoder.*
+debian/tmp/opt/trinity/lib/trinity/libk3bmaddecoder.*
+debian/tmp/opt/trinity/lib/trinity/libk3bffmpegdecoder.*
diff --git a/debian/lenny/applications/k3b/debian/libk3b3-trinity.install b/debian/lenny/applications/k3b/debian/libk3b3-trinity.install
index ac53b1722..e18a34c1c 100644
--- a/debian/lenny/applications/k3b/debian/libk3b3-trinity.install
+++ b/debian/lenny/applications/k3b/debian/libk3b3-trinity.install
@@ -1,27 +1,27 @@
debian/tmp/opt/trinity/lib/libk3b.so.*
debian/tmp/opt/trinity/lib/libk3bdevice.so.*
debian/tmp/opt/trinity/lib/*.la
-debian/tmp/opt/trinity/lib/kde3/libk3balsaoutputplugin.la
-debian/tmp/opt/trinity/lib/kde3/libk3balsaoutputplugin.so
-debian/tmp/opt/trinity/lib/kde3/libk3bartsoutputplugin.la
-debian/tmp/opt/trinity/lib/kde3/libk3bartsoutputplugin.so
-debian/tmp/opt/trinity/lib/kde3/libk3bexternalencoder.la
-debian/tmp/opt/trinity/lib/kde3/libk3bexternalencoder.so
-debian/tmp/opt/trinity/lib/kde3/libk3bflacdecoder.la
-debian/tmp/opt/trinity/lib/kde3/libk3bflacdecoder.so
+debian/tmp/opt/trinity/lib/trinity/libk3balsaoutputplugin.la
+debian/tmp/opt/trinity/lib/trinity/libk3balsaoutputplugin.so
+debian/tmp/opt/trinity/lib/trinity/libk3bartsoutputplugin.la
+debian/tmp/opt/trinity/lib/trinity/libk3bartsoutputplugin.so
+debian/tmp/opt/trinity/lib/trinity/libk3bexternalencoder.la
+debian/tmp/opt/trinity/lib/trinity/libk3bexternalencoder.so
+debian/tmp/opt/trinity/lib/trinity/libk3bflacdecoder.la
+debian/tmp/opt/trinity/lib/trinity/libk3bflacdecoder.so
-debian/tmp/opt/trinity/lib/kde3/libk3boggvorbisdecoder.la
-debian/tmp/opt/trinity/lib/kde3/libk3boggvorbisdecoder.so
-debian/tmp/opt/trinity/lib/kde3/libk3boggvorbisencoder.la
-debian/tmp/opt/trinity/lib/kde3/libk3boggvorbisencoder.so
-debian/tmp/opt/trinity/lib/kde3/libk3bsoxencoder.la
-debian/tmp/opt/trinity/lib/kde3/libk3bsoxencoder.so
-debian/tmp/opt/trinity/lib/kde3/libk3bwavedecoder.la
-debian/tmp/opt/trinity/lib/kde3/libk3bwavedecoder.so
-debian/tmp/opt/trinity/lib/kde3/libk3baudioprojectcddbplugin.so
-debian/tmp/opt/trinity/lib/kde3/libk3baudioprojectcddbplugin.la
-debian/tmp/opt/trinity/lib/kde3/libk3baudiometainforenamerplugin.so
-debian/tmp/opt/trinity/lib/kde3/libk3baudiometainforenamerplugin.la
-debian/tmp/opt/trinity/lib/kde3/kio_videodvd.so
-debian/tmp/opt/trinity/lib/kde3/kio_videodvd.la
+debian/tmp/opt/trinity/lib/trinity/libk3boggvorbisdecoder.la
+debian/tmp/opt/trinity/lib/trinity/libk3boggvorbisdecoder.so
+debian/tmp/opt/trinity/lib/trinity/libk3boggvorbisencoder.la
+debian/tmp/opt/trinity/lib/trinity/libk3boggvorbisencoder.so
+debian/tmp/opt/trinity/lib/trinity/libk3bsoxencoder.la
+debian/tmp/opt/trinity/lib/trinity/libk3bsoxencoder.so
+debian/tmp/opt/trinity/lib/trinity/libk3bwavedecoder.la
+debian/tmp/opt/trinity/lib/trinity/libk3bwavedecoder.so
+debian/tmp/opt/trinity/lib/trinity/libk3baudioprojectcddbplugin.so
+debian/tmp/opt/trinity/lib/trinity/libk3baudioprojectcddbplugin.la
+debian/tmp/opt/trinity/lib/trinity/libk3baudiometainforenamerplugin.so
+debian/tmp/opt/trinity/lib/trinity/libk3baudiometainforenamerplugin.la
+debian/tmp/opt/trinity/lib/trinity/kio_videodvd.so
+debian/tmp/opt/trinity/lib/trinity/kio_videodvd.la
diff --git a/debian/lenny/applications/kaffeine/debian/kaffeine-gstreamer-trinity.install b/debian/lenny/applications/kaffeine/debian/kaffeine-gstreamer-trinity.install
index ef17e5d67..cddfdc50f 100644
--- a/debian/lenny/applications/kaffeine/debian/kaffeine-gstreamer-trinity.install
+++ b/debian/lenny/applications/kaffeine/debian/kaffeine-gstreamer-trinity.install
@@ -1,4 +1,4 @@
-debian/tmp/opt/trinity/lib/kde3/libgstreamerpart.la
-debian/tmp/opt/trinity/lib/kde3/libgstreamerpart.so
+debian/tmp/opt/trinity/lib/trinity/libgstreamerpart.la
+debian/tmp/opt/trinity/lib/trinity/libgstreamerpart.so
debian/tmp/opt/trinity/share/services/gstreamer_part.desktop
debian/tmp/opt/trinity/share/apps/gstreamerpart/gstreamer_part.rc
diff --git a/debian/lenny/applications/kaffeine/debian/kaffeine-trinity.install b/debian/lenny/applications/kaffeine/debian/kaffeine-trinity.install
index 8fbe826e1..825837cba 100644
--- a/debian/lenny/applications/kaffeine/debian/kaffeine-trinity.install
+++ b/debian/lenny/applications/kaffeine/debian/kaffeine-trinity.install
@@ -15,9 +15,9 @@ debian/tmp/opt/trinity/share/mimelnk/application/x-kaffeine.desktop
debian/tmp/opt/trinity/share/locale/
debian/tmp/opt/trinity/include/kde/kaffeine/*h
debian/tmp/opt/trinity/share/services/kaffeineoggvorbis.desktop
-debian/tmp/opt/trinity/lib/kde3/libkaffeineoggvorbis.la
-debian/tmp/opt/trinity/lib/kde3/libkaffeineoggvorbis.so
-debian/tmp/opt/trinity/lib/kde3/libxinepart.la
-debian/tmp/opt/trinity/lib/kde3/libxinepart.so
+debian/tmp/opt/trinity/lib/trinity/libkaffeineoggvorbis.la
+debian/tmp/opt/trinity/lib/trinity/libkaffeineoggvorbis.so
+debian/tmp/opt/trinity/lib/trinity/libxinepart.la
+debian/tmp/opt/trinity/lib/trinity/libxinepart.so
debian/tmp/opt/trinity/share/services/xine_part.desktop
diff --git a/debian/lenny/applications/kchmviewer/debian/dirs b/debian/lenny/applications/kchmviewer/debian/dirs
index c53a164e3..9d345cd36 100644
--- a/debian/lenny/applications/kchmviewer/debian/dirs
+++ b/debian/lenny/applications/kchmviewer/debian/dirs
@@ -1,2 +1,2 @@
opt/trinity/bin
-opt/trinity/lib/kde3
+opt/trinity/lib/trinity
diff --git a/debian/lenny/applications/kde-guidance/debian/kde-guidance-trinity.install b/debian/lenny/applications/kde-guidance/debian/kde-guidance-trinity.install
index dd8d06153..2b145ae71 100644
--- a/debian/lenny/applications/kde-guidance/debian/kde-guidance-trinity.install
+++ b/debian/lenny/applications/kde-guidance/debian/kde-guidance-trinity.install
@@ -1,18 +1,18 @@
-opt/trinity/lib/kde3/kcm_serviceconfig.so.0.0.0 opt/trinity/lib/
-opt/trinity/lib/kde3/kcm_serviceconfig.la opt/trinity/lib/
-opt/trinity/lib/kde3/kcm_serviceconfig.a opt/trinity/lib/
-opt/trinity/lib/kde3/kcm_userconfig.so.0.0.0 opt/trinity/lib/
-opt/trinity/lib/kde3/kcm_userconfig.la opt/trinity/lib/
-opt/trinity/lib/kde3/kcm_userconfig.a opt/trinity/lib/
-opt/trinity/lib/kde3/kcm_mountconfig.so.0.0.0 opt/trinity/lib/
-opt/trinity/lib/kde3/kcm_mountconfig.la opt/trinity/lib/
-opt/trinity/lib/kde3/kcm_mountconfig.a opt/trinity/lib/
-opt/trinity/lib/kde3/kcm_displayconfig.so.0.0.0 opt/trinity/lib/
-opt/trinity/lib/kde3/kcm_displayconfig.la opt/trinity/lib/
-opt/trinity/lib/kde3/kcm_displayconfig.a opt/trinity/lib/
-opt/trinity/lib/kde3/kcm_wineconfig.so.0.0.0 opt/trinity/lib/
-opt/trinity/lib/kde3/kcm_wineconfig.la opt/trinity/lib/
-opt/trinity/lib/kde3/kcm_wineconfig.a opt/trinity/lib/
+opt/trinity/lib/trinity/kcm_serviceconfig.so.0.0.0 opt/trinity/lib/
+opt/trinity/lib/trinity/kcm_serviceconfig.la opt/trinity/lib/
+opt/trinity/lib/trinity/kcm_serviceconfig.a opt/trinity/lib/
+opt/trinity/lib/trinity/kcm_userconfig.so.0.0.0 opt/trinity/lib/
+opt/trinity/lib/trinity/kcm_userconfig.la opt/trinity/lib/
+opt/trinity/lib/trinity/kcm_userconfig.a opt/trinity/lib/
+opt/trinity/lib/trinity/kcm_mountconfig.so.0.0.0 opt/trinity/lib/
+opt/trinity/lib/trinity/kcm_mountconfig.la opt/trinity/lib/
+opt/trinity/lib/trinity/kcm_mountconfig.a opt/trinity/lib/
+opt/trinity/lib/trinity/kcm_displayconfig.so.0.0.0 opt/trinity/lib/
+opt/trinity/lib/trinity/kcm_displayconfig.la opt/trinity/lib/
+opt/trinity/lib/trinity/kcm_displayconfig.a opt/trinity/lib/
+opt/trinity/lib/trinity/kcm_wineconfig.so.0.0.0 opt/trinity/lib/
+opt/trinity/lib/trinity/kcm_wineconfig.la opt/trinity/lib/
+opt/trinity/lib/trinity/kcm_wineconfig.a opt/trinity/lib/
opt/trinity/share/icons/crystalsvg/32x32/apps/daemons.png
opt/trinity/share/icons/crystalsvg/32x32/apps/disksfilesystems.png
opt/trinity/share/icons/crystalsvg/32x32/apps/userconfig.png
@@ -46,7 +46,7 @@ opt/trinity/share/apps/guidance/pics/hi32-password.png
opt/trinity/share/apps/guidance/pics/kcmpartitions.png
opt/trinity/share/apps/guidance/pics/kde1.png
opt/trinity/share/apps/guidance/pics/kde2.png
-opt/trinity/share/apps/guidance/pics/kde3.png
+opt/trinity/share/apps/guidance/pics/trinity.png
opt/trinity/share/apps/guidance/pics/kde4.png
opt/trinity/share/apps/guidance/pics/kde5.png
opt/trinity/share/apps/guidance/pics/kde6.png
@@ -111,15 +111,15 @@ opt/trinity/share/python-support/kde-guidance-trinity/sizeview.py
opt/trinity/share/python-support/kde-guidance-trinity/unixauthdb.py
opt/trinity/share/python-support/kde-guidance-trinity/userconfig.py
opt/trinity/share/python-support/kde-guidance-trinity/wineconfig.py
-opt/trinity/lib/kde3/kcm_serviceconfig.so.0 opt/trinity/lib/
-opt/trinity/lib/kde3/kcm_serviceconfig.so opt/trinity/lib/
-opt/trinity/lib/kde3/kcm_userconfig.so.0 opt/trinity/lib/
-opt/trinity/lib/kde3/kcm_userconfig.so opt/trinity/lib/
-opt/trinity/lib/kde3/kcm_mountconfig.so.0 opt/trinity/lib/
-opt/trinity/lib/kde3/kcm_mountconfig.so opt/trinity/lib/
-opt/trinity/lib/kde3/kcm_displayconfig.so.0 opt/trinity/lib/
-opt/trinity/lib/kde3/kcm_displayconfig.so opt/trinity/lib/
-opt/trinity/lib/kde3/kcm_wineconfig.so.0 opt/trinity/lib/
-opt/trinity/lib/kde3/kcm_wineconfig.so opt/trinity/lib/
+opt/trinity/lib/trinity/kcm_serviceconfig.so.0 opt/trinity/lib/
+opt/trinity/lib/trinity/kcm_serviceconfig.so opt/trinity/lib/
+opt/trinity/lib/trinity/kcm_userconfig.so.0 opt/trinity/lib/
+opt/trinity/lib/trinity/kcm_userconfig.so opt/trinity/lib/
+opt/trinity/lib/trinity/kcm_mountconfig.so.0 opt/trinity/lib/
+opt/trinity/lib/trinity/kcm_mountconfig.so opt/trinity/lib/
+opt/trinity/lib/trinity/kcm_displayconfig.so.0 opt/trinity/lib/
+opt/trinity/lib/trinity/kcm_displayconfig.so opt/trinity/lib/
+opt/trinity/lib/trinity/kcm_wineconfig.so.0 opt/trinity/lib/
+opt/trinity/lib/trinity/kcm_wineconfig.so opt/trinity/lib/
usr/share/lintian/overrides/kde-guidance-trinity
etc/X11/Xsession.d/40guidance-displayconfig_restore
diff --git a/debian/lenny/applications/kde-guidance/debian/rules b/debian/lenny/applications/kde-guidance/debian/rules
index b388d4b12..54634ed38 100755
--- a/debian/lenny/applications/kde-guidance/debian/rules
+++ b/debian/lenny/applications/kde-guidance/debian/rules
@@ -35,7 +35,7 @@ install/kde-guidance-trinity::
$(DEB_DESTDIR)/usr/share/lintian/overrides/kde-guidance-trinity
# fix binary-or-shlib-defines-rpath
- chrpath -d $(DEB_DESTDIR)/opt/trinity/lib/kde3/kcm_*.so.*
+ chrpath -d $(DEB_DESTDIR)/opt/trinity/lib/trinity/kcm_*.so.*
# fix executable-not-elf-or-script
chmod 0644 $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/pics/kdewinewizard.png
diff --git a/debian/lenny/applications/kdesvn/debian/rules b/debian/lenny/applications/kdesvn/debian/rules
index 66125d731..6e339cd2e 100755
--- a/debian/lenny/applications/kdesvn/debian/rules
+++ b/debian/lenny/applications/kdesvn/debian/rules
@@ -28,26 +28,26 @@ common-install-impl::
mkdir -p debian/tmp/opt/trinity/include/kde
mkdir -p debian/tmp/usr/lib
mkdir -p debian/tmp/opt/trinity/lib
- mkdir -p debian/tmp/usr/lib/kde3
- mkdir -p debian/tmp/usr/lib64/kde3
- touch debian/tmp/usr/lib/kde3/removeme
- touch debian/tmp/usr/lib64/kde3/removeme
- mv debian/tmp/usr/lib/kde3/* debian/tmp/usr/lib/
- mv debian/tmp/usr/lib64/kde3/* debian/tmp/usr/lib64/
- rm -rf debian/tmp/usr/lib/kde3
- rm -rf debian/tmp/usr/lib64/kde3
+ mkdir -p debian/tmp/usr/lib/trinity
+ mkdir -p debian/tmp/usr/lib64/trinity
+ touch debian/tmp/usr/lib/trinity/removeme
+ touch debian/tmp/usr/lib64/trinity/removeme
+ mv debian/tmp/usr/lib/trinity/* debian/tmp/usr/lib/
+ mv debian/tmp/usr/lib64/trinity/* debian/tmp/usr/lib64/
+ rm -rf debian/tmp/usr/lib/trinity
+ rm -rf debian/tmp/usr/lib64/trinity
cp -Rp debian/tmp/usr/bin debian/tmp/opt/trinity/
cp -Rp debian/tmp/usr/lib/* debian/tmp/opt/trinity/lib/
cp -Rp debian/tmp/usr/lib64/* debian/tmp/opt/trinity/lib/
cp -Rp debian/tmp/usr/share debian/tmp/opt/trinity/
cp -Rp debian/tmp/usr/include/* debian/tmp/opt/trinity/include/kde/
rm -rf debian/tmp/usr/bin
- rm -rf debian/tmp/usr/lib/kde3
- rm -rf debian/tmp/usr/lib64/kde3
+ rm -rf debian/tmp/usr/lib/trinity
+ rm -rf debian/tmp/usr/lib64/trinity
rm -rf debian/tmp/usr/share
rm -rf debian/tmp/usr/include
- mkdir -p debian/tmp/opt/trinity/lib/kde3
- touch debian/tmp/opt/trinity/lib/kde3/removeme
- cp -Rp debian/tmp/opt/trinity/lib/kde3/* debian/tmp/opt/trinity/lib/
- rm -rf debian/tmp/opt/trinity/lib/kde3
+ mkdir -p debian/tmp/opt/trinity/lib/trinity
+ touch debian/tmp/opt/trinity/lib/trinity/removeme
+ cp -Rp debian/tmp/opt/trinity/lib/trinity/* debian/tmp/opt/trinity/lib/
+ rm -rf debian/tmp/opt/trinity/lib/trinity
rm -rf debian/tmp/opt/trinity/lib/removeme
diff --git a/debian/lenny/applications/kerry/debian/rules b/debian/lenny/applications/kerry/debian/rules
index 8689ee969..e3861ca8d 100755
--- a/debian/lenny/applications/kerry/debian/rules
+++ b/debian/lenny/applications/kerry/debian/rules
@@ -25,8 +25,8 @@ clean::
binary-post-install/kerry-trinity::
chrpath -d debian/kerry-trinity/opt/trinity/lib/libkdeinit_kerry.so
chrpath -d debian/kerry-trinity/opt/trinity/bin/kerry
- chrpath -d debian/kerry-trinity/opt/trinity/lib/kde3/kerry.so
- chrpath -d debian/kerry-trinity/opt/trinity/lib/kde3/kcm_beagle.so
+ chrpath -d debian/kerry-trinity/opt/trinity/lib/trinity/kerry.so
+ chrpath -d debian/kerry-trinity/opt/trinity/lib/trinity/kcm_beagle.so
mkdir -p debian/kerry-trinity/opt/trinity/share/man/man1/
mv debian/kerry-trinity/usr/share/man/man1/kerry.1 debian/kerry-trinity/opt/trinity/share/man/man1/kerry.1
rm -rf debian/kerry-trinity/usr/share/man
diff --git a/debian/lenny/applications/kmplayer/debian/kmplayer-konq-plugins-trinity.install b/debian/lenny/applications/kmplayer/debian/kmplayer-konq-plugins-trinity.install
index a6db5e999..4590b56f4 100644
--- a/debian/lenny/applications/kmplayer/debian/kmplayer-konq-plugins-trinity.install
+++ b/debian/lenny/applications/kmplayer/debian/kmplayer-konq-plugins-trinity.install
@@ -1,5 +1,5 @@
-opt/trinity/lib/kde3/libkmplayerpart.so
-opt/trinity/lib/kde3/libkmplayerpart.la
+opt/trinity/lib/trinity/libkmplayerpart.so
+opt/trinity/lib/trinity/libkmplayerpart.la
/opt/trinity/share/apps/kmplayer/kmplayerpartui.rc
/opt/trinity/share/apps/kmplayer/pluginsinfo
/opt/trinity/share/services/kmplayer_part.desktop
diff --git a/debian/lenny/applications/kmplayer/debian/kmplayer-trinity.install b/debian/lenny/applications/kmplayer/debian/kmplayer-trinity.install
index 6709895c4..3c2a5f5ff 100644
--- a/debian/lenny/applications/kmplayer/debian/kmplayer-trinity.install
+++ b/debian/lenny/applications/kmplayer/debian/kmplayer-trinity.install
@@ -1,5 +1,5 @@
opt/trinity/lib/libkdeinit_kmplayer.so
-opt/trinity/lib/kde3/kmplayer.so
+opt/trinity/lib/trinity/kmplayer.so
opt/trinity/bin/kmplayer
opt/trinity/bin/kxvplayer
/opt/trinity/share/apps/kmplayer/kmplayerui.rc
diff --git a/debian/lenny/applications/kmyfirewall/debian/rules b/debian/lenny/applications/kmyfirewall/debian/rules
index 5e704e660..1993e3bfe 100755
--- a/debian/lenny/applications/kmyfirewall/debian/rules
+++ b/debian/lenny/applications/kmyfirewall/debian/rules
@@ -97,7 +97,7 @@ install: build
env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde $(MAKE) install DESTDIR=$(CURDIR)/debian/kmyfirewall-trinity
rm -f debian/kmyfirewall-trinity/opt/trinity/lib/*.so
- chrpath -d debian/kmyfirewall-trinity/opt/trinity/bin/kmyfirewall debian/kmyfirewall-trinity/opt/trinity/lib/*.so.* debian/kmyfirewall-trinity/opt/trinity/lib/kde3/*.so
+ chrpath -d debian/kmyfirewall-trinity/opt/trinity/bin/kmyfirewall debian/kmyfirewall-trinity/opt/trinity/lib/*.so.* debian/kmyfirewall-trinity/opt/trinity/lib/trinity/*.so
chmod +x debian/kmyfirewall-trinity/opt/trinity/share/apps/kmyfirewall/scripts/installer/linux/*.sh
dh_install
diff --git a/debian/lenny/applications/kmymoney/debian/kmymoney2-trinity.install b/debian/lenny/applications/kmymoney/debian/kmymoney2-trinity.install
index ace2df368..89ecca2de 100644
--- a/debian/lenny/applications/kmymoney/debian/kmymoney2-trinity.install
+++ b/debian/lenny/applications/kmymoney/debian/kmymoney2-trinity.install
@@ -1,6 +1,6 @@
debian/kmymoney2.xpm opt/trinity/share/pixmaps/
opt/trinity/bin/kmymoney*
-opt/trinity/lib/kde3/kmm_ofximport.la
-opt/trinity/lib/kde3/kmm_ofximport.so
+opt/trinity/lib/trinity/kmm_ofximport.la
+opt/trinity/lib/trinity/kmm_ofximport.so
opt/trinity/lib/lib*.so.*
opt/trinity/share/applications/kde/kmymoney2.desktop
diff --git a/debian/lenny/applications/koffice/debian/chalk-trinity.install b/debian/lenny/applications/koffice/debian/chalk-trinity.install
index 92ee23791..a36c77eb8 100644
--- a/debian/lenny/applications/koffice/debian/chalk-trinity.install
+++ b/debian/lenny/applications/koffice/debian/chalk-trinity.install
@@ -1,147 +1,147 @@
debian/tmp/opt/trinity/bin/chalk
-debian/tmp/opt/trinity/lib/kde3/chalkblurfilter.la
-debian/tmp/opt/trinity/lib/kde3/chalkblurfilter.so
-debian/tmp/opt/trinity/lib/kde3/chalkbumpmap.la
-debian/tmp/opt/trinity/lib/kde3/chalkbumpmap.so
-debian/tmp/opt/trinity/lib/kde3/chalkcimg.la
-debian/tmp/opt/trinity/lib/kde3/chalkcimg.so
-debian/tmp/opt/trinity/lib/kde3/chalk_cmyk_*
-debian/tmp/opt/trinity/lib/kde3/chalkcmykplugin.la
-debian/tmp/opt/trinity/lib/kde3/chalkcmykplugin.so
-debian/tmp/opt/trinity/lib/kde3/chalkcolorify.la
-debian/tmp/opt/trinity/lib/kde3/chalkcolorify.so
-debian/tmp/opt/trinity/lib/kde3/chalkcolorrange.la
-debian/tmp/opt/trinity/lib/kde3/chalkcolorrange.so
-debian/tmp/opt/trinity/lib/kde3/chalkcolorsfilters.la
-debian/tmp/opt/trinity/lib/kde3/chalkcolorsfilters.so
-debian/tmp/opt/trinity/lib/kde3/chalkcolorspaceconversion.la
-debian/tmp/opt/trinity/lib/kde3/chalkcolorspaceconversion.so
-debian/tmp/opt/trinity/lib/kde3/chalkconvolutionfilters.la
-debian/tmp/opt/trinity/lib/kde3/chalkconvolutionfilters.so
-debian/tmp/opt/trinity/lib/kde3/chalkconvolutionfilters.so
-debian/tmp/opt/trinity/lib/kde3/chalkdefaultpaintops.la
-debian/tmp/opt/trinity/lib/kde3/chalkdefaultpaintops.so
-debian/tmp/opt/trinity/lib/kde3/chalkdefaulttools.la
-debian/tmp/opt/trinity/lib/kde3/chalkdefaulttools.so
-debian/tmp/opt/trinity/lib/kde3/chalkdropshadow.la
-debian/tmp/opt/trinity/lib/kde3/chalkdropshadow.so
-debian/tmp/opt/trinity/lib/kde3/chalkembossfilter.la
-debian/tmp/opt/trinity/lib/kde3/chalkembossfilter.so
-debian/tmp/opt/trinity/lib/kde3/chalkexample.la
-debian/tmp/opt/trinity/lib/kde3/chalkexample.so
-debian/tmp/opt/trinity/lib/kde3/chalkextensioncolorsfilters.la
-debian/tmp/opt/trinity/lib/kde3/chalkextensioncolorsfilters.so
-debian/tmp/opt/trinity/lib/kde3/chalkfastcolortransfer.la
-debian/tmp/opt/trinity/lib/kde3/chalkfastcolortransfer.so
-debian/tmp/opt/trinity/lib/kde3/chalkfiltersgallery.la
-debian/tmp/opt/trinity/lib/kde3/chalkfiltersgallery.so
-debian/tmp/opt/trinity/lib/kde3/chalk_gray_*
-debian/tmp/opt/trinity/lib/kde3/chalkgrayplugin.la
-debian/tmp/opt/trinity/lib/kde3/chalkgrayplugin.so
-debian/tmp/opt/trinity/lib/kde3/chalkhistogramdocker.la
-debian/tmp/opt/trinity/lib/kde3/chalkhistogramdocker.so
-debian/tmp/opt/trinity/lib/kde3/chalkhistogram.la
-debian/tmp/opt/trinity/lib/kde3/chalkhistogram.so
-debian/tmp/opt/trinity/lib/kde3/chalkimageenhancement.la
-debian/tmp/opt/trinity/lib/kde3/chalkimageenhancement.so
-debian/tmp/opt/trinity/lib/kde3/chalkimagesize.la
-debian/tmp/opt/trinity/lib/kde3/chalkimagesize.so
-debian/tmp/opt/trinity/lib/kde3/chalk.la
-debian/tmp/opt/trinity/lib/kde3/chalklenscorrectionfilter.la
-debian/tmp/opt/trinity/lib/kde3/chalklenscorrectionfilter.so
-debian/tmp/opt/trinity/lib/kde3/chalklevelfilter.la
-debian/tmp/opt/trinity/lib/kde3/chalklevelfilter.so
-debian/tmp/opt/trinity/lib/kde3/chalk_lms_*
-debian/tmp/opt/trinity/lib/kde3/chalkmodifyselection.la
-debian/tmp/opt/trinity/lib/kde3/chalkmodifyselection.so
-debian/tmp/opt/trinity/lib/kde3/chalknoisefilter.la
-debian/tmp/opt/trinity/lib/kde3/chalknoisefilter.so
-debian/tmp/opt/trinity/lib/kde3/chalkoilpaintfilter.la
-debian/tmp/opt/trinity/lib/kde3/chalkoilpaintfilter.so
-debian/tmp/opt/trinity/lib/kde3/chalkpixelizefilter.la
-debian/tmp/opt/trinity/lib/kde3/chalkpixelizefilter.so
-debian/tmp/opt/trinity/lib/kde3/chalkraindropsfilter.la
-debian/tmp/opt/trinity/lib/kde3/chalkraindropsfilter.so
-debian/tmp/opt/trinity/lib/kde3/chalkrandompickfilter.la
-debian/tmp/opt/trinity/lib/kde3/chalkrandompickfilter.so
-debian/tmp/opt/trinity/lib/kde3/chalk_rgb_*
-debian/tmp/opt/trinity/lib/kde3/chalkrgbplugin.la
-debian/tmp/opt/trinity/lib/kde3/chalkrgbplugin.so
-debian/tmp/opt/trinity/lib/kde3/chalkrotateimage.la
-debian/tmp/opt/trinity/lib/kde3/chalkrotateimage.so
-debian/tmp/opt/trinity/lib/kde3/chalkroundcornersfilter.la
-debian/tmp/opt/trinity/lib/kde3/chalkroundcornersfilter.so
-debian/tmp/opt/trinity/lib/kde3/chalkscreenshot.la
-debian/tmp/opt/trinity/lib/kde3/chalkscreenshot.so
-debian/tmp/opt/trinity/lib/kde3/chalkscripting.la
-debian/tmp/opt/trinity/lib/kde3/chalkscripting.so
-debian/tmp/opt/trinity/lib/kde3/chalkselectiontools.la
-debian/tmp/opt/trinity/lib/kde3/chalkselectiontools.so
-debian/tmp/opt/trinity/lib/kde3/chalkselectopaque.la
-debian/tmp/opt/trinity/lib/kde3/chalkselectopaque.so
-debian/tmp/opt/trinity/lib/kde3/chalkseparatechannels.la
-debian/tmp/opt/trinity/lib/kde3/chalkseparatechannels.so
-debian/tmp/opt/trinity/lib/kde3/chalkshearimage.la
-debian/tmp/opt/trinity/lib/kde3/chalkshearimage.so
-debian/tmp/opt/trinity/lib/kde3/chalksmalltilesfilter.la
-debian/tmp/opt/trinity/lib/kde3/chalksmalltilesfilter.so
-debian/tmp/opt/trinity/lib/kde3/chalk.so
-debian/tmp/opt/trinity/lib/kde3/chalksobelfilter.la
-debian/tmp/opt/trinity/lib/kde3/chalksobelfilter.so
-debian/tmp/opt/trinity/lib/kde3/chalksubstrate.la
-debian/tmp/opt/trinity/lib/kde3/chalksubstrate.so
-debian/tmp/opt/trinity/lib/kde3/chalktoolcrop.la
-debian/tmp/opt/trinity/lib/kde3/chalktoolcrop.so
-debian/tmp/opt/trinity/lib/kde3/chalktoolcurves.la
-debian/tmp/opt/trinity/lib/kde3/chalktoolcurves.so
-debian/tmp/opt/trinity/lib/kde3/chalktoolfilter.la
-debian/tmp/opt/trinity/lib/kde3/chalktoolfilter.so
-debian/tmp/opt/trinity/lib/kde3/chalktoolperspectivegrid.la
-debian/tmp/opt/trinity/lib/kde3/chalktoolperspectivegrid.so
-debian/tmp/opt/trinity/lib/kde3/chalktoolperspectivetransform.la
-debian/tmp/opt/trinity/lib/kde3/chalktoolperspectivetransform.so
-debian/tmp/opt/trinity/lib/kde3/chalktoolpolygon.la
-debian/tmp/opt/trinity/lib/kde3/chalktoolpolygon.so
-debian/tmp/opt/trinity/lib/kde3/chalktoolpolyline.la
-debian/tmp/opt/trinity/lib/kde3/chalktoolpolyline.so
-debian/tmp/opt/trinity/lib/kde3/chalktoolselectsimilar.la
-debian/tmp/opt/trinity/lib/kde3/chalktoolselectsimilar.so
-debian/tmp/opt/trinity/lib/kde3/chalktoolstar.la
-debian/tmp/opt/trinity/lib/kde3/chalktoolstar.so
-debian/tmp/opt/trinity/lib/kde3/chalktooltransform.la
-debian/tmp/opt/trinity/lib/kde3/chalktooltransform.so
-debian/tmp/opt/trinity/lib/kde3/chalkunsharpfilter.la
-debian/tmp/opt/trinity/lib/kde3/chalkunsharpfilter.so
-debian/tmp/opt/trinity/lib/kde3/chalkwavefilter.la
-debian/tmp/opt/trinity/lib/kde3/chalkwavefilter.so
-debian/tmp/opt/trinity/lib/kde3/chalkwetplugin.la
-debian/tmp/opt/trinity/lib/kde3/chalkwetplugin.so
-debian/tmp/opt/trinity/lib/kde3/chalk_ycbcr_*
-debian/tmp/opt/trinity/lib/kde3/krosschalkcore.la
-debian/tmp/opt/trinity/lib/kde3/krosschalkcore.so
-debian/tmp/opt/trinity/lib/kde3/libchalkjpegexport.la
-debian/tmp/opt/trinity/lib/kde3/libchalkjpegexport.so
-debian/tmp/opt/trinity/lib/kde3/libchalkjpegimport.la
-debian/tmp/opt/trinity/lib/kde3/libchalkjpegimport.so
-debian/tmp/opt/trinity/lib/kde3/libchalk_openexr_export.la
-debian/tmp/opt/trinity/lib/kde3/libchalk_openexr_export.so
-debian/tmp/opt/trinity/lib/kde3/libchalk_openexr_import.la
-debian/tmp/opt/trinity/lib/kde3/libchalk_openexr_import.so
-debian/tmp/opt/trinity/lib/kde3/libchalkpart.la
-debian/tmp/opt/trinity/lib/kde3/libchalkpart.la
-debian/tmp/opt/trinity/lib/kde3/libchalkpart.so
-debian/tmp/opt/trinity/lib/kde3/libchalkpdfimport.la
-debian/tmp/opt/trinity/lib/kde3/libchalkpdfimport.so
-debian/tmp/opt/trinity/lib/kde3/libchalkpngexport.la
-debian/tmp/opt/trinity/lib/kde3/libchalkpngexport.so
-debian/tmp/opt/trinity/lib/kde3/libchalkpngimport.la
-debian/tmp/opt/trinity/lib/kde3/libchalkpngimport.so
-debian/tmp/opt/trinity/lib/kde3/libchalk_raw_import.la
-debian/tmp/opt/trinity/lib/kde3/libchalk_raw_import.so
-debian/tmp/opt/trinity/lib/kde3/libchalktiffexport.la
-debian/tmp/opt/trinity/lib/kde3/libchalktiffexport.so
-debian/tmp/opt/trinity/lib/kde3/libchalktiffimport.la
-debian/tmp/opt/trinity/lib/kde3/libchalktiffimport.so
+debian/tmp/opt/trinity/lib/trinity/chalkblurfilter.la
+debian/tmp/opt/trinity/lib/trinity/chalkblurfilter.so
+debian/tmp/opt/trinity/lib/trinity/chalkbumpmap.la
+debian/tmp/opt/trinity/lib/trinity/chalkbumpmap.so
+debian/tmp/opt/trinity/lib/trinity/chalkcimg.la
+debian/tmp/opt/trinity/lib/trinity/chalkcimg.so
+debian/tmp/opt/trinity/lib/trinity/chalk_cmyk_*
+debian/tmp/opt/trinity/lib/trinity/chalkcmykplugin.la
+debian/tmp/opt/trinity/lib/trinity/chalkcmykplugin.so
+debian/tmp/opt/trinity/lib/trinity/chalkcolorify.la
+debian/tmp/opt/trinity/lib/trinity/chalkcolorify.so
+debian/tmp/opt/trinity/lib/trinity/chalkcolorrange.la
+debian/tmp/opt/trinity/lib/trinity/chalkcolorrange.so
+debian/tmp/opt/trinity/lib/trinity/chalkcolorsfilters.la
+debian/tmp/opt/trinity/lib/trinity/chalkcolorsfilters.so
+debian/tmp/opt/trinity/lib/trinity/chalkcolorspaceconversion.la
+debian/tmp/opt/trinity/lib/trinity/chalkcolorspaceconversion.so
+debian/tmp/opt/trinity/lib/trinity/chalkconvolutionfilters.la
+debian/tmp/opt/trinity/lib/trinity/chalkconvolutionfilters.so
+debian/tmp/opt/trinity/lib/trinity/chalkconvolutionfilters.so
+debian/tmp/opt/trinity/lib/trinity/chalkdefaultpaintops.la
+debian/tmp/opt/trinity/lib/trinity/chalkdefaultpaintops.so
+debian/tmp/opt/trinity/lib/trinity/chalkdefaulttools.la
+debian/tmp/opt/trinity/lib/trinity/chalkdefaulttools.so
+debian/tmp/opt/trinity/lib/trinity/chalkdropshadow.la
+debian/tmp/opt/trinity/lib/trinity/chalkdropshadow.so
+debian/tmp/opt/trinity/lib/trinity/chalkembossfilter.la
+debian/tmp/opt/trinity/lib/trinity/chalkembossfilter.so
+debian/tmp/opt/trinity/lib/trinity/chalkexample.la
+debian/tmp/opt/trinity/lib/trinity/chalkexample.so
+debian/tmp/opt/trinity/lib/trinity/chalkextensioncolorsfilters.la
+debian/tmp/opt/trinity/lib/trinity/chalkextensioncolorsfilters.so
+debian/tmp/opt/trinity/lib/trinity/chalkfastcolortransfer.la
+debian/tmp/opt/trinity/lib/trinity/chalkfastcolortransfer.so
+debian/tmp/opt/trinity/lib/trinity/chalkfiltersgallery.la
+debian/tmp/opt/trinity/lib/trinity/chalkfiltersgallery.so
+debian/tmp/opt/trinity/lib/trinity/chalk_gray_*
+debian/tmp/opt/trinity/lib/trinity/chalkgrayplugin.la
+debian/tmp/opt/trinity/lib/trinity/chalkgrayplugin.so
+debian/tmp/opt/trinity/lib/trinity/chalkhistogramdocker.la
+debian/tmp/opt/trinity/lib/trinity/chalkhistogramdocker.so
+debian/tmp/opt/trinity/lib/trinity/chalkhistogram.la
+debian/tmp/opt/trinity/lib/trinity/chalkhistogram.so
+debian/tmp/opt/trinity/lib/trinity/chalkimageenhancement.la
+debian/tmp/opt/trinity/lib/trinity/chalkimageenhancement.so
+debian/tmp/opt/trinity/lib/trinity/chalkimagesize.la
+debian/tmp/opt/trinity/lib/trinity/chalkimagesize.so
+debian/tmp/opt/trinity/lib/trinity/chalk.la
+debian/tmp/opt/trinity/lib/trinity/chalklenscorrectionfilter.la
+debian/tmp/opt/trinity/lib/trinity/chalklenscorrectionfilter.so
+debian/tmp/opt/trinity/lib/trinity/chalklevelfilter.la
+debian/tmp/opt/trinity/lib/trinity/chalklevelfilter.so
+debian/tmp/opt/trinity/lib/trinity/chalk_lms_*
+debian/tmp/opt/trinity/lib/trinity/chalkmodifyselection.la
+debian/tmp/opt/trinity/lib/trinity/chalkmodifyselection.so
+debian/tmp/opt/trinity/lib/trinity/chalknoisefilter.la
+debian/tmp/opt/trinity/lib/trinity/chalknoisefilter.so
+debian/tmp/opt/trinity/lib/trinity/chalkoilpaintfilter.la
+debian/tmp/opt/trinity/lib/trinity/chalkoilpaintfilter.so
+debian/tmp/opt/trinity/lib/trinity/chalkpixelizefilter.la
+debian/tmp/opt/trinity/lib/trinity/chalkpixelizefilter.so
+debian/tmp/opt/trinity/lib/trinity/chalkraindropsfilter.la
+debian/tmp/opt/trinity/lib/trinity/chalkraindropsfilter.so
+debian/tmp/opt/trinity/lib/trinity/chalkrandompickfilter.la
+debian/tmp/opt/trinity/lib/trinity/chalkrandompickfilter.so
+debian/tmp/opt/trinity/lib/trinity/chalk_rgb_*
+debian/tmp/opt/trinity/lib/trinity/chalkrgbplugin.la
+debian/tmp/opt/trinity/lib/trinity/chalkrgbplugin.so
+debian/tmp/opt/trinity/lib/trinity/chalkrotateimage.la
+debian/tmp/opt/trinity/lib/trinity/chalkrotateimage.so
+debian/tmp/opt/trinity/lib/trinity/chalkroundcornersfilter.la
+debian/tmp/opt/trinity/lib/trinity/chalkroundcornersfilter.so
+debian/tmp/opt/trinity/lib/trinity/chalkscreenshot.la
+debian/tmp/opt/trinity/lib/trinity/chalkscreenshot.so
+debian/tmp/opt/trinity/lib/trinity/chalkscripting.la
+debian/tmp/opt/trinity/lib/trinity/chalkscripting.so
+debian/tmp/opt/trinity/lib/trinity/chalkselectiontools.la
+debian/tmp/opt/trinity/lib/trinity/chalkselectiontools.so
+debian/tmp/opt/trinity/lib/trinity/chalkselectopaque.la
+debian/tmp/opt/trinity/lib/trinity/chalkselectopaque.so
+debian/tmp/opt/trinity/lib/trinity/chalkseparatechannels.la
+debian/tmp/opt/trinity/lib/trinity/chalkseparatechannels.so
+debian/tmp/opt/trinity/lib/trinity/chalkshearimage.la
+debian/tmp/opt/trinity/lib/trinity/chalkshearimage.so
+debian/tmp/opt/trinity/lib/trinity/chalksmalltilesfilter.la
+debian/tmp/opt/trinity/lib/trinity/chalksmalltilesfilter.so
+debian/tmp/opt/trinity/lib/trinity/chalk.so
+debian/tmp/opt/trinity/lib/trinity/chalksobelfilter.la
+debian/tmp/opt/trinity/lib/trinity/chalksobelfilter.so
+debian/tmp/opt/trinity/lib/trinity/chalksubstrate.la
+debian/tmp/opt/trinity/lib/trinity/chalksubstrate.so
+debian/tmp/opt/trinity/lib/trinity/chalktoolcrop.la
+debian/tmp/opt/trinity/lib/trinity/chalktoolcrop.so
+debian/tmp/opt/trinity/lib/trinity/chalktoolcurves.la
+debian/tmp/opt/trinity/lib/trinity/chalktoolcurves.so
+debian/tmp/opt/trinity/lib/trinity/chalktoolfilter.la
+debian/tmp/opt/trinity/lib/trinity/chalktoolfilter.so
+debian/tmp/opt/trinity/lib/trinity/chalktoolperspectivegrid.la
+debian/tmp/opt/trinity/lib/trinity/chalktoolperspectivegrid.so
+debian/tmp/opt/trinity/lib/trinity/chalktoolperspectivetransform.la
+debian/tmp/opt/trinity/lib/trinity/chalktoolperspectivetransform.so
+debian/tmp/opt/trinity/lib/trinity/chalktoolpolygon.la
+debian/tmp/opt/trinity/lib/trinity/chalktoolpolygon.so
+debian/tmp/opt/trinity/lib/trinity/chalktoolpolyline.la
+debian/tmp/opt/trinity/lib/trinity/chalktoolpolyline.so
+debian/tmp/opt/trinity/lib/trinity/chalktoolselectsimilar.la
+debian/tmp/opt/trinity/lib/trinity/chalktoolselectsimilar.so
+debian/tmp/opt/trinity/lib/trinity/chalktoolstar.la
+debian/tmp/opt/trinity/lib/trinity/chalktoolstar.so
+debian/tmp/opt/trinity/lib/trinity/chalktooltransform.la
+debian/tmp/opt/trinity/lib/trinity/chalktooltransform.so
+debian/tmp/opt/trinity/lib/trinity/chalkunsharpfilter.la
+debian/tmp/opt/trinity/lib/trinity/chalkunsharpfilter.so
+debian/tmp/opt/trinity/lib/trinity/chalkwavefilter.la
+debian/tmp/opt/trinity/lib/trinity/chalkwavefilter.so
+debian/tmp/opt/trinity/lib/trinity/chalkwetplugin.la
+debian/tmp/opt/trinity/lib/trinity/chalkwetplugin.so
+debian/tmp/opt/trinity/lib/trinity/chalk_ycbcr_*
+debian/tmp/opt/trinity/lib/trinity/krosschalkcore.la
+debian/tmp/opt/trinity/lib/trinity/krosschalkcore.so
+debian/tmp/opt/trinity/lib/trinity/libchalkjpegexport.la
+debian/tmp/opt/trinity/lib/trinity/libchalkjpegexport.so
+debian/tmp/opt/trinity/lib/trinity/libchalkjpegimport.la
+debian/tmp/opt/trinity/lib/trinity/libchalkjpegimport.so
+debian/tmp/opt/trinity/lib/trinity/libchalk_openexr_export.la
+debian/tmp/opt/trinity/lib/trinity/libchalk_openexr_export.so
+debian/tmp/opt/trinity/lib/trinity/libchalk_openexr_import.la
+debian/tmp/opt/trinity/lib/trinity/libchalk_openexr_import.so
+debian/tmp/opt/trinity/lib/trinity/libchalkpart.la
+debian/tmp/opt/trinity/lib/trinity/libchalkpart.la
+debian/tmp/opt/trinity/lib/trinity/libchalkpart.so
+debian/tmp/opt/trinity/lib/trinity/libchalkpdfimport.la
+debian/tmp/opt/trinity/lib/trinity/libchalkpdfimport.so
+debian/tmp/opt/trinity/lib/trinity/libchalkpngexport.la
+debian/tmp/opt/trinity/lib/trinity/libchalkpngexport.so
+debian/tmp/opt/trinity/lib/trinity/libchalkpngimport.la
+debian/tmp/opt/trinity/lib/trinity/libchalkpngimport.so
+debian/tmp/opt/trinity/lib/trinity/libchalk_raw_import.la
+debian/tmp/opt/trinity/lib/trinity/libchalk_raw_import.so
+debian/tmp/opt/trinity/lib/trinity/libchalktiffexport.la
+debian/tmp/opt/trinity/lib/trinity/libchalktiffexport.so
+debian/tmp/opt/trinity/lib/trinity/libchalktiffimport.la
+debian/tmp/opt/trinity/lib/trinity/libchalktiffimport.so
debian/tmp/opt/trinity/lib/libkdeinit_chalk.so
debian/tmp/opt/trinity/lib/libchalk_cmyk_*.so.*
debian/tmp/opt/trinity/lib/libchalkcolor.so.*
diff --git a/debian/lenny/applications/koffice/debian/karbon-trinity.install b/debian/lenny/applications/koffice/debian/karbon-trinity.install
index 8ddf981d2..363bf04dc 100644
--- a/debian/lenny/applications/koffice/debian/karbon-trinity.install
+++ b/debian/lenny/applications/koffice/debian/karbon-trinity.install
@@ -1,49 +1,49 @@
debian/karbon.xpm opt/trinity/share/pixmaps
debian/tmp/opt/trinity/bin/karbon
-debian/tmp/opt/trinity/lib/kde3/karbon_defaulttools.la
-debian/tmp/opt/trinity/lib/kde3/karbon_defaulttools.so
-debian/tmp/opt/trinity/lib/kde3/karbon_flattenpathplugin.la
-debian/tmp/opt/trinity/lib/kde3/karbon_flattenpathplugin.so
-debian/tmp/opt/trinity/lib/kde3/karbon_imagetoolplugin.la
-debian/tmp/opt/trinity/lib/kde3/karbon_imagetoolplugin.so
-debian/tmp/opt/trinity/lib/kde3/karbon_insertknotsplugin.la
-debian/tmp/opt/trinity/lib/kde3/karbon_insertknotsplugin.so
-debian/tmp/opt/trinity/lib/kde3/karbon.la
-debian/tmp/opt/trinity/lib/kde3/karbon_roundcornersplugin.la
-debian/tmp/opt/trinity/lib/kde3/karbon_roundcornersplugin.so
-debian/tmp/opt/trinity/lib/kde3/karbon_shadoweffectplugin.la
-debian/tmp/opt/trinity/lib/kde3/karbon_shadoweffectplugin.so
-debian/tmp/opt/trinity/lib/kde3/karbon.so
-debian/tmp/opt/trinity/lib/kde3/karbon_whirlpinchplugin.la
-debian/tmp/opt/trinity/lib/kde3/karbon_whirlpinchplugin.so
-debian/tmp/opt/trinity/lib/kde3/karbon_zoomtoolplugin.la
-debian/tmp/opt/trinity/lib/kde3/karbon_zoomtoolplugin.so
-debian/tmp/opt/trinity/lib/kde3/libkarbonaiimport.la
-debian/tmp/opt/trinity/lib/kde3/libkarbonaiimport.so
-debian/tmp/opt/trinity/lib/kde3/libkarbonepsexport.la
-debian/tmp/opt/trinity/lib/kde3/libkarbonepsexport.so
-debian/tmp/opt/trinity/lib/kde3/libkarbonepsimport.la
-debian/tmp/opt/trinity/lib/kde3/libkarbonepsimport.so
-debian/tmp/opt/trinity/lib/kde3/libkarbonkontourimport.la
-debian/tmp/opt/trinity/lib/kde3/libkarbonkontourimport.so
-debian/tmp/opt/trinity/lib/kde3/libkarbonmsodimport.la
-debian/tmp/opt/trinity/lib/kde3/libkarbonmsodimport.so
-debian/tmp/opt/trinity/lib/kde3/libkarbonpart.la
-debian/tmp/opt/trinity/lib/kde3/libkarbonpart.so
-debian/tmp/opt/trinity/lib/kde3/libkarbonpngexport.la
-debian/tmp/opt/trinity/lib/kde3/libkarbonpngexport.so
-debian/tmp/opt/trinity/lib/kde3/libkarbonsvgexport.la
-debian/tmp/opt/trinity/lib/kde3/libkarbonsvgexport.so
-debian/tmp/opt/trinity/lib/kde3/libkarbonsvgimport.la
-debian/tmp/opt/trinity/lib/kde3/libkarbonsvgimport.so
-debian/tmp/opt/trinity/lib/kde3/libkarbonxcfexport.la
-debian/tmp/opt/trinity/lib/kde3/libkarbonxcfexport.so
-debian/tmp/opt/trinity/lib/kde3/liboodrawimport.la
-debian/tmp/opt/trinity/lib/kde3/liboodrawimport.so
-debian/tmp/opt/trinity/lib/kde3/libwmfexport.la
-debian/tmp/opt/trinity/lib/kde3/libwmfexport.so
-debian/tmp/opt/trinity/lib/kde3/libwmfimport.la
-debian/tmp/opt/trinity/lib/kde3/libwmfimport.so
+debian/tmp/opt/trinity/lib/trinity/karbon_defaulttools.la
+debian/tmp/opt/trinity/lib/trinity/karbon_defaulttools.so
+debian/tmp/opt/trinity/lib/trinity/karbon_flattenpathplugin.la
+debian/tmp/opt/trinity/lib/trinity/karbon_flattenpathplugin.so
+debian/tmp/opt/trinity/lib/trinity/karbon_imagetoolplugin.la
+debian/tmp/opt/trinity/lib/trinity/karbon_imagetoolplugin.so
+debian/tmp/opt/trinity/lib/trinity/karbon_insertknotsplugin.la
+debian/tmp/opt/trinity/lib/trinity/karbon_insertknotsplugin.so
+debian/tmp/opt/trinity/lib/trinity/karbon.la
+debian/tmp/opt/trinity/lib/trinity/karbon_roundcornersplugin.la
+debian/tmp/opt/trinity/lib/trinity/karbon_roundcornersplugin.so
+debian/tmp/opt/trinity/lib/trinity/karbon_shadoweffectplugin.la
+debian/tmp/opt/trinity/lib/trinity/karbon_shadoweffectplugin.so
+debian/tmp/opt/trinity/lib/trinity/karbon.so
+debian/tmp/opt/trinity/lib/trinity/karbon_whirlpinchplugin.la
+debian/tmp/opt/trinity/lib/trinity/karbon_whirlpinchplugin.so
+debian/tmp/opt/trinity/lib/trinity/karbon_zoomtoolplugin.la
+debian/tmp/opt/trinity/lib/trinity/karbon_zoomtoolplugin.so
+debian/tmp/opt/trinity/lib/trinity/libkarbonaiimport.la
+debian/tmp/opt/trinity/lib/trinity/libkarbonaiimport.so
+debian/tmp/opt/trinity/lib/trinity/libkarbonepsexport.la
+debian/tmp/opt/trinity/lib/trinity/libkarbonepsexport.so
+debian/tmp/opt/trinity/lib/trinity/libkarbonepsimport.la
+debian/tmp/opt/trinity/lib/trinity/libkarbonepsimport.so
+debian/tmp/opt/trinity/lib/trinity/libkarbonkontourimport.la
+debian/tmp/opt/trinity/lib/trinity/libkarbonkontourimport.so
+debian/tmp/opt/trinity/lib/trinity/libkarbonmsodimport.la
+debian/tmp/opt/trinity/lib/trinity/libkarbonmsodimport.so
+debian/tmp/opt/trinity/lib/trinity/libkarbonpart.la
+debian/tmp/opt/trinity/lib/trinity/libkarbonpart.so
+debian/tmp/opt/trinity/lib/trinity/libkarbonpngexport.la
+debian/tmp/opt/trinity/lib/trinity/libkarbonpngexport.so
+debian/tmp/opt/trinity/lib/trinity/libkarbonsvgexport.la
+debian/tmp/opt/trinity/lib/trinity/libkarbonsvgexport.so
+debian/tmp/opt/trinity/lib/trinity/libkarbonsvgimport.la
+debian/tmp/opt/trinity/lib/trinity/libkarbonsvgimport.so
+debian/tmp/opt/trinity/lib/trinity/libkarbonxcfexport.la
+debian/tmp/opt/trinity/lib/trinity/libkarbonxcfexport.so
+debian/tmp/opt/trinity/lib/trinity/liboodrawimport.la
+debian/tmp/opt/trinity/lib/trinity/liboodrawimport.so
+debian/tmp/opt/trinity/lib/trinity/libwmfexport.la
+debian/tmp/opt/trinity/lib/trinity/libwmfexport.so
+debian/tmp/opt/trinity/lib/trinity/libwmfimport.la
+debian/tmp/opt/trinity/lib/trinity/libwmfimport.so
debian/tmp/opt/trinity/lib/libkarboncommon.so.*
debian/tmp/opt/trinity/lib/libkdeinit_karbon.so
debian/tmp/opt/trinity/share/applications/kde/karbon.desktop
diff --git a/debian/lenny/applications/koffice/debian/kchart-trinity.install b/debian/lenny/applications/koffice/debian/kchart-trinity.install
index 0128696a2..095261d9f 100644
--- a/debian/lenny/applications/koffice/debian/kchart-trinity.install
+++ b/debian/lenny/applications/koffice/debian/kchart-trinity.install
@@ -1,23 +1,23 @@
debian/kchart.xpm opt/trinity/share/pixmaps
debian/tmp/opt/trinity/bin/kchart
-debian/tmp/opt/trinity/lib/kde3/kchart.la
-debian/tmp/opt/trinity/lib/kde3/kchart.so
-debian/tmp/opt/trinity/lib/kde3/libkchartbmpexport.la
-debian/tmp/opt/trinity/lib/kde3/libkchartbmpexport.so
-debian/tmp/opt/trinity/lib/kde3/libkchartjpegexport.la
-debian/tmp/opt/trinity/lib/kde3/libkchartjpegexport.so
-debian/tmp/opt/trinity/lib/kde3/libkchartmngexport.la
-debian/tmp/opt/trinity/lib/kde3/libkchartmngexport.so
-debian/tmp/opt/trinity/lib/kde3/libkchartpart.la
-debian/tmp/opt/trinity/lib/kde3/libkchartpart.so
-debian/tmp/opt/trinity/lib/kde3/libkchartpngexport.la
-debian/tmp/opt/trinity/lib/kde3/libkchartpngexport.so
-debian/tmp/opt/trinity/lib/kde3/libkchartsvgexport.la
-debian/tmp/opt/trinity/lib/kde3/libkchartsvgexport.so
-debian/tmp/opt/trinity/lib/kde3/libkchartxbmexport.la
-debian/tmp/opt/trinity/lib/kde3/libkchartxbmexport.so
-debian/tmp/opt/trinity/lib/kde3/libkchartxpmexport.la
-debian/tmp/opt/trinity/lib/kde3/libkchartxpmexport.so
+debian/tmp/opt/trinity/lib/trinity/kchart.la
+debian/tmp/opt/trinity/lib/trinity/kchart.so
+debian/tmp/opt/trinity/lib/trinity/libkchartbmpexport.la
+debian/tmp/opt/trinity/lib/trinity/libkchartbmpexport.so
+debian/tmp/opt/trinity/lib/trinity/libkchartjpegexport.la
+debian/tmp/opt/trinity/lib/trinity/libkchartjpegexport.so
+debian/tmp/opt/trinity/lib/trinity/libkchartmngexport.la
+debian/tmp/opt/trinity/lib/trinity/libkchartmngexport.so
+debian/tmp/opt/trinity/lib/trinity/libkchartpart.la
+debian/tmp/opt/trinity/lib/trinity/libkchartpart.so
+debian/tmp/opt/trinity/lib/trinity/libkchartpngexport.la
+debian/tmp/opt/trinity/lib/trinity/libkchartpngexport.so
+debian/tmp/opt/trinity/lib/trinity/libkchartsvgexport.la
+debian/tmp/opt/trinity/lib/trinity/libkchartsvgexport.so
+debian/tmp/opt/trinity/lib/trinity/libkchartxbmexport.la
+debian/tmp/opt/trinity/lib/trinity/libkchartxbmexport.so
+debian/tmp/opt/trinity/lib/trinity/libkchartxpmexport.la
+debian/tmp/opt/trinity/lib/trinity/libkchartxpmexport.so
debian/tmp/opt/trinity/lib/libkchartcommon.so.*
debian/tmp/opt/trinity/lib/libkchartimageexport.so.*
debian/tmp/opt/trinity/lib/libkdchart.*
diff --git a/debian/lenny/applications/koffice/debian/kexi-trinity.install b/debian/lenny/applications/koffice/debian/kexi-trinity.install
index 96b6fab89..fc645134d 100644
--- a/debian/lenny/applications/koffice/debian/kexi-trinity.install
+++ b/debian/lenny/applications/koffice/debian/kexi-trinity.install
@@ -8,44 +8,44 @@ debian/tmp/opt/trinity/bin/kexi_delete_column_gui
debian/tmp/opt/trinity/bin/ksqlite
debian/tmp/opt/trinity/bin/ksqlite2
debian/tmp/opt/trinity/bin/ksqlite2to3
-debian/tmp/opt/trinity/lib/kde3/kexidb_mysqldriver.la
-debian/tmp/opt/trinity/lib/kde3/kexidb_mysqldriver.so
-debian/tmp/opt/trinity/lib/kde3/kexidb_pqxxsqldriver.la
-debian/tmp/opt/trinity/lib/kde3/kexidb_pqxxsqldriver.so
-debian/tmp/opt/trinity/lib/kde3/kexidb_sqlite2driver.la
-debian/tmp/opt/trinity/lib/kde3/kexidb_sqlite2driver.so
-debian/tmp/opt/trinity/lib/kde3/kexidb_sqlite3driver.la
-debian/tmp/opt/trinity/lib/kde3/kexidb_sqlite3driver.so
-debian/tmp/opt/trinity/lib/kde3/kexihandler_csv_importexport.la
-debian/tmp/opt/trinity/lib/kde3/kexihandler_csv_importexport.so
-debian/tmp/opt/trinity/lib/kde3/kexihandler_form.la
-debian/tmp/opt/trinity/lib/kde3/kexihandler_form.so
-debian/tmp/opt/trinity/lib/kde3/kexihandler_migration.la
-debian/tmp/opt/trinity/lib/kde3/kexihandler_migration.so
-debian/tmp/opt/trinity/lib/kde3/kexihandler_query.la
-debian/tmp/opt/trinity/lib/kde3/kexihandler_query.so
-debian/tmp/opt/trinity/lib/kde3/kexihandler_relation.la
-debian/tmp/opt/trinity/lib/kde3/kexihandler_relation.so
-debian/tmp/opt/trinity/lib/kde3/kexihandler_script.la
-debian/tmp/opt/trinity/lib/kde3/kexihandler_script.so
-debian/tmp/opt/trinity/lib/kde3/kexihandler_table.la
-debian/tmp/opt/trinity/lib/kde3/kexihandler_table.so
-debian/tmp/opt/trinity/lib/kde3/kexi.la
-debian/tmp/opt/trinity/lib/kde3/keximigrate_mysql.la
-debian/tmp/opt/trinity/lib/kde3/keximigrate_mysql.so
-debian/tmp/opt/trinity/lib/kde3/keximigrate_pqxx.la
-debian/tmp/opt/trinity/lib/kde3/keximigrate_pqxx.so
-debian/tmp/opt/trinity/lib/kde3/kexi.so
-debian/tmp/opt/trinity/lib/kde3/kformdesigner_containers.la
-debian/tmp/opt/trinity/lib/kde3/kformdesigner_containers.so
-debian/tmp/opt/trinity/lib/kde3/kformdesigner_kexidbwidgets.la
-debian/tmp/opt/trinity/lib/kde3/kformdesigner_kexidbwidgets.so
-debian/tmp/opt/trinity/lib/kde3/kformdesigner_stdwidgets.la
-debian/tmp/opt/trinity/lib/kde3/kformdesigner_stdwidgets.so
-debian/tmp/opt/trinity/lib/kde3/krosskexiapp.la
-debian/tmp/opt/trinity/lib/kde3/krosskexiapp.so
-debian/tmp/opt/trinity/lib/kde3/krosskexidb.la
-debian/tmp/opt/trinity/lib/kde3/krosskexidb.so
+debian/tmp/opt/trinity/lib/trinity/kexidb_mysqldriver.la
+debian/tmp/opt/trinity/lib/trinity/kexidb_mysqldriver.so
+debian/tmp/opt/trinity/lib/trinity/kexidb_pqxxsqldriver.la
+debian/tmp/opt/trinity/lib/trinity/kexidb_pqxxsqldriver.so
+debian/tmp/opt/trinity/lib/trinity/kexidb_sqlite2driver.la
+debian/tmp/opt/trinity/lib/trinity/kexidb_sqlite2driver.so
+debian/tmp/opt/trinity/lib/trinity/kexidb_sqlite3driver.la
+debian/tmp/opt/trinity/lib/trinity/kexidb_sqlite3driver.so
+debian/tmp/opt/trinity/lib/trinity/kexihandler_csv_importexport.la
+debian/tmp/opt/trinity/lib/trinity/kexihandler_csv_importexport.so
+debian/tmp/opt/trinity/lib/trinity/kexihandler_form.la
+debian/tmp/opt/trinity/lib/trinity/kexihandler_form.so
+debian/tmp/opt/trinity/lib/trinity/kexihandler_migration.la
+debian/tmp/opt/trinity/lib/trinity/kexihandler_migration.so
+debian/tmp/opt/trinity/lib/trinity/kexihandler_query.la
+debian/tmp/opt/trinity/lib/trinity/kexihandler_query.so
+debian/tmp/opt/trinity/lib/trinity/kexihandler_relation.la
+debian/tmp/opt/trinity/lib/trinity/kexihandler_relation.so
+debian/tmp/opt/trinity/lib/trinity/kexihandler_script.la
+debian/tmp/opt/trinity/lib/trinity/kexihandler_script.so
+debian/tmp/opt/trinity/lib/trinity/kexihandler_table.la
+debian/tmp/opt/trinity/lib/trinity/kexihandler_table.so
+debian/tmp/opt/trinity/lib/trinity/kexi.la
+debian/tmp/opt/trinity/lib/trinity/keximigrate_mysql.la
+debian/tmp/opt/trinity/lib/trinity/keximigrate_mysql.so
+debian/tmp/opt/trinity/lib/trinity/keximigrate_pqxx.la
+debian/tmp/opt/trinity/lib/trinity/keximigrate_pqxx.so
+debian/tmp/opt/trinity/lib/trinity/kexi.so
+debian/tmp/opt/trinity/lib/trinity/kformdesigner_containers.la
+debian/tmp/opt/trinity/lib/trinity/kformdesigner_containers.so
+debian/tmp/opt/trinity/lib/trinity/kformdesigner_kexidbwidgets.la
+debian/tmp/opt/trinity/lib/trinity/kformdesigner_kexidbwidgets.so
+debian/tmp/opt/trinity/lib/trinity/kformdesigner_stdwidgets.la
+debian/tmp/opt/trinity/lib/trinity/kformdesigner_stdwidgets.so
+debian/tmp/opt/trinity/lib/trinity/krosskexiapp.la
+debian/tmp/opt/trinity/lib/trinity/krosskexiapp.so
+debian/tmp/opt/trinity/lib/trinity/krosskexidb.la
+debian/tmp/opt/trinity/lib/trinity/krosskexidb.so
debian/tmp/opt/trinity/lib/libkdeinit_kexi.so
debian/tmp/opt/trinity/lib/libkexicore.so.*
debian/tmp/opt/trinity/lib/libkexidatatable.so.*
diff --git a/debian/lenny/applications/koffice/debian/kformula-trinity.install b/debian/lenny/applications/koffice/debian/kformula-trinity.install
index 01a078f28..d9ba60a08 100644
--- a/debian/lenny/applications/koffice/debian/kformula-trinity.install
+++ b/debian/lenny/applications/koffice/debian/kformula-trinity.install
@@ -1,11 +1,11 @@
debian/kformula.xpm opt/trinity/share/pixmaps
debian/tmp/opt/trinity/bin/kformula
-debian/tmp/opt/trinity/lib/kde3/kformula.la
-debian/tmp/opt/trinity/lib/kde3/kformula.so
-debian/tmp/opt/trinity/lib/kde3/libkformulapart.la
-debian/tmp/opt/trinity/lib/kde3/libkformulapart.so
-debian/tmp/opt/trinity/lib/kde3/libkfosvgexport.la
-debian/tmp/opt/trinity/lib/kde3/libkfosvgexport.so
+debian/tmp/opt/trinity/lib/trinity/kformula.la
+debian/tmp/opt/trinity/lib/trinity/kformula.so
+debian/tmp/opt/trinity/lib/trinity/libkformulapart.la
+debian/tmp/opt/trinity/lib/trinity/libkformulapart.so
+debian/tmp/opt/trinity/lib/trinity/libkfosvgexport.la
+debian/tmp/opt/trinity/lib/trinity/libkfosvgexport.so
debian/tmp/opt/trinity/lib/libkdeinit_kformula.so
debian/tmp/opt/trinity/share/applications/kde/kformula.desktop
debian/tmp/opt/trinity/share/apps/kformula
diff --git a/debian/lenny/applications/koffice/debian/kivio-trinity.install b/debian/lenny/applications/koffice/debian/kivio-trinity.install
index e1dd97076..510c85320 100644
--- a/debian/lenny/applications/koffice/debian/kivio-trinity.install
+++ b/debian/lenny/applications/koffice/debian/kivio-trinity.install
@@ -1,21 +1,21 @@
debian/tmp/opt/trinity/bin/kivio
-debian/tmp/opt/trinity/lib/kde3/kivio.la
-debian/tmp/opt/trinity/lib/kde3/kivio.so
-debian/tmp/opt/trinity/lib/kde3/libkivioconnectortool.la
-debian/tmp/opt/trinity/lib/kde3/libkivioconnectortool.so
-debian/tmp/opt/trinity/lib/kde3/libkivioimageexport.la
-debian/tmp/opt/trinity/lib/kde3/libkivioimageexport.so
-debian/tmp/opt/trinity/lib/kde3/libkiviopart.la
-debian/tmp/opt/trinity/lib/kde3/libkiviopart.so
-debian/tmp/opt/trinity/lib/kde3/libkivioselecttool.la
-debian/tmp/opt/trinity/lib/kde3/libkivioselecttool.so
-debian/tmp/opt/trinity/lib/kde3/libkiviotargettool.la
-debian/tmp/opt/trinity/lib/kde3/libkiviotargettool.so
-debian/tmp/opt/trinity/lib/kde3/libkiviotexttool.la
-debian/tmp/opt/trinity/lib/kde3/libkiviotexttool.so
-debian/tmp/opt/trinity/lib/kde3/libkiviozoomtool.la
-debian/tmp/opt/trinity/lib/kde3/libkiviozoomtool.so
-debian/tmp/opt/trinity/lib/kde3/straight_connector.la
-debian/tmp/opt/trinity/lib/kde3/straight_connector.so
+debian/tmp/opt/trinity/lib/trinity/kivio.la
+debian/tmp/opt/trinity/lib/trinity/kivio.so
+debian/tmp/opt/trinity/lib/trinity/libkivioconnectortool.la
+debian/tmp/opt/trinity/lib/trinity/libkivioconnectortool.so
+debian/tmp/opt/trinity/lib/trinity/libkivioimageexport.la
+debian/tmp/opt/trinity/lib/trinity/libkivioimageexport.so
+debian/tmp/opt/trinity/lib/trinity/libkiviopart.la
+debian/tmp/opt/trinity/lib/trinity/libkiviopart.so
+debian/tmp/opt/trinity/lib/trinity/libkivioselecttool.la
+debian/tmp/opt/trinity/lib/trinity/libkivioselecttool.so
+debian/tmp/opt/trinity/lib/trinity/libkiviotargettool.la
+debian/tmp/opt/trinity/lib/trinity/libkiviotargettool.so
+debian/tmp/opt/trinity/lib/trinity/libkiviotexttool.la
+debian/tmp/opt/trinity/lib/trinity/libkiviotexttool.so
+debian/tmp/opt/trinity/lib/trinity/libkiviozoomtool.la
+debian/tmp/opt/trinity/lib/trinity/libkiviozoomtool.so
+debian/tmp/opt/trinity/lib/trinity/straight_connector.la
+debian/tmp/opt/trinity/lib/trinity/straight_connector.so
debian/tmp/opt/trinity/lib/libkdeinit_kivio.so
debian/tmp/opt/trinity/lib/libkiviocommon.so.*
diff --git a/debian/lenny/applications/koffice/debian/koffice-libs-trinity.install b/debian/lenny/applications/koffice/debian/koffice-libs-trinity.install
index e6c517a10..8d1ecc1d3 100644
--- a/debian/lenny/applications/koffice/debian/koffice-libs-trinity.install
+++ b/debian/lenny/applications/koffice/debian/koffice-libs-trinity.install
@@ -1,41 +1,41 @@
debian/tmp/opt/trinity/bin/koconverter
debian/tmp/opt/trinity/bin/krossrunner
-debian/tmp/opt/trinity/lib/kde3/clipartthumbnail.la
-debian/tmp/opt/trinity/lib/kde3/clipartthumbnail.so
-debian/tmp/opt/trinity/lib/kde3/kfile_abiword.la
-debian/tmp/opt/trinity/lib/kde3/kfile_abiword.so
-debian/tmp/opt/trinity/lib/kde3/kfile_gnumeric.la
-debian/tmp/opt/trinity/lib/kde3/kfile_gnumeric.so
-debian/tmp/opt/trinity/lib/kde3/kfile_koffice.la
-debian/tmp/opt/trinity/lib/kde3/kfile_koffice.so
-debian/tmp/opt/trinity/lib/kde3/kfile_ooo.la
-debian/tmp/opt/trinity/lib/kde3/kfile_ooo.so
-debian/tmp/opt/trinity/lib/kde3/kodocinfopropspage.la
-debian/tmp/opt/trinity/lib/kde3/kodocinfopropspage.so
-debian/tmp/opt/trinity/lib/kde3/kofficescan.la
-debian/tmp/opt/trinity/lib/kde3/kofficescan.so
-debian/tmp/opt/trinity/lib/kde3/kofficethumbnail.la
-debian/tmp/opt/trinity/lib/kde3/kofficethumbnail.so
-debian/tmp/opt/trinity/lib/kde3/krossruby.la
-debian/tmp/opt/trinity/lib/kde3/krossruby.so
-debian/tmp/opt/trinity/lib/kde3/libgenerickofilter.la
-debian/tmp/opt/trinity/lib/kde3/libgenerickofilter.so
-debian/tmp/opt/trinity/lib/kde3/libkfolatexexport.la
-debian/tmp/opt/trinity/lib/kde3/libkfolatexexport.so
-debian/tmp/opt/trinity/lib/kde3/libkfomathmlexport.la
-debian/tmp/opt/trinity/lib/kde3/libkfomathmlexport.so
-debian/tmp/opt/trinity/lib/kde3/libkfomathmlimport.la
-debian/tmp/opt/trinity/lib/kde3/libkfomathmlimport.so
-debian/tmp/opt/trinity/lib/kde3/libkfopngexport.la
-debian/tmp/opt/trinity/lib/kde3/libkfopngexport.so
-debian/tmp/opt/trinity/lib/kde3/libkounavailpart.la
-debian/tmp/opt/trinity/lib/kde3/libkounavailpart.so
-debian/tmp/opt/trinity/lib/kde3/libkprkword.la
-debian/tmp/opt/trinity/lib/kde3/libkprkword.so
-debian/tmp/opt/trinity/lib/kde3/libxsltexport.la
-debian/tmp/opt/trinity/lib/kde3/libxsltexport.so
-debian/tmp/opt/trinity/lib/kde3/libxsltimport.la
-debian/tmp/opt/trinity/lib/kde3/libxsltimport.so
+debian/tmp/opt/trinity/lib/trinity/clipartthumbnail.la
+debian/tmp/opt/trinity/lib/trinity/clipartthumbnail.so
+debian/tmp/opt/trinity/lib/trinity/kfile_abiword.la
+debian/tmp/opt/trinity/lib/trinity/kfile_abiword.so
+debian/tmp/opt/trinity/lib/trinity/kfile_gnumeric.la
+debian/tmp/opt/trinity/lib/trinity/kfile_gnumeric.so
+debian/tmp/opt/trinity/lib/trinity/kfile_koffice.la
+debian/tmp/opt/trinity/lib/trinity/kfile_koffice.so
+debian/tmp/opt/trinity/lib/trinity/kfile_ooo.la
+debian/tmp/opt/trinity/lib/trinity/kfile_ooo.so
+debian/tmp/opt/trinity/lib/trinity/kodocinfopropspage.la
+debian/tmp/opt/trinity/lib/trinity/kodocinfopropspage.so
+debian/tmp/opt/trinity/lib/trinity/kofficescan.la
+debian/tmp/opt/trinity/lib/trinity/kofficescan.so
+debian/tmp/opt/trinity/lib/trinity/kofficethumbnail.la
+debian/tmp/opt/trinity/lib/trinity/kofficethumbnail.so
+debian/tmp/opt/trinity/lib/trinity/krossruby.la
+debian/tmp/opt/trinity/lib/trinity/krossruby.so
+debian/tmp/opt/trinity/lib/trinity/libgenerickofilter.la
+debian/tmp/opt/trinity/lib/trinity/libgenerickofilter.so
+debian/tmp/opt/trinity/lib/trinity/libkfolatexexport.la
+debian/tmp/opt/trinity/lib/trinity/libkfolatexexport.so
+debian/tmp/opt/trinity/lib/trinity/libkfomathmlexport.la
+debian/tmp/opt/trinity/lib/trinity/libkfomathmlexport.so
+debian/tmp/opt/trinity/lib/trinity/libkfomathmlimport.la
+debian/tmp/opt/trinity/lib/trinity/libkfomathmlimport.so
+debian/tmp/opt/trinity/lib/trinity/libkfopngexport.la
+debian/tmp/opt/trinity/lib/trinity/libkfopngexport.so
+debian/tmp/opt/trinity/lib/trinity/libkounavailpart.la
+debian/tmp/opt/trinity/lib/trinity/libkounavailpart.so
+debian/tmp/opt/trinity/lib/trinity/libkprkword.la
+debian/tmp/opt/trinity/lib/trinity/libkprkword.so
+debian/tmp/opt/trinity/lib/trinity/libxsltexport.la
+debian/tmp/opt/trinity/lib/trinity/libxsltexport.so
+debian/tmp/opt/trinity/lib/trinity/libxsltimport.la
+debian/tmp/opt/trinity/lib/trinity/libxsltimport.so
debian/tmp/opt/trinity/lib/libkformulalib.so.*
debian/tmp/opt/trinity/lib/libkochart.so.*
debian/tmp/opt/trinity/lib/libkofficecore.so.*
diff --git a/debian/lenny/applications/koffice/debian/koshell-trinity.install b/debian/lenny/applications/koffice/debian/koshell-trinity.install
index b73b6b963..fc8fbb841 100644
--- a/debian/lenny/applications/koffice/debian/koshell-trinity.install
+++ b/debian/lenny/applications/koffice/debian/koshell-trinity.install
@@ -1,7 +1,7 @@
debian/koshell.xpm opt/trinity/share/pixmaps
debian/tmp/opt/trinity/bin/koshell
-debian/tmp/opt/trinity/lib/kde3/koshell.la
-debian/tmp/opt/trinity/lib/kde3/koshell.so
+debian/tmp/opt/trinity/lib/trinity/koshell.la
+debian/tmp/opt/trinity/lib/trinity/koshell.so
debian/tmp/opt/trinity/lib/libkdeinit_koshell.so
debian/tmp/opt/trinity/share/applications/kde/koshell.desktop
debian/tmp/opt/trinity/share/apps/koshell/koshellui.rc
diff --git a/debian/lenny/applications/koffice/debian/kplato-trinity.install b/debian/lenny/applications/koffice/debian/kplato-trinity.install
index 723803ff8..df01154f4 100644
--- a/debian/lenny/applications/koffice/debian/kplato-trinity.install
+++ b/debian/lenny/applications/koffice/debian/kplato-trinity.install
@@ -1,8 +1,8 @@
debian/tmp/opt/trinity/bin/kplato
-debian/tmp/opt/trinity/lib/kde3/kplato.la
-debian/tmp/opt/trinity/lib/kde3/kplato.so
-debian/tmp/opt/trinity/lib/kde3/libkplatopart.la
-debian/tmp/opt/trinity/lib/kde3/libkplatopart.so
+debian/tmp/opt/trinity/lib/trinity/kplato.la
+debian/tmp/opt/trinity/lib/trinity/kplato.so
+debian/tmp/opt/trinity/lib/trinity/libkplatopart.la
+debian/tmp/opt/trinity/lib/trinity/libkplatopart.so
debian/tmp/opt/trinity/lib/libkdeinit_kplato.so
debian/tmp/opt/trinity/share/applications/kde/kplato.desktop
debian/tmp/opt/trinity/share/apps/kplato/icons/crystalsvg/22x22/actions/accounts.png
diff --git a/debian/lenny/applications/koffice/debian/kpresenter-trinity.install b/debian/lenny/applications/koffice/debian/kpresenter-trinity.install
index b47947be4..fc90edce6 100644
--- a/debian/lenny/applications/koffice/debian/kpresenter-trinity.install
+++ b/debian/lenny/applications/koffice/debian/kpresenter-trinity.install
@@ -1,29 +1,29 @@
debian/tmp/opt/trinity/bin/kprconverter.pl
debian/tmp/opt/trinity/bin/kpresenter
-debian/tmp/opt/trinity/lib/kde3/kpresenter.la
-debian/tmp/opt/trinity/lib/kde3/kpresenter.so
-debian/tmp/opt/trinity/lib/kde3/libkpresenterbmpexport.la
-debian/tmp/opt/trinity/lib/kde3/libkpresenterbmpexport.so
-debian/tmp/opt/trinity/lib/kde3/libkpresenterjpegexport.la
-debian/tmp/opt/trinity/lib/kde3/libkpresenterjpegexport.so
-debian/tmp/opt/trinity/lib/kde3/libkpresentermngexport.la
-debian/tmp/opt/trinity/lib/kde3/libkpresentermngexport.so
-debian/tmp/opt/trinity/lib/kde3/libkpresenterpart.la
-debian/tmp/opt/trinity/lib/kde3/libkpresenterpart.so
-debian/tmp/opt/trinity/lib/kde3/libkpresenterpngexport.la
-debian/tmp/opt/trinity/lib/kde3/libkpresenterpngexport.so
-debian/tmp/opt/trinity/lib/kde3/libkpresentersvgexport.la
-debian/tmp/opt/trinity/lib/kde3/libkpresentersvgexport.so
-debian/tmp/opt/trinity/lib/kde3/libkpresenterxbmexport.la
-debian/tmp/opt/trinity/lib/kde3/libkpresenterxbmexport.so
-debian/tmp/opt/trinity/lib/kde3/libkpresenterxpmexport.la
-debian/tmp/opt/trinity/lib/kde3/libkpresenterxpmexport.so
-debian/tmp/opt/trinity/lib/kde3/libolefilter.la
-debian/tmp/opt/trinity/lib/kde3/libolefilter.so
-debian/tmp/opt/trinity/lib/kde3/libooimpressexport.la
-debian/tmp/opt/trinity/lib/kde3/libooimpressexport.so
-debian/tmp/opt/trinity/lib/kde3/libooimpressimport.la
-debian/tmp/opt/trinity/lib/kde3/libooimpressimport.so
+debian/tmp/opt/trinity/lib/trinity/kpresenter.la
+debian/tmp/opt/trinity/lib/trinity/kpresenter.so
+debian/tmp/opt/trinity/lib/trinity/libkpresenterbmpexport.la
+debian/tmp/opt/trinity/lib/trinity/libkpresenterbmpexport.so
+debian/tmp/opt/trinity/lib/trinity/libkpresenterjpegexport.la
+debian/tmp/opt/trinity/lib/trinity/libkpresenterjpegexport.so
+debian/tmp/opt/trinity/lib/trinity/libkpresentermngexport.la
+debian/tmp/opt/trinity/lib/trinity/libkpresentermngexport.so
+debian/tmp/opt/trinity/lib/trinity/libkpresenterpart.la
+debian/tmp/opt/trinity/lib/trinity/libkpresenterpart.so
+debian/tmp/opt/trinity/lib/trinity/libkpresenterpngexport.la
+debian/tmp/opt/trinity/lib/trinity/libkpresenterpngexport.so
+debian/tmp/opt/trinity/lib/trinity/libkpresentersvgexport.la
+debian/tmp/opt/trinity/lib/trinity/libkpresentersvgexport.so
+debian/tmp/opt/trinity/lib/trinity/libkpresenterxbmexport.la
+debian/tmp/opt/trinity/lib/trinity/libkpresenterxbmexport.so
+debian/tmp/opt/trinity/lib/trinity/libkpresenterxpmexport.la
+debian/tmp/opt/trinity/lib/trinity/libkpresenterxpmexport.so
+debian/tmp/opt/trinity/lib/trinity/libolefilter.la
+debian/tmp/opt/trinity/lib/trinity/libolefilter.so
+debian/tmp/opt/trinity/lib/trinity/libooimpressexport.la
+debian/tmp/opt/trinity/lib/trinity/libooimpressexport.so
+debian/tmp/opt/trinity/lib/trinity/libooimpressimport.la
+debian/tmp/opt/trinity/lib/trinity/libooimpressimport.so
debian/tmp/opt/trinity/lib/libkdeinit_kpresenter.so
debian/tmp/opt/trinity/lib/libkpresenterimageexport.so.*
debian/tmp/opt/trinity/lib/libkpresenterprivate.so.*
diff --git a/debian/lenny/applications/koffice/debian/kspread-trinity.install b/debian/lenny/applications/koffice/debian/kspread-trinity.install
index f4570b605..9b1251bf2 100644
--- a/debian/lenny/applications/koffice/debian/kspread-trinity.install
+++ b/debian/lenny/applications/koffice/debian/kspread-trinity.install
@@ -1,41 +1,41 @@
debian/kspread.xpm opt/trinity/share/pixmaps
debian/tmp/opt/trinity/bin/kspread
-debian/tmp/opt/trinity/lib/kde3/krosskspreadcore.la
-debian/tmp/opt/trinity/lib/kde3/krosskspreadcore.so
-debian/tmp/opt/trinity/lib/kde3/kspread.la
-debian/tmp/opt/trinity/lib/kde3/kspreadscripting.la
-debian/tmp/opt/trinity/lib/kde3/kspreadscripting.so
-debian/tmp/opt/trinity/lib/kde3/kspread.so
-debian/tmp/opt/trinity/lib/kde3/libapplixspreadimport.la
-debian/tmp/opt/trinity/lib/kde3/libapplixspreadimport.so
-debian/tmp/opt/trinity/lib/kde3/libcsvexport.la
-debian/tmp/opt/trinity/lib/kde3/libcsvexport.so
-debian/tmp/opt/trinity/lib/kde3/libcsvimport.la
-debian/tmp/opt/trinity/lib/kde3/libcsvimport.so
-debian/tmp/opt/trinity/lib/kde3/libdbaseimport.la
-debian/tmp/opt/trinity/lib/kde3/libdbaseimport.so
-debian/tmp/opt/trinity/lib/kde3/libexcelimport.la
-debian/tmp/opt/trinity/lib/kde3/libexcelimport.so
-debian/tmp/opt/trinity/lib/kde3/libgnumericexport.la
-debian/tmp/opt/trinity/lib/kde3/libgnumericexport.so
-debian/tmp/opt/trinity/lib/kde3/libgnumericimport.la
-debian/tmp/opt/trinity/lib/kde3/libgnumericimport.so
-debian/tmp/opt/trinity/lib/kde3/libkspreadhtmlexport.la
-debian/tmp/opt/trinity/lib/kde3/libkspreadhtmlexport.so
-debian/tmp/opt/trinity/lib/kde3/libkspreadinsertcalendar.la
-debian/tmp/opt/trinity/lib/kde3/libkspreadinsertcalendar.so
-debian/tmp/opt/trinity/lib/kde3/libkspreadkexiimport.la
-debian/tmp/opt/trinity/lib/kde3/libkspreadkexiimport.so
-debian/tmp/opt/trinity/lib/kde3/libkspreadlatexexport.la
-debian/tmp/opt/trinity/lib/kde3/libkspreadlatexexport.so
-debian/tmp/opt/trinity/lib/kde3/libkspreadpart.la
-debian/tmp/opt/trinity/lib/kde3/libkspreadpart.so
-debian/tmp/opt/trinity/lib/kde3/libopencalcexport.la
-debian/tmp/opt/trinity/lib/kde3/libopencalcexport.so
-debian/tmp/opt/trinity/lib/kde3/libopencalcimport.la
-debian/tmp/opt/trinity/lib/kde3/libopencalcimport.so
-debian/tmp/opt/trinity/lib/kde3/libqproimport.la
-debian/tmp/opt/trinity/lib/kde3/libqproimport.so
+debian/tmp/opt/trinity/lib/trinity/krosskspreadcore.la
+debian/tmp/opt/trinity/lib/trinity/krosskspreadcore.so
+debian/tmp/opt/trinity/lib/trinity/kspread.la
+debian/tmp/opt/trinity/lib/trinity/kspreadscripting.la
+debian/tmp/opt/trinity/lib/trinity/kspreadscripting.so
+debian/tmp/opt/trinity/lib/trinity/kspread.so
+debian/tmp/opt/trinity/lib/trinity/libapplixspreadimport.la
+debian/tmp/opt/trinity/lib/trinity/libapplixspreadimport.so
+debian/tmp/opt/trinity/lib/trinity/libcsvexport.la
+debian/tmp/opt/trinity/lib/trinity/libcsvexport.so
+debian/tmp/opt/trinity/lib/trinity/libcsvimport.la
+debian/tmp/opt/trinity/lib/trinity/libcsvimport.so
+debian/tmp/opt/trinity/lib/trinity/libdbaseimport.la
+debian/tmp/opt/trinity/lib/trinity/libdbaseimport.so
+debian/tmp/opt/trinity/lib/trinity/libexcelimport.la
+debian/tmp/opt/trinity/lib/trinity/libexcelimport.so
+debian/tmp/opt/trinity/lib/trinity/libgnumericexport.la
+debian/tmp/opt/trinity/lib/trinity/libgnumericexport.so
+debian/tmp/opt/trinity/lib/trinity/libgnumericimport.la
+debian/tmp/opt/trinity/lib/trinity/libgnumericimport.so
+debian/tmp/opt/trinity/lib/trinity/libkspreadhtmlexport.la
+debian/tmp/opt/trinity/lib/trinity/libkspreadhtmlexport.so
+debian/tmp/opt/trinity/lib/trinity/libkspreadinsertcalendar.la
+debian/tmp/opt/trinity/lib/trinity/libkspreadinsertcalendar.so
+debian/tmp/opt/trinity/lib/trinity/libkspreadkexiimport.la
+debian/tmp/opt/trinity/lib/trinity/libkspreadkexiimport.so
+debian/tmp/opt/trinity/lib/trinity/libkspreadlatexexport.la
+debian/tmp/opt/trinity/lib/trinity/libkspreadlatexexport.so
+debian/tmp/opt/trinity/lib/trinity/libkspreadpart.la
+debian/tmp/opt/trinity/lib/trinity/libkspreadpart.so
+debian/tmp/opt/trinity/lib/trinity/libopencalcexport.la
+debian/tmp/opt/trinity/lib/trinity/libopencalcexport.so
+debian/tmp/opt/trinity/lib/trinity/libopencalcimport.la
+debian/tmp/opt/trinity/lib/trinity/libopencalcimport.so
+debian/tmp/opt/trinity/lib/trinity/libqproimport.la
+debian/tmp/opt/trinity/lib/trinity/libqproimport.so
debian/tmp/opt/trinity/lib/libkdeinit_kspread.so
debian/tmp/opt/trinity/lib/libkspreadcommon.so.*
debian/tmp/opt/trinity/share/applications/kde/kspread.desktop
diff --git a/debian/lenny/applications/koffice/debian/kthesaurus-trinity.install b/debian/lenny/applications/koffice/debian/kthesaurus-trinity.install
index 1fd206695..d115bcf4b 100644
--- a/debian/lenny/applications/koffice/debian/kthesaurus-trinity.install
+++ b/debian/lenny/applications/koffice/debian/kthesaurus-trinity.install
@@ -1,7 +1,7 @@
debian/tmp/opt/trinity/bin/kthesaurus
-debian/tmp/opt/trinity/lib/kde3/kthesaurus.*
-debian/tmp/opt/trinity/lib/kde3/libthesaurustool.la
-debian/tmp/opt/trinity/lib/kde3/libthesaurustool.so
+debian/tmp/opt/trinity/lib/trinity/kthesaurus.*
+debian/tmp/opt/trinity/lib/trinity/libthesaurustool.la
+debian/tmp/opt/trinity/lib/trinity/libthesaurustool.so
debian/tmp/opt/trinity/lib/libkdeinit_kthesaurus.so
debian/tmp/opt/trinity/share/applnk/Office/KThesaurus.desktop
debian/tmp/opt/trinity/share/apps/thesaurus
diff --git a/debian/lenny/applications/koffice/debian/kugar-trinity.install b/debian/lenny/applications/koffice/debian/kugar-trinity.install
index a6cf88845..62c8c369f 100644
--- a/debian/lenny/applications/koffice/debian/kugar-trinity.install
+++ b/debian/lenny/applications/koffice/debian/kugar-trinity.install
@@ -1,16 +1,16 @@
debian/kugar.xpm opt/trinity/share/pixmaps
debian/tmp/opt/trinity/bin/kudesigner
debian/tmp/opt/trinity/bin/kugar
-debian/tmp/opt/trinity/lib/kde3/kudesigner.la
-debian/tmp/opt/trinity/lib/kde3/kudesigner.so
-debian/tmp/opt/trinity/lib/kde3/kugar.la
-debian/tmp/opt/trinity/lib/kde3/kugar.so
-debian/tmp/opt/trinity/lib/kde3/libkudesignerpart.la
-debian/tmp/opt/trinity/lib/kde3/libkudesignerpart.so
-debian/tmp/opt/trinity/lib/kde3/libkugarnopimport.la
-debian/tmp/opt/trinity/lib/kde3/libkugarnopimport.so
-debian/tmp/opt/trinity/lib/kde3/libkugarpart.la
-debian/tmp/opt/trinity/lib/kde3/libkugarpart.so
+debian/tmp/opt/trinity/lib/trinity/kudesigner.la
+debian/tmp/opt/trinity/lib/trinity/kudesigner.so
+debian/tmp/opt/trinity/lib/trinity/kugar.la
+debian/tmp/opt/trinity/lib/trinity/kugar.so
+debian/tmp/opt/trinity/lib/trinity/libkudesignerpart.la
+debian/tmp/opt/trinity/lib/trinity/libkudesignerpart.so
+debian/tmp/opt/trinity/lib/trinity/libkugarnopimport.la
+debian/tmp/opt/trinity/lib/trinity/libkugarnopimport.so
+debian/tmp/opt/trinity/lib/trinity/libkugarpart.la
+debian/tmp/opt/trinity/lib/trinity/libkugarpart.so
debian/tmp/opt/trinity/lib/libkdeinit_kudesigner.so
debian/tmp/opt/trinity/lib/libkdeinit_kugar.so
debian/tmp/opt/trinity/lib/libkudesignercore.la
diff --git a/debian/lenny/applications/koffice/debian/kword-trinity.install b/debian/lenny/applications/koffice/debian/kword-trinity.install
index 3eeb32c72..d003812cd 100644
--- a/debian/lenny/applications/koffice/debian/kword-trinity.install
+++ b/debian/lenny/applications/koffice/debian/kword-trinity.install
@@ -1,71 +1,71 @@
debian/tmp/opt/trinity/bin/kword
-debian/tmp/opt/trinity/lib/kde3/kwmailmerge_classic.la
-debian/tmp/opt/trinity/lib/kde3/kwmailmerge_classic.so
-debian/tmp/opt/trinity/lib/kde3/kwmailmerge_kabc.la
-debian/tmp/opt/trinity/lib/kde3/kwmailmerge_kabc.so
-debian/tmp/opt/trinity/lib/kde3/kwmailmerge_kspread.la
-debian/tmp/opt/trinity/lib/kde3/kwmailmerge_kspread.so
-debian/tmp/opt/trinity/lib/kde3/kwmailmerge_qtsqldb.la
-debian/tmp/opt/trinity/lib/kde3/kwmailmerge_qtsqldb_power.la
-debian/tmp/opt/trinity/lib/kde3/kwmailmerge_qtsqldb_power.so
-debian/tmp/opt/trinity/lib/kde3/kwmailmerge_qtsqldb.so
-debian/tmp/opt/trinity/lib/kde3/kword.la
-debian/tmp/opt/trinity/lib/kde3/kword.so
-debian/tmp/opt/trinity/lib/kde3/libabiwordexport.la
-debian/tmp/opt/trinity/lib/kde3/libabiwordexport.so
-debian/tmp/opt/trinity/lib/kde3/libabiwordimport.la
-debian/tmp/opt/trinity/lib/kde3/libabiwordimport.so
-debian/tmp/opt/trinity/lib/kde3/libamiproexport.la
-debian/tmp/opt/trinity/lib/kde3/libamiproexport.so
-debian/tmp/opt/trinity/lib/kde3/libamiproimport.la
-debian/tmp/opt/trinity/lib/kde3/libamiproimport.so
-debian/tmp/opt/trinity/lib/kde3/libapplixwordimport.la
-debian/tmp/opt/trinity/lib/kde3/libapplixwordimport.so
-debian/tmp/opt/trinity/lib/kde3/libasciiexport.la
-debian/tmp/opt/trinity/lib/kde3/libasciiexport.so
-debian/tmp/opt/trinity/lib/kde3/libasciiimport.la
-debian/tmp/opt/trinity/lib/kde3/libasciiimport.so
-debian/tmp/opt/trinity/lib/kde3/libdocbookexport.la
-debian/tmp/opt/trinity/lib/kde3/libdocbookexport.so
-debian/tmp/opt/trinity/lib/kde3/libhancomwordimport.la
-debian/tmp/opt/trinity/lib/kde3/libhancomwordimport.so
-debian/tmp/opt/trinity/lib/kde3/libhtmlexport.la
-debian/tmp/opt/trinity/lib/kde3/libhtmlexport.so
-debian/tmp/opt/trinity/lib/kde3/libhtmlimport.la
-debian/tmp/opt/trinity/lib/kde3/libhtmlimport.so
-debian/tmp/opt/trinity/lib/kde3/libkwordkword1dot3import.la
-debian/tmp/opt/trinity/lib/kde3/libkwordkword1dot3import.so
-debian/tmp/opt/trinity/lib/kde3/libkwordlatexexport.la
-debian/tmp/opt/trinity/lib/kde3/libkwordlatexexport.so
-debian/tmp/opt/trinity/lib/kde3/libkwordpart.la
-debian/tmp/opt/trinity/lib/kde3/libkwordpart.so
-debian/tmp/opt/trinity/lib/kde3/libmswordimport.la
-debian/tmp/opt/trinity/lib/kde3/libmswordimport.so
-debian/tmp/opt/trinity/lib/kde3/libmswriteexport.la
-debian/tmp/opt/trinity/lib/kde3/libmswriteexport.so
-debian/tmp/opt/trinity/lib/kde3/libmswriteimport.la
-debian/tmp/opt/trinity/lib/kde3/libmswriteimport.so
-debian/tmp/opt/trinity/lib/kde3/liboowriterexport.la
-debian/tmp/opt/trinity/lib/kde3/liboowriterexport.so
-debian/tmp/opt/trinity/lib/kde3/liboowriterimport.la
-debian/tmp/opt/trinity/lib/kde3/liboowriterimport.so
-debian/tmp/opt/trinity/lib/kde3/libpalmdocexport.la
-debian/tmp/opt/trinity/lib/kde3/libpalmdocexport.so
-debian/tmp/opt/trinity/lib/kde3/libpalmdocimport.la
-debian/tmp/opt/trinity/lib/kde3/libpalmdocimport.so
-debian/tmp/opt/trinity/lib/kde3/libpdfimport.la
-debian/tmp/opt/trinity/lib/kde3/libpdfimport.so
-debian/tmp/opt/trinity/lib/kde3/librtfexport.la
-debian/tmp/opt/trinity/lib/kde3/librtfexport.so
-debian/tmp/opt/trinity/lib/kde3/librtfimport.la
-debian/tmp/opt/trinity/lib/kde3/librtfimport.so
-debian/tmp/opt/trinity/lib/kde3/libwmlexport.la
-debian/tmp/opt/trinity/lib/kde3/libwmlexport.so
-debian/tmp/opt/trinity/lib/kde3/libwmlimport.la
-debian/tmp/opt/trinity/lib/kde3/libwmlimport.so
-debian/tmp/opt/trinity/lib/kde3/libwpexport.la
-debian/tmp/opt/trinity/lib/kde3/libwpexport.so
-debian/tmp/opt/trinity/lib/kde3/libwpimport.la
-debian/tmp/opt/trinity/lib/kde3/libwpimport.so
+debian/tmp/opt/trinity/lib/trinity/kwmailmerge_classic.la
+debian/tmp/opt/trinity/lib/trinity/kwmailmerge_classic.so
+debian/tmp/opt/trinity/lib/trinity/kwmailmerge_kabc.la
+debian/tmp/opt/trinity/lib/trinity/kwmailmerge_kabc.so
+debian/tmp/opt/trinity/lib/trinity/kwmailmerge_kspread.la
+debian/tmp/opt/trinity/lib/trinity/kwmailmerge_kspread.so
+debian/tmp/opt/trinity/lib/trinity/kwmailmerge_qtsqldb.la
+debian/tmp/opt/trinity/lib/trinity/kwmailmerge_qtsqldb_power.la
+debian/tmp/opt/trinity/lib/trinity/kwmailmerge_qtsqldb_power.so
+debian/tmp/opt/trinity/lib/trinity/kwmailmerge_qtsqldb.so
+debian/tmp/opt/trinity/lib/trinity/kword.la
+debian/tmp/opt/trinity/lib/trinity/kword.so
+debian/tmp/opt/trinity/lib/trinity/libabiwordexport.la
+debian/tmp/opt/trinity/lib/trinity/libabiwordexport.so
+debian/tmp/opt/trinity/lib/trinity/libabiwordimport.la
+debian/tmp/opt/trinity/lib/trinity/libabiwordimport.so
+debian/tmp/opt/trinity/lib/trinity/libamiproexport.la
+debian/tmp/opt/trinity/lib/trinity/libamiproexport.so
+debian/tmp/opt/trinity/lib/trinity/libamiproimport.la
+debian/tmp/opt/trinity/lib/trinity/libamiproimport.so
+debian/tmp/opt/trinity/lib/trinity/libapplixwordimport.la
+debian/tmp/opt/trinity/lib/trinity/libapplixwordimport.so
+debian/tmp/opt/trinity/lib/trinity/libasciiexport.la
+debian/tmp/opt/trinity/lib/trinity/libasciiexport.so
+debian/tmp/opt/trinity/lib/trinity/libasciiimport.la
+debian/tmp/opt/trinity/lib/trinity/libasciiimport.so
+debian/tmp/opt/trinity/lib/trinity/libdocbookexport.la
+debian/tmp/opt/trinity/lib/trinity/libdocbookexport.so
+debian/tmp/opt/trinity/lib/trinity/libhancomwordimport.la
+debian/tmp/opt/trinity/lib/trinity/libhancomwordimport.so
+debian/tmp/opt/trinity/lib/trinity/libhtmlexport.la
+debian/tmp/opt/trinity/lib/trinity/libhtmlexport.so
+debian/tmp/opt/trinity/lib/trinity/libhtmlimport.la
+debian/tmp/opt/trinity/lib/trinity/libhtmlimport.so
+debian/tmp/opt/trinity/lib/trinity/libkwordkword1dot3import.la
+debian/tmp/opt/trinity/lib/trinity/libkwordkword1dot3import.so
+debian/tmp/opt/trinity/lib/trinity/libkwordlatexexport.la
+debian/tmp/opt/trinity/lib/trinity/libkwordlatexexport.so
+debian/tmp/opt/trinity/lib/trinity/libkwordpart.la
+debian/tmp/opt/trinity/lib/trinity/libkwordpart.so
+debian/tmp/opt/trinity/lib/trinity/libmswordimport.la
+debian/tmp/opt/trinity/lib/trinity/libmswordimport.so
+debian/tmp/opt/trinity/lib/trinity/libmswriteexport.la
+debian/tmp/opt/trinity/lib/trinity/libmswriteexport.so
+debian/tmp/opt/trinity/lib/trinity/libmswriteimport.la
+debian/tmp/opt/trinity/lib/trinity/libmswriteimport.so
+debian/tmp/opt/trinity/lib/trinity/liboowriterexport.la
+debian/tmp/opt/trinity/lib/trinity/liboowriterexport.so
+debian/tmp/opt/trinity/lib/trinity/liboowriterimport.la
+debian/tmp/opt/trinity/lib/trinity/liboowriterimport.so
+debian/tmp/opt/trinity/lib/trinity/libpalmdocexport.la
+debian/tmp/opt/trinity/lib/trinity/libpalmdocexport.so
+debian/tmp/opt/trinity/lib/trinity/libpalmdocimport.la
+debian/tmp/opt/trinity/lib/trinity/libpalmdocimport.so
+debian/tmp/opt/trinity/lib/trinity/libpdfimport.la
+debian/tmp/opt/trinity/lib/trinity/libpdfimport.so
+debian/tmp/opt/trinity/lib/trinity/librtfexport.la
+debian/tmp/opt/trinity/lib/trinity/librtfexport.so
+debian/tmp/opt/trinity/lib/trinity/librtfimport.la
+debian/tmp/opt/trinity/lib/trinity/librtfimport.so
+debian/tmp/opt/trinity/lib/trinity/libwmlexport.la
+debian/tmp/opt/trinity/lib/trinity/libwmlexport.so
+debian/tmp/opt/trinity/lib/trinity/libwmlimport.la
+debian/tmp/opt/trinity/lib/trinity/libwmlimport.so
+debian/tmp/opt/trinity/lib/trinity/libwpexport.la
+debian/tmp/opt/trinity/lib/trinity/libwpexport.so
+debian/tmp/opt/trinity/lib/trinity/libwpimport.la
+debian/tmp/opt/trinity/lib/trinity/libwpimport.so
debian/tmp/opt/trinity/lib/libkdeinit_kword.so
debian/tmp/opt/trinity/lib/libkwordprivate.so.*
diff --git a/debian/lenny/applications/ktechlab/debian/debiandirs b/debian/lenny/applications/ktechlab/debian/debiandirs
index a26d7ec9f..57c2b82b6 100644
--- a/debian/lenny/applications/ktechlab/debian/debiandirs
+++ b/debian/lenny/applications/ktechlab/debian/debiandirs
@@ -4,7 +4,7 @@ export kde_bindir=/opt/trinity/bin
export kde_includedir=/opt/trinity/include/kde
export kde_libdir=/opt/trinity/lib
export kde_cgidir=/opt/trinity/lib/cgi-bin
-export kde_moduledir=/opt/trinity/lib/kde3
+export kde_moduledir=/opt/trinity/lib/trinity
export kde_appsdir=/opt/trinity/share/applnk
export kde_datadir=/opt/trinity/share/apps
export kde_htmldir=/opt/trinity/share/doc/kde/HTML
diff --git a/debian/lenny/applications/kwin-style-crystal/debian/dirs b/debian/lenny/applications/kwin-style-crystal/debian/dirs
index 5a339f0ec..af39e99b5 100644
--- a/debian/lenny/applications/kwin-style-crystal/debian/dirs
+++ b/debian/lenny/applications/kwin-style-crystal/debian/dirs
@@ -1,2 +1,2 @@
-usr/trinity/lib/kde3
+usr/trinity/lib/trinity
usr/share/apps/kwin
diff --git a/debian/lenny/kdeaccessibility/debian/kbstate-trinity.install b/debian/lenny/kdeaccessibility/debian/kbstate-trinity.install
index 14dc071c8..a5c05d80c 100644
--- a/debian/lenny/kdeaccessibility/debian/kbstate-trinity.install
+++ b/debian/lenny/kdeaccessibility/debian/kbstate-trinity.install
@@ -1,5 +1,5 @@
-debian/tmp/opt/trinity/lib/kde3/kbstate_panelapplet.la
-debian/tmp/opt/trinity/lib/kde3/kbstate_panelapplet.so
+debian/tmp/opt/trinity/lib/trinity/kbstate_panelapplet.la
+debian/tmp/opt/trinity/lib/trinity/kbstate_panelapplet.so
debian/tmp/opt/trinity/share/apps/kbstateapplet/icons/crystalsvg/16x16/actions/altkey.png
debian/tmp/opt/trinity/share/apps/kbstateapplet/icons/crystalsvg/16x16/actions/capskey.png
debian/tmp/opt/trinity/share/apps/kbstateapplet/icons/crystalsvg/16x16/actions/controlkey.png
diff --git a/debian/lenny/kdeaccessibility/debian/ksayit-trinity.install b/debian/lenny/kdeaccessibility/debian/ksayit-trinity.install
index 5ba6679c0..2f5be2460 100644
--- a/debian/lenny/kdeaccessibility/debian/ksayit-trinity.install
+++ b/debian/lenny/kdeaccessibility/debian/ksayit-trinity.install
@@ -1,7 +1,7 @@
debian/tmp/opt/trinity/bin/ksayit
debian/tmp/opt/trinity/include/kde/ksayit_fxplugin.h
-debian/tmp/opt/trinity/lib/kde3/libFreeverb_plugin.la
-debian/tmp/opt/trinity/lib/kde3/libFreeverb_plugin.so
+debian/tmp/opt/trinity/lib/trinity/libFreeverb_plugin.la
+debian/tmp/opt/trinity/lib/trinity/libFreeverb_plugin.so
debian/tmp/opt/trinity/lib/libKTTSD_Lib.la
debian/tmp/opt/trinity/lib/libKTTSD_Lib.so
debian/tmp/opt/trinity/lib/libKTTSD_Lib.so.0
diff --git a/debian/lenny/kdeaccessibility/debian/kttsd-contrib-plugins-trinity.install b/debian/lenny/kdeaccessibility/debian/kttsd-contrib-plugins-trinity.install
index 27b447561..698f85fe2 100644
--- a/debian/lenny/kdeaccessibility/debian/kttsd-contrib-plugins-trinity.install
+++ b/debian/lenny/kdeaccessibility/debian/kttsd-contrib-plugins-trinity.install
@@ -1,7 +1,7 @@
-debian/tmp/opt/trinity/lib/kde3/libkttsd_freettsplugin.la
-debian/tmp/opt/trinity/lib/kde3/libkttsd_freettsplugin.so
-debian/tmp/opt/trinity/lib/kde3/libkttsd_hadifixplugin.la
-debian/tmp/opt/trinity/lib/kde3/libkttsd_hadifixplugin.so
+debian/tmp/opt/trinity/lib/trinity/libkttsd_freettsplugin.la
+debian/tmp/opt/trinity/lib/trinity/libkttsd_freettsplugin.so
+debian/tmp/opt/trinity/lib/trinity/libkttsd_hadifixplugin.la
+debian/tmp/opt/trinity/lib/trinity/libkttsd_hadifixplugin.so
debian/tmp/opt/trinity/share/apps/kttsd/hadifix/xslt/SSMLtoTxt2pho.xsl
debian/tmp/opt/trinity/share/services/kttsd_freettsplugin.desktop
debian/tmp/opt/trinity/share/services/kttsd_hadifixplugin.desktop
diff --git a/debian/lenny/kdeaccessibility/debian/kttsd-trinity.install b/debian/lenny/kdeaccessibility/debian/kttsd-trinity.install
index f860b4ad2..1c2554962 100644
--- a/debian/lenny/kdeaccessibility/debian/kttsd-trinity.install
+++ b/debian/lenny/kdeaccessibility/debian/kttsd-trinity.install
@@ -1,33 +1,33 @@
debian/tmp/opt/trinity/bin/kttsd
debian/tmp/opt/trinity/bin/kttsmgr
-debian/tmp/opt/trinity/lib/kde3/kcm_kttsd.la
-debian/tmp/opt/trinity/lib/kde3/kcm_kttsd.so
-debian/tmp/opt/trinity/lib/kde3/ktexteditor_kttsd.la
-debian/tmp/opt/trinity/lib/kde3/ktexteditor_kttsd.so
-debian/tmp/opt/trinity/lib/kde3/libkttsd_akodeplugin.la
-debian/tmp/opt/trinity/lib/kde3/libkttsd_akodeplugin.so
-debian/tmp/opt/trinity/lib/kde3/libkttsd_alsaplugin.la
-debian/tmp/opt/trinity/lib/kde3/libkttsd_alsaplugin.so
-debian/tmp/opt/trinity/lib/kde3/libkttsd_artsplugin.la
-debian/tmp/opt/trinity/lib/kde3/libkttsd_artsplugin.so
-debian/tmp/opt/trinity/lib/kde3/libkttsd_commandplugin.la
-debian/tmp/opt/trinity/lib/kde3/libkttsd_commandplugin.so
-debian/tmp/opt/trinity/lib/kde3/libkttsd_eposplugin.la
-debian/tmp/opt/trinity/lib/kde3/libkttsd_eposplugin.so
-debian/tmp/opt/trinity/lib/kde3/libkttsd_festivalintplugin.la
-debian/tmp/opt/trinity/lib/kde3/libkttsd_festivalintplugin.so
-debian/tmp/opt/trinity/lib/kde3/libkttsd_fliteplugin.la
-debian/tmp/opt/trinity/lib/kde3/libkttsd_fliteplugin.so
-debian/tmp/opt/trinity/lib/kde3/libkttsd_sbdplugin.la
-debian/tmp/opt/trinity/lib/kde3/libkttsd_sbdplugin.so
-debian/tmp/opt/trinity/lib/kde3/libkttsd_stringreplacerplugin.la
-debian/tmp/opt/trinity/lib/kde3/libkttsd_stringreplacerplugin.so
-debian/tmp/opt/trinity/lib/kde3/libkttsd_talkerchooserplugin.la
-debian/tmp/opt/trinity/lib/kde3/libkttsd_talkerchooserplugin.so
-debian/tmp/opt/trinity/lib/kde3/libkttsd_xmltransformerplugin.la
-debian/tmp/opt/trinity/lib/kde3/libkttsd_xmltransformerplugin.so
-debian/tmp/opt/trinity/lib/kde3/libkttsjobmgrpart.la
-debian/tmp/opt/trinity/lib/kde3/libkttsjobmgrpart.so
+debian/tmp/opt/trinity/lib/trinity/kcm_kttsd.la
+debian/tmp/opt/trinity/lib/trinity/kcm_kttsd.so
+debian/tmp/opt/trinity/lib/trinity/ktexteditor_kttsd.la
+debian/tmp/opt/trinity/lib/trinity/ktexteditor_kttsd.so
+debian/tmp/opt/trinity/lib/trinity/libkttsd_akodeplugin.la
+debian/tmp/opt/trinity/lib/trinity/libkttsd_akodeplugin.so
+debian/tmp/opt/trinity/lib/trinity/libkttsd_alsaplugin.la
+debian/tmp/opt/trinity/lib/trinity/libkttsd_alsaplugin.so
+debian/tmp/opt/trinity/lib/trinity/libkttsd_artsplugin.la
+debian/tmp/opt/trinity/lib/trinity/libkttsd_artsplugin.so
+debian/tmp/opt/trinity/lib/trinity/libkttsd_commandplugin.la
+debian/tmp/opt/trinity/lib/trinity/libkttsd_commandplugin.so
+debian/tmp/opt/trinity/lib/trinity/libkttsd_eposplugin.la
+debian/tmp/opt/trinity/lib/trinity/libkttsd_eposplugin.so
+debian/tmp/opt/trinity/lib/trinity/libkttsd_festivalintplugin.la
+debian/tmp/opt/trinity/lib/trinity/libkttsd_festivalintplugin.so
+debian/tmp/opt/trinity/lib/trinity/libkttsd_fliteplugin.la
+debian/tmp/opt/trinity/lib/trinity/libkttsd_fliteplugin.so
+debian/tmp/opt/trinity/lib/trinity/libkttsd_sbdplugin.la
+debian/tmp/opt/trinity/lib/trinity/libkttsd_sbdplugin.so
+debian/tmp/opt/trinity/lib/trinity/libkttsd_stringreplacerplugin.la
+debian/tmp/opt/trinity/lib/trinity/libkttsd_stringreplacerplugin.so
+debian/tmp/opt/trinity/lib/trinity/libkttsd_talkerchooserplugin.la
+debian/tmp/opt/trinity/lib/trinity/libkttsd_talkerchooserplugin.so
+debian/tmp/opt/trinity/lib/trinity/libkttsd_xmltransformerplugin.la
+debian/tmp/opt/trinity/lib/trinity/libkttsd_xmltransformerplugin.so
+debian/tmp/opt/trinity/lib/trinity/libkttsjobmgrpart.la
+debian/tmp/opt/trinity/lib/trinity/libkttsjobmgrpart.so
debian/tmp/opt/trinity/lib/libkttsd.la
debian/tmp/opt/trinity/lib/libkttsd.so
debian/tmp/opt/trinity/lib/libkttsd.so.1
diff --git a/debian/lenny/kdeaccessibility/debian/kttsd-trinity.install.kfreebsd-amd64 b/debian/lenny/kdeaccessibility/debian/kttsd-trinity.install.kfreebsd-amd64
index c561b15bb..780e2bc62 100644
--- a/debian/lenny/kdeaccessibility/debian/kttsd-trinity.install.kfreebsd-amd64
+++ b/debian/lenny/kdeaccessibility/debian/kttsd-trinity.install.kfreebsd-amd64
@@ -1,31 +1,31 @@
debian/tmp/opt/trinity/bin/kttsd
debian/tmp/opt/trinity/bin/kttsmgr
-debian/tmp/opt/trinity/lib/kde3/kcm_kttsd.la
-debian/tmp/opt/trinity/lib/kde3/kcm_kttsd.so
-debian/tmp/opt/trinity/lib/kde3/ktexteditor_kttsd.la
-debian/tmp/opt/trinity/lib/kde3/ktexteditor_kttsd.so
-debian/tmp/opt/trinity/lib/kde3/libkttsd_akodeplugin.la
-debian/tmp/opt/trinity/lib/kde3/libkttsd_akodeplugin.so
-debian/tmp/opt/trinity/lib/kde3/libkttsd_artsplugin.la
-debian/tmp/opt/trinity/lib/kde3/libkttsd_artsplugin.so
-debian/tmp/opt/trinity/lib/kde3/libkttsd_commandplugin.la
-debian/tmp/opt/trinity/lib/kde3/libkttsd_commandplugin.so
-debian/tmp/opt/trinity/lib/kde3/libkttsd_eposplugin.la
-debian/tmp/opt/trinity/lib/kde3/libkttsd_eposplugin.so
-debian/tmp/opt/trinity/lib/kde3/libkttsd_festivalintplugin.la
-debian/tmp/opt/trinity/lib/kde3/libkttsd_festivalintplugin.so
-debian/tmp/opt/trinity/lib/kde3/libkttsd_fliteplugin.la
-debian/tmp/opt/trinity/lib/kde3/libkttsd_fliteplugin.so
-debian/tmp/opt/trinity/lib/kde3/libkttsd_sbdplugin.la
-debian/tmp/opt/trinity/lib/kde3/libkttsd_sbdplugin.so
-debian/tmp/opt/trinity/lib/kde3/libkttsd_stringreplacerplugin.la
-debian/tmp/opt/trinity/lib/kde3/libkttsd_stringreplacerplugin.so
-debian/tmp/opt/trinity/lib/kde3/libkttsd_talkerchooserplugin.la
-debian/tmp/opt/trinity/lib/kde3/libkttsd_talkerchooserplugin.so
-debian/tmp/opt/trinity/lib/kde3/libkttsd_xmltransformerplugin.la
-debian/tmp/opt/trinity/lib/kde3/libkttsd_xmltransformerplugin.so
-debian/tmp/opt/trinity/lib/kde3/libkttsjobmgrpart.la
-debian/tmp/opt/trinity/lib/kde3/libkttsjobmgrpart.so
+debian/tmp/opt/trinity/lib/trinity/kcm_kttsd.la
+debian/tmp/opt/trinity/lib/trinity/kcm_kttsd.so
+debian/tmp/opt/trinity/lib/trinity/ktexteditor_kttsd.la
+debian/tmp/opt/trinity/lib/trinity/ktexteditor_kttsd.so
+debian/tmp/opt/trinity/lib/trinity/libkttsd_akodeplugin.la
+debian/tmp/opt/trinity/lib/trinity/libkttsd_akodeplugin.so
+debian/tmp/opt/trinity/lib/trinity/libkttsd_artsplugin.la
+debian/tmp/opt/trinity/lib/trinity/libkttsd_artsplugin.so
+debian/tmp/opt/trinity/lib/trinity/libkttsd_commandplugin.la
+debian/tmp/opt/trinity/lib/trinity/libkttsd_commandplugin.so
+debian/tmp/opt/trinity/lib/trinity/libkttsd_eposplugin.la
+debian/tmp/opt/trinity/lib/trinity/libkttsd_eposplugin.so
+debian/tmp/opt/trinity/lib/trinity/libkttsd_festivalintplugin.la
+debian/tmp/opt/trinity/lib/trinity/libkttsd_festivalintplugin.so
+debian/tmp/opt/trinity/lib/trinity/libkttsd_fliteplugin.la
+debian/tmp/opt/trinity/lib/trinity/libkttsd_fliteplugin.so
+debian/tmp/opt/trinity/lib/trinity/libkttsd_sbdplugin.la
+debian/tmp/opt/trinity/lib/trinity/libkttsd_sbdplugin.so
+debian/tmp/opt/trinity/lib/trinity/libkttsd_stringreplacerplugin.la
+debian/tmp/opt/trinity/lib/trinity/libkttsd_stringreplacerplugin.so
+debian/tmp/opt/trinity/lib/trinity/libkttsd_talkerchooserplugin.la
+debian/tmp/opt/trinity/lib/trinity/libkttsd_talkerchooserplugin.so
+debian/tmp/opt/trinity/lib/trinity/libkttsd_xmltransformerplugin.la
+debian/tmp/opt/trinity/lib/trinity/libkttsd_xmltransformerplugin.so
+debian/tmp/opt/trinity/lib/trinity/libkttsjobmgrpart.la
+debian/tmp/opt/trinity/lib/trinity/libkttsjobmgrpart.so
debian/tmp/opt/trinity/lib/libkttsd.la
debian/tmp/opt/trinity/lib/libkttsd.so
debian/tmp/opt/trinity/lib/libkttsd.so.1
diff --git a/debian/lenny/kdeaccessibility/debian/kttsd-trinity.install.kfreebsd-i386 b/debian/lenny/kdeaccessibility/debian/kttsd-trinity.install.kfreebsd-i386
index c561b15bb..780e2bc62 100644
--- a/debian/lenny/kdeaccessibility/debian/kttsd-trinity.install.kfreebsd-i386
+++ b/debian/lenny/kdeaccessibility/debian/kttsd-trinity.install.kfreebsd-i386
@@ -1,31 +1,31 @@
debian/tmp/opt/trinity/bin/kttsd
debian/tmp/opt/trinity/bin/kttsmgr
-debian/tmp/opt/trinity/lib/kde3/kcm_kttsd.la
-debian/tmp/opt/trinity/lib/kde3/kcm_kttsd.so
-debian/tmp/opt/trinity/lib/kde3/ktexteditor_kttsd.la
-debian/tmp/opt/trinity/lib/kde3/ktexteditor_kttsd.so
-debian/tmp/opt/trinity/lib/kde3/libkttsd_akodeplugin.la
-debian/tmp/opt/trinity/lib/kde3/libkttsd_akodeplugin.so
-debian/tmp/opt/trinity/lib/kde3/libkttsd_artsplugin.la
-debian/tmp/opt/trinity/lib/kde3/libkttsd_artsplugin.so
-debian/tmp/opt/trinity/lib/kde3/libkttsd_commandplugin.la
-debian/tmp/opt/trinity/lib/kde3/libkttsd_commandplugin.so
-debian/tmp/opt/trinity/lib/kde3/libkttsd_eposplugin.la
-debian/tmp/opt/trinity/lib/kde3/libkttsd_eposplugin.so
-debian/tmp/opt/trinity/lib/kde3/libkttsd_festivalintplugin.la
-debian/tmp/opt/trinity/lib/kde3/libkttsd_festivalintplugin.so
-debian/tmp/opt/trinity/lib/kde3/libkttsd_fliteplugin.la
-debian/tmp/opt/trinity/lib/kde3/libkttsd_fliteplugin.so
-debian/tmp/opt/trinity/lib/kde3/libkttsd_sbdplugin.la
-debian/tmp/opt/trinity/lib/kde3/libkttsd_sbdplugin.so
-debian/tmp/opt/trinity/lib/kde3/libkttsd_stringreplacerplugin.la
-debian/tmp/opt/trinity/lib/kde3/libkttsd_stringreplacerplugin.so
-debian/tmp/opt/trinity/lib/kde3/libkttsd_talkerchooserplugin.la
-debian/tmp/opt/trinity/lib/kde3/libkttsd_talkerchooserplugin.so
-debian/tmp/opt/trinity/lib/kde3/libkttsd_xmltransformerplugin.la
-debian/tmp/opt/trinity/lib/kde3/libkttsd_xmltransformerplugin.so
-debian/tmp/opt/trinity/lib/kde3/libkttsjobmgrpart.la
-debian/tmp/opt/trinity/lib/kde3/libkttsjobmgrpart.so
+debian/tmp/opt/trinity/lib/trinity/kcm_kttsd.la
+debian/tmp/opt/trinity/lib/trinity/kcm_kttsd.so
+debian/tmp/opt/trinity/lib/trinity/ktexteditor_kttsd.la
+debian/tmp/opt/trinity/lib/trinity/ktexteditor_kttsd.so
+debian/tmp/opt/trinity/lib/trinity/libkttsd_akodeplugin.la
+debian/tmp/opt/trinity/lib/trinity/libkttsd_akodeplugin.so
+debian/tmp/opt/trinity/lib/trinity/libkttsd_artsplugin.la
+debian/tmp/opt/trinity/lib/trinity/libkttsd_artsplugin.so
+debian/tmp/opt/trinity/lib/trinity/libkttsd_commandplugin.la
+debian/tmp/opt/trinity/lib/trinity/libkttsd_commandplugin.so
+debian/tmp/opt/trinity/lib/trinity/libkttsd_eposplugin.la
+debian/tmp/opt/trinity/lib/trinity/libkttsd_eposplugin.so
+debian/tmp/opt/trinity/lib/trinity/libkttsd_festivalintplugin.la
+debian/tmp/opt/trinity/lib/trinity/libkttsd_festivalintplugin.so
+debian/tmp/opt/trinity/lib/trinity/libkttsd_fliteplugin.la
+debian/tmp/opt/trinity/lib/trinity/libkttsd_fliteplugin.so
+debian/tmp/opt/trinity/lib/trinity/libkttsd_sbdplugin.la
+debian/tmp/opt/trinity/lib/trinity/libkttsd_sbdplugin.so
+debian/tmp/opt/trinity/lib/trinity/libkttsd_stringreplacerplugin.la
+debian/tmp/opt/trinity/lib/trinity/libkttsd_stringreplacerplugin.so
+debian/tmp/opt/trinity/lib/trinity/libkttsd_talkerchooserplugin.la
+debian/tmp/opt/trinity/lib/trinity/libkttsd_talkerchooserplugin.so
+debian/tmp/opt/trinity/lib/trinity/libkttsd_xmltransformerplugin.la
+debian/tmp/opt/trinity/lib/trinity/libkttsd_xmltransformerplugin.so
+debian/tmp/opt/trinity/lib/trinity/libkttsjobmgrpart.la
+debian/tmp/opt/trinity/lib/trinity/libkttsjobmgrpart.so
debian/tmp/opt/trinity/lib/libkttsd.la
debian/tmp/opt/trinity/lib/libkttsd.so
debian/tmp/opt/trinity/lib/libkttsd.so.1
diff --git a/debian/lenny/kdeaddons/debian/kaddressbook-plugins-trinity.install b/debian/lenny/kdeaddons/debian/kaddressbook-plugins-trinity.install
index d324aa70a..a2102d3a8 100644
--- a/debian/lenny/kdeaddons/debian/kaddressbook-plugins-trinity.install
+++ b/debian/lenny/kdeaddons/debian/kaddressbook-plugins-trinity.install
@@ -1,6 +1,6 @@
-debian/tmp/opt/trinity/lib/kde3/libkaddrbk_geo_xxport.la
-debian/tmp/opt/trinity/lib/kde3/libkaddrbk_geo_xxport.so
-debian/tmp/opt/trinity/lib/kde3/libkaddrbk_gmx_xxport.la
-debian/tmp/opt/trinity/lib/kde3/libkaddrbk_gmx_xxport.so
+debian/tmp/opt/trinity/lib/trinity/libkaddrbk_geo_xxport.la
+debian/tmp/opt/trinity/lib/trinity/libkaddrbk_geo_xxport.so
+debian/tmp/opt/trinity/lib/trinity/libkaddrbk_gmx_xxport.la
+debian/tmp/opt/trinity/lib/trinity/libkaddrbk_gmx_xxport.so
debian/tmp/opt/trinity/share/apps/kaddressbook
debian/tmp/opt/trinity/share/services/kaddressbook
diff --git a/debian/lenny/kdeaddons/debian/kate-plugins-trinity.install b/debian/lenny/kdeaddons/debian/kate-plugins-trinity.install
index e0dd8bb43..9dc3f2b7d 100644
--- a/debian/lenny/kdeaddons/debian/kate-plugins-trinity.install
+++ b/debian/lenny/kdeaddons/debian/kate-plugins-trinity.install
@@ -1,33 +1,33 @@
-debian/tmp/opt/trinity/lib/kde3/katecppsymbolviewerplugin.la
-debian/tmp/opt/trinity/lib/kde3/katecppsymbolviewerplugin.so
-debian/tmp/opt/trinity/lib/kde3/katefiletemplates.la
-debian/tmp/opt/trinity/lib/kde3/katefiletemplates.so
-debian/tmp/opt/trinity/lib/kde3/katefll_plugin.la
-debian/tmp/opt/trinity/lib/kde3/katefll_plugin.so
-debian/tmp/opt/trinity/lib/kde3/katehelloworldplugin.la
-debian/tmp/opt/trinity/lib/kde3/katehelloworldplugin.so
-debian/tmp/opt/trinity/lib/kde3/katehtmltoolsplugin.la
-debian/tmp/opt/trinity/lib/kde3/katehtmltoolsplugin.so
-debian/tmp/opt/trinity/lib/kde3/kateinsertcommandplugin.la
-debian/tmp/opt/trinity/lib/kde3/kateinsertcommandplugin.so
-debian/tmp/opt/trinity/lib/kde3/katemakeplugin.la
-debian/tmp/opt/trinity/lib/kde3/katemakeplugin.so
-debian/tmp/opt/trinity/lib/kde3/katemodelineplugin.la
-debian/tmp/opt/trinity/lib/kde3/katemodelineplugin.so
-debian/tmp/opt/trinity/lib/kde3/kateopenheaderplugin.la
-debian/tmp/opt/trinity/lib/kde3/kateopenheaderplugin.so
-debian/tmp/opt/trinity/lib/kde3/katepybrowseplugin.la
-debian/tmp/opt/trinity/lib/kde3/katepybrowseplugin.so
-debian/tmp/opt/trinity/lib/kde3/katesnippetsplugin.la
-debian/tmp/opt/trinity/lib/kde3/katesnippetsplugin.so
-debian/tmp/opt/trinity/lib/kde3/katetextfilterplugin.la
-debian/tmp/opt/trinity/lib/kde3/katetextfilterplugin.so
-debian/tmp/opt/trinity/lib/kde3/katexmlcheckplugin.la
-debian/tmp/opt/trinity/lib/kde3/katexmlcheckplugin.so
-debian/tmp/opt/trinity/lib/kde3/katexmltoolsplugin.la
-debian/tmp/opt/trinity/lib/kde3/katexmltoolsplugin.so
-debian/tmp/opt/trinity/lib/kde3/libkatetabbarextensionplugin.la
-debian/tmp/opt/trinity/lib/kde3/libkatetabbarextensionplugin.so
+debian/tmp/opt/trinity/lib/trinity/katecppsymbolviewerplugin.la
+debian/tmp/opt/trinity/lib/trinity/katecppsymbolviewerplugin.so
+debian/tmp/opt/trinity/lib/trinity/katefiletemplates.la
+debian/tmp/opt/trinity/lib/trinity/katefiletemplates.so
+debian/tmp/opt/trinity/lib/trinity/katefll_plugin.la
+debian/tmp/opt/trinity/lib/trinity/katefll_plugin.so
+debian/tmp/opt/trinity/lib/trinity/katehelloworldplugin.la
+debian/tmp/opt/trinity/lib/trinity/katehelloworldplugin.so
+debian/tmp/opt/trinity/lib/trinity/katehtmltoolsplugin.la
+debian/tmp/opt/trinity/lib/trinity/katehtmltoolsplugin.so
+debian/tmp/opt/trinity/lib/trinity/kateinsertcommandplugin.la
+debian/tmp/opt/trinity/lib/trinity/kateinsertcommandplugin.so
+debian/tmp/opt/trinity/lib/trinity/katemakeplugin.la
+debian/tmp/opt/trinity/lib/trinity/katemakeplugin.so
+debian/tmp/opt/trinity/lib/trinity/katemodelineplugin.la
+debian/tmp/opt/trinity/lib/trinity/katemodelineplugin.so
+debian/tmp/opt/trinity/lib/trinity/kateopenheaderplugin.la
+debian/tmp/opt/trinity/lib/trinity/kateopenheaderplugin.so
+debian/tmp/opt/trinity/lib/trinity/katepybrowseplugin.la
+debian/tmp/opt/trinity/lib/trinity/katepybrowseplugin.so
+debian/tmp/opt/trinity/lib/trinity/katesnippetsplugin.la
+debian/tmp/opt/trinity/lib/trinity/katesnippetsplugin.so
+debian/tmp/opt/trinity/lib/trinity/katetextfilterplugin.la
+debian/tmp/opt/trinity/lib/trinity/katetextfilterplugin.so
+debian/tmp/opt/trinity/lib/trinity/katexmlcheckplugin.la
+debian/tmp/opt/trinity/lib/trinity/katexmlcheckplugin.so
+debian/tmp/opt/trinity/lib/trinity/katexmltoolsplugin.la
+debian/tmp/opt/trinity/lib/trinity/katexmltoolsplugin.so
+debian/tmp/opt/trinity/lib/trinity/libkatetabbarextensionplugin.la
+debian/tmp/opt/trinity/lib/trinity/libkatetabbarextensionplugin.so
debian/tmp/opt/trinity/share/applnk/.hidden/katefll.desktop
debian/tmp/opt/trinity/share/apps/kate
debian/tmp/opt/trinity/share/apps/katepart
diff --git a/debian/lenny/kdeaddons/debian/kdeaddons-kfile-plugins-trinity.install b/debian/lenny/kdeaddons/debian/kdeaddons-kfile-plugins-trinity.install
index 5bd8dd927..a85a16b55 100644
--- a/debian/lenny/kdeaddons/debian/kdeaddons-kfile-plugins-trinity.install
+++ b/debian/lenny/kdeaddons/debian/kdeaddons-kfile-plugins-trinity.install
@@ -1,22 +1,22 @@
debian/tmp/opt/trinity/bin/lnkforward
-debian/tmp/opt/trinity/lib/kde3/kfile_cert.la
-debian/tmp/opt/trinity/lib/kde3/kfile_cert.so
-debian/tmp/opt/trinity/lib/kde3/kfile_desktop.la
-debian/tmp/opt/trinity/lib/kde3/kfile_desktop.so
-debian/tmp/opt/trinity/lib/kde3/kfile_folder.la
-debian/tmp/opt/trinity/lib/kde3/kfile_folder.so
-debian/tmp/opt/trinity/lib/kde3/kfile_html.la
-debian/tmp/opt/trinity/lib/kde3/kfile_html.so
-debian/tmp/opt/trinity/lib/kde3/kfile_lnk.la
-debian/tmp/opt/trinity/lib/kde3/kfile_lnk.so
-debian/tmp/opt/trinity/lib/kde3/kfile_mhtml.la
-debian/tmp/opt/trinity/lib/kde3/kfile_mhtml.so
-debian/tmp/opt/trinity/lib/kde3/kfile_txt.la
-debian/tmp/opt/trinity/lib/kde3/kfile_txt.so
-debian/tmp/opt/trinity/lib/kde3/librenaudioplugin.la
-debian/tmp/opt/trinity/lib/kde3/librenaudioplugin.so
-debian/tmp/opt/trinity/lib/kde3/librenimageplugin.la
-debian/tmp/opt/trinity/lib/kde3/librenimageplugin.so
+debian/tmp/opt/trinity/lib/trinity/kfile_cert.la
+debian/tmp/opt/trinity/lib/trinity/kfile_cert.so
+debian/tmp/opt/trinity/lib/trinity/kfile_desktop.la
+debian/tmp/opt/trinity/lib/trinity/kfile_desktop.so
+debian/tmp/opt/trinity/lib/trinity/kfile_folder.la
+debian/tmp/opt/trinity/lib/trinity/kfile_folder.so
+debian/tmp/opt/trinity/lib/trinity/kfile_html.la
+debian/tmp/opt/trinity/lib/trinity/kfile_html.so
+debian/tmp/opt/trinity/lib/trinity/kfile_lnk.la
+debian/tmp/opt/trinity/lib/trinity/kfile_lnk.so
+debian/tmp/opt/trinity/lib/trinity/kfile_mhtml.la
+debian/tmp/opt/trinity/lib/trinity/kfile_mhtml.so
+debian/tmp/opt/trinity/lib/trinity/kfile_txt.la
+debian/tmp/opt/trinity/lib/trinity/kfile_txt.so
+debian/tmp/opt/trinity/lib/trinity/librenaudioplugin.la
+debian/tmp/opt/trinity/lib/trinity/librenaudioplugin.so
+debian/tmp/opt/trinity/lib/trinity/librenimageplugin.la
+debian/tmp/opt/trinity/lib/trinity/librenimageplugin.so
debian/tmp/opt/trinity/share/applnk/.hidden/lnkforward.desktop
debian/tmp/opt/trinity/share/mimelnk/application/x-win-lnk.desktop
debian/tmp/opt/trinity/share/services/kfile_cert.desktop
diff --git a/debian/lenny/kdeaddons/debian/kicker-applets-trinity.install b/debian/lenny/kdeaddons/debian/kicker-applets-trinity.install
index ac076f039..d4dfe6204 100644
--- a/debian/lenny/kdeaddons/debian/kicker-applets-trinity.install
+++ b/debian/lenny/kdeaddons/debian/kicker-applets-trinity.install
@@ -1,13 +1,13 @@
-debian/tmp/opt/trinity/lib/kde3/kolourpicker_panelapplet.la
-debian/tmp/opt/trinity/lib/kde3/kolourpicker_panelapplet.so
-debian/tmp/opt/trinity/lib/kde3/ktimemon_panelapplet.la
-debian/tmp/opt/trinity/lib/kde3/ktimemon_panelapplet.so
-debian/tmp/opt/trinity/lib/kde3/math_panelapplet.la
-debian/tmp/opt/trinity/lib/kde3/math_panelapplet.so
-debian/tmp/opt/trinity/lib/kde3/mediacontrol_panelapplet.la
-debian/tmp/opt/trinity/lib/kde3/mediacontrol_panelapplet.so
-debian/tmp/opt/trinity/lib/kde3/kbinaryclock_panelapplet.la
-debian/tmp/opt/trinity/lib/kde3/kbinaryclock_panelapplet.so
+debian/tmp/opt/trinity/lib/trinity/kolourpicker_panelapplet.la
+debian/tmp/opt/trinity/lib/trinity/kolourpicker_panelapplet.so
+debian/tmp/opt/trinity/lib/trinity/ktimemon_panelapplet.la
+debian/tmp/opt/trinity/lib/trinity/ktimemon_panelapplet.so
+debian/tmp/opt/trinity/lib/trinity/math_panelapplet.la
+debian/tmp/opt/trinity/lib/trinity/math_panelapplet.so
+debian/tmp/opt/trinity/lib/trinity/mediacontrol_panelapplet.la
+debian/tmp/opt/trinity/lib/trinity/mediacontrol_panelapplet.so
+debian/tmp/opt/trinity/lib/trinity/kbinaryclock_panelapplet.la
+debian/tmp/opt/trinity/lib/trinity/kbinaryclock_panelapplet.so
debian/tmp/opt/trinity/share/apps/kicker/applets
debian/tmp/opt/trinity/share/apps/mediacontrol
debian/tmp/opt/trinity/share/config.kcfg/kbinaryclock.kcfg
diff --git a/debian/lenny/kdeaddons/debian/konq-plugins-trinity.install b/debian/lenny/kdeaddons/debian/konq-plugins-trinity.install
index bd06cadad..e4d4e14c7 100644
--- a/debian/lenny/kdeaddons/debian/konq-plugins-trinity.install
+++ b/debian/lenny/kdeaddons/debian/konq-plugins-trinity.install
@@ -2,58 +2,58 @@ debian/tmp/etc/trinity/translaterc
debian/tmp/opt/trinity/bin/fsview
debian/tmp/opt/trinity/bin/jpegorient
debian/tmp/opt/trinity/bin/kio_media_realfolder
-debian/tmp/opt/trinity/lib/kde3/konq_sidebarnews.la
-debian/tmp/opt/trinity/lib/kde3/konq_sidebarnews.so
-debian/tmp/opt/trinity/lib/kde3/konqsidebar_delicious.la
-debian/tmp/opt/trinity/lib/kde3/konqsidebar_delicious.so
-debian/tmp/opt/trinity/lib/kde3/konqsidebar_mediaplayer.la
-debian/tmp/opt/trinity/lib/kde3/konqsidebar_mediaplayer.so
-debian/tmp/opt/trinity/lib/kde3/konqsidebar_metabar.la
-debian/tmp/opt/trinity/lib/kde3/konqsidebar_metabar.so
-debian/tmp/opt/trinity/lib/kde3/libakregatorkonqfeedicon.la
-debian/tmp/opt/trinity/lib/kde3/libakregatorkonqfeedicon.so
-debian/tmp/opt/trinity/lib/kde3/libakregatorkonqplugin.la
-debian/tmp/opt/trinity/lib/kde3/libakregatorkonqplugin.so
-debian/tmp/opt/trinity/lib/kde3/libarkplugin.la
-debian/tmp/opt/trinity/lib/kde3/libarkplugin.so
-debian/tmp/opt/trinity/lib/kde3/libautorefresh.la
-debian/tmp/opt/trinity/lib/kde3/libautorefresh.so
-debian/tmp/opt/trinity/lib/kde3/libbabelfishplugin.la
-debian/tmp/opt/trinity/lib/kde3/libbabelfishplugin.so
-debian/tmp/opt/trinity/lib/kde3/libcrashesplugin.la
-debian/tmp/opt/trinity/lib/kde3/libcrashesplugin.so
-debian/tmp/opt/trinity/lib/kde3/libdirfilterplugin.la
-debian/tmp/opt/trinity/lib/kde3/libdirfilterplugin.so
-debian/tmp/opt/trinity/lib/kde3/librsyncplugin.la
-debian/tmp/opt/trinity/lib/kde3/librsyncplugin.so
-debian/tmp/opt/trinity/lib/kde3/libdomtreeviewerplugin.la
-debian/tmp/opt/trinity/lib/kde3/libdomtreeviewerplugin.so
-debian/tmp/opt/trinity/lib/kde3/libfsviewpart.la
-debian/tmp/opt/trinity/lib/kde3/libfsviewpart.so
-debian/tmp/opt/trinity/lib/kde3/libkhtmlsettingsplugin.la
-debian/tmp/opt/trinity/lib/kde3/libkhtmlsettingsplugin.so
-debian/tmp/opt/trinity/lib/kde3/kcm_kuick.la
-debian/tmp/opt/trinity/lib/kde3/kcm_kuick.so
-debian/tmp/opt/trinity/lib/kde3/libkimgallery.la
-debian/tmp/opt/trinity/lib/kde3/libkimgallery.so
-debian/tmp/opt/trinity/lib/kde3/libkuickplugin.la
-debian/tmp/opt/trinity/lib/kde3/libkuickplugin.so
-debian/tmp/opt/trinity/lib/kde3/libmfkonqmficon.la
-debian/tmp/opt/trinity/lib/kde3/libmfkonqmficon.so
-debian/tmp/opt/trinity/lib/kde3/libminitoolsplugin.la
-debian/tmp/opt/trinity/lib/kde3/libminitoolsplugin.so
-debian/tmp/opt/trinity/lib/kde3/librellinksplugin.la
-debian/tmp/opt/trinity/lib/kde3/librellinksplugin.so
-debian/tmp/opt/trinity/lib/kde3/libsearchbarplugin.la
-debian/tmp/opt/trinity/lib/kde3/libsearchbarplugin.so
-debian/tmp/opt/trinity/lib/kde3/libuachangerplugin.la
-debian/tmp/opt/trinity/lib/kde3/libuachangerplugin.so
-debian/tmp/opt/trinity/lib/kde3/libvalidatorsplugin.la
-debian/tmp/opt/trinity/lib/kde3/libvalidatorsplugin.so
-debian/tmp/opt/trinity/lib/kde3/libwebarchiverplugin.la
-debian/tmp/opt/trinity/lib/kde3/libwebarchiverplugin.so
-debian/tmp/opt/trinity/lib/kde3/webarchivethumbnail.la
-debian/tmp/opt/trinity/lib/kde3/webarchivethumbnail.so
+debian/tmp/opt/trinity/lib/trinity/konq_sidebarnews.la
+debian/tmp/opt/trinity/lib/trinity/konq_sidebarnews.so
+debian/tmp/opt/trinity/lib/trinity/konqsidebar_delicious.la
+debian/tmp/opt/trinity/lib/trinity/konqsidebar_delicious.so
+debian/tmp/opt/trinity/lib/trinity/konqsidebar_mediaplayer.la
+debian/tmp/opt/trinity/lib/trinity/konqsidebar_mediaplayer.so
+debian/tmp/opt/trinity/lib/trinity/konqsidebar_metabar.la
+debian/tmp/opt/trinity/lib/trinity/konqsidebar_metabar.so
+debian/tmp/opt/trinity/lib/trinity/libakregatorkonqfeedicon.la
+debian/tmp/opt/trinity/lib/trinity/libakregatorkonqfeedicon.so
+debian/tmp/opt/trinity/lib/trinity/libakregatorkonqplugin.la
+debian/tmp/opt/trinity/lib/trinity/libakregatorkonqplugin.so
+debian/tmp/opt/trinity/lib/trinity/libarkplugin.la
+debian/tmp/opt/trinity/lib/trinity/libarkplugin.so
+debian/tmp/opt/trinity/lib/trinity/libautorefresh.la
+debian/tmp/opt/trinity/lib/trinity/libautorefresh.so
+debian/tmp/opt/trinity/lib/trinity/libbabelfishplugin.la
+debian/tmp/opt/trinity/lib/trinity/libbabelfishplugin.so
+debian/tmp/opt/trinity/lib/trinity/libcrashesplugin.la
+debian/tmp/opt/trinity/lib/trinity/libcrashesplugin.so
+debian/tmp/opt/trinity/lib/trinity/libdirfilterplugin.la
+debian/tmp/opt/trinity/lib/trinity/libdirfilterplugin.so
+debian/tmp/opt/trinity/lib/trinity/librsyncplugin.la
+debian/tmp/opt/trinity/lib/trinity/librsyncplugin.so
+debian/tmp/opt/trinity/lib/trinity/libdomtreeviewerplugin.la
+debian/tmp/opt/trinity/lib/trinity/libdomtreeviewerplugin.so
+debian/tmp/opt/trinity/lib/trinity/libfsviewpart.la
+debian/tmp/opt/trinity/lib/trinity/libfsviewpart.so
+debian/tmp/opt/trinity/lib/trinity/libkhtmlsettingsplugin.la
+debian/tmp/opt/trinity/lib/trinity/libkhtmlsettingsplugin.so
+debian/tmp/opt/trinity/lib/trinity/kcm_kuick.la
+debian/tmp/opt/trinity/lib/trinity/kcm_kuick.so
+debian/tmp/opt/trinity/lib/trinity/libkimgallery.la
+debian/tmp/opt/trinity/lib/trinity/libkimgallery.so
+debian/tmp/opt/trinity/lib/trinity/libkuickplugin.la
+debian/tmp/opt/trinity/lib/trinity/libkuickplugin.so
+debian/tmp/opt/trinity/lib/trinity/libmfkonqmficon.la
+debian/tmp/opt/trinity/lib/trinity/libmfkonqmficon.so
+debian/tmp/opt/trinity/lib/trinity/libminitoolsplugin.la
+debian/tmp/opt/trinity/lib/trinity/libminitoolsplugin.so
+debian/tmp/opt/trinity/lib/trinity/librellinksplugin.la
+debian/tmp/opt/trinity/lib/trinity/librellinksplugin.so
+debian/tmp/opt/trinity/lib/trinity/libsearchbarplugin.la
+debian/tmp/opt/trinity/lib/trinity/libsearchbarplugin.so
+debian/tmp/opt/trinity/lib/trinity/libuachangerplugin.la
+debian/tmp/opt/trinity/lib/trinity/libuachangerplugin.so
+debian/tmp/opt/trinity/lib/trinity/libvalidatorsplugin.la
+debian/tmp/opt/trinity/lib/trinity/libvalidatorsplugin.so
+debian/tmp/opt/trinity/lib/trinity/libwebarchiverplugin.la
+debian/tmp/opt/trinity/lib/trinity/libwebarchiverplugin.so
+debian/tmp/opt/trinity/lib/trinity/webarchivethumbnail.la
+debian/tmp/opt/trinity/lib/trinity/webarchivethumbnail.so
debian/tmp/opt/trinity/share/applnk/.hidden/arkplugin.desktop
debian/tmp/opt/trinity/share/applnk/.hidden/kcmkuick.desktop
debian/tmp/opt/trinity/share/applnk/.hidden/kuickplugin.desktop
@@ -178,5 +178,5 @@ konq-plugins/rellinks/TODO /opt/trinity/share/doc/konq-plugins/rellinks
konq-plugins/sidebar/mediaplayer/AUTHORS /opt/trinity/share/doc/konq-plugins/sidebar-mediaplayer
konq-plugins/sidebar/newsticker/README /opt/trinity/share/doc/konq-plugins/sidebar-newsticker
-debian/tmp/opt/trinity/lib/kde3/libadblock.la
-debian/tmp/opt/trinity/lib/kde3/libadblock.so
+debian/tmp/opt/trinity/lib/trinity/libadblock.la
+debian/tmp/opt/trinity/lib/trinity/libadblock.so
diff --git a/debian/lenny/kdeaddons/debian/kontact-plugins-trinity.install b/debian/lenny/kdeaddons/debian/kontact-plugins-trinity.install
index a39d1d9e2..3571c1d1d 100644
--- a/debian/lenny/kdeaddons/debian/kontact-plugins-trinity.install
+++ b/debian/lenny/kdeaddons/debian/kontact-plugins-trinity.install
@@ -1,6 +1,6 @@
-debian/tmp/opt/trinity/lib/kde3/kcm_kontactknt.so
-debian/tmp/opt/trinity/lib/kde3/kcm_kontactknt.la
-debian/tmp/opt/trinity/lib/kde3/libkontact_newstickerplugin.so
-debian/tmp/opt/trinity/lib/kde3/libkontact_newstickerplugin.la
+debian/tmp/opt/trinity/lib/trinity/kcm_kontactknt.so
+debian/tmp/opt/trinity/lib/trinity/kcm_kontactknt.la
+debian/tmp/opt/trinity/lib/trinity/libkontact_newstickerplugin.so
+debian/tmp/opt/trinity/lib/trinity/libkontact_newstickerplugin.la
debian/tmp/opt/trinity/share/services/kcmkontactknt.desktop
debian/tmp/opt/trinity/share/services/kontact
diff --git a/debian/lenny/kdeaddons/debian/noatun-plugins-trinity.install b/debian/lenny/kdeaddons/debian/noatun-plugins-trinity.install
index adf61ad08..843bdf15c 100644
--- a/debian/lenny/kdeaddons/debian/noatun-plugins-trinity.install
+++ b/debian/lenny/kdeaddons/debian/noatun-plugins-trinity.install
@@ -1,36 +1,36 @@
debian/tmp/opt/trinity/bin/noatunsynaescope.bin
debian/tmp/opt/trinity/bin/noatuntippecanoe.bin
debian/tmp/opt/trinity/bin/noatuntyler.bin
-debian/tmp/opt/trinity/lib/kde3/noatunalsaplayer.la
-debian/tmp/opt/trinity/lib/kde3/noatunalsaplayer.so
-debian/tmp/opt/trinity/lib/kde3/noatunblurscope.la
-debian/tmp/opt/trinity/lib/kde3/noatunblurscope.so
-debian/tmp/opt/trinity/lib/kde3/noatuncharlatan.la
-debian/tmp/opt/trinity/lib/kde3/noatuncharlatan.so
-debian/tmp/opt/trinity/lib/kde3/noatundub.la
-debian/tmp/opt/trinity/lib/kde3/noatundub.so
-debian/tmp/opt/trinity/lib/kde3/noatun_ffrs.la
-debian/tmp/opt/trinity/lib/kde3/noatun_ffrs.so
-debian/tmp/opt/trinity/lib/kde3/noatunluckytag.la
-debian/tmp/opt/trinity/lib/kde3/noatunluckytag.so
-debian/tmp/opt/trinity/lib/kde3/noatunlyrics.la
-debian/tmp/opt/trinity/lib/kde3/noatunlyrics.so
-debian/tmp/opt/trinity/lib/kde3/noatunmadness.la
-debian/tmp/opt/trinity/lib/kde3/noatunmadness.so
-debian/tmp/opt/trinity/lib/kde3/noatun_oblique.la
-debian/tmp/opt/trinity/lib/kde3/noatun_oblique.so
-debian/tmp/opt/trinity/lib/kde3/noatunpitchablespeed.la
-debian/tmp/opt/trinity/lib/kde3/noatunpitchablespeed.so
-debian/tmp/opt/trinity/lib/kde3/noatunsynaescope.la
-debian/tmp/opt/trinity/lib/kde3/noatunsynaescope.so
-debian/tmp/opt/trinity/lib/kde3/noatuntippecanoe.la
-debian/tmp/opt/trinity/lib/kde3/noatuntippecanoe.so
-debian/tmp/opt/trinity/lib/kde3/noatuntyler.la
-debian/tmp/opt/trinity/lib/kde3/noatuntyler.so
-debian/tmp/opt/trinity/lib/kde3/noatunwakeup.la
-debian/tmp/opt/trinity/lib/kde3/noatunwakeup.so
-debian/tmp/opt/trinity/lib/kde3/noatunwavecapture.la
-debian/tmp/opt/trinity/lib/kde3/noatunwavecapture.so
+debian/tmp/opt/trinity/lib/trinity/noatunalsaplayer.la
+debian/tmp/opt/trinity/lib/trinity/noatunalsaplayer.so
+debian/tmp/opt/trinity/lib/trinity/noatunblurscope.la
+debian/tmp/opt/trinity/lib/trinity/noatunblurscope.so
+debian/tmp/opt/trinity/lib/trinity/noatuncharlatan.la
+debian/tmp/opt/trinity/lib/trinity/noatuncharlatan.so
+debian/tmp/opt/trinity/lib/trinity/noatundub.la
+debian/tmp/opt/trinity/lib/trinity/noatundub.so
+debian/tmp/opt/trinity/lib/trinity/noatun_ffrs.la
+debian/tmp/opt/trinity/lib/trinity/noatun_ffrs.so
+debian/tmp/opt/trinity/lib/trinity/noatunluckytag.la
+debian/tmp/opt/trinity/lib/trinity/noatunluckytag.so
+debian/tmp/opt/trinity/lib/trinity/noatunlyrics.la
+debian/tmp/opt/trinity/lib/trinity/noatunlyrics.so
+debian/tmp/opt/trinity/lib/trinity/noatunmadness.la
+debian/tmp/opt/trinity/lib/trinity/noatunmadness.so
+debian/tmp/opt/trinity/lib/trinity/noatun_oblique.la
+debian/tmp/opt/trinity/lib/trinity/noatun_oblique.so
+debian/tmp/opt/trinity/lib/trinity/noatunpitchablespeed.la
+debian/tmp/opt/trinity/lib/trinity/noatunpitchablespeed.so
+debian/tmp/opt/trinity/lib/trinity/noatunsynaescope.la
+debian/tmp/opt/trinity/lib/trinity/noatunsynaescope.so
+debian/tmp/opt/trinity/lib/trinity/noatuntippecanoe.la
+debian/tmp/opt/trinity/lib/trinity/noatuntippecanoe.so
+debian/tmp/opt/trinity/lib/trinity/noatuntyler.la
+debian/tmp/opt/trinity/lib/trinity/noatuntyler.so
+debian/tmp/opt/trinity/lib/trinity/noatunwakeup.la
+debian/tmp/opt/trinity/lib/trinity/noatunwakeup.so
+debian/tmp/opt/trinity/lib/trinity/noatunwavecapture.la
+debian/tmp/opt/trinity/lib/trinity/noatunwavecapture.so
debian/tmp/opt/trinity/share/apps/noatun/alsaplayerui.plugin
debian/tmp/opt/trinity/share/apps/noatun/blurscope.plugin
debian/tmp/opt/trinity/share/apps/noatun/charlatanui.plugin
diff --git a/debian/lenny/kdeadmin/debian/kdeadmin-kfile-plugins-trinity.install b/debian/lenny/kdeadmin/debian/kdeadmin-kfile-plugins-trinity.install
index 32ed6fc04..e3b00f7da 100644
--- a/debian/lenny/kdeadmin/debian/kdeadmin-kfile-plugins-trinity.install
+++ b/debian/lenny/kdeadmin/debian/kdeadmin-kfile-plugins-trinity.install
@@ -1,6 +1,6 @@
-debian/tmp/opt/trinity/lib/kde3/kfile_deb.la
-debian/tmp/opt/trinity/lib/kde3/kfile_deb.so
-debian/tmp/opt/trinity/lib/kde3/kfile_rpm.la
-debian/tmp/opt/trinity/lib/kde3/kfile_rpm.so
+debian/tmp/opt/trinity/lib/trinity/kfile_deb.la
+debian/tmp/opt/trinity/lib/trinity/kfile_deb.so
+debian/tmp/opt/trinity/lib/trinity/kfile_rpm.la
+debian/tmp/opt/trinity/lib/trinity/kfile_rpm.so
debian/tmp/opt/trinity/share/services/kfile_deb.desktop
debian/tmp/opt/trinity/share/services/kfile_rpm.desktop
diff --git a/debian/lenny/kdeadmin/debian/knetworkconf-trinity.install b/debian/lenny/kdeadmin/debian/knetworkconf-trinity.install
index 957936acd..7fe54e136 100644
--- a/debian/lenny/kdeadmin/debian/knetworkconf-trinity.install
+++ b/debian/lenny/kdeadmin/debian/knetworkconf-trinity.install
@@ -52,5 +52,5 @@ debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/rpath.png
debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/kubuntu.png
debian/tmp/opt/trinity/share/apps/knetworkconf/pixmaps/yoper.png
debian/tmp/opt/trinity/share/applications/kde/kcm_knetworkconfmodule.desktop
-debian/tmp/opt/trinity/lib/kde3/kcm_knetworkconfmodule.so
-debian/tmp/opt/trinity/lib/kde3/kcm_knetworkconfmodule.la
+debian/tmp/opt/trinity/lib/trinity/kcm_knetworkconfmodule.so
+debian/tmp/opt/trinity/lib/trinity/kcm_knetworkconfmodule.la
diff --git a/debian/lenny/kdeadmin/debian/lilo-config-trinity.install b/debian/lenny/kdeadmin/debian/lilo-config-trinity.install
index 4f275e6cf..a56b98960 100644
--- a/debian/lenny/kdeadmin/debian/lilo-config-trinity.install
+++ b/debian/lenny/kdeadmin/debian/lilo-config-trinity.install
@@ -1,5 +1,5 @@
-debian/tmp/opt/trinity/lib/kde3/kcm_lilo.la
-debian/tmp/opt/trinity/lib/kde3/kcm_lilo.so
+debian/tmp/opt/trinity/lib/trinity/kcm_lilo.la
+debian/tmp/opt/trinity/lib/trinity/kcm_lilo.so
debian/tmp/opt/trinity/share/applications/kde/lilo.desktop
debian/tmp/opt/trinity/share/doc/kde/HTML/en/lilo-config/index.docbook
debian/tmp/opt/trinity/share/doc/kde/HTML/en/lilo-config/index.cache.bz2
diff --git a/debian/lenny/kdeartwork/debian/kdeartwork-style-trinity.install b/debian/lenny/kdeartwork/debian/kdeartwork-style-trinity.install
index 808f67c1c..8fab1bcbf 100644
--- a/debian/lenny/kdeartwork/debian/kdeartwork-style-trinity.install
+++ b/debian/lenny/kdeartwork/debian/kdeartwork-style-trinity.install
@@ -1,4 +1,4 @@
-debian/tmp/opt/trinity/lib/kde3/plugins/styles
-debian/tmp/opt/trinity/lib/kde3/kstyle_phase_config.la
-debian/tmp/opt/trinity/lib/kde3/kstyle_phase_config.so
+debian/tmp/opt/trinity/lib/trinity/plugins/styles
+debian/tmp/opt/trinity/lib/trinity/kstyle_phase_config.la
+debian/tmp/opt/trinity/lib/trinity/kstyle_phase_config.so
debian/tmp/opt/trinity/share/apps/kstyle
diff --git a/debian/lenny/kdeartwork/debian/kdeartwork-theme-window-trinity.install b/debian/lenny/kdeartwork/debian/kdeartwork-theme-window-trinity.install
index 2f12c0172..7f688e236 100644
--- a/debian/lenny/kdeartwork/debian/kdeartwork-theme-window-trinity.install
+++ b/debian/lenny/kdeartwork/debian/kdeartwork-theme-window-trinity.install
@@ -1,2 +1,2 @@
-debian/tmp/opt/trinity/lib/kde3/kwin*
+debian/tmp/opt/trinity/lib/trinity/kwin*
debian/tmp/opt/trinity/share/apps/kwin
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
diff --git a/debian/lenny/kdebindings/debian/konqueror-kjsembed-plugin-trinity.install b/debian/lenny/kdebindings/debian/konqueror-kjsembed-plugin-trinity.install
index b71d0ad93..e37ad763e 100644
--- a/debian/lenny/kdebindings/debian/konqueror-kjsembed-plugin-trinity.install
+++ b/debian/lenny/kdebindings/debian/konqueror-kjsembed-plugin-trinity.install
@@ -1,2 +1,2 @@
-debian/tmp/opt/trinity/lib/kde3/libjsconsoleplugin.la
-debian/tmp/opt/trinity/lib/kde3/libjsconsoleplugin.so
+debian/tmp/opt/trinity/lib/trinity/libjsconsoleplugin.la
+debian/tmp/opt/trinity/lib/trinity/libjsconsoleplugin.so
diff --git a/debian/lenny/kdebindings/debian/libkjsembed1-trinity.install b/debian/lenny/kdebindings/debian/libkjsembed1-trinity.install
index a9848bfb5..c0fe0bc67 100644
--- a/debian/lenny/kdebindings/debian/libkjsembed1-trinity.install
+++ b/debian/lenny/kdebindings/debian/libkjsembed1-trinity.install
@@ -1,16 +1,16 @@
debian/tmp/opt/trinity/lib/libkjsembed.so.1.0.0
debian/tmp/opt/trinity/lib/libkjsembed.so.1
-debian/tmp/opt/trinity/lib/kde3/libimagefxplugin.la
-debian/tmp/opt/trinity/lib/kde3/libimagefxplugin.so
+debian/tmp/opt/trinity/lib/trinity/libimagefxplugin.la
+debian/tmp/opt/trinity/lib/trinity/libimagefxplugin.so
debian/tmp/opt/trinity/share/services/imagefx_plugin.desktop
-debian/tmp/opt/trinity/lib/kde3/libqprocessplugin.so
-debian/tmp/opt/trinity/lib/kde3/libqprocessplugin.la
+debian/tmp/opt/trinity/lib/trinity/libqprocessplugin.so
+debian/tmp/opt/trinity/lib/trinity/libqprocessplugin.la
debian/tmp/opt/trinity/share/services/qprocess_plugin.desktop
-debian/tmp/opt/trinity/lib/kde3/libfileitemplugin.la
-debian/tmp/opt/trinity/lib/kde3/libfileitemplugin.so
+debian/tmp/opt/trinity/lib/trinity/libfileitemplugin.la
+debian/tmp/opt/trinity/lib/trinity/libfileitemplugin.so
debian/tmp/opt/trinity/share/services/kfileitem_plugin.desktop
debian/tmp/opt/trinity/share/apps/kjsembed/cmdline.js
@@ -22,8 +22,8 @@ debian/tmp/opt/trinity/share/applnk/Utilities/embedjs.desktop
debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/embedjs.png
debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/embedjs.png
-debian/tmp/opt/trinity/lib/kde3/libjavascript.la
-debian/tmp/opt/trinity/lib/kde3/libjavascript.so
+debian/tmp/opt/trinity/lib/trinity/libjavascript.la
+debian/tmp/opt/trinity/lib/trinity/libjavascript.so
debian/tmp/opt/trinity/share/apps/kate/scripts/swaptabs.js
debian/tmp/opt/trinity/share/apps/kate/scripts/swaptabs.ui
debian/tmp/opt/trinity/share/apps/kate/scripts/swaptabs.desktop
diff --git a/debian/lenny/kdeedu/debian/keduca-trinity.install b/debian/lenny/kdeedu/debian/keduca-trinity.install
index d7808321a..405435bf2 100644
--- a/debian/lenny/kdeedu/debian/keduca-trinity.install
+++ b/debian/lenny/kdeedu/debian/keduca-trinity.install
@@ -1,7 +1,7 @@
opt/trinity/bin/keduca
opt/trinity/bin/keducabuilder
-opt/trinity/lib/kde3/libkeducapart.la
-opt/trinity/lib/kde3/libkeducapart.so
+opt/trinity/lib/trinity/libkeducapart.la
+opt/trinity/lib/trinity/libkeducapart.so
/opt/trinity/share/applications/kde/keduca.desktop
/opt/trinity/share/applications/kde/keducabuilder.desktop
/opt/trinity/share/apps/keduca
diff --git a/debian/lenny/kdeedu/debian/kig-trinity.install b/debian/lenny/kdeedu/debian/kig-trinity.install
index 037c32942..a7c1ae6c1 100644
--- a/debian/lenny/kdeedu/debian/kig-trinity.install
+++ b/debian/lenny/kdeedu/debian/kig-trinity.install
@@ -2,12 +2,12 @@ etc/trinity/magic/cabri.magic
etc/trinity/magic/drgeo.magic
opt/trinity/bin/kig
opt/trinity/bin/pykig.py
-opt/trinity/lib/kde3/kfile_drgeo.la
-opt/trinity/lib/kde3/kfile_drgeo.so
-opt/trinity/lib/kde3/kfile_kig.la
-opt/trinity/lib/kde3/kfile_kig.so
-opt/trinity/lib/kde3/libkigpart.la
-opt/trinity/lib/kde3/libkigpart.so
+opt/trinity/lib/trinity/kfile_drgeo.la
+opt/trinity/lib/trinity/kfile_drgeo.so
+opt/trinity/lib/trinity/kfile_kig.la
+opt/trinity/lib/trinity/kfile_kig.so
+opt/trinity/lib/trinity/libkigpart.la
+opt/trinity/lib/trinity/libkigpart.so
/opt/trinity/share/applications/kde/kig.desktop
/opt/trinity/share/apps/katepart/syntax/python-kig.xml
/opt/trinity/share/apps/kig
diff --git a/debian/lenny/kdeedu/debian/kmplot-trinity.install b/debian/lenny/kdeedu/debian/kmplot-trinity.install
index d25198c96..4d7a52e48 100644
--- a/debian/lenny/kdeedu/debian/kmplot-trinity.install
+++ b/debian/lenny/kdeedu/debian/kmplot-trinity.install
@@ -1,6 +1,6 @@
opt/trinity/bin/kmplot
-opt/trinity/lib/kde3/libkmplotpart.la
-opt/trinity/lib/kde3/libkmplotpart.so
+opt/trinity/lib/trinity/libkmplotpart.la
+opt/trinity/lib/trinity/libkmplotpart.so
/opt/trinity/share/applications/kde/kmplot.desktop
/opt/trinity/share/apps/kmplot
/opt/trinity/share/config.kcfg/kmplot.kcfg
diff --git a/debian/lenny/kdegames/debian/atlantik-trinity.install b/debian/lenny/kdegames/debian/atlantik-trinity.install
index 51f0e9c86..d4a54c6c7 100644
--- a/debian/lenny/kdegames/debian/atlantik-trinity.install
+++ b/debian/lenny/kdegames/debian/atlantik-trinity.install
@@ -5,8 +5,8 @@
/opt/trinity/lib/libatlantikclient.so.*
/opt/trinity/lib/libatlantikui.la
/opt/trinity/lib/libatlantikui.so.*
-/opt/trinity/lib/kde3/kio_atlantik.la
-/opt/trinity/lib/kde3/kio_atlantik.so
+/opt/trinity/lib/trinity/kio_atlantik.la
+/opt/trinity/lib/trinity/kio_atlantik.so
/opt/trinity/share/services/atlantik.protocol
/opt/trinity/share/doc/kde/HTML/en/atlantik/*
/opt/trinity/share/applications/kde/atlantik.desktop
diff --git a/debian/lenny/kdegames/debian/kolf-trinity.install b/debian/lenny/kdegames/debian/kolf-trinity.install
index 42f33728a..7ca84b810 100644
--- a/debian/lenny/kdegames/debian/kolf-trinity.install
+++ b/debian/lenny/kdegames/debian/kolf-trinity.install
@@ -13,8 +13,8 @@
/opt/trinity/share/mimelnk/application/x-kourse.desktop
/opt/trinity/lib/libkdeinit_kolf.so
/opt/trinity/lib/libkdeinit_kolf.la
-/opt/trinity/lib/kde3/kolf.la
-/opt/trinity/lib/kde3/kolf.so
+/opt/trinity/lib/trinity/kolf.la
+/opt/trinity/lib/trinity/kolf.so
/opt/trinity/lib/libkolf.la
/opt/trinity/lib/libkolf.so.1
/opt/trinity/lib/libkolf.so.1.2.0
diff --git a/debian/lenny/kdegraphics.automake/debian/kamera-trinity.install b/debian/lenny/kdegraphics.automake/debian/kamera-trinity.install
index c615ebfaa..16f11dbf2 100644
--- a/debian/lenny/kdegraphics.automake/debian/kamera-trinity.install
+++ b/debian/lenny/kdegraphics.automake/debian/kamera-trinity.install
@@ -1,8 +1,8 @@
-debian/tmp/opt/trinity/lib/kde3/kcm_kamera.la
-debian/tmp/opt/trinity/lib/kde3/kcm_kamera.so
-debian/tmp/opt/trinity/lib/kde3/kio_kamera.la
-debian/tmp/opt/trinity/lib/kde3/kio_kamera.so
+debian/tmp/opt/trinity/lib/trinity/kcm_kamera.la
+debian/tmp/opt/trinity/lib/trinity/kcm_kamera.so
+debian/tmp/opt/trinity/lib/trinity/kio_kamera.la
+debian/tmp/opt/trinity/lib/trinity/kio_kamera.so
debian/tmp/opt/trinity/share/applications/kde/kamera.desktop
debian/tmp/opt/trinity/share/doc/kde/HTML/en/kamera/common
debian/tmp/opt/trinity/share/doc/kde/HTML/en/kamera/index.cache.bz2
diff --git a/debian/lenny/kdegraphics.automake/debian/kdegraphics-kfile-plugins-trinity.install b/debian/lenny/kdegraphics.automake/debian/kdegraphics-kfile-plugins-trinity.install
index 44140e75f..d7a77267e 100644
--- a/debian/lenny/kdegraphics.automake/debian/kdegraphics-kfile-plugins-trinity.install
+++ b/debian/lenny/kdegraphics.automake/debian/kdegraphics-kfile-plugins-trinity.install
@@ -1,41 +1,41 @@
-debian/tmp/opt/trinity/lib/kde3/gsthumbnail.la
-debian/tmp/opt/trinity/lib/kde3/gsthumbnail.so
-debian/tmp/opt/trinity/lib/kde3/kfile_bmp.la
-debian/tmp/opt/trinity/lib/kde3/kfile_bmp.so
-debian/tmp/opt/trinity/lib/kde3/kfile_dds.la
-debian/tmp/opt/trinity/lib/kde3/kfile_dds.so
-debian/tmp/opt/trinity/lib/kde3/kfile_dvi.la
-debian/tmp/opt/trinity/lib/kde3/kfile_dvi.so
-debian/tmp/opt/trinity/lib/kde3/kfile_exr.la
-debian/tmp/opt/trinity/lib/kde3/kfile_exr.so
-debian/tmp/opt/trinity/lib/kde3/kfile_gif.la
-debian/tmp/opt/trinity/lib/kde3/kfile_gif.so
-debian/tmp/opt/trinity/lib/kde3/kfile_ico.la
-debian/tmp/opt/trinity/lib/kde3/kfile_ico.so
-debian/tmp/opt/trinity/lib/kde3/kfile_jpeg.la
-debian/tmp/opt/trinity/lib/kde3/kfile_jpeg.so
-debian/tmp/opt/trinity/lib/kde3/kfile_pcx.la
-debian/tmp/opt/trinity/lib/kde3/kfile_pcx.so
-debian/tmp/opt/trinity/lib/kde3/kfile_pdf.la
-debian/tmp/opt/trinity/lib/kde3/kfile_pdf.so
-debian/tmp/opt/trinity/lib/kde3/kfile_png.la
-debian/tmp/opt/trinity/lib/kde3/kfile_png.so
-debian/tmp/opt/trinity/lib/kde3/kfile_pnm.la
-debian/tmp/opt/trinity/lib/kde3/kfile_pnm.so
-debian/tmp/opt/trinity/lib/kde3/kfile_ps.la
-debian/tmp/opt/trinity/lib/kde3/kfile_ps.so
-debian/tmp/opt/trinity/lib/kde3/kfile_raw.la
-debian/tmp/opt/trinity/lib/kde3/kfile_raw.so
-debian/tmp/opt/trinity/lib/kde3/kfile_rgb.la
-debian/tmp/opt/trinity/lib/kde3/kfile_rgb.so
-debian/tmp/opt/trinity/lib/kde3/kfile_tga.la
-debian/tmp/opt/trinity/lib/kde3/kfile_tga.so
-debian/tmp/opt/trinity/lib/kde3/kfile_tiff.la
-debian/tmp/opt/trinity/lib/kde3/kfile_tiff.so
-debian/tmp/opt/trinity/lib/kde3/kfile_xbm.la
-debian/tmp/opt/trinity/lib/kde3/kfile_xbm.so
-debian/tmp/opt/trinity/lib/kde3/kfile_xpm.la
-debian/tmp/opt/trinity/lib/kde3/kfile_xpm.so
+debian/tmp/opt/trinity/lib/trinity/gsthumbnail.la
+debian/tmp/opt/trinity/lib/trinity/gsthumbnail.so
+debian/tmp/opt/trinity/lib/trinity/kfile_bmp.la
+debian/tmp/opt/trinity/lib/trinity/kfile_bmp.so
+debian/tmp/opt/trinity/lib/trinity/kfile_dds.la
+debian/tmp/opt/trinity/lib/trinity/kfile_dds.so
+debian/tmp/opt/trinity/lib/trinity/kfile_dvi.la
+debian/tmp/opt/trinity/lib/trinity/kfile_dvi.so
+debian/tmp/opt/trinity/lib/trinity/kfile_exr.la
+debian/tmp/opt/trinity/lib/trinity/kfile_exr.so
+debian/tmp/opt/trinity/lib/trinity/kfile_gif.la
+debian/tmp/opt/trinity/lib/trinity/kfile_gif.so
+debian/tmp/opt/trinity/lib/trinity/kfile_ico.la
+debian/tmp/opt/trinity/lib/trinity/kfile_ico.so
+debian/tmp/opt/trinity/lib/trinity/kfile_jpeg.la
+debian/tmp/opt/trinity/lib/trinity/kfile_jpeg.so
+debian/tmp/opt/trinity/lib/trinity/kfile_pcx.la
+debian/tmp/opt/trinity/lib/trinity/kfile_pcx.so
+debian/tmp/opt/trinity/lib/trinity/kfile_pdf.la
+debian/tmp/opt/trinity/lib/trinity/kfile_pdf.so
+debian/tmp/opt/trinity/lib/trinity/kfile_png.la
+debian/tmp/opt/trinity/lib/trinity/kfile_png.so
+debian/tmp/opt/trinity/lib/trinity/kfile_pnm.la
+debian/tmp/opt/trinity/lib/trinity/kfile_pnm.so
+debian/tmp/opt/trinity/lib/trinity/kfile_ps.la
+debian/tmp/opt/trinity/lib/trinity/kfile_ps.so
+debian/tmp/opt/trinity/lib/trinity/kfile_raw.la
+debian/tmp/opt/trinity/lib/trinity/kfile_raw.so
+debian/tmp/opt/trinity/lib/trinity/kfile_rgb.la
+debian/tmp/opt/trinity/lib/trinity/kfile_rgb.so
+debian/tmp/opt/trinity/lib/trinity/kfile_tga.la
+debian/tmp/opt/trinity/lib/trinity/kfile_tga.so
+debian/tmp/opt/trinity/lib/trinity/kfile_tiff.la
+debian/tmp/opt/trinity/lib/trinity/kfile_tiff.so
+debian/tmp/opt/trinity/lib/trinity/kfile_xbm.la
+debian/tmp/opt/trinity/lib/trinity/kfile_xbm.so
+debian/tmp/opt/trinity/lib/trinity/kfile_xpm.la
+debian/tmp/opt/trinity/lib/trinity/kfile_xpm.so
debian/tmp/opt/trinity/share/services/gsthumbnail.desktop
debian/tmp/opt/trinity/share/services/kfile_bmp.desktop
debian/tmp/opt/trinity/share/services/kfile_dds.desktop
diff --git a/debian/lenny/kdegraphics.automake/debian/kdvi-trinity.install b/debian/lenny/kdegraphics.automake/debian/kdvi-trinity.install
index bb8b79129..288ee8fed 100644
--- a/debian/lenny/kdegraphics.automake/debian/kdvi-trinity.install
+++ b/debian/lenny/kdegraphics.automake/debian/kdvi-trinity.install
@@ -1,6 +1,6 @@
debian/tmp/opt/trinity/bin/kdvi
-debian/tmp/opt/trinity/lib/kde3/kdvipart.la
-debian/tmp/opt/trinity/lib/kde3/kdvipart.so
+debian/tmp/opt/trinity/lib/trinity/kdvipart.la
+debian/tmp/opt/trinity/lib/trinity/kdvipart.so
debian/tmp/opt/trinity/share/applications/kde/kdvi.desktop
debian/tmp/opt/trinity/share/apps/kdvi/kdvi_part.rc
debian/tmp/opt/trinity/share/apps/kdvi/kviewshell.rc
diff --git a/debian/lenny/kdegraphics.automake/debian/kfaxview-trinity.install b/debian/lenny/kdegraphics.automake/debian/kfaxview-trinity.install
index 1dab23cae..92000e53a 100644
--- a/debian/lenny/kdegraphics.automake/debian/kfaxview-trinity.install
+++ b/debian/lenny/kdegraphics.automake/debian/kfaxview-trinity.install
@@ -1,6 +1,6 @@
debian/tmp/opt/trinity/bin/kfaxview
-debian/tmp/opt/trinity/lib/kde3/kfaxviewpart.so
-debian/tmp/opt/trinity/lib/kde3/kfaxviewpart.la
+debian/tmp/opt/trinity/lib/trinity/kfaxviewpart.so
+debian/tmp/opt/trinity/lib/trinity/kfaxviewpart.la
debian/tmp/opt/trinity/lib/libkfaximage.so
debian/tmp/opt/trinity/lib/libkfaximage.la
debian/tmp/opt/trinity/share/applications/kde/kfaxview.desktop
diff --git a/debian/lenny/kdegraphics.automake/debian/kgamma-trinity.install b/debian/lenny/kdegraphics.automake/debian/kgamma-trinity.install
index 7a84c12f7..4da99e829 100644
--- a/debian/lenny/kdegraphics.automake/debian/kgamma-trinity.install
+++ b/debian/lenny/kdegraphics.automake/debian/kgamma-trinity.install
@@ -1,6 +1,6 @@
debian/tmp/opt/trinity/bin/xf86gammacfg
-debian/tmp/opt/trinity/lib/kde3/kcm_kgamma.la
-debian/tmp/opt/trinity/lib/kde3/kcm_kgamma.so
+debian/tmp/opt/trinity/lib/trinity/kcm_kgamma.la
+debian/tmp/opt/trinity/lib/trinity/kcm_kgamma.so
debian/tmp/opt/trinity/share/applications/kde/kgamma.desktop
debian/tmp/opt/trinity/share/apps/kgamma/pics/background.png
debian/tmp/opt/trinity/share/apps/kgamma/pics/cmyscale.png
diff --git a/debian/lenny/kdegraphics.automake/debian/kghostview-trinity.install b/debian/lenny/kdegraphics.automake/debian/kghostview-trinity.install
index 4fa99e814..8bb376a3c 100644
--- a/debian/lenny/kdegraphics.automake/debian/kghostview-trinity.install
+++ b/debian/lenny/kdegraphics.automake/debian/kghostview-trinity.install
@@ -1,6 +1,6 @@
debian/tmp/opt/trinity/bin/kghostview
-debian/tmp/opt/trinity/lib/kde3/libkghostviewpart.la
-debian/tmp/opt/trinity/lib/kde3/libkghostviewpart.so
+debian/tmp/opt/trinity/lib/trinity/libkghostviewpart.la
+debian/tmp/opt/trinity/lib/trinity/libkghostviewpart.so
debian/tmp/opt/trinity/lib/libkghostviewlib.so.0
debian/tmp/opt/trinity/lib/libkghostviewlib.so.0.0.0
debian/tmp/opt/trinity/share/applications/kde/kghostview.desktop
diff --git a/debian/lenny/kdegraphics.automake/debian/kmrml-trinity.install b/debian/lenny/kdegraphics.automake/debian/kmrml-trinity.install
index 55677d387..99491c4e7 100644
--- a/debian/lenny/kdegraphics.automake/debian/kmrml-trinity.install
+++ b/debian/lenny/kdegraphics.automake/debian/kmrml-trinity.install
@@ -1,14 +1,14 @@
debian/tmp/opt/trinity/bin/mrmlsearch
-debian/tmp/opt/trinity/lib/kde3/kcm_kmrml.la
-debian/tmp/opt/trinity/lib/kde3/kcm_kmrml.so
-debian/tmp/opt/trinity/lib/kde3/kded_daemonwatcher.la
-debian/tmp/opt/trinity/lib/kde3/kded_daemonwatcher.so
-debian/tmp/opt/trinity/lib/kde3/kio_mrml.la
-debian/tmp/opt/trinity/lib/kde3/kio_mrml.so
-debian/tmp/opt/trinity/lib/kde3/libkmrmlpart.la
-debian/tmp/opt/trinity/lib/kde3/libkmrmlpart.so
-debian/tmp/opt/trinity/lib/kde3/mrmlsearch.la
-debian/tmp/opt/trinity/lib/kde3/mrmlsearch.so
+debian/tmp/opt/trinity/lib/trinity/kcm_kmrml.la
+debian/tmp/opt/trinity/lib/trinity/kcm_kmrml.so
+debian/tmp/opt/trinity/lib/trinity/kded_daemonwatcher.la
+debian/tmp/opt/trinity/lib/trinity/kded_daemonwatcher.so
+debian/tmp/opt/trinity/lib/trinity/kio_mrml.la
+debian/tmp/opt/trinity/lib/trinity/kio_mrml.so
+debian/tmp/opt/trinity/lib/trinity/libkmrmlpart.la
+debian/tmp/opt/trinity/lib/trinity/libkmrmlpart.so
+debian/tmp/opt/trinity/lib/trinity/mrmlsearch.la
+debian/tmp/opt/trinity/lib/trinity/mrmlsearch.so
debian/tmp/opt/trinity/lib/libkdeinit_mrmlsearch.so
debian/tmp/opt/trinity/share/applications/kde/kcmkmrml.desktop
debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/mrml-servicemenu.desktop
diff --git a/debian/lenny/kdegraphics.automake/debian/kpdf-trinity.install b/debian/lenny/kdegraphics.automake/debian/kpdf-trinity.install
index 0b6e562c7..29584fa07 100644
--- a/debian/lenny/kdegraphics.automake/debian/kpdf-trinity.install
+++ b/debian/lenny/kdegraphics.automake/debian/kpdf-trinity.install
@@ -1,6 +1,6 @@
debian/tmp/opt/trinity/bin/kpdf
-debian/tmp/opt/trinity/lib/kde3/libkpdfpart.la
-debian/tmp/opt/trinity/lib/kde3/libkpdfpart.so
+debian/tmp/opt/trinity/lib/trinity/libkpdfpart.la
+debian/tmp/opt/trinity/lib/trinity/libkpdfpart.so
debian/tmp/opt/trinity/share/applications/kde/kpdf.desktop
debian/tmp/opt/trinity/share/apps/kpdf/shell.rc
debian/tmp/opt/trinity/share/apps/kpdfpart/part.rc
diff --git a/debian/lenny/kdegraphics.automake/debian/kpovmodeler-trinity.install b/debian/lenny/kdegraphics.automake/debian/kpovmodeler-trinity.install
index a3d46f92e..84b6083ef 100644
--- a/debian/lenny/kdegraphics.automake/debian/kpovmodeler-trinity.install
+++ b/debian/lenny/kdegraphics.automake/debian/kpovmodeler-trinity.install
@@ -1,6 +1,6 @@
debian/tmp/opt/trinity/bin/kpovmodeler
-debian/tmp/opt/trinity/lib/kde3/libkpovmodelerpart.la
-debian/tmp/opt/trinity/lib/kde3/libkpovmodelerpart.so
+debian/tmp/opt/trinity/lib/trinity/libkpovmodelerpart.la
+debian/tmp/opt/trinity/lib/trinity/libkpovmodelerpart.so
debian/tmp/opt/trinity/lib/libkpovmodeler.so.0
debian/tmp/opt/trinity/lib/libkpovmodeler.so.0.0.0
debian/tmp/opt/trinity/share/applications/kde/kpovmodeler.desktop
diff --git a/debian/lenny/kdegraphics.automake/debian/ksvg-trinity.install b/debian/lenny/kdegraphics.automake/debian/ksvg-trinity.install
index 7601fbad2..e7264cbb8 100644
--- a/debian/lenny/kdegraphics.automake/debian/ksvg-trinity.install
+++ b/debian/lenny/kdegraphics.automake/debian/ksvg-trinity.install
@@ -1,11 +1,11 @@
debian/tmp/opt/trinity/bin/printnodetest
debian/tmp/opt/trinity/bin/svgdisplay
-debian/tmp/opt/trinity/lib/kde3/libksvgplugin.la
-debian/tmp/opt/trinity/lib/kde3/libksvgplugin.so
-debian/tmp/opt/trinity/lib/kde3/libksvgrendererlibart.la
-debian/tmp/opt/trinity/lib/kde3/libksvgrendererlibart.so
-debian/tmp/opt/trinity/lib/kde3/svgthumbnail.la
-debian/tmp/opt/trinity/lib/kde3/svgthumbnail.so
+debian/tmp/opt/trinity/lib/trinity/libksvgplugin.la
+debian/tmp/opt/trinity/lib/trinity/libksvgplugin.so
+debian/tmp/opt/trinity/lib/trinity/libksvgrendererlibart.la
+debian/tmp/opt/trinity/lib/trinity/libksvgrendererlibart.so
+debian/tmp/opt/trinity/lib/trinity/svgthumbnail.la
+debian/tmp/opt/trinity/lib/trinity/svgthumbnail.so
debian/tmp/opt/trinity/lib/libksvg.so.0
debian/tmp/opt/trinity/lib/libksvg.so.0.0.1
debian/tmp/opt/trinity/lib/libtext2path.so.0
diff --git a/debian/lenny/kdegraphics.automake/debian/kuickshow-trinity.install b/debian/lenny/kdegraphics.automake/debian/kuickshow-trinity.install
index 11c176bf6..07929cfa2 100644
--- a/debian/lenny/kdegraphics.automake/debian/kuickshow-trinity.install
+++ b/debian/lenny/kdegraphics.automake/debian/kuickshow-trinity.install
@@ -1,6 +1,6 @@
debian/tmp/opt/trinity/bin/kuickshow
-debian/tmp/opt/trinity/lib/kde3/kuickshow.la
-debian/tmp/opt/trinity/lib/kde3/kuickshow.so
+debian/tmp/opt/trinity/lib/trinity/kuickshow.la
+debian/tmp/opt/trinity/lib/trinity/kuickshow.so
debian/tmp/opt/trinity/lib/libkdeinit_kuickshow.so
debian/tmp/opt/trinity/share/applications/kde/kuickshow.desktop
debian/tmp/opt/trinity/share/apps/kuickshow/im_palette.pal
diff --git a/debian/lenny/kdegraphics.automake/debian/kview-trinity.install b/debian/lenny/kdegraphics.automake/debian/kview-trinity.install
index 3203fc726..0efbbd7b5 100644
--- a/debian/lenny/kdegraphics.automake/debian/kview-trinity.install
+++ b/debian/lenny/kdegraphics.automake/debian/kview-trinity.install
@@ -1,31 +1,31 @@
debian/tmp/opt/trinity/bin/kview
-debian/tmp/opt/trinity/lib/kde3/kcm_kviewcanvasconfig.la
-debian/tmp/opt/trinity/lib/kde3/kcm_kviewcanvasconfig.so
-debian/tmp/opt/trinity/lib/kde3/kcm_kviewgeneralconfig.la
-debian/tmp/opt/trinity/lib/kde3/kcm_kviewgeneralconfig.so
-debian/tmp/opt/trinity/lib/kde3/kcm_kviewpluginsconfig.la
-debian/tmp/opt/trinity/lib/kde3/kcm_kviewpluginsconfig.so
-debian/tmp/opt/trinity/lib/kde3/kcm_kviewviewerpluginsconfig.la
-debian/tmp/opt/trinity/lib/kde3/kcm_kviewviewerpluginsconfig.so
-debian/tmp/opt/trinity/lib/kde3/kview.la
-debian/tmp/opt/trinity/lib/kde3/kview.so
-debian/tmp/opt/trinity/lib/kde3/kview_browserplugin.la
-debian/tmp/opt/trinity/lib/kde3/kview_browserplugin.so
-debian/tmp/opt/trinity/lib/kde3/kview_effectsplugin.la
-debian/tmp/opt/trinity/lib/kde3/kview_effectsplugin.so
-debian/tmp/opt/trinity/lib/kde3/kview_presenterplugin.la
-debian/tmp/opt/trinity/lib/kde3/kview_presenterplugin.so
-debian/tmp/opt/trinity/lib/kde3/kview_scannerplugin.la
-debian/tmp/opt/trinity/lib/kde3/kview_scannerplugin.so
-debian/tmp/opt/trinity/lib/kde3/libkviewcanvas.la
-debian/tmp/opt/trinity/lib/kde3/libkviewcanvas.so
-debian/tmp/opt/trinity/lib/kde3/libkviewviewer.la
-debian/tmp/opt/trinity/lib/kde3/libkviewviewer.so
+debian/tmp/opt/trinity/lib/trinity/kcm_kviewcanvasconfig.la
+debian/tmp/opt/trinity/lib/trinity/kcm_kviewcanvasconfig.so
+debian/tmp/opt/trinity/lib/trinity/kcm_kviewgeneralconfig.la
+debian/tmp/opt/trinity/lib/trinity/kcm_kviewgeneralconfig.so
+debian/tmp/opt/trinity/lib/trinity/kcm_kviewpluginsconfig.la
+debian/tmp/opt/trinity/lib/trinity/kcm_kviewpluginsconfig.so
+debian/tmp/opt/trinity/lib/trinity/kcm_kviewviewerpluginsconfig.la
+debian/tmp/opt/trinity/lib/trinity/kcm_kviewviewerpluginsconfig.so
+debian/tmp/opt/trinity/lib/trinity/kview.la
+debian/tmp/opt/trinity/lib/trinity/kview.so
+debian/tmp/opt/trinity/lib/trinity/kview_browserplugin.la
+debian/tmp/opt/trinity/lib/trinity/kview_browserplugin.so
+debian/tmp/opt/trinity/lib/trinity/kview_effectsplugin.la
+debian/tmp/opt/trinity/lib/trinity/kview_effectsplugin.so
+debian/tmp/opt/trinity/lib/trinity/kview_presenterplugin.la
+debian/tmp/opt/trinity/lib/trinity/kview_presenterplugin.so
+debian/tmp/opt/trinity/lib/trinity/kview_scannerplugin.la
+debian/tmp/opt/trinity/lib/trinity/kview_scannerplugin.so
+debian/tmp/opt/trinity/lib/trinity/libkviewcanvas.la
+debian/tmp/opt/trinity/lib/trinity/libkviewcanvas.so
+debian/tmp/opt/trinity/lib/trinity/libkviewviewer.la
+debian/tmp/opt/trinity/lib/trinity/libkviewviewer.so
debian/tmp/opt/trinity/lib/libkdeinit_kview.so
debian/tmp/opt/trinity/lib/libkimageviewer.so.0
debian/tmp/opt/trinity/lib/libkimageviewer.so.0.0.0
-debian/tmp/opt/trinity/lib/kde3/libphotobook.la
-debian/tmp/opt/trinity/lib/kde3/libphotobook.so
+debian/tmp/opt/trinity/lib/trinity/libphotobook.la
+debian/tmp/opt/trinity/lib/trinity/libphotobook.so
debian/tmp/opt/trinity/share/applications/kde/kview.desktop
debian/tmp/opt/trinity/share/apps/kview/kpartplugins/kvieweffects.desktop
debian/tmp/opt/trinity/share/apps/kview/kpartplugins/kvieweffects.rc
diff --git a/debian/lenny/kdegraphics.automake/debian/kviewshell-trinity.install b/debian/lenny/kdegraphics.automake/debian/kviewshell-trinity.install
index a43c470e3..2d4ea669a 100644
--- a/debian/lenny/kdegraphics.automake/debian/kviewshell-trinity.install
+++ b/debian/lenny/kdegraphics.automake/debian/kviewshell-trinity.install
@@ -1,12 +1,12 @@
debian/tmp/opt/trinity/bin/kviewshell
debian/tmp/opt/trinity/lib/libdjvu.la
debian/tmp/opt/trinity/lib/libdjvu.so
-debian/tmp/opt/trinity/lib/kde3/djvuviewpart.so
-debian/tmp/opt/trinity/lib/kde3/djvuviewpart.la
-debian/tmp/opt/trinity/lib/kde3/emptymultipagepart.la
-debian/tmp/opt/trinity/lib/kde3/emptymultipagepart.so
-debian/tmp/opt/trinity/lib/kde3/kviewerpart.la
-debian/tmp/opt/trinity/lib/kde3/kviewerpart.so
+debian/tmp/opt/trinity/lib/trinity/djvuviewpart.so
+debian/tmp/opt/trinity/lib/trinity/djvuviewpart.la
+debian/tmp/opt/trinity/lib/trinity/emptymultipagepart.la
+debian/tmp/opt/trinity/lib/trinity/emptymultipagepart.so
+debian/tmp/opt/trinity/lib/trinity/kviewerpart.la
+debian/tmp/opt/trinity/lib/trinity/kviewerpart.so
debian/tmp/opt/trinity/lib/libkmultipage.so.0
debian/tmp/opt/trinity/lib/libkmultipage.so.0.0.0
debian/tmp/opt/trinity/share/apps/djvumultipage.rc
diff --git a/debian/lenny/kdegraphics/debian/kamera-trinity.install b/debian/lenny/kdegraphics/debian/kamera-trinity.install
index c615ebfaa..16f11dbf2 100644
--- a/debian/lenny/kdegraphics/debian/kamera-trinity.install
+++ b/debian/lenny/kdegraphics/debian/kamera-trinity.install
@@ -1,8 +1,8 @@
-debian/tmp/opt/trinity/lib/kde3/kcm_kamera.la
-debian/tmp/opt/trinity/lib/kde3/kcm_kamera.so
-debian/tmp/opt/trinity/lib/kde3/kio_kamera.la
-debian/tmp/opt/trinity/lib/kde3/kio_kamera.so
+debian/tmp/opt/trinity/lib/trinity/kcm_kamera.la
+debian/tmp/opt/trinity/lib/trinity/kcm_kamera.so
+debian/tmp/opt/trinity/lib/trinity/kio_kamera.la
+debian/tmp/opt/trinity/lib/trinity/kio_kamera.so
debian/tmp/opt/trinity/share/applications/kde/kamera.desktop
debian/tmp/opt/trinity/share/doc/kde/HTML/en/kamera/common
debian/tmp/opt/trinity/share/doc/kde/HTML/en/kamera/index.cache.bz2
diff --git a/debian/lenny/kdegraphics/debian/kdegraphics-kfile-plugins-trinity.install b/debian/lenny/kdegraphics/debian/kdegraphics-kfile-plugins-trinity.install
index 44140e75f..d7a77267e 100644
--- a/debian/lenny/kdegraphics/debian/kdegraphics-kfile-plugins-trinity.install
+++ b/debian/lenny/kdegraphics/debian/kdegraphics-kfile-plugins-trinity.install
@@ -1,41 +1,41 @@
-debian/tmp/opt/trinity/lib/kde3/gsthumbnail.la
-debian/tmp/opt/trinity/lib/kde3/gsthumbnail.so
-debian/tmp/opt/trinity/lib/kde3/kfile_bmp.la
-debian/tmp/opt/trinity/lib/kde3/kfile_bmp.so
-debian/tmp/opt/trinity/lib/kde3/kfile_dds.la
-debian/tmp/opt/trinity/lib/kde3/kfile_dds.so
-debian/tmp/opt/trinity/lib/kde3/kfile_dvi.la
-debian/tmp/opt/trinity/lib/kde3/kfile_dvi.so
-debian/tmp/opt/trinity/lib/kde3/kfile_exr.la
-debian/tmp/opt/trinity/lib/kde3/kfile_exr.so
-debian/tmp/opt/trinity/lib/kde3/kfile_gif.la
-debian/tmp/opt/trinity/lib/kde3/kfile_gif.so
-debian/tmp/opt/trinity/lib/kde3/kfile_ico.la
-debian/tmp/opt/trinity/lib/kde3/kfile_ico.so
-debian/tmp/opt/trinity/lib/kde3/kfile_jpeg.la
-debian/tmp/opt/trinity/lib/kde3/kfile_jpeg.so
-debian/tmp/opt/trinity/lib/kde3/kfile_pcx.la
-debian/tmp/opt/trinity/lib/kde3/kfile_pcx.so
-debian/tmp/opt/trinity/lib/kde3/kfile_pdf.la
-debian/tmp/opt/trinity/lib/kde3/kfile_pdf.so
-debian/tmp/opt/trinity/lib/kde3/kfile_png.la
-debian/tmp/opt/trinity/lib/kde3/kfile_png.so
-debian/tmp/opt/trinity/lib/kde3/kfile_pnm.la
-debian/tmp/opt/trinity/lib/kde3/kfile_pnm.so
-debian/tmp/opt/trinity/lib/kde3/kfile_ps.la
-debian/tmp/opt/trinity/lib/kde3/kfile_ps.so
-debian/tmp/opt/trinity/lib/kde3/kfile_raw.la
-debian/tmp/opt/trinity/lib/kde3/kfile_raw.so
-debian/tmp/opt/trinity/lib/kde3/kfile_rgb.la
-debian/tmp/opt/trinity/lib/kde3/kfile_rgb.so
-debian/tmp/opt/trinity/lib/kde3/kfile_tga.la
-debian/tmp/opt/trinity/lib/kde3/kfile_tga.so
-debian/tmp/opt/trinity/lib/kde3/kfile_tiff.la
-debian/tmp/opt/trinity/lib/kde3/kfile_tiff.so
-debian/tmp/opt/trinity/lib/kde3/kfile_xbm.la
-debian/tmp/opt/trinity/lib/kde3/kfile_xbm.so
-debian/tmp/opt/trinity/lib/kde3/kfile_xpm.la
-debian/tmp/opt/trinity/lib/kde3/kfile_xpm.so
+debian/tmp/opt/trinity/lib/trinity/gsthumbnail.la
+debian/tmp/opt/trinity/lib/trinity/gsthumbnail.so
+debian/tmp/opt/trinity/lib/trinity/kfile_bmp.la
+debian/tmp/opt/trinity/lib/trinity/kfile_bmp.so
+debian/tmp/opt/trinity/lib/trinity/kfile_dds.la
+debian/tmp/opt/trinity/lib/trinity/kfile_dds.so
+debian/tmp/opt/trinity/lib/trinity/kfile_dvi.la
+debian/tmp/opt/trinity/lib/trinity/kfile_dvi.so
+debian/tmp/opt/trinity/lib/trinity/kfile_exr.la
+debian/tmp/opt/trinity/lib/trinity/kfile_exr.so
+debian/tmp/opt/trinity/lib/trinity/kfile_gif.la
+debian/tmp/opt/trinity/lib/trinity/kfile_gif.so
+debian/tmp/opt/trinity/lib/trinity/kfile_ico.la
+debian/tmp/opt/trinity/lib/trinity/kfile_ico.so
+debian/tmp/opt/trinity/lib/trinity/kfile_jpeg.la
+debian/tmp/opt/trinity/lib/trinity/kfile_jpeg.so
+debian/tmp/opt/trinity/lib/trinity/kfile_pcx.la
+debian/tmp/opt/trinity/lib/trinity/kfile_pcx.so
+debian/tmp/opt/trinity/lib/trinity/kfile_pdf.la
+debian/tmp/opt/trinity/lib/trinity/kfile_pdf.so
+debian/tmp/opt/trinity/lib/trinity/kfile_png.la
+debian/tmp/opt/trinity/lib/trinity/kfile_png.so
+debian/tmp/opt/trinity/lib/trinity/kfile_pnm.la
+debian/tmp/opt/trinity/lib/trinity/kfile_pnm.so
+debian/tmp/opt/trinity/lib/trinity/kfile_ps.la
+debian/tmp/opt/trinity/lib/trinity/kfile_ps.so
+debian/tmp/opt/trinity/lib/trinity/kfile_raw.la
+debian/tmp/opt/trinity/lib/trinity/kfile_raw.so
+debian/tmp/opt/trinity/lib/trinity/kfile_rgb.la
+debian/tmp/opt/trinity/lib/trinity/kfile_rgb.so
+debian/tmp/opt/trinity/lib/trinity/kfile_tga.la
+debian/tmp/opt/trinity/lib/trinity/kfile_tga.so
+debian/tmp/opt/trinity/lib/trinity/kfile_tiff.la
+debian/tmp/opt/trinity/lib/trinity/kfile_tiff.so
+debian/tmp/opt/trinity/lib/trinity/kfile_xbm.la
+debian/tmp/opt/trinity/lib/trinity/kfile_xbm.so
+debian/tmp/opt/trinity/lib/trinity/kfile_xpm.la
+debian/tmp/opt/trinity/lib/trinity/kfile_xpm.so
debian/tmp/opt/trinity/share/services/gsthumbnail.desktop
debian/tmp/opt/trinity/share/services/kfile_bmp.desktop
debian/tmp/opt/trinity/share/services/kfile_dds.desktop
diff --git a/debian/lenny/kdegraphics/debian/kdvi-trinity.install b/debian/lenny/kdegraphics/debian/kdvi-trinity.install
index bb8b79129..288ee8fed 100644
--- a/debian/lenny/kdegraphics/debian/kdvi-trinity.install
+++ b/debian/lenny/kdegraphics/debian/kdvi-trinity.install
@@ -1,6 +1,6 @@
debian/tmp/opt/trinity/bin/kdvi
-debian/tmp/opt/trinity/lib/kde3/kdvipart.la
-debian/tmp/opt/trinity/lib/kde3/kdvipart.so
+debian/tmp/opt/trinity/lib/trinity/kdvipart.la
+debian/tmp/opt/trinity/lib/trinity/kdvipart.so
debian/tmp/opt/trinity/share/applications/kde/kdvi.desktop
debian/tmp/opt/trinity/share/apps/kdvi/kdvi_part.rc
debian/tmp/opt/trinity/share/apps/kdvi/kviewshell.rc
diff --git a/debian/lenny/kdegraphics/debian/kfaxview-trinity.install b/debian/lenny/kdegraphics/debian/kfaxview-trinity.install
index 1dab23cae..92000e53a 100644
--- a/debian/lenny/kdegraphics/debian/kfaxview-trinity.install
+++ b/debian/lenny/kdegraphics/debian/kfaxview-trinity.install
@@ -1,6 +1,6 @@
debian/tmp/opt/trinity/bin/kfaxview
-debian/tmp/opt/trinity/lib/kde3/kfaxviewpart.so
-debian/tmp/opt/trinity/lib/kde3/kfaxviewpart.la
+debian/tmp/opt/trinity/lib/trinity/kfaxviewpart.so
+debian/tmp/opt/trinity/lib/trinity/kfaxviewpart.la
debian/tmp/opt/trinity/lib/libkfaximage.so
debian/tmp/opt/trinity/lib/libkfaximage.la
debian/tmp/opt/trinity/share/applications/kde/kfaxview.desktop
diff --git a/debian/lenny/kdegraphics/debian/kgamma-trinity.install b/debian/lenny/kdegraphics/debian/kgamma-trinity.install
index 7a84c12f7..4da99e829 100644
--- a/debian/lenny/kdegraphics/debian/kgamma-trinity.install
+++ b/debian/lenny/kdegraphics/debian/kgamma-trinity.install
@@ -1,6 +1,6 @@
debian/tmp/opt/trinity/bin/xf86gammacfg
-debian/tmp/opt/trinity/lib/kde3/kcm_kgamma.la
-debian/tmp/opt/trinity/lib/kde3/kcm_kgamma.so
+debian/tmp/opt/trinity/lib/trinity/kcm_kgamma.la
+debian/tmp/opt/trinity/lib/trinity/kcm_kgamma.so
debian/tmp/opt/trinity/share/applications/kde/kgamma.desktop
debian/tmp/opt/trinity/share/apps/kgamma/pics/background.png
debian/tmp/opt/trinity/share/apps/kgamma/pics/cmyscale.png
diff --git a/debian/lenny/kdegraphics/debian/kghostview-trinity.install b/debian/lenny/kdegraphics/debian/kghostview-trinity.install
index 4fa99e814..8bb376a3c 100644
--- a/debian/lenny/kdegraphics/debian/kghostview-trinity.install
+++ b/debian/lenny/kdegraphics/debian/kghostview-trinity.install
@@ -1,6 +1,6 @@
debian/tmp/opt/trinity/bin/kghostview
-debian/tmp/opt/trinity/lib/kde3/libkghostviewpart.la
-debian/tmp/opt/trinity/lib/kde3/libkghostviewpart.so
+debian/tmp/opt/trinity/lib/trinity/libkghostviewpart.la
+debian/tmp/opt/trinity/lib/trinity/libkghostviewpart.so
debian/tmp/opt/trinity/lib/libkghostviewlib.so.0
debian/tmp/opt/trinity/lib/libkghostviewlib.so.0.0.0
debian/tmp/opt/trinity/share/applications/kde/kghostview.desktop
diff --git a/debian/lenny/kdegraphics/debian/kmrml-trinity.install b/debian/lenny/kdegraphics/debian/kmrml-trinity.install
index 55677d387..99491c4e7 100644
--- a/debian/lenny/kdegraphics/debian/kmrml-trinity.install
+++ b/debian/lenny/kdegraphics/debian/kmrml-trinity.install
@@ -1,14 +1,14 @@
debian/tmp/opt/trinity/bin/mrmlsearch
-debian/tmp/opt/trinity/lib/kde3/kcm_kmrml.la
-debian/tmp/opt/trinity/lib/kde3/kcm_kmrml.so
-debian/tmp/opt/trinity/lib/kde3/kded_daemonwatcher.la
-debian/tmp/opt/trinity/lib/kde3/kded_daemonwatcher.so
-debian/tmp/opt/trinity/lib/kde3/kio_mrml.la
-debian/tmp/opt/trinity/lib/kde3/kio_mrml.so
-debian/tmp/opt/trinity/lib/kde3/libkmrmlpart.la
-debian/tmp/opt/trinity/lib/kde3/libkmrmlpart.so
-debian/tmp/opt/trinity/lib/kde3/mrmlsearch.la
-debian/tmp/opt/trinity/lib/kde3/mrmlsearch.so
+debian/tmp/opt/trinity/lib/trinity/kcm_kmrml.la
+debian/tmp/opt/trinity/lib/trinity/kcm_kmrml.so
+debian/tmp/opt/trinity/lib/trinity/kded_daemonwatcher.la
+debian/tmp/opt/trinity/lib/trinity/kded_daemonwatcher.so
+debian/tmp/opt/trinity/lib/trinity/kio_mrml.la
+debian/tmp/opt/trinity/lib/trinity/kio_mrml.so
+debian/tmp/opt/trinity/lib/trinity/libkmrmlpart.la
+debian/tmp/opt/trinity/lib/trinity/libkmrmlpart.so
+debian/tmp/opt/trinity/lib/trinity/mrmlsearch.la
+debian/tmp/opt/trinity/lib/trinity/mrmlsearch.so
debian/tmp/opt/trinity/lib/libkdeinit_mrmlsearch.so
debian/tmp/opt/trinity/share/applications/kde/kcmkmrml.desktop
debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/mrml-servicemenu.desktop
diff --git a/debian/lenny/kdegraphics/debian/kpdf-trinity.install b/debian/lenny/kdegraphics/debian/kpdf-trinity.install
index 0b6e562c7..29584fa07 100644
--- a/debian/lenny/kdegraphics/debian/kpdf-trinity.install
+++ b/debian/lenny/kdegraphics/debian/kpdf-trinity.install
@@ -1,6 +1,6 @@
debian/tmp/opt/trinity/bin/kpdf
-debian/tmp/opt/trinity/lib/kde3/libkpdfpart.la
-debian/tmp/opt/trinity/lib/kde3/libkpdfpart.so
+debian/tmp/opt/trinity/lib/trinity/libkpdfpart.la
+debian/tmp/opt/trinity/lib/trinity/libkpdfpart.so
debian/tmp/opt/trinity/share/applications/kde/kpdf.desktop
debian/tmp/opt/trinity/share/apps/kpdf/shell.rc
debian/tmp/opt/trinity/share/apps/kpdfpart/part.rc
diff --git a/debian/lenny/kdegraphics/debian/kpovmodeler-trinity.install b/debian/lenny/kdegraphics/debian/kpovmodeler-trinity.install
index a3d46f92e..84b6083ef 100644
--- a/debian/lenny/kdegraphics/debian/kpovmodeler-trinity.install
+++ b/debian/lenny/kdegraphics/debian/kpovmodeler-trinity.install
@@ -1,6 +1,6 @@
debian/tmp/opt/trinity/bin/kpovmodeler
-debian/tmp/opt/trinity/lib/kde3/libkpovmodelerpart.la
-debian/tmp/opt/trinity/lib/kde3/libkpovmodelerpart.so
+debian/tmp/opt/trinity/lib/trinity/libkpovmodelerpart.la
+debian/tmp/opt/trinity/lib/trinity/libkpovmodelerpart.so
debian/tmp/opt/trinity/lib/libkpovmodeler.so.0
debian/tmp/opt/trinity/lib/libkpovmodeler.so.0.0.0
debian/tmp/opt/trinity/share/applications/kde/kpovmodeler.desktop
diff --git a/debian/lenny/kdegraphics/debian/ksvg-trinity.install b/debian/lenny/kdegraphics/debian/ksvg-trinity.install
index 7601fbad2..e7264cbb8 100644
--- a/debian/lenny/kdegraphics/debian/ksvg-trinity.install
+++ b/debian/lenny/kdegraphics/debian/ksvg-trinity.install
@@ -1,11 +1,11 @@
debian/tmp/opt/trinity/bin/printnodetest
debian/tmp/opt/trinity/bin/svgdisplay
-debian/tmp/opt/trinity/lib/kde3/libksvgplugin.la
-debian/tmp/opt/trinity/lib/kde3/libksvgplugin.so
-debian/tmp/opt/trinity/lib/kde3/libksvgrendererlibart.la
-debian/tmp/opt/trinity/lib/kde3/libksvgrendererlibart.so
-debian/tmp/opt/trinity/lib/kde3/svgthumbnail.la
-debian/tmp/opt/trinity/lib/kde3/svgthumbnail.so
+debian/tmp/opt/trinity/lib/trinity/libksvgplugin.la
+debian/tmp/opt/trinity/lib/trinity/libksvgplugin.so
+debian/tmp/opt/trinity/lib/trinity/libksvgrendererlibart.la
+debian/tmp/opt/trinity/lib/trinity/libksvgrendererlibart.so
+debian/tmp/opt/trinity/lib/trinity/svgthumbnail.la
+debian/tmp/opt/trinity/lib/trinity/svgthumbnail.so
debian/tmp/opt/trinity/lib/libksvg.so.0
debian/tmp/opt/trinity/lib/libksvg.so.0.0.1
debian/tmp/opt/trinity/lib/libtext2path.so.0
diff --git a/debian/lenny/kdegraphics/debian/kuickshow-trinity.install b/debian/lenny/kdegraphics/debian/kuickshow-trinity.install
index 11c176bf6..07929cfa2 100644
--- a/debian/lenny/kdegraphics/debian/kuickshow-trinity.install
+++ b/debian/lenny/kdegraphics/debian/kuickshow-trinity.install
@@ -1,6 +1,6 @@
debian/tmp/opt/trinity/bin/kuickshow
-debian/tmp/opt/trinity/lib/kde3/kuickshow.la
-debian/tmp/opt/trinity/lib/kde3/kuickshow.so
+debian/tmp/opt/trinity/lib/trinity/kuickshow.la
+debian/tmp/opt/trinity/lib/trinity/kuickshow.so
debian/tmp/opt/trinity/lib/libkdeinit_kuickshow.so
debian/tmp/opt/trinity/share/applications/kde/kuickshow.desktop
debian/tmp/opt/trinity/share/apps/kuickshow/im_palette.pal
diff --git a/debian/lenny/kdegraphics/debian/kview-trinity.install b/debian/lenny/kdegraphics/debian/kview-trinity.install
index 3203fc726..0efbbd7b5 100644
--- a/debian/lenny/kdegraphics/debian/kview-trinity.install
+++ b/debian/lenny/kdegraphics/debian/kview-trinity.install
@@ -1,31 +1,31 @@
debian/tmp/opt/trinity/bin/kview
-debian/tmp/opt/trinity/lib/kde3/kcm_kviewcanvasconfig.la
-debian/tmp/opt/trinity/lib/kde3/kcm_kviewcanvasconfig.so
-debian/tmp/opt/trinity/lib/kde3/kcm_kviewgeneralconfig.la
-debian/tmp/opt/trinity/lib/kde3/kcm_kviewgeneralconfig.so
-debian/tmp/opt/trinity/lib/kde3/kcm_kviewpluginsconfig.la
-debian/tmp/opt/trinity/lib/kde3/kcm_kviewpluginsconfig.so
-debian/tmp/opt/trinity/lib/kde3/kcm_kviewviewerpluginsconfig.la
-debian/tmp/opt/trinity/lib/kde3/kcm_kviewviewerpluginsconfig.so
-debian/tmp/opt/trinity/lib/kde3/kview.la
-debian/tmp/opt/trinity/lib/kde3/kview.so
-debian/tmp/opt/trinity/lib/kde3/kview_browserplugin.la
-debian/tmp/opt/trinity/lib/kde3/kview_browserplugin.so
-debian/tmp/opt/trinity/lib/kde3/kview_effectsplugin.la
-debian/tmp/opt/trinity/lib/kde3/kview_effectsplugin.so
-debian/tmp/opt/trinity/lib/kde3/kview_presenterplugin.la
-debian/tmp/opt/trinity/lib/kde3/kview_presenterplugin.so
-debian/tmp/opt/trinity/lib/kde3/kview_scannerplugin.la
-debian/tmp/opt/trinity/lib/kde3/kview_scannerplugin.so
-debian/tmp/opt/trinity/lib/kde3/libkviewcanvas.la
-debian/tmp/opt/trinity/lib/kde3/libkviewcanvas.so
-debian/tmp/opt/trinity/lib/kde3/libkviewviewer.la
-debian/tmp/opt/trinity/lib/kde3/libkviewviewer.so
+debian/tmp/opt/trinity/lib/trinity/kcm_kviewcanvasconfig.la
+debian/tmp/opt/trinity/lib/trinity/kcm_kviewcanvasconfig.so
+debian/tmp/opt/trinity/lib/trinity/kcm_kviewgeneralconfig.la
+debian/tmp/opt/trinity/lib/trinity/kcm_kviewgeneralconfig.so
+debian/tmp/opt/trinity/lib/trinity/kcm_kviewpluginsconfig.la
+debian/tmp/opt/trinity/lib/trinity/kcm_kviewpluginsconfig.so
+debian/tmp/opt/trinity/lib/trinity/kcm_kviewviewerpluginsconfig.la
+debian/tmp/opt/trinity/lib/trinity/kcm_kviewviewerpluginsconfig.so
+debian/tmp/opt/trinity/lib/trinity/kview.la
+debian/tmp/opt/trinity/lib/trinity/kview.so
+debian/tmp/opt/trinity/lib/trinity/kview_browserplugin.la
+debian/tmp/opt/trinity/lib/trinity/kview_browserplugin.so
+debian/tmp/opt/trinity/lib/trinity/kview_effectsplugin.la
+debian/tmp/opt/trinity/lib/trinity/kview_effectsplugin.so
+debian/tmp/opt/trinity/lib/trinity/kview_presenterplugin.la
+debian/tmp/opt/trinity/lib/trinity/kview_presenterplugin.so
+debian/tmp/opt/trinity/lib/trinity/kview_scannerplugin.la
+debian/tmp/opt/trinity/lib/trinity/kview_scannerplugin.so
+debian/tmp/opt/trinity/lib/trinity/libkviewcanvas.la
+debian/tmp/opt/trinity/lib/trinity/libkviewcanvas.so
+debian/tmp/opt/trinity/lib/trinity/libkviewviewer.la
+debian/tmp/opt/trinity/lib/trinity/libkviewviewer.so
debian/tmp/opt/trinity/lib/libkdeinit_kview.so
debian/tmp/opt/trinity/lib/libkimageviewer.so.0
debian/tmp/opt/trinity/lib/libkimageviewer.so.0.0.0
-debian/tmp/opt/trinity/lib/kde3/libphotobook.la
-debian/tmp/opt/trinity/lib/kde3/libphotobook.so
+debian/tmp/opt/trinity/lib/trinity/libphotobook.la
+debian/tmp/opt/trinity/lib/trinity/libphotobook.so
debian/tmp/opt/trinity/share/applications/kde/kview.desktop
debian/tmp/opt/trinity/share/apps/kview/kpartplugins/kvieweffects.desktop
debian/tmp/opt/trinity/share/apps/kview/kpartplugins/kvieweffects.rc
diff --git a/debian/lenny/kdegraphics/debian/kviewshell-trinity.install b/debian/lenny/kdegraphics/debian/kviewshell-trinity.install
index a43c470e3..2d4ea669a 100644
--- a/debian/lenny/kdegraphics/debian/kviewshell-trinity.install
+++ b/debian/lenny/kdegraphics/debian/kviewshell-trinity.install
@@ -1,12 +1,12 @@
debian/tmp/opt/trinity/bin/kviewshell
debian/tmp/opt/trinity/lib/libdjvu.la
debian/tmp/opt/trinity/lib/libdjvu.so
-debian/tmp/opt/trinity/lib/kde3/djvuviewpart.so
-debian/tmp/opt/trinity/lib/kde3/djvuviewpart.la
-debian/tmp/opt/trinity/lib/kde3/emptymultipagepart.la
-debian/tmp/opt/trinity/lib/kde3/emptymultipagepart.so
-debian/tmp/opt/trinity/lib/kde3/kviewerpart.la
-debian/tmp/opt/trinity/lib/kde3/kviewerpart.so
+debian/tmp/opt/trinity/lib/trinity/djvuviewpart.so
+debian/tmp/opt/trinity/lib/trinity/djvuviewpart.la
+debian/tmp/opt/trinity/lib/trinity/emptymultipagepart.la
+debian/tmp/opt/trinity/lib/trinity/emptymultipagepart.so
+debian/tmp/opt/trinity/lib/trinity/kviewerpart.la
+debian/tmp/opt/trinity/lib/trinity/kviewerpart.so
debian/tmp/opt/trinity/lib/libkmultipage.so.0
debian/tmp/opt/trinity/lib/libkmultipage.so.0.0.0
debian/tmp/opt/trinity/share/apps/djvumultipage.rc
diff --git a/debian/lenny/kdelibs/debian/kdelibs-data-trinity.install b/debian/lenny/kdelibs/debian/kdelibs-data-trinity.install
index 1ae552e17..8df1da81f 100644
--- a/debian/lenny/kdelibs/debian/kdelibs-data-trinity.install
+++ b/debian/lenny/kdelibs/debian/kdelibs-data-trinity.install
@@ -2068,7 +2068,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/info.png
debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/inline_image.png
debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/inline_table.png
debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/kde1.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/kde3.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/trinity.png
debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/kde4.png
debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/kde5.png
debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/kde6.png
diff --git a/debian/lenny/kdelibs/debian/kdelibs4c2a-trinity.install b/debian/lenny/kdelibs/debian/kdelibs4c2a-trinity.install
index 4026c180e..25c781723 100644
--- a/debian/lenny/kdelibs/debian/kdelibs4c2a-trinity.install
+++ b/debian/lenny/kdelibs/debian/kdelibs4c2a-trinity.install
@@ -52,163 +52,163 @@ debian/tmp/opt/trinity/bin/make_driver_db_lpr
debian/tmp/opt/trinity/bin/meinproc
debian/tmp/opt/trinity/bin/start_kdeinit
debian/tmp/opt/trinity/bin/start_kdeinit_wrapper
-debian/tmp/opt/trinity/lib/kde3/cupsdconf.la
-debian/tmp/opt/trinity/lib/kde3/cupsdconf.so
-debian/tmp/opt/trinity/lib/kde3/dcopserver.la
-debian/tmp/opt/trinity/lib/kde3/dcopserver.so
-debian/tmp/opt/trinity/lib/kde3/kabc_dir.la
-debian/tmp/opt/trinity/lib/kde3/kabc_dir.so
-debian/tmp/opt/trinity/lib/kde3/kabc_file.la
-debian/tmp/opt/trinity/lib/kde3/kabc_file.so
-debian/tmp/opt/trinity/lib/kde3/kabc_net.la
-debian/tmp/opt/trinity/lib/kde3/kabc_net.so
-debian/tmp/opt/trinity/lib/kde3/kabcformat_binary.la
-debian/tmp/opt/trinity/lib/kde3/kabcformat_binary.so
-debian/tmp/opt/trinity/lib/kde3/kabc_ldapkio.la
-debian/tmp/opt/trinity/lib/kde3/kabc_ldapkio.so
+debian/tmp/opt/trinity/lib/trinity/cupsdconf.la
+debian/tmp/opt/trinity/lib/trinity/cupsdconf.so
+debian/tmp/opt/trinity/lib/trinity/dcopserver.la
+debian/tmp/opt/trinity/lib/trinity/dcopserver.so
+debian/tmp/opt/trinity/lib/trinity/kabc_dir.la
+debian/tmp/opt/trinity/lib/trinity/kabc_dir.so
+debian/tmp/opt/trinity/lib/trinity/kabc_file.la
+debian/tmp/opt/trinity/lib/trinity/kabc_file.so
+debian/tmp/opt/trinity/lib/trinity/kabc_net.la
+debian/tmp/opt/trinity/lib/trinity/kabc_net.so
+debian/tmp/opt/trinity/lib/trinity/kabcformat_binary.la
+debian/tmp/opt/trinity/lib/trinity/kabcformat_binary.so
+debian/tmp/opt/trinity/lib/trinity/kabc_ldapkio.la
+debian/tmp/opt/trinity/lib/trinity/kabc_ldapkio.so
-debian/tmp/opt/trinity/lib/kde3/kaddprinterwizard.la
-debian/tmp/opt/trinity/lib/kde3/kaddprinterwizard.so
-debian/tmp/opt/trinity/lib/kde3/kbuildsycoca.la
-debian/tmp/opt/trinity/lib/kde3/kbuildsycoca.so
-debian/tmp/opt/trinity/lib/kde3/kbzip2filter.la
-debian/tmp/opt/trinity/lib/kde3/kbzip2filter.so
-debian/tmp/opt/trinity/lib/kde3/kcm_kresources.la
-debian/tmp/opt/trinity/lib/kde3/kcm_kresources.so
-debian/tmp/opt/trinity/lib/kde3/kcmshell.la
-debian/tmp/opt/trinity/lib/kde3/kcmshell.so
-debian/tmp/opt/trinity/lib/kde3/kconf_update.la
-debian/tmp/opt/trinity/lib/kde3/kconf_update.so
-debian/tmp/opt/trinity/lib/kde3/kcookiejar.la
-debian/tmp/opt/trinity/lib/kde3/kcookiejar.so
-debian/tmp/opt/trinity/lib/kde3/kded_kcookiejar.la
-debian/tmp/opt/trinity/lib/kde3/kded_kcookiejar.so
-debian/tmp/opt/trinity/lib/kde3/kded_kdeprintd.la
-debian/tmp/opt/trinity/lib/kde3/kded_kdeprintd.so
-debian/tmp/opt/trinity/lib/kde3/kded_kdetrayproxy.la
-debian/tmp/opt/trinity/lib/kde3/kded_kdetrayproxy.so
-debian/tmp/opt/trinity/lib/kde3/kded_kpasswdserver.la
-debian/tmp/opt/trinity/lib/kde3/kded_kpasswdserver.so
-debian/tmp/opt/trinity/lib/kde3/kded_kssld.la
-debian/tmp/opt/trinity/lib/kde3/kded_kssld.so
-debian/tmp/opt/trinity/lib/kde3/kded_kwalletd.la
-debian/tmp/opt/trinity/lib/kde3/kded_kwalletd.so
-debian/tmp/opt/trinity/lib/kde3/kded.la
-debian/tmp/opt/trinity/lib/kde3/kded_proxyscout.la
-debian/tmp/opt/trinity/lib/kde3/kded_proxyscout.so
-debian/tmp/opt/trinity/lib/kde3/kded.so
-debian/tmp/opt/trinity/lib/kde3/kdeprint_cups.la
-debian/tmp/opt/trinity/lib/kde3/kdeprint_cups.so
-debian/tmp/opt/trinity/lib/kde3/kdeprint_ext.la
-debian/tmp/opt/trinity/lib/kde3/kdeprint_ext.so
-debian/tmp/opt/trinity/lib/kde3/kdeprint_lpdunix.la
-debian/tmp/opt/trinity/lib/kde3/kdeprint_lpdunix.so
-debian/tmp/opt/trinity/lib/kde3/kdeprint_lpr.la
-debian/tmp/opt/trinity/lib/kde3/kdeprint_lpr.so
-debian/tmp/opt/trinity/lib/kde3/kdeprint_rlpr.la
-debian/tmp/opt/trinity/lib/kde3/kdeprint_rlpr.so
-debian/tmp/opt/trinity/lib/kde3/kdeprint_tool_escputil.la
-debian/tmp/opt/trinity/lib/kde3/kdeprint_tool_escputil.so
-debian/tmp/opt/trinity/lib/kde3/kfileaudiopreview.la
-debian/tmp/opt/trinity/lib/kde3/kfileaudiopreview.so
-debian/tmp/opt/trinity/lib/kde3/kgzipfilter.la
-debian/tmp/opt/trinity/lib/kde3/kgzipfilter.so
-debian/tmp/opt/trinity/lib/kde3/khtmlimagepart.la
-debian/tmp/opt/trinity/lib/kde3/khtmlimagepart.so
-debian/tmp/opt/trinity/lib/kde3/kimg_dds.la
-debian/tmp/opt/trinity/lib/kde3/kimg_dds.so
-debian/tmp/opt/trinity/lib/kde3/kimg_eps.la
-debian/tmp/opt/trinity/lib/kde3/kimg_eps.so
-debian/tmp/opt/trinity/lib/kde3/kimg_exr.la
-debian/tmp/opt/trinity/lib/kde3/kimg_exr.so
-debian/tmp/opt/trinity/lib/kde3/kimg_hdr.la
-debian/tmp/opt/trinity/lib/kde3/kimg_hdr.so
-debian/tmp/opt/trinity/lib/kde3/kimg_ico.la
-debian/tmp/opt/trinity/lib/kde3/kimg_ico.so
-debian/tmp/opt/trinity/lib/kde3/kimg_jp2.la
-debian/tmp/opt/trinity/lib/kde3/kimg_jp2.so
-debian/tmp/opt/trinity/lib/kde3/kimg_pcx.la
-debian/tmp/opt/trinity/lib/kde3/kimg_pcx.so
-debian/tmp/opt/trinity/lib/kde3/kimg_psd.la
-debian/tmp/opt/trinity/lib/kde3/kimg_psd.so
-debian/tmp/opt/trinity/lib/kde3/kimg_rgb.la
-debian/tmp/opt/trinity/lib/kde3/kimg_rgb.so
-debian/tmp/opt/trinity/lib/kde3/kimg_tga.la
-debian/tmp/opt/trinity/lib/kde3/kimg_tga.so
-debian/tmp/opt/trinity/lib/kde3/kimg_tiff.la
-debian/tmp/opt/trinity/lib/kde3/kimg_tiff.so
-debian/tmp/opt/trinity/lib/kde3/kimg_xcf.la
-debian/tmp/opt/trinity/lib/kde3/kimg_xcf.so
-debian/tmp/opt/trinity/lib/kde3/kimg_xview.la
-debian/tmp/opt/trinity/lib/kde3/kimg_xview.so
-debian/tmp/opt/trinity/lib/kde3/kio_file.la
-debian/tmp/opt/trinity/lib/kde3/kio_file.so
-debian/tmp/opt/trinity/lib/kde3/kio_ftp.la
-debian/tmp/opt/trinity/lib/kde3/kio_ftp.so
-debian/tmp/opt/trinity/lib/kde3/kio_ghelp.la
-debian/tmp/opt/trinity/lib/kde3/kio_ghelp.so
-debian/tmp/opt/trinity/lib/kde3/kio_help.la
-debian/tmp/opt/trinity/lib/kde3/kio_help.so
-debian/tmp/opt/trinity/lib/kde3/kio_http_cache_cleaner.la
-debian/tmp/opt/trinity/lib/kde3/kio_http_cache_cleaner.so
-debian/tmp/opt/trinity/lib/kde3/kio_http.la
-debian/tmp/opt/trinity/lib/kde3/kio_http.so
-debian/tmp/opt/trinity/lib/kde3/kio_iso.la
-debian/tmp/opt/trinity/lib/kde3/kio_iso.so
-debian/tmp/opt/trinity/lib/kde3/kio_metainfo.la
-debian/tmp/opt/trinity/lib/kde3/kio_metainfo.so
-debian/tmp/opt/trinity/lib/kde3/kio_uiserver.la
-debian/tmp/opt/trinity/lib/kde3/kio_uiserver.so
-debian/tmp/opt/trinity/lib/kde3/kjavaappletviewer.la
-debian/tmp/opt/trinity/lib/kde3/kjavaappletviewer.so
-debian/tmp/opt/trinity/lib/kde3/klauncher.la
-debian/tmp/opt/trinity/lib/kde3/klauncher.so
-debian/tmp/opt/trinity/lib/kde3/knotify.la
-debian/tmp/opt/trinity/lib/kde3/knotify.so
-debian/tmp/opt/trinity/lib/kde3/kspell_aspell.la
-debian/tmp/opt/trinity/lib/kde3/kspell_aspell.so
-debian/tmp/opt/trinity/lib/kde3/kspell_hspell.la
-debian/tmp/opt/trinity/lib/kde3/kspell_hspell.so
-debian/tmp/opt/trinity/lib/kde3/kspell_ispell.la
-debian/tmp/opt/trinity/lib/kde3/kspell_ispell.so
-debian/tmp/opt/trinity/lib/kde3/kstyle_highcontrast_config.la
-debian/tmp/opt/trinity/lib/kde3/kstyle_highcontrast_config.so
-debian/tmp/opt/trinity/lib/kde3/kstyle_plastik_config.la
-debian/tmp/opt/trinity/lib/kde3/kstyle_plastik_config.so
-debian/tmp/opt/trinity/lib/kde3/ktexteditor_docwordcompletion.la
-debian/tmp/opt/trinity/lib/kde3/ktexteditor_docwordcompletion.so
-debian/tmp/opt/trinity/lib/kde3/ktexteditor_insertfile.la
-debian/tmp/opt/trinity/lib/kde3/ktexteditor_insertfile.so
-debian/tmp/opt/trinity/lib/kde3/ktexteditor_isearch.la
-debian/tmp/opt/trinity/lib/kde3/ktexteditor_isearch.so
-debian/tmp/opt/trinity/lib/kde3/ktexteditor_kdatatool.la
-debian/tmp/opt/trinity/lib/kde3/ktexteditor_kdatatool.so
-debian/tmp/opt/trinity/lib/kde3/libkatepart.la
-debian/tmp/opt/trinity/lib/kde3/libkatepart.so
-debian/tmp/opt/trinity/lib/kde3/libkcertpart.la
-debian/tmp/opt/trinity/lib/kde3/libkcertpart.so
-debian/tmp/opt/trinity/lib/kde3/libkdeprint_management_module.la
-debian/tmp/opt/trinity/lib/kde3/libkdeprint_management_module.so
-debian/tmp/opt/trinity/lib/kde3/libkhtmlpart.la
-debian/tmp/opt/trinity/lib/kde3/libkhtmlpart.so
-debian/tmp/opt/trinity/lib/kde3/libkmultipart.la
-debian/tmp/opt/trinity/lib/kde3/libkmultipart.so
-debian/tmp/opt/trinity/lib/kde3/libshellscript.la
-debian/tmp/opt/trinity/lib/kde3/libshellscript.so
-debian/tmp/opt/trinity/lib/kde3/plugins/designer/kdewidgets.la
-debian/tmp/opt/trinity/lib/kde3/plugins/designer/kdewidgets.so
-debian/tmp/opt/trinity/lib/kde3/plugins/styles/highcolor.la
-debian/tmp/opt/trinity/lib/kde3/plugins/styles/highcolor.so
-debian/tmp/opt/trinity/lib/kde3/plugins/styles/highcontrast.la
-debian/tmp/opt/trinity/lib/kde3/plugins/styles/highcontrast.so
-debian/tmp/opt/trinity/lib/kde3/plugins/styles/keramik.la
-debian/tmp/opt/trinity/lib/kde3/plugins/styles/keramik.so
-debian/tmp/opt/trinity/lib/kde3/plugins/styles/kthemestyle.la
-debian/tmp/opt/trinity/lib/kde3/plugins/styles/kthemestyle.so
-debian/tmp/opt/trinity/lib/kde3/plugins/styles/light.la
-debian/tmp/opt/trinity/lib/kde3/plugins/styles/light.so
-debian/tmp/opt/trinity/lib/kde3/plugins/styles/plastik.la
-debian/tmp/opt/trinity/lib/kde3/plugins/styles/plastik.so
+debian/tmp/opt/trinity/lib/trinity/kaddprinterwizard.la
+debian/tmp/opt/trinity/lib/trinity/kaddprinterwizard.so
+debian/tmp/opt/trinity/lib/trinity/kbuildsycoca.la
+debian/tmp/opt/trinity/lib/trinity/kbuildsycoca.so
+debian/tmp/opt/trinity/lib/trinity/kbzip2filter.la
+debian/tmp/opt/trinity/lib/trinity/kbzip2filter.so
+debian/tmp/opt/trinity/lib/trinity/kcm_kresources.la
+debian/tmp/opt/trinity/lib/trinity/kcm_kresources.so
+debian/tmp/opt/trinity/lib/trinity/kcmshell.la
+debian/tmp/opt/trinity/lib/trinity/kcmshell.so
+debian/tmp/opt/trinity/lib/trinity/kconf_update.la
+debian/tmp/opt/trinity/lib/trinity/kconf_update.so
+debian/tmp/opt/trinity/lib/trinity/kcookiejar.la
+debian/tmp/opt/trinity/lib/trinity/kcookiejar.so
+debian/tmp/opt/trinity/lib/trinity/kded_kcookiejar.la
+debian/tmp/opt/trinity/lib/trinity/kded_kcookiejar.so
+debian/tmp/opt/trinity/lib/trinity/kded_kdeprintd.la
+debian/tmp/opt/trinity/lib/trinity/kded_kdeprintd.so
+debian/tmp/opt/trinity/lib/trinity/kded_kdetrayproxy.la
+debian/tmp/opt/trinity/lib/trinity/kded_kdetrayproxy.so
+debian/tmp/opt/trinity/lib/trinity/kded_kpasswdserver.la
+debian/tmp/opt/trinity/lib/trinity/kded_kpasswdserver.so
+debian/tmp/opt/trinity/lib/trinity/kded_kssld.la
+debian/tmp/opt/trinity/lib/trinity/kded_kssld.so
+debian/tmp/opt/trinity/lib/trinity/kded_kwalletd.la
+debian/tmp/opt/trinity/lib/trinity/kded_kwalletd.so
+debian/tmp/opt/trinity/lib/trinity/kded.la
+debian/tmp/opt/trinity/lib/trinity/kded_proxyscout.la
+debian/tmp/opt/trinity/lib/trinity/kded_proxyscout.so
+debian/tmp/opt/trinity/lib/trinity/kded.so
+debian/tmp/opt/trinity/lib/trinity/kdeprint_cups.la
+debian/tmp/opt/trinity/lib/trinity/kdeprint_cups.so
+debian/tmp/opt/trinity/lib/trinity/kdeprint_ext.la
+debian/tmp/opt/trinity/lib/trinity/kdeprint_ext.so
+debian/tmp/opt/trinity/lib/trinity/kdeprint_lpdunix.la
+debian/tmp/opt/trinity/lib/trinity/kdeprint_lpdunix.so
+debian/tmp/opt/trinity/lib/trinity/kdeprint_lpr.la
+debian/tmp/opt/trinity/lib/trinity/kdeprint_lpr.so
+debian/tmp/opt/trinity/lib/trinity/kdeprint_rlpr.la
+debian/tmp/opt/trinity/lib/trinity/kdeprint_rlpr.so
+debian/tmp/opt/trinity/lib/trinity/kdeprint_tool_escputil.la
+debian/tmp/opt/trinity/lib/trinity/kdeprint_tool_escputil.so
+debian/tmp/opt/trinity/lib/trinity/kfileaudiopreview.la
+debian/tmp/opt/trinity/lib/trinity/kfileaudiopreview.so
+debian/tmp/opt/trinity/lib/trinity/kgzipfilter.la
+debian/tmp/opt/trinity/lib/trinity/kgzipfilter.so
+debian/tmp/opt/trinity/lib/trinity/khtmlimagepart.la
+debian/tmp/opt/trinity/lib/trinity/khtmlimagepart.so
+debian/tmp/opt/trinity/lib/trinity/kimg_dds.la
+debian/tmp/opt/trinity/lib/trinity/kimg_dds.so
+debian/tmp/opt/trinity/lib/trinity/kimg_eps.la
+debian/tmp/opt/trinity/lib/trinity/kimg_eps.so
+debian/tmp/opt/trinity/lib/trinity/kimg_exr.la
+debian/tmp/opt/trinity/lib/trinity/kimg_exr.so
+debian/tmp/opt/trinity/lib/trinity/kimg_hdr.la
+debian/tmp/opt/trinity/lib/trinity/kimg_hdr.so
+debian/tmp/opt/trinity/lib/trinity/kimg_ico.la
+debian/tmp/opt/trinity/lib/trinity/kimg_ico.so
+debian/tmp/opt/trinity/lib/trinity/kimg_jp2.la
+debian/tmp/opt/trinity/lib/trinity/kimg_jp2.so
+debian/tmp/opt/trinity/lib/trinity/kimg_pcx.la
+debian/tmp/opt/trinity/lib/trinity/kimg_pcx.so
+debian/tmp/opt/trinity/lib/trinity/kimg_psd.la
+debian/tmp/opt/trinity/lib/trinity/kimg_psd.so
+debian/tmp/opt/trinity/lib/trinity/kimg_rgb.la
+debian/tmp/opt/trinity/lib/trinity/kimg_rgb.so
+debian/tmp/opt/trinity/lib/trinity/kimg_tga.la
+debian/tmp/opt/trinity/lib/trinity/kimg_tga.so
+debian/tmp/opt/trinity/lib/trinity/kimg_tiff.la
+debian/tmp/opt/trinity/lib/trinity/kimg_tiff.so
+debian/tmp/opt/trinity/lib/trinity/kimg_xcf.la
+debian/tmp/opt/trinity/lib/trinity/kimg_xcf.so
+debian/tmp/opt/trinity/lib/trinity/kimg_xview.la
+debian/tmp/opt/trinity/lib/trinity/kimg_xview.so
+debian/tmp/opt/trinity/lib/trinity/kio_file.la
+debian/tmp/opt/trinity/lib/trinity/kio_file.so
+debian/tmp/opt/trinity/lib/trinity/kio_ftp.la
+debian/tmp/opt/trinity/lib/trinity/kio_ftp.so
+debian/tmp/opt/trinity/lib/trinity/kio_ghelp.la
+debian/tmp/opt/trinity/lib/trinity/kio_ghelp.so
+debian/tmp/opt/trinity/lib/trinity/kio_help.la
+debian/tmp/opt/trinity/lib/trinity/kio_help.so
+debian/tmp/opt/trinity/lib/trinity/kio_http_cache_cleaner.la
+debian/tmp/opt/trinity/lib/trinity/kio_http_cache_cleaner.so
+debian/tmp/opt/trinity/lib/trinity/kio_http.la
+debian/tmp/opt/trinity/lib/trinity/kio_http.so
+debian/tmp/opt/trinity/lib/trinity/kio_iso.la
+debian/tmp/opt/trinity/lib/trinity/kio_iso.so
+debian/tmp/opt/trinity/lib/trinity/kio_metainfo.la
+debian/tmp/opt/trinity/lib/trinity/kio_metainfo.so
+debian/tmp/opt/trinity/lib/trinity/kio_uiserver.la
+debian/tmp/opt/trinity/lib/trinity/kio_uiserver.so
+debian/tmp/opt/trinity/lib/trinity/kjavaappletviewer.la
+debian/tmp/opt/trinity/lib/trinity/kjavaappletviewer.so
+debian/tmp/opt/trinity/lib/trinity/klauncher.la
+debian/tmp/opt/trinity/lib/trinity/klauncher.so
+debian/tmp/opt/trinity/lib/trinity/knotify.la
+debian/tmp/opt/trinity/lib/trinity/knotify.so
+debian/tmp/opt/trinity/lib/trinity/kspell_aspell.la
+debian/tmp/opt/trinity/lib/trinity/kspell_aspell.so
+debian/tmp/opt/trinity/lib/trinity/kspell_hspell.la
+debian/tmp/opt/trinity/lib/trinity/kspell_hspell.so
+debian/tmp/opt/trinity/lib/trinity/kspell_ispell.la
+debian/tmp/opt/trinity/lib/trinity/kspell_ispell.so
+debian/tmp/opt/trinity/lib/trinity/kstyle_highcontrast_config.la
+debian/tmp/opt/trinity/lib/trinity/kstyle_highcontrast_config.so
+debian/tmp/opt/trinity/lib/trinity/kstyle_plastik_config.la
+debian/tmp/opt/trinity/lib/trinity/kstyle_plastik_config.so
+debian/tmp/opt/trinity/lib/trinity/ktexteditor_docwordcompletion.la
+debian/tmp/opt/trinity/lib/trinity/ktexteditor_docwordcompletion.so
+debian/tmp/opt/trinity/lib/trinity/ktexteditor_insertfile.la
+debian/tmp/opt/trinity/lib/trinity/ktexteditor_insertfile.so
+debian/tmp/opt/trinity/lib/trinity/ktexteditor_isearch.la
+debian/tmp/opt/trinity/lib/trinity/ktexteditor_isearch.so
+debian/tmp/opt/trinity/lib/trinity/ktexteditor_kdatatool.la
+debian/tmp/opt/trinity/lib/trinity/ktexteditor_kdatatool.so
+debian/tmp/opt/trinity/lib/trinity/libkatepart.la
+debian/tmp/opt/trinity/lib/trinity/libkatepart.so
+debian/tmp/opt/trinity/lib/trinity/libkcertpart.la
+debian/tmp/opt/trinity/lib/trinity/libkcertpart.so
+debian/tmp/opt/trinity/lib/trinity/libkdeprint_management_module.la
+debian/tmp/opt/trinity/lib/trinity/libkdeprint_management_module.so
+debian/tmp/opt/trinity/lib/trinity/libkhtmlpart.la
+debian/tmp/opt/trinity/lib/trinity/libkhtmlpart.so
+debian/tmp/opt/trinity/lib/trinity/libkmultipart.la
+debian/tmp/opt/trinity/lib/trinity/libkmultipart.so
+debian/tmp/opt/trinity/lib/trinity/libshellscript.la
+debian/tmp/opt/trinity/lib/trinity/libshellscript.so
+debian/tmp/opt/trinity/lib/trinity/plugins/designer/kdewidgets.la
+debian/tmp/opt/trinity/lib/trinity/plugins/designer/kdewidgets.so
+debian/tmp/opt/trinity/lib/trinity/plugins/styles/highcolor.la
+debian/tmp/opt/trinity/lib/trinity/plugins/styles/highcolor.so
+debian/tmp/opt/trinity/lib/trinity/plugins/styles/highcontrast.la
+debian/tmp/opt/trinity/lib/trinity/plugins/styles/highcontrast.so
+debian/tmp/opt/trinity/lib/trinity/plugins/styles/keramik.la
+debian/tmp/opt/trinity/lib/trinity/plugins/styles/keramik.so
+debian/tmp/opt/trinity/lib/trinity/plugins/styles/kthemestyle.la
+debian/tmp/opt/trinity/lib/trinity/plugins/styles/kthemestyle.so
+debian/tmp/opt/trinity/lib/trinity/plugins/styles/light.la
+debian/tmp/opt/trinity/lib/trinity/plugins/styles/light.so
+debian/tmp/opt/trinity/lib/trinity/plugins/styles/plastik.la
+debian/tmp/opt/trinity/lib/trinity/plugins/styles/plastik.so
debian/tmp/opt/trinity/lib/libartskde.so.1
debian/tmp/opt/trinity/lib/libartskde.so.1.2.0
debian/tmp/opt/trinity/lib/libDCOP.so.4
diff --git a/debian/lenny/kdelibs/debian/trinitylibs.conf b/debian/lenny/kdelibs/debian/trinitylibs.conf
index 575516c88..4158c0679 100644
--- a/debian/lenny/kdelibs/debian/trinitylibs.conf
+++ b/debian/lenny/kdelibs/debian/trinitylibs.conf
@@ -1,4 +1,4 @@
/opt/trinity/lib/
/opt/trinity/lib64/
-/opt/trinity/lib/kde3/
+/opt/trinity/lib/trinity/
/opt/trinity/lib64/trinity/
diff --git a/debian/lenny/kdemultimedia/debian/kaboodle-trinity.install b/debian/lenny/kdemultimedia/debian/kaboodle-trinity.install
index 2b0ce6bfa..65cda92a3 100644
--- a/debian/lenny/kdemultimedia/debian/kaboodle-trinity.install
+++ b/debian/lenny/kdemultimedia/debian/kaboodle-trinity.install
@@ -1,6 +1,6 @@
debian/tmp/opt/trinity/bin/kaboodle
-debian/tmp/opt/trinity/lib/kde3/libkaboodlepart.la
-debian/tmp/opt/trinity/lib/kde3/libkaboodlepart.so
+debian/tmp/opt/trinity/lib/trinity/libkaboodlepart.la
+debian/tmp/opt/trinity/lib/trinity/libkaboodlepart.so
debian/tmp/opt/trinity/share/applications/kde/kaboodle.desktop
debian/tmp/opt/trinity/share/apps/kaboodle/icons/crystalsvg/16x16/actions/kaboodleloop.png
debian/tmp/opt/trinity/share/apps/kaboodle/icons/crystalsvg/22x22/actions/kaboodleloop.png
diff --git a/debian/lenny/kdemultimedia/debian/kdemultimedia-kfile-plugins-trinity.install b/debian/lenny/kdemultimedia/debian/kdemultimedia-kfile-plugins-trinity.install
index 45ae0204d..422efd2a4 100644
--- a/debian/lenny/kdemultimedia/debian/kdemultimedia-kfile-plugins-trinity.install
+++ b/debian/lenny/kdemultimedia/debian/kdemultimedia-kfile-plugins-trinity.install
@@ -1,25 +1,25 @@
-debian/tmp/opt/trinity/lib/kde3/kfile_au.la
-debian/tmp/opt/trinity/lib/kde3/kfile_au.so
-debian/tmp/opt/trinity/lib/kde3/kfile_avi.la
-debian/tmp/opt/trinity/lib/kde3/kfile_avi.so
-debian/tmp/opt/trinity/lib/kde3/kfile_flac.la
-debian/tmp/opt/trinity/lib/kde3/kfile_flac.so
-debian/tmp/opt/trinity/lib/kde3/kfile_m3u.la
-debian/tmp/opt/trinity/lib/kde3/kfile_m3u.so
-debian/tmp/opt/trinity/lib/kde3/kfile_mp3.la
-debian/tmp/opt/trinity/lib/kde3/kfile_mp3.so
-debian/tmp/opt/trinity/lib/kde3/kfile_mpc.la
-debian/tmp/opt/trinity/lib/kde3/kfile_mpc.so
-debian/tmp/opt/trinity/lib/kde3/kfile_mpeg.la
-debian/tmp/opt/trinity/lib/kde3/kfile_mpeg.so
-debian/tmp/opt/trinity/lib/kde3/kfile_ogg.la
-debian/tmp/opt/trinity/lib/kde3/kfile_ogg.so
-debian/tmp/opt/trinity/lib/kde3/kfile_sid.la
-debian/tmp/opt/trinity/lib/kde3/kfile_sid.so
-debian/tmp/opt/trinity/lib/kde3/kfile_theora.la
-debian/tmp/opt/trinity/lib/kde3/kfile_theora.so
-debian/tmp/opt/trinity/lib/kde3/kfile_wav.la
-debian/tmp/opt/trinity/lib/kde3/kfile_wav.so
+debian/tmp/opt/trinity/lib/trinity/kfile_au.la
+debian/tmp/opt/trinity/lib/trinity/kfile_au.so
+debian/tmp/opt/trinity/lib/trinity/kfile_avi.la
+debian/tmp/opt/trinity/lib/trinity/kfile_avi.so
+debian/tmp/opt/trinity/lib/trinity/kfile_flac.la
+debian/tmp/opt/trinity/lib/trinity/kfile_flac.so
+debian/tmp/opt/trinity/lib/trinity/kfile_m3u.la
+debian/tmp/opt/trinity/lib/trinity/kfile_m3u.so
+debian/tmp/opt/trinity/lib/trinity/kfile_mp3.la
+debian/tmp/opt/trinity/lib/trinity/kfile_mp3.so
+debian/tmp/opt/trinity/lib/trinity/kfile_mpc.la
+debian/tmp/opt/trinity/lib/trinity/kfile_mpc.so
+debian/tmp/opt/trinity/lib/trinity/kfile_mpeg.la
+debian/tmp/opt/trinity/lib/trinity/kfile_mpeg.so
+debian/tmp/opt/trinity/lib/trinity/kfile_ogg.la
+debian/tmp/opt/trinity/lib/trinity/kfile_ogg.so
+debian/tmp/opt/trinity/lib/trinity/kfile_sid.la
+debian/tmp/opt/trinity/lib/trinity/kfile_sid.so
+debian/tmp/opt/trinity/lib/trinity/kfile_theora.la
+debian/tmp/opt/trinity/lib/trinity/kfile_theora.so
+debian/tmp/opt/trinity/lib/trinity/kfile_wav.la
+debian/tmp/opt/trinity/lib/trinity/kfile_wav.so
debian/tmp/opt/trinity/share/services/kfile_au.desktop
debian/tmp/opt/trinity/share/services/kfile_avi.desktop
debian/tmp/opt/trinity/share/services/kfile_flac.desktop
diff --git a/debian/lenny/kdemultimedia/debian/kdemultimedia-kio-plugins-trinity.install b/debian/lenny/kdemultimedia/debian/kdemultimedia-kio-plugins-trinity.install
index dd34f7481..6f28fe72e 100644
--- a/debian/lenny/kdemultimedia/debian/kdemultimedia-kio-plugins-trinity.install
+++ b/debian/lenny/kdemultimedia/debian/kdemultimedia-kio-plugins-trinity.install
@@ -1,15 +1,15 @@
-debian/tmp/opt/trinity/lib/kde3/kcm_audiocd.la
-debian/tmp/opt/trinity/lib/kde3/kcm_audiocd.so
-debian/tmp/opt/trinity/lib/kde3/kio_audiocd.la
-debian/tmp/opt/trinity/lib/kde3/kio_audiocd.so
-debian/tmp/opt/trinity/lib/kde3/libaudiocd_encoder_flac.la
-debian/tmp/opt/trinity/lib/kde3/libaudiocd_encoder_flac.so
-debian/tmp/opt/trinity/lib/kde3/libaudiocd_encoder_lame.la
-debian/tmp/opt/trinity/lib/kde3/libaudiocd_encoder_lame.so
-debian/tmp/opt/trinity/lib/kde3/libaudiocd_encoder_vorbis.la
-debian/tmp/opt/trinity/lib/kde3/libaudiocd_encoder_vorbis.so
-debian/tmp/opt/trinity/lib/kde3/libaudiocd_encoder_wav.la
-debian/tmp/opt/trinity/lib/kde3/libaudiocd_encoder_wav.so
+debian/tmp/opt/trinity/lib/trinity/kcm_audiocd.la
+debian/tmp/opt/trinity/lib/trinity/kcm_audiocd.so
+debian/tmp/opt/trinity/lib/trinity/kio_audiocd.la
+debian/tmp/opt/trinity/lib/trinity/kio_audiocd.so
+debian/tmp/opt/trinity/lib/trinity/libaudiocd_encoder_flac.la
+debian/tmp/opt/trinity/lib/trinity/libaudiocd_encoder_flac.so
+debian/tmp/opt/trinity/lib/trinity/libaudiocd_encoder_lame.la
+debian/tmp/opt/trinity/lib/trinity/libaudiocd_encoder_lame.so
+debian/tmp/opt/trinity/lib/trinity/libaudiocd_encoder_vorbis.la
+debian/tmp/opt/trinity/lib/trinity/libaudiocd_encoder_vorbis.so
+debian/tmp/opt/trinity/lib/trinity/libaudiocd_encoder_wav.la
+debian/tmp/opt/trinity/lib/trinity/libaudiocd_encoder_wav.so
debian/tmp/opt/trinity/lib/libaudiocdplugins.so.1
debian/tmp/opt/trinity/lib/libaudiocdplugins.so.1.0.0
debian/tmp/opt/trinity/share/applications/kde/audiocd.desktop
diff --git a/debian/lenny/kdemultimedia/debian/kmid-trinity.install b/debian/lenny/kdemultimedia/debian/kmid-trinity.install
index a8e46d257..2bd425d0a 100644
--- a/debian/lenny/kdemultimedia/debian/kmid-trinity.install
+++ b/debian/lenny/kdemultimedia/debian/kmid-trinity.install
@@ -1,6 +1,6 @@
debian/tmp/opt/trinity/bin/kmid
-debian/tmp/opt/trinity/lib/kde3/libkmidpart.la
-debian/tmp/opt/trinity/lib/kde3/libkmidpart.so
+debian/tmp/opt/trinity/lib/trinity/libkmidpart.la
+debian/tmp/opt/trinity/lib/trinity/libkmidpart.so
debian/tmp/opt/trinity/lib/libkmidlib.so.0
debian/tmp/opt/trinity/lib/libkmidlib.so.0.0.0
debian/tmp/opt/trinity/share/applications/kde/kmid.desktop
diff --git a/debian/lenny/kdemultimedia/debian/kmix-trinity.install b/debian/lenny/kdemultimedia/debian/kmix-trinity.install
index 638d0015a..742bd3f9c 100644
--- a/debian/lenny/kdemultimedia/debian/kmix-trinity.install
+++ b/debian/lenny/kdemultimedia/debian/kmix-trinity.install
@@ -1,11 +1,11 @@
debian/tmp/opt/trinity/bin/kmix
debian/tmp/opt/trinity/bin/kmixctrl
-debian/tmp/opt/trinity/lib/kde3/kmix.la
-debian/tmp/opt/trinity/lib/kde3/kmix.so
-debian/tmp/opt/trinity/lib/kde3/kmix_panelapplet.la
-debian/tmp/opt/trinity/lib/kde3/kmix_panelapplet.so
-debian/tmp/opt/trinity/lib/kde3/kmixctrl.la
-debian/tmp/opt/trinity/lib/kde3/kmixctrl.so
+debian/tmp/opt/trinity/lib/trinity/kmix.la
+debian/tmp/opt/trinity/lib/trinity/kmix.so
+debian/tmp/opt/trinity/lib/trinity/kmix_panelapplet.la
+debian/tmp/opt/trinity/lib/trinity/kmix_panelapplet.so
+debian/tmp/opt/trinity/lib/trinity/kmixctrl.la
+debian/tmp/opt/trinity/lib/trinity/kmixctrl.so
debian/tmp/opt/trinity/lib/libkdeinit_kmix.so
debian/tmp/opt/trinity/lib/libkdeinit_kmixctrl.so
debian/tmp/opt/trinity/share/applications/kde/kmix.desktop
diff --git a/debian/lenny/kdemultimedia/debian/krec-trinity.install b/debian/lenny/kdemultimedia/debian/krec-trinity.install
index 528c89486..7446b200d 100644
--- a/debian/lenny/kdemultimedia/debian/krec-trinity.install
+++ b/debian/lenny/kdemultimedia/debian/krec-trinity.install
@@ -1,14 +1,14 @@
debian/tmp/opt/trinity/bin/krec
-debian/tmp/opt/trinity/lib/kde3/kcm_krec.la
-debian/tmp/opt/trinity/lib/kde3/kcm_krec.so
-debian/tmp/opt/trinity/lib/kde3/kcm_krec_files.la
-debian/tmp/opt/trinity/lib/kde3/kcm_krec_files.so
-debian/tmp/opt/trinity/lib/kde3/krec.la
-debian/tmp/opt/trinity/lib/kde3/krec.so
-debian/tmp/opt/trinity/lib/kde3/libkrecexport_ogg.la
-debian/tmp/opt/trinity/lib/kde3/libkrecexport_ogg.so
-debian/tmp/opt/trinity/lib/kde3/libkrecexport_wave.la
-debian/tmp/opt/trinity/lib/kde3/libkrecexport_wave.so
+debian/tmp/opt/trinity/lib/trinity/kcm_krec.la
+debian/tmp/opt/trinity/lib/trinity/kcm_krec.so
+debian/tmp/opt/trinity/lib/trinity/kcm_krec_files.la
+debian/tmp/opt/trinity/lib/trinity/kcm_krec_files.so
+debian/tmp/opt/trinity/lib/trinity/krec.la
+debian/tmp/opt/trinity/lib/trinity/krec.so
+debian/tmp/opt/trinity/lib/trinity/libkrecexport_ogg.la
+debian/tmp/opt/trinity/lib/trinity/libkrecexport_ogg.so
+debian/tmp/opt/trinity/lib/trinity/libkrecexport_wave.la
+debian/tmp/opt/trinity/lib/trinity/libkrecexport_wave.so
debian/tmp/opt/trinity/lib/libkdeinit_krec.so
debian/tmp/opt/trinity/share/applications/kde/krec.desktop
debian/tmp/opt/trinity/share/apps/krec/icons/crystalsvg/16x16/actions/krec_record.png
diff --git a/debian/lenny/kdemultimedia/debian/libarts1-xine-trinity.install b/debian/lenny/kdemultimedia/debian/libarts1-xine-trinity.install
index 8b8cd5980..ab89af340 100644
--- a/debian/lenny/kdemultimedia/debian/libarts1-xine-trinity.install
+++ b/debian/lenny/kdemultimedia/debian/libarts1-xine-trinity.install
@@ -1,5 +1,5 @@
-debian/tmp/opt/trinity/lib/kde3/videothumbnail.la
-debian/tmp/opt/trinity/lib/kde3/videothumbnail.so
+debian/tmp/opt/trinity/lib/trinity/videothumbnail.la
+debian/tmp/opt/trinity/lib/trinity/videothumbnail.so
debian/tmp/opt/trinity/lib/libarts_xine.la
debian/tmp/opt/trinity/lib/libarts_xine.so
debian/tmp/opt/trinity/lib/libarts_xine.so.0
diff --git a/debian/lenny/kdemultimedia/debian/libkcddb1-trinity.install b/debian/lenny/kdemultimedia/debian/libkcddb1-trinity.install
index c0e5645f9..cece6d8da 100644
--- a/debian/lenny/kdemultimedia/debian/libkcddb1-trinity.install
+++ b/debian/lenny/kdemultimedia/debian/libkcddb1-trinity.install
@@ -1,5 +1,5 @@
-debian/tmp/opt/trinity/lib/kde3/kcm_cddb.la
-debian/tmp/opt/trinity/lib/kde3/kcm_cddb.so
+debian/tmp/opt/trinity/lib/trinity/kcm_cddb.la
+debian/tmp/opt/trinity/lib/trinity/kcm_cddb.so
debian/tmp/opt/trinity/lib/libkcddb.so.1
debian/tmp/opt/trinity/lib/libkcddb.so.1.0.0
debian/tmp/opt/trinity/share/applications/kde/libkcddb.desktop
diff --git a/debian/lenny/kdemultimedia/debian/noatun-trinity.install b/debian/lenny/kdemultimedia/debian/noatun-trinity.install
index 827514630..21524ef0b 100644
--- a/debian/lenny/kdemultimedia/debian/noatun-trinity.install
+++ b/debian/lenny/kdemultimedia/debian/noatun-trinity.install
@@ -1,41 +1,41 @@
debian/tmp/opt/trinity/bin/noatun
debian/tmp/opt/trinity/lib/kconf_update_bin/noatun20update
-debian/tmp/opt/trinity/lib/kde3/noatun.la
-debian/tmp/opt/trinity/lib/kde3/noatun.so
-debian/tmp/opt/trinity/lib/kde3/noatun_dcopiface.la
-debian/tmp/opt/trinity/lib/kde3/noatun_dcopiface.so
-debian/tmp/opt/trinity/lib/kde3/noatun_excellent.la
-debian/tmp/opt/trinity/lib/kde3/noatun_excellent.so
-debian/tmp/opt/trinity/lib/kde3/noatun_htmlexport.la
-debian/tmp/opt/trinity/lib/kde3/noatun_htmlexport.so
-debian/tmp/opt/trinity/lib/kde3/noatun_infrared.la
-debian/tmp/opt/trinity/lib/kde3/noatun_infrared.so
-debian/tmp/opt/trinity/lib/kde3/noatun_kaiman.la
-debian/tmp/opt/trinity/lib/kde3/noatun_kaiman.so
-debian/tmp/opt/trinity/lib/kde3/noatun_keyz.la
-debian/tmp/opt/trinity/lib/kde3/noatun_keyz.so
-debian/tmp/opt/trinity/lib/kde3/noatun_kjofol.la
-debian/tmp/opt/trinity/lib/kde3/noatun_kjofol.so
-debian/tmp/opt/trinity/lib/kde3/noatun_marquis.la
-debian/tmp/opt/trinity/lib/kde3/noatun_marquis.so
-debian/tmp/opt/trinity/lib/kde3/noatun_metatag.la
-debian/tmp/opt/trinity/lib/kde3/noatun_metatag.so
-debian/tmp/opt/trinity/lib/kde3/noatun_monoscope.la
-debian/tmp/opt/trinity/lib/kde3/noatun_monoscope.so
-debian/tmp/opt/trinity/lib/kde3/noatun_net.la
-debian/tmp/opt/trinity/lib/kde3/noatun_net.so
-debian/tmp/opt/trinity/lib/kde3/noatun_splitplaylist.la
-debian/tmp/opt/trinity/lib/kde3/noatun_splitplaylist.so
-debian/tmp/opt/trinity/lib/kde3/noatun_systray.la
-debian/tmp/opt/trinity/lib/kde3/noatun_systray.so
-debian/tmp/opt/trinity/lib/kde3/noatun_ui.la
-debian/tmp/opt/trinity/lib/kde3/noatun_ui.so
-debian/tmp/opt/trinity/lib/kde3/noatun_voiceprint.la
-debian/tmp/opt/trinity/lib/kde3/noatun_voiceprint.so
-debian/tmp/opt/trinity/lib/kde3/noatun_winskin.la
-debian/tmp/opt/trinity/lib/kde3/noatun_winskin.so
-debian/tmp/opt/trinity/lib/kde3/noatunsimple.la
-debian/tmp/opt/trinity/lib/kde3/noatunsimple.so
+debian/tmp/opt/trinity/lib/trinity/noatun.la
+debian/tmp/opt/trinity/lib/trinity/noatun.so
+debian/tmp/opt/trinity/lib/trinity/noatun_dcopiface.la
+debian/tmp/opt/trinity/lib/trinity/noatun_dcopiface.so
+debian/tmp/opt/trinity/lib/trinity/noatun_excellent.la
+debian/tmp/opt/trinity/lib/trinity/noatun_excellent.so
+debian/tmp/opt/trinity/lib/trinity/noatun_htmlexport.la
+debian/tmp/opt/trinity/lib/trinity/noatun_htmlexport.so
+debian/tmp/opt/trinity/lib/trinity/noatun_infrared.la
+debian/tmp/opt/trinity/lib/trinity/noatun_infrared.so
+debian/tmp/opt/trinity/lib/trinity/noatun_kaiman.la
+debian/tmp/opt/trinity/lib/trinity/noatun_kaiman.so
+debian/tmp/opt/trinity/lib/trinity/noatun_keyz.la
+debian/tmp/opt/trinity/lib/trinity/noatun_keyz.so
+debian/tmp/opt/trinity/lib/trinity/noatun_kjofol.la
+debian/tmp/opt/trinity/lib/trinity/noatun_kjofol.so
+debian/tmp/opt/trinity/lib/trinity/noatun_marquis.la
+debian/tmp/opt/trinity/lib/trinity/noatun_marquis.so
+debian/tmp/opt/trinity/lib/trinity/noatun_metatag.la
+debian/tmp/opt/trinity/lib/trinity/noatun_metatag.so
+debian/tmp/opt/trinity/lib/trinity/noatun_monoscope.la
+debian/tmp/opt/trinity/lib/trinity/noatun_monoscope.so
+debian/tmp/opt/trinity/lib/trinity/noatun_net.la
+debian/tmp/opt/trinity/lib/trinity/noatun_net.so
+debian/tmp/opt/trinity/lib/trinity/noatun_splitplaylist.la
+debian/tmp/opt/trinity/lib/trinity/noatun_splitplaylist.so
+debian/tmp/opt/trinity/lib/trinity/noatun_systray.la
+debian/tmp/opt/trinity/lib/trinity/noatun_systray.so
+debian/tmp/opt/trinity/lib/trinity/noatun_ui.la
+debian/tmp/opt/trinity/lib/trinity/noatun_ui.so
+debian/tmp/opt/trinity/lib/trinity/noatun_voiceprint.la
+debian/tmp/opt/trinity/lib/trinity/noatun_voiceprint.so
+debian/tmp/opt/trinity/lib/trinity/noatun_winskin.la
+debian/tmp/opt/trinity/lib/trinity/noatun_winskin.so
+debian/tmp/opt/trinity/lib/trinity/noatunsimple.la
+debian/tmp/opt/trinity/lib/trinity/noatunsimple.so
debian/tmp/opt/trinity/lib/libartseffects.la
debian/tmp/opt/trinity/lib/libartseffects.so
debian/tmp/opt/trinity/lib/libkdeinit_noatun.so
diff --git a/debian/lenny/kdenetwork/debian/kdenetwork-filesharing-trinity.install b/debian/lenny/kdenetwork/debian/kdenetwork-filesharing-trinity.install
index 558a10cd3..4b0e9f5b9 100644
--- a/debian/lenny/kdenetwork/debian/kdenetwork-filesharing-trinity.install
+++ b/debian/lenny/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/debian/lenny/kdenetwork/debian/kdenetwork-kfile-plugins-trinity.install b/debian/lenny/kdenetwork/debian/kdenetwork-kfile-plugins-trinity.install
index a75e05ab5..b32a36440 100644
--- a/debian/lenny/kdenetwork/debian/kdenetwork-kfile-plugins-trinity.install
+++ b/debian/lenny/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/debian/lenny/kdenetwork/debian/kdict-trinity.install b/debian/lenny/kdenetwork/debian/kdict-trinity.install
index 7f67f3834..24d312686 100644
--- a/debian/lenny/kdenetwork/debian/kdict-trinity.install
+++ b/debian/lenny/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/debian/lenny/kdenetwork/debian/kdnssd-trinity.install b/debian/lenny/kdenetwork/debian/kdnssd-trinity.install
index 64b6ca584..8d6a52c6b 100644
--- a/debian/lenny/kdenetwork/debian/kdnssd-trinity.install
+++ b/debian/lenny/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/debian/lenny/kdenetwork/debian/kget-trinity.install b/debian/lenny/kdenetwork/debian/kget-trinity.install
index 5ed1b6b4b..8e508722e 100644
--- a/debian/lenny/kdenetwork/debian/kget-trinity.install
+++ b/debian/lenny/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/debian/lenny/kdenetwork/debian/knewsticker-trinity.install b/debian/lenny/kdenetwork/debian/knewsticker-trinity.install
index 4e8a8b52f..b7b2aa7c4 100644
--- a/debian/lenny/kdenetwork/debian/knewsticker-trinity.install
+++ b/debian/lenny/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/debian/lenny/kdenetwork/debian/kopete-trinity.install b/debian/lenny/kdenetwork/debian/kopete-trinity.install
index 41d28544b..c4a342dc5 100644
--- a/debian/lenny/kdenetwork/debian/kopete-trinity.install
+++ b/debian/lenny/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/debian/lenny/kdenetwork/debian/kpf-trinity.install b/debian/lenny/kdenetwork/debian/kpf-trinity.install
index b1936b1ad..1ea904b80 100644
--- a/debian/lenny/kdenetwork/debian/kpf-trinity.install
+++ b/debian/lenny/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/debian/lenny/kdenetwork/debian/krfb-trinity.install b/debian/lenny/kdenetwork/debian/krfb-trinity.install
index 656ba7d45..5bae6725b 100644
--- a/debian/lenny/kdenetwork/debian/krfb-trinity.install
+++ b/debian/lenny/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/debian/lenny/kdenetwork/debian/ksirc-trinity.install b/debian/lenny/kdenetwork/debian/ksirc-trinity.install
index bdc0728f3..30d9f29b3 100644
--- a/debian/lenny/kdenetwork/debian/ksirc-trinity.install
+++ b/debian/lenny/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/debian/lenny/kdenetwork/debian/ktalkd-trinity.install b/debian/lenny/kdenetwork/debian/ktalkd-trinity.install
index 46ec62753..4206a1618 100644
--- a/debian/lenny/kdenetwork/debian/ktalkd-trinity.install
+++ b/debian/lenny/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/debian/lenny/kdenetwork/debian/kwifimanager-trinity.install b/debian/lenny/kdenetwork/debian/kwifimanager-trinity.install
index c0c494e5f..ce735f6fa 100644
--- a/debian/lenny/kdenetwork/debian/kwifimanager-trinity.install
+++ b/debian/lenny/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/debian/lenny/kdenetwork/debian/lisa-trinity.install b/debian/lenny/kdenetwork/debian/lisa-trinity.install
index e1e073d3f..e6a53ecf2 100644
--- a/debian/lenny/kdenetwork/debian/lisa-trinity.install
+++ b/debian/lenny/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
diff --git a/debian/lenny/kdepim/debian/akregator-trinity.install b/debian/lenny/kdepim/debian/akregator-trinity.install
index 8fee8f157..e67c9c91a 100644
--- a/debian/lenny/kdepim/debian/akregator-trinity.install
+++ b/debian/lenny/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/debian/lenny/kdepim/debian/control b/debian/lenny/kdepim/debian/control
index f12445a70..ceb8680ae 100644
--- a/debian/lenny/kdepim/debian/control
+++ b/debian/lenny/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/debian/lenny/kdepim/debian/kaddressbook-trinity.install b/debian/lenny/kdepim/debian/kaddressbook-trinity.install
index ff875366f..cd87d91bd 100644
--- a/debian/lenny/kdepim/debian/kaddressbook-trinity.install
+++ b/debian/lenny/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/debian/lenny/kdepim/debian/karm-trinity.install b/debian/lenny/kdepim/debian/karm-trinity.install
index 4ed24ce22..aab595c42 100644
--- a/debian/lenny/kdepim/debian/karm-trinity.install
+++ b/debian/lenny/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/debian/lenny/kdepim/debian/kdepim-kfile-plugins-trinity.install b/debian/lenny/kdepim/debian/kdepim-kfile-plugins-trinity.install
index afae2323d..3f39aaf87 100644
--- a/debian/lenny/kdepim/debian/kdepim-kfile-plugins-trinity.install
+++ b/debian/lenny/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/debian/lenny/kdepim/debian/kdepim-kio-plugins-trinity.install b/debian/lenny/kdepim/debian/kdepim-kio-plugins-trinity.install
index c08b844a5..f9cc8ca27 100644
--- a/debian/lenny/kdepim/debian/kdepim-kio-plugins-trinity.install
+++ b/debian/lenny/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/debian/lenny/kdepim/debian/kdepim-kresources-trinity.install b/debian/lenny/kdepim/debian/kdepim-kresources-trinity.install
index 4fc5fef60..588b690b1 100644
--- a/debian/lenny/kdepim/debian/kdepim-kresources-trinity.install
+++ b/debian/lenny/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/debian/lenny/kdepim/debian/kdepim-wizards-trinity.install b/debian/lenny/kdepim/debian/kdepim-wizards-trinity.install
index 31efd9d35..465782c25 100644
--- a/debian/lenny/kdepim/debian/kdepim-wizards-trinity.install
+++ b/debian/lenny/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/debian/lenny/kdepim/debian/kitchensync-trinity.install b/debian/lenny/kdepim/debian/kitchensync-trinity.install
index 76d998e5a..cdf89734d 100644
--- a/debian/lenny/kdepim/debian/kitchensync-trinity.install
+++ b/debian/lenny/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/debian/lenny/kdepim/debian/kleopatra-trinity.install b/debian/lenny/kdepim/debian/kleopatra-trinity.install
index 5dd2c26d2..46ad1b0e9 100644
--- a/debian/lenny/kdepim/debian/kleopatra-trinity.install
+++ b/debian/lenny/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/debian/lenny/kdepim/debian/kmail-trinity.install b/debian/lenny/kdepim/debian/kmail-trinity.install
index b7436c3b2..c6a5999d2 100644
--- a/debian/lenny/kdepim/debian/kmail-trinity.install
+++ b/debian/lenny/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/debian/lenny/kdepim/debian/knode-trinity.install b/debian/lenny/kdepim/debian/knode-trinity.install
index 5a7619adc..5017248f9 100644
--- a/debian/lenny/kdepim/debian/knode-trinity.install
+++ b/debian/lenny/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/debian/lenny/kdepim/debian/knotes-trinity.install b/debian/lenny/kdepim/debian/knotes-trinity.install
index 976a34a44..741d0c822 100644
--- a/debian/lenny/kdepim/debian/knotes-trinity.install
+++ b/debian/lenny/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/debian/lenny/kdepim/debian/kontact-trinity.install b/debian/lenny/kdepim/debian/kontact-trinity.install
index e7e97a798..93065d1f8 100644
--- a/debian/lenny/kdepim/debian/kontact-trinity.install
+++ b/debian/lenny/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/debian/lenny/kdepim/debian/korganizer-trinity.install b/debian/lenny/kdepim/debian/korganizer-trinity.install
index addb79f24..6b6ce856b 100644
--- a/debian/lenny/kdepim/debian/korganizer-trinity.install
+++ b/debian/lenny/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/debian/lenny/kdepim/debian/libkcal2b-trinity.install b/debian/lenny/kdepim/debian/libkcal2b-trinity.install
index d871d449a..ca6e71652 100644
--- a/debian/lenny/kdepim/debian/libkcal2b-trinity.install
+++ b/debian/lenny/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/debian/lenny/kdepim/debian/libkdepim1a-trinity.install b/debian/lenny/kdepim/debian/libkdepim1a-trinity.install
index 0d4e75cb4..b7799470a 100644
--- a/debian/lenny/kdepim/debian/libkdepim1a-trinity.install
+++ b/debian/lenny/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/debian/lenny/kdepim/debian/libkpimexchange1-trinity.install b/debian/lenny/kdepim/debian/libkpimexchange1-trinity.install
index abf65f60c..f5b098575 100644
--- a/debian/lenny/kdepim/debian/libkpimexchange1-trinity.install
+++ b/debian/lenny/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/debian/lenny/kdepim/debian/rules b/debian/lenny/kdepim/debian/rules
index 11b332f36..6d8c87f14 100755
--- a/debian/lenny/kdepim/debian/rules
+++ b/debian/lenny/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:
diff --git a/debian/lenny/kdesdk/debian/cervisia-trinity.install b/debian/lenny/kdesdk/debian/cervisia-trinity.install
index 6203b5f0c..8bbaccc5d 100644
--- a/debian/lenny/kdesdk/debian/cervisia-trinity.install
+++ b/debian/lenny/kdesdk/debian/cervisia-trinity.install
@@ -1,10 +1,10 @@
debian/tmp/opt/trinity/bin/cervisia
debian/tmp/opt/trinity/lib/libkdeinit_cervisia.la
debian/tmp/opt/trinity/lib/libkdeinit_cervisia.so
-debian/tmp/opt/trinity/lib/kde3/cervisia.la
-debian/tmp/opt/trinity/lib/kde3/cervisia.so
-debian/tmp/opt/trinity/lib/kde3/libcervisiapart.la
-debian/tmp/opt/trinity/lib/kde3/libcervisiapart.so
+debian/tmp/opt/trinity/lib/trinity/cervisia.la
+debian/tmp/opt/trinity/lib/trinity/cervisia.so
+debian/tmp/opt/trinity/lib/trinity/libcervisiapart.la
+debian/tmp/opt/trinity/lib/trinity/libcervisiapart.so
debian/tmp/opt/trinity/share/applications/kde/cervisia.desktop
debian/tmp/opt/trinity/share/apps/cervisia/cervisiashellui.rc
debian/tmp/opt/trinity/share/apps/cervisia/eventsrc
diff --git a/debian/lenny/kdesdk/debian/kbabel-trinity.install b/debian/lenny/kdesdk/debian/kbabel-trinity.install
index 964750620..40e614c64 100644
--- a/debian/lenny/kdesdk/debian/kbabel-trinity.install
+++ b/debian/lenny/kdesdk/debian/kbabel-trinity.install
@@ -5,54 +5,54 @@ debian/tmp/opt/trinity/lib/libkbabelcommon.so.3
debian/tmp/opt/trinity/lib/libkbabelcommon.so.3.2.0
debian/tmp/opt/trinity/lib/libkbabeldictplugin.so.1
debian/tmp/opt/trinity/lib/libkbabeldictplugin.so.1.2.0
-debian/tmp/opt/trinity/lib/kde3/kfile_po.la
-debian/tmp/opt/trinity/lib/kde3/kfile_po.so
-debian/tmp/opt/trinity/lib/kde3/pothumbnail.la
-debian/tmp/opt/trinity/lib/kde3/pothumbnail.so
-debian/tmp/opt/trinity/lib/kde3/kbabel_accelstool.la
-debian/tmp/opt/trinity/lib/kde3/kbabel_accelstool.so
-debian/tmp/opt/trinity/lib/kde3/kbabel_argstool.la
-debian/tmp/opt/trinity/lib/kde3/kbabel_argstool.so
-debian/tmp/opt/trinity/lib/kde3/kbabel_contexttool.la
-debian/tmp/opt/trinity/lib/kde3/kbabel_contexttool.so
-debian/tmp/opt/trinity/lib/kde3/kbabel_equationstool.la
-debian/tmp/opt/trinity/lib/kde3/kbabel_equationstool.so
-debian/tmp/opt/trinity/lib/kde3/kbabel_gettextexport.la
-debian/tmp/opt/trinity/lib/kde3/kbabel_gettextexport.so
-debian/tmp/opt/trinity/lib/kde3/kbabel_gettextimport.la
-debian/tmp/opt/trinity/lib/kde3/kbabel_gettextimport.so
-debian/tmp/opt/trinity/lib/kde3/kbabel_lengthtool.la
-debian/tmp/opt/trinity/lib/kde3/kbabel_lengthtool.so
-debian/tmp/opt/trinity/lib/kde3/kbabel_linguistexport.la
-debian/tmp/opt/trinity/lib/kde3/kbabel_linguistexport.so
-debian/tmp/opt/trinity/lib/kde3/kbabel_linguistimport.la
-debian/tmp/opt/trinity/lib/kde3/kbabel_linguistimport.so
-debian/tmp/opt/trinity/lib/kde3/kbabel_nottranslatedtool.la
-debian/tmp/opt/trinity/lib/kde3/kbabel_nottranslatedtool.so
-debian/tmp/opt/trinity/lib/kde3/kbabel_pluraltool.la
-debian/tmp/opt/trinity/lib/kde3/kbabel_pluraltool.so
-debian/tmp/opt/trinity/lib/kde3/kbabel_punctuationtool.la
-debian/tmp/opt/trinity/lib/kde3/kbabel_punctuationtool.so
-debian/tmp/opt/trinity/lib/kde3/kbabel_regexptool.la
-debian/tmp/opt/trinity/lib/kde3/kbabel_regexptool.so
-debian/tmp/opt/trinity/lib/kde3/kbabel_setfuzzytool.la
-debian/tmp/opt/trinity/lib/kde3/kbabel_setfuzzytool.so
-debian/tmp/opt/trinity/lib/kde3/kbabel_whitespacetool.la
-debian/tmp/opt/trinity/lib/kde3/kbabel_whitespacetool.so
-debian/tmp/opt/trinity/lib/kde3/kbabel_xliffexport.la
-debian/tmp/opt/trinity/lib/kde3/kbabel_xliffexport.so
-debian/tmp/opt/trinity/lib/kde3/kbabel_xliffimport.la
-debian/tmp/opt/trinity/lib/kde3/kbabel_xliffimport.so
-debian/tmp/opt/trinity/lib/kde3/kbabel_xmltool.la
-debian/tmp/opt/trinity/lib/kde3/kbabel_xmltool.so
-debian/tmp/opt/trinity/lib/kde3/kbabeldict_dbsearchengine.la
-debian/tmp/opt/trinity/lib/kde3/kbabeldict_dbsearchengine.so
-debian/tmp/opt/trinity/lib/kde3/kbabeldict_poauxiliary.la
-debian/tmp/opt/trinity/lib/kde3/kbabeldict_poauxiliary.so
-debian/tmp/opt/trinity/lib/kde3/kbabeldict_pocompendium.la
-debian/tmp/opt/trinity/lib/kde3/kbabeldict_pocompendium.so
-debian/tmp/opt/trinity/lib/kde3/kbabeldict_tmxcompendium.la
-debian/tmp/opt/trinity/lib/kde3/kbabeldict_tmxcompendium.so
+debian/tmp/opt/trinity/lib/trinity/kfile_po.la
+debian/tmp/opt/trinity/lib/trinity/kfile_po.so
+debian/tmp/opt/trinity/lib/trinity/pothumbnail.la
+debian/tmp/opt/trinity/lib/trinity/pothumbnail.so
+debian/tmp/opt/trinity/lib/trinity/kbabel_accelstool.la
+debian/tmp/opt/trinity/lib/trinity/kbabel_accelstool.so
+debian/tmp/opt/trinity/lib/trinity/kbabel_argstool.la
+debian/tmp/opt/trinity/lib/trinity/kbabel_argstool.so
+debian/tmp/opt/trinity/lib/trinity/kbabel_contexttool.la
+debian/tmp/opt/trinity/lib/trinity/kbabel_contexttool.so
+debian/tmp/opt/trinity/lib/trinity/kbabel_equationstool.la
+debian/tmp/opt/trinity/lib/trinity/kbabel_equationstool.so
+debian/tmp/opt/trinity/lib/trinity/kbabel_gettextexport.la
+debian/tmp/opt/trinity/lib/trinity/kbabel_gettextexport.so
+debian/tmp/opt/trinity/lib/trinity/kbabel_gettextimport.la
+debian/tmp/opt/trinity/lib/trinity/kbabel_gettextimport.so
+debian/tmp/opt/trinity/lib/trinity/kbabel_lengthtool.la
+debian/tmp/opt/trinity/lib/trinity/kbabel_lengthtool.so
+debian/tmp/opt/trinity/lib/trinity/kbabel_linguistexport.la
+debian/tmp/opt/trinity/lib/trinity/kbabel_linguistexport.so
+debian/tmp/opt/trinity/lib/trinity/kbabel_linguistimport.la
+debian/tmp/opt/trinity/lib/trinity/kbabel_linguistimport.so
+debian/tmp/opt/trinity/lib/trinity/kbabel_nottranslatedtool.la
+debian/tmp/opt/trinity/lib/trinity/kbabel_nottranslatedtool.so
+debian/tmp/opt/trinity/lib/trinity/kbabel_pluraltool.la
+debian/tmp/opt/trinity/lib/trinity/kbabel_pluraltool.so
+debian/tmp/opt/trinity/lib/trinity/kbabel_punctuationtool.la
+debian/tmp/opt/trinity/lib/trinity/kbabel_punctuationtool.so
+debian/tmp/opt/trinity/lib/trinity/kbabel_regexptool.la
+debian/tmp/opt/trinity/lib/trinity/kbabel_regexptool.so
+debian/tmp/opt/trinity/lib/trinity/kbabel_setfuzzytool.la
+debian/tmp/opt/trinity/lib/trinity/kbabel_setfuzzytool.so
+debian/tmp/opt/trinity/lib/trinity/kbabel_whitespacetool.la
+debian/tmp/opt/trinity/lib/trinity/kbabel_whitespacetool.so
+debian/tmp/opt/trinity/lib/trinity/kbabel_xliffexport.la
+debian/tmp/opt/trinity/lib/trinity/kbabel_xliffexport.so
+debian/tmp/opt/trinity/lib/trinity/kbabel_xliffimport.la
+debian/tmp/opt/trinity/lib/trinity/kbabel_xliffimport.so
+debian/tmp/opt/trinity/lib/trinity/kbabel_xmltool.la
+debian/tmp/opt/trinity/lib/trinity/kbabel_xmltool.so
+debian/tmp/opt/trinity/lib/trinity/kbabeldict_dbsearchengine.la
+debian/tmp/opt/trinity/lib/trinity/kbabeldict_dbsearchengine.so
+debian/tmp/opt/trinity/lib/trinity/kbabeldict_poauxiliary.la
+debian/tmp/opt/trinity/lib/trinity/kbabeldict_poauxiliary.so
+debian/tmp/opt/trinity/lib/trinity/kbabeldict_pocompendium.la
+debian/tmp/opt/trinity/lib/trinity/kbabeldict_pocompendium.so
+debian/tmp/opt/trinity/lib/trinity/kbabeldict_tmxcompendium.la
+debian/tmp/opt/trinity/lib/trinity/kbabeldict_tmxcompendium.so
debian/tmp/opt/trinity/share/applications/kde/catalogmanager.desktop
debian/tmp/opt/trinity/share/applications/kde/kbabel.desktop
debian/tmp/opt/trinity/share/applications/kde/kbabeldict.desktop
diff --git a/debian/lenny/kdesdk/debian/kbugbuster-trinity.install b/debian/lenny/kdesdk/debian/kbugbuster-trinity.install
index 805416fc2..98cb1832e 100644
--- a/debian/lenny/kdesdk/debian/kbugbuster-trinity.install
+++ b/debian/lenny/kdesdk/debian/kbugbuster-trinity.install
@@ -1,6 +1,6 @@
debian/tmp/opt/trinity/bin/kbugbuster
-debian/tmp/opt/trinity/lib/kde3/kcal_bugzilla.la
-debian/tmp/opt/trinity/lib/kde3/kcal_bugzilla.so
+debian/tmp/opt/trinity/lib/trinity/kcal_bugzilla.la
+debian/tmp/opt/trinity/lib/trinity/kcal_bugzilla.so
debian/tmp/opt/trinity/share/applications/kde/kbugbuster.desktop
debian/tmp/opt/trinity/share/apps/kbugbuster/kbugbusterui.rc
debian/tmp/opt/trinity/share/apps/kbugbuster/pics/bars.png
diff --git a/debian/lenny/kdesdk/debian/kdesdk-kfile-plugins-trinity.install b/debian/lenny/kdesdk/debian/kdesdk-kfile-plugins-trinity.install
index 17676f088..1ffa48c57 100644
--- a/debian/lenny/kdesdk/debian/kdesdk-kfile-plugins-trinity.install
+++ b/debian/lenny/kdesdk/debian/kdesdk-kfile-plugins-trinity.install
@@ -1,9 +1,9 @@
-debian/tmp/opt/trinity/lib/kde3/kfile_cpp.so
-debian/tmp/opt/trinity/lib/kde3/kfile_cpp.la
-debian/tmp/opt/trinity/lib/kde3/kfile_diff.so
-debian/tmp/opt/trinity/lib/kde3/kfile_diff.la
-debian/tmp/opt/trinity/lib/kde3/kfile_ts.so
-debian/tmp/opt/trinity/lib/kde3/kfile_ts.la
+debian/tmp/opt/trinity/lib/trinity/kfile_cpp.so
+debian/tmp/opt/trinity/lib/trinity/kfile_cpp.la
+debian/tmp/opt/trinity/lib/trinity/kfile_diff.so
+debian/tmp/opt/trinity/lib/trinity/kfile_diff.la
+debian/tmp/opt/trinity/lib/trinity/kfile_ts.so
+debian/tmp/opt/trinity/lib/trinity/kfile_ts.la
debian/tmp/opt/trinity/share/services/kfile_cpp.desktop
debian/tmp/opt/trinity/share/services/kfile_diff.desktop
debian/tmp/opt/trinity/share/services/kfile_h.desktop
diff --git a/debian/lenny/kdesdk/debian/kdesdk-kio-plugins-trinity.install b/debian/lenny/kdesdk/debian/kdesdk-kio-plugins-trinity.install
index ce47fca1a..f3f70394c 100644
--- a/debian/lenny/kdesdk/debian/kdesdk-kio-plugins-trinity.install
+++ b/debian/lenny/kdesdk/debian/kdesdk-kio-plugins-trinity.install
@@ -1,8 +1,8 @@
debian/tmp/opt/trinity/bin/kio_svn_helper
-debian/tmp/opt/trinity/lib/kde3/kded_ksvnd.la
-debian/tmp/opt/trinity/lib/kde3/kded_ksvnd.so
-debian/tmp/opt/trinity/lib/kde3/kio_svn.la
-debian/tmp/opt/trinity/lib/kde3/kio_svn.so
+debian/tmp/opt/trinity/lib/trinity/kded_ksvnd.la
+debian/tmp/opt/trinity/lib/trinity/kded_ksvnd.so
+debian/tmp/opt/trinity/lib/trinity/kio_svn.la
+debian/tmp/opt/trinity/lib/trinity/kio_svn.so
debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/subversion_toplevel.desktop
debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/subversion.desktop
debian/tmp/opt/trinity/share/services/kded/ksvnd.desktop
diff --git a/debian/lenny/kdesdk/debian/kdesdk-misc-trinity.install b/debian/lenny/kdesdk/debian/kdesdk-misc-trinity.install
index ac363f400..cc229ce19 100644
--- a/debian/lenny/kdesdk/debian/kdesdk-misc-trinity.install
+++ b/debian/lenny/kdesdk/debian/kdesdk-misc-trinity.install
@@ -1,8 +1,8 @@
debian/tmp/opt/trinity/include/kde/kprofilemethod.h
-debian/tmp/opt/trinity/lib/kde3/kabcformat_kdeaccounts.la
-debian/tmp/opt/trinity/lib/kde3/kabcformat_kdeaccounts.so
-debian/tmp/opt/trinity/lib/kde3/plugins/styles/scheck.so
-debian/tmp/opt/trinity/lib/kde3/plugins/styles/scheck.la
+debian/tmp/opt/trinity/lib/trinity/kabcformat_kdeaccounts.la
+debian/tmp/opt/trinity/lib/trinity/kabcformat_kdeaccounts.so
+debian/tmp/opt/trinity/lib/trinity/plugins/styles/scheck.so
+debian/tmp/opt/trinity/lib/trinity/plugins/styles/scheck.la
debian/tmp/opt/trinity/share/apps/kabc/formats/kdeaccountsplugin.desktop
debian/tmp/opt/trinity/share/apps/kstyle/themes/scheck.themerc
kdepalettes/kde_xpaintrc /opt/trinity/share/kdepalettes
diff --git a/debian/lenny/kdesdk/debian/kompare-trinity.install b/debian/lenny/kdesdk/debian/kompare-trinity.install
index a97646df6..e4050e27f 100644
--- a/debian/lenny/kdesdk/debian/kompare-trinity.install
+++ b/debian/lenny/kdesdk/debian/kompare-trinity.install
@@ -3,10 +3,10 @@ debian/tmp/opt/trinity/lib/libkompareinterface.la
debian/tmp/opt/trinity/lib/libkompareinterface.so
debian/tmp/opt/trinity/lib/libkompareinterface.so.0
debian/tmp/opt/trinity/lib/libkompareinterface.so.0.0.0
-debian/tmp/opt/trinity/lib/kde3/libkomparenavtreepart.la
-debian/tmp/opt/trinity/lib/kde3/libkomparenavtreepart.so
-debian/tmp/opt/trinity/lib/kde3/libkomparepart.la
-debian/tmp/opt/trinity/lib/kde3/libkomparepart.so
+debian/tmp/opt/trinity/lib/trinity/libkomparenavtreepart.la
+debian/tmp/opt/trinity/lib/trinity/libkomparenavtreepart.so
+debian/tmp/opt/trinity/lib/trinity/libkomparepart.la
+debian/tmp/opt/trinity/lib/trinity/libkomparepart.so
debian/tmp/opt/trinity/share/applications/kde/kompare.desktop
debian/tmp/opt/trinity/share/apps/kompare/komparepartui.rc
debian/tmp/opt/trinity/share/apps/kompare/kompareui.rc
diff --git a/debian/lenny/kdesdk/debian/kuiviewer-trinity.install b/debian/lenny/kdesdk/debian/kuiviewer-trinity.install
index 7f0461308..964614988 100644
--- a/debian/lenny/kdesdk/debian/kuiviewer-trinity.install
+++ b/debian/lenny/kdesdk/debian/kuiviewer-trinity.install
@@ -1,8 +1,8 @@
debian/tmp/opt/trinity/bin/kuiviewer
-debian/tmp/opt/trinity/lib/kde3/libkuiviewerpart.so
-debian/tmp/opt/trinity/lib/kde3/libkuiviewerpart.la
-debian/tmp/opt/trinity/lib/kde3/quithumbnail.so
-debian/tmp/opt/trinity/lib/kde3/quithumbnail.la
+debian/tmp/opt/trinity/lib/trinity/libkuiviewerpart.so
+debian/tmp/opt/trinity/lib/trinity/libkuiviewerpart.la
+debian/tmp/opt/trinity/lib/trinity/quithumbnail.so
+debian/tmp/opt/trinity/lib/trinity/quithumbnail.la
debian/tmp/opt/trinity/share/applications/kde/kuiviewer.desktop
debian/tmp/opt/trinity/share/apps/kuiviewer/kuiviewerui.rc
debian/tmp/opt/trinity/share/apps/kuiviewerpart/kuiviewer_part.rc
diff --git a/debian/lenny/kdesdk/debian/libcvsservice0-trinity.install b/debian/lenny/kdesdk/debian/libcvsservice0-trinity.install
index fe4d6e16a..c1649ddd2 100644
--- a/debian/lenny/kdesdk/debian/libcvsservice0-trinity.install
+++ b/debian/lenny/kdesdk/debian/libcvsservice0-trinity.install
@@ -4,8 +4,8 @@ debian/tmp/opt/trinity/lib/libcvsservice.so.0
debian/tmp/opt/trinity/lib/libcvsservice.so.0.0.1
debian/tmp/opt/trinity/lib/libkdeinit_cvsaskpass.so
debian/tmp/opt/trinity/lib/libkdeinit_cvsservice.so
-debian/tmp/opt/trinity/lib/kde3/cvsaskpass.la
-debian/tmp/opt/trinity/lib/kde3/cvsaskpass.so
-debian/tmp/opt/trinity/lib/kde3/cvsservice.la
-debian/tmp/opt/trinity/lib/kde3/cvsservice.so
+debian/tmp/opt/trinity/lib/trinity/cvsaskpass.la
+debian/tmp/opt/trinity/lib/trinity/cvsaskpass.so
+debian/tmp/opt/trinity/lib/trinity/cvsservice.la
+debian/tmp/opt/trinity/lib/trinity/cvsservice.so
debian/tmp/opt/trinity/share/services/cvsservice.desktop
diff --git a/debian/lenny/kdetoys/debian/eyesapplet-trinity.install b/debian/lenny/kdetoys/debian/eyesapplet-trinity.install
index 793a1c414..60e3c7b16 100644
--- a/debian/lenny/kdetoys/debian/eyesapplet-trinity.install
+++ b/debian/lenny/kdetoys/debian/eyesapplet-trinity.install
@@ -1,3 +1,3 @@
-debian/tmp/opt/trinity/lib/kde3/eyes_panelapplet.la
-debian/tmp/opt/trinity/lib/kde3/eyes_panelapplet.so
+debian/tmp/opt/trinity/lib/trinity/eyes_panelapplet.la
+debian/tmp/opt/trinity/lib/trinity/eyes_panelapplet.so
debian/tmp/opt/trinity/share/apps/kicker/applets/eyesapplet.desktop
diff --git a/debian/lenny/kdetoys/debian/fifteenapplet-trinity.install b/debian/lenny/kdetoys/debian/fifteenapplet-trinity.install
index b3c4ed723..d54014b4b 100644
--- a/debian/lenny/kdetoys/debian/fifteenapplet-trinity.install
+++ b/debian/lenny/kdetoys/debian/fifteenapplet-trinity.install
@@ -1,3 +1,3 @@
-debian/tmp/opt/trinity/lib/kde3/fifteen_panelapplet.la
-debian/tmp/opt/trinity/lib/kde3/fifteen_panelapplet.so
+debian/tmp/opt/trinity/lib/trinity/fifteen_panelapplet.la
+debian/tmp/opt/trinity/lib/trinity/fifteen_panelapplet.so
debian/tmp/opt/trinity/share/apps/kicker/applets/kfifteenapplet.desktop
diff --git a/debian/lenny/kdetoys/debian/kmoon-trinity.install b/debian/lenny/kdetoys/debian/kmoon-trinity.install
index 0fdaa53cb..0fa153323 100644
--- a/debian/lenny/kdetoys/debian/kmoon-trinity.install
+++ b/debian/lenny/kdetoys/debian/kmoon-trinity.install
@@ -1,5 +1,5 @@
-debian/tmp/opt/trinity/lib/kde3/kmoon_panelapplet.la
-debian/tmp/opt/trinity/lib/kde3/kmoon_panelapplet.so
+debian/tmp/opt/trinity/lib/trinity/kmoon_panelapplet.la
+debian/tmp/opt/trinity/lib/trinity/kmoon_panelapplet.so
debian/tmp/opt/trinity/share/apps/kicker/applets/kmoonapplet.desktop
debian/tmp/opt/trinity/share/apps/kmoon
debian/tmp/opt/trinity/share/doc/kde/HTML/en/kmoon/*.bz2
diff --git a/debian/lenny/kdetoys/debian/kweather-trinity.install b/debian/lenny/kdetoys/debian/kweather-trinity.install
index a442fc66c..199f52605 100644
--- a/debian/lenny/kdetoys/debian/kweather-trinity.install
+++ b/debian/lenny/kdetoys/debian/kweather-trinity.install
@@ -2,14 +2,14 @@ debian/tmp/opt/trinity/bin/kweatherservice
debian/tmp/opt/trinity/bin/kweatherreport
debian/tmp/opt/trinity/lib/libkdeinit_kweatherreport.so
debian/tmp/opt/trinity/lib/libkdeinit_kweatherreport.la
-debian/tmp/opt/trinity/lib/kde3/kcm_weather.so
-debian/tmp/opt/trinity/lib/kde3/kcm_weather.la
-debian/tmp/opt/trinity/lib/kde3/kcm_weatherservice.so
-debian/tmp/opt/trinity/lib/kde3/kcm_weatherservice.la
-debian/tmp/opt/trinity/lib/kde3/kweatherreport.so
-debian/tmp/opt/trinity/lib/kde3/kweatherreport.la
-debian/tmp/opt/trinity/lib/kde3/weather_panelapplet.la
-debian/tmp/opt/trinity/lib/kde3/weather_panelapplet.so
+debian/tmp/opt/trinity/lib/trinity/kcm_weather.so
+debian/tmp/opt/trinity/lib/trinity/kcm_weather.la
+debian/tmp/opt/trinity/lib/trinity/kcm_weatherservice.so
+debian/tmp/opt/trinity/lib/trinity/kcm_weatherservice.la
+debian/tmp/opt/trinity/lib/trinity/kweatherreport.so
+debian/tmp/opt/trinity/lib/trinity/kweatherreport.la
+debian/tmp/opt/trinity/lib/trinity/weather_panelapplet.la
+debian/tmp/opt/trinity/lib/trinity/weather_panelapplet.so
debian/tmp/opt/trinity/share/apps/kicker/applets/kweather.desktop
debian/tmp/opt/trinity/share/apps/kweather
debian/tmp/opt/trinity/share/apps/kweatherservice/stations.dat
diff --git a/debian/lenny/kdetoys/debian/kworldclock-trinity.install b/debian/lenny/kdetoys/debian/kworldclock-trinity.install
index ed4a99eac..160b8b1dd 100644
--- a/debian/lenny/kdetoys/debian/kworldclock-trinity.install
+++ b/debian/lenny/kdetoys/debian/kworldclock-trinity.install
@@ -1,6 +1,6 @@
debian/tmp/opt/trinity/bin/kworldclock
-debian/tmp/opt/trinity/lib/kde3/ww_panelapplet.la
-debian/tmp/opt/trinity/lib/kde3/ww_panelapplet.so
+debian/tmp/opt/trinity/lib/trinity/ww_panelapplet.la
+debian/tmp/opt/trinity/lib/trinity/ww_panelapplet.so
debian/tmp/opt/trinity/share/applications/kde/kworldclock.desktop
debian/tmp/opt/trinity/share/apps/kdesktop/programs/kdeworld.desktop
debian/tmp/opt/trinity/share/apps/kicker/applets/kwwapplet.desktop
diff --git a/debian/lenny/kdeutils/debian/ark-trinity.install b/debian/lenny/kdeutils/debian/ark-trinity.install
index 3bfb6e255..bb908c9c3 100644
--- a/debian/lenny/kdeutils/debian/ark-trinity.install
+++ b/debian/lenny/kdeutils/debian/ark-trinity.install
@@ -1,8 +1,8 @@
debian/tmp/opt/trinity/bin/ark
-debian/tmp/opt/trinity/lib/kde3/ark.la
-debian/tmp/opt/trinity/lib/kde3/ark.so
-debian/tmp/opt/trinity/lib/kde3/libarkpart.la
-debian/tmp/opt/trinity/lib/kde3/libarkpart.so
+debian/tmp/opt/trinity/lib/trinity/ark.la
+debian/tmp/opt/trinity/lib/trinity/ark.so
+debian/tmp/opt/trinity/lib/trinity/libarkpart.la
+debian/tmp/opt/trinity/lib/trinity/libarkpart.so
debian/tmp/opt/trinity/lib/libkdeinit_ark.so
debian/tmp/opt/trinity/share/applications/kde/ark.desktop
debian/tmp/opt/trinity/share/apps/ark/ark_part.rc
diff --git a/debian/lenny/kdeutils/debian/kcalc-trinity.install b/debian/lenny/kdeutils/debian/kcalc-trinity.install
index d1ef79ca1..bf44a2749 100644
--- a/debian/lenny/kdeutils/debian/kcalc-trinity.install
+++ b/debian/lenny/kdeutils/debian/kcalc-trinity.install
@@ -1,6 +1,6 @@
debian/tmp/opt/trinity/bin/kcalc
-debian/tmp/opt/trinity/lib/kde3/kcalc.la
-debian/tmp/opt/trinity/lib/kde3/kcalc.so
+debian/tmp/opt/trinity/lib/trinity/kcalc.la
+debian/tmp/opt/trinity/lib/trinity/kcalc.so
debian/tmp/opt/trinity/lib/libkdeinit_kcalc.so
debian/tmp/opt/trinity/share/applications/kde/kcalc.desktop
debian/tmp/opt/trinity/share/apps/kcalc/kcalcui.rc
diff --git a/debian/lenny/kdeutils/debian/kcharselect-trinity.install b/debian/lenny/kdeutils/debian/kcharselect-trinity.install
index 0c7a666cb..d2987fae5 100644
--- a/debian/lenny/kdeutils/debian/kcharselect-trinity.install
+++ b/debian/lenny/kdeutils/debian/kcharselect-trinity.install
@@ -1,6 +1,6 @@
debian/tmp/opt/trinity/bin/kcharselect
-debian/tmp/opt/trinity/lib/kde3/kcharselect_panelapplet.la
-debian/tmp/opt/trinity/lib/kde3/kcharselect_panelapplet.so
+debian/tmp/opt/trinity/lib/trinity/kcharselect_panelapplet.la
+debian/tmp/opt/trinity/lib/trinity/kcharselect_panelapplet.so
debian/tmp/opt/trinity/share/applications/kde/KCharSelect.desktop
debian/tmp/opt/trinity/share/apps/kcharselect/kcharselectui.rc
debian/tmp/opt/trinity/share/apps/kconf_update/kcharselect.upd
diff --git a/debian/lenny/kdeutils/debian/kdelirc-trinity.install b/debian/lenny/kdeutils/debian/kdelirc-trinity.install
index c73648eeb..7753037cb 100644
--- a/debian/lenny/kdeutils/debian/kdelirc-trinity.install
+++ b/debian/lenny/kdeutils/debian/kdelirc-trinity.install
@@ -1,8 +1,8 @@
debian/tmp/opt/trinity/bin/irkick
-debian/tmp/opt/trinity/lib/kde3/irkick.la
-debian/tmp/opt/trinity/lib/kde3/irkick.so
-debian/tmp/opt/trinity/lib/kde3/kcm_kcmlirc.la
-debian/tmp/opt/trinity/lib/kde3/kcm_kcmlirc.so
+debian/tmp/opt/trinity/lib/trinity/irkick.la
+debian/tmp/opt/trinity/lib/trinity/irkick.so
+debian/tmp/opt/trinity/lib/trinity/kcm_kcmlirc.la
+debian/tmp/opt/trinity/lib/trinity/kcm_kcmlirc.so
debian/tmp/opt/trinity/lib/libkdeinit_irkick.so
debian/tmp/opt/trinity/share/applications/kde/irkick.desktop
debian/tmp/opt/trinity/share/applications/kde/kcmlirc.desktop
diff --git a/debian/lenny/kdeutils/debian/kdf-trinity.install b/debian/lenny/kdeutils/debian/kdf-trinity.install
index f24ed0c01..e259b569b 100644
--- a/debian/lenny/kdeutils/debian/kdf-trinity.install
+++ b/debian/lenny/kdeutils/debian/kdf-trinity.install
@@ -1,7 +1,7 @@
debian/tmp/opt/trinity/bin/kdf
debian/tmp/opt/trinity/bin/kwikdisk
-debian/tmp/opt/trinity/lib/kde3/kcm_kdf.la
-debian/tmp/opt/trinity/lib/kde3/kcm_kdf.so
+debian/tmp/opt/trinity/lib/trinity/kcm_kdf.la
+debian/tmp/opt/trinity/lib/trinity/kcm_kdf.so
debian/tmp/opt/trinity/share/applications/kde/kcmdf.desktop
debian/tmp/opt/trinity/share/applications/kde/kdf.desktop
debian/tmp/opt/trinity/share/applications/kde/kwikdisk.desktop
diff --git a/debian/lenny/kdeutils/debian/kedit-trinity.install b/debian/lenny/kdeutils/debian/kedit-trinity.install
index 3506d7444..0ecca6f75 100644
--- a/debian/lenny/kdeutils/debian/kedit-trinity.install
+++ b/debian/lenny/kdeutils/debian/kedit-trinity.install
@@ -1,6 +1,6 @@
debian/tmp/opt/trinity/bin/kedit
-debian/tmp/opt/trinity/lib/kde3/kedit.la
-debian/tmp/opt/trinity/lib/kde3/kedit.so
+debian/tmp/opt/trinity/lib/trinity/kedit.la
+debian/tmp/opt/trinity/lib/trinity/kedit.so
debian/tmp/opt/trinity/lib/libkdeinit_kedit.so
debian/tmp/opt/trinity/share/applications/kde/KEdit.desktop
debian/tmp/opt/trinity/share/apps/kedit/keditui.rc
diff --git a/debian/lenny/kdeutils/debian/khexedit-trinity.install b/debian/lenny/kdeutils/debian/khexedit-trinity.install
index a17d94cd8..d0e694758 100644
--- a/debian/lenny/kdeutils/debian/khexedit-trinity.install
+++ b/debian/lenny/kdeutils/debian/khexedit-trinity.install
@@ -1,8 +1,8 @@
debian/tmp/opt/trinity/bin/khexedit
-debian/tmp/opt/trinity/lib/kde3/libkbyteseditwidget.la
-debian/tmp/opt/trinity/lib/kde3/libkbyteseditwidget.so
-debian/tmp/opt/trinity/lib/kde3/libkhexedit2part.la
-debian/tmp/opt/trinity/lib/kde3/libkhexedit2part.so
+debian/tmp/opt/trinity/lib/trinity/libkbyteseditwidget.la
+debian/tmp/opt/trinity/lib/trinity/libkbyteseditwidget.so
+debian/tmp/opt/trinity/lib/trinity/libkhexedit2part.la
+debian/tmp/opt/trinity/lib/trinity/libkhexedit2part.so
debian/tmp/opt/trinity/lib/libkhexeditcommon.so.0
debian/tmp/opt/trinity/lib/libkhexeditcommon.so.0.0.0
debian/tmp/opt/trinity/share/applications/kde/khexedit.desktop
diff --git a/debian/lenny/kdeutils/debian/klaptopdaemon-trinity.install b/debian/lenny/kdeutils/debian/klaptopdaemon-trinity.install
index 175ed9a05..6803ab72e 100644
--- a/debian/lenny/kdeutils/debian/klaptopdaemon-trinity.install
+++ b/debian/lenny/kdeutils/debian/klaptopdaemon-trinity.install
@@ -1,9 +1,9 @@
debian/tmp/opt/trinity/bin/klaptop_acpi_helper
debian/tmp/opt/trinity/bin/klaptop_check
-debian/tmp/opt/trinity/lib/kde3/kcm_laptop.la
-debian/tmp/opt/trinity/lib/kde3/kcm_laptop.so
-debian/tmp/opt/trinity/lib/kde3/kded_klaptopdaemon.la
-debian/tmp/opt/trinity/lib/kde3/kded_klaptopdaemon.so
+debian/tmp/opt/trinity/lib/trinity/kcm_laptop.la
+debian/tmp/opt/trinity/lib/trinity/kcm_laptop.so
+debian/tmp/opt/trinity/lib/trinity/kded_klaptopdaemon.la
+debian/tmp/opt/trinity/lib/trinity/kded_klaptopdaemon.so
debian/tmp/opt/trinity/lib/libkcmlaptop.so.0
debian/tmp/opt/trinity/lib/libkcmlaptop.so.0.0.0
debian/tmp/opt/trinity/share/applications/kde/laptop.desktop
diff --git a/debian/lenny/kdeutils/debian/kmilo-legacy-trinity.install b/debian/lenny/kdeutils/debian/kmilo-legacy-trinity.install
index df00a2b98..9cc04b20c 100644
--- a/debian/lenny/kdeutils/debian/kmilo-legacy-trinity.install
+++ b/debian/lenny/kdeutils/debian/kmilo-legacy-trinity.install
@@ -1,15 +1,15 @@
-debian/tmp/opt/trinity/lib/kde3/kcm_kvaio.la
-debian/tmp/opt/trinity/lib/kde3/kcm_kvaio.so
-debian/tmp/opt/trinity/lib/kde3/kcm_thinkpad.la
-debian/tmp/opt/trinity/lib/kde3/kcm_thinkpad.so
-debian/tmp/opt/trinity/lib/kde3/kmilo_asus.la
-debian/tmp/opt/trinity/lib/kde3/kmilo_asus.so
-debian/tmp/opt/trinity/lib/kde3/kmilo_delli8k.la
-debian/tmp/opt/trinity/lib/kde3/kmilo_delli8k.so
-debian/tmp/opt/trinity/lib/kde3/kmilo_kvaio.la
-debian/tmp/opt/trinity/lib/kde3/kmilo_kvaio.so
-debian/tmp/opt/trinity/lib/kde3/kmilo_thinkpad.la
-debian/tmp/opt/trinity/lib/kde3/kmilo_thinkpad.so
+debian/tmp/opt/trinity/lib/trinity/kcm_kvaio.la
+debian/tmp/opt/trinity/lib/trinity/kcm_kvaio.so
+debian/tmp/opt/trinity/lib/trinity/kcm_thinkpad.la
+debian/tmp/opt/trinity/lib/trinity/kcm_thinkpad.so
+debian/tmp/opt/trinity/lib/trinity/kmilo_asus.la
+debian/tmp/opt/trinity/lib/trinity/kmilo_asus.so
+debian/tmp/opt/trinity/lib/trinity/kmilo_delli8k.la
+debian/tmp/opt/trinity/lib/trinity/kmilo_delli8k.so
+debian/tmp/opt/trinity/lib/trinity/kmilo_kvaio.la
+debian/tmp/opt/trinity/lib/trinity/kmilo_kvaio.so
+debian/tmp/opt/trinity/lib/trinity/kmilo_thinkpad.la
+debian/tmp/opt/trinity/lib/trinity/kmilo_thinkpad.so
debian/tmp/opt/trinity/share/applications/kde/kvaio.desktop
debian/tmp/opt/trinity/share/applications/kde/thinkpad.desktop
debian/tmp/opt/trinity/share/services/kmilo/kmilo_asus.desktop
diff --git a/debian/lenny/kdeutils/debian/kmilo-trinity.install b/debian/lenny/kdeutils/debian/kmilo-trinity.install
index 33cb4d77e..1d5b8cb8f 100644
--- a/debian/lenny/kdeutils/debian/kmilo-trinity.install
+++ b/debian/lenny/kdeutils/debian/kmilo-trinity.install
@@ -1,7 +1,7 @@
-debian/tmp/opt/trinity/lib/kde3/kded_kmilod.la
-debian/tmp/opt/trinity/lib/kde3/kded_kmilod.so
-debian/tmp/opt/trinity/lib/kde3/kmilo_generic.la
-debian/tmp/opt/trinity/lib/kde3/kmilo_generic.so
+debian/tmp/opt/trinity/lib/trinity/kded_kmilod.la
+debian/tmp/opt/trinity/lib/trinity/kded_kmilod.so
+debian/tmp/opt/trinity/lib/trinity/kmilo_generic.la
+debian/tmp/opt/trinity/lib/trinity/kmilo_generic.so
debian/tmp/opt/trinity/lib/libkmilo.so.1
debian/tmp/opt/trinity/lib/libkmilo.so.1.0.0
debian/tmp/opt/trinity/share/services/kded/kmilod.desktop
diff --git a/debian/lenny/kdeutils/debian/kregexpeditor-trinity.install b/debian/lenny/kdeutils/debian/kregexpeditor-trinity.install
index 763a10031..268ea089e 100644
--- a/debian/lenny/kdeutils/debian/kregexpeditor-trinity.install
+++ b/debian/lenny/kdeutils/debian/kregexpeditor-trinity.install
@@ -1,6 +1,6 @@
debian/tmp/opt/trinity/bin/kregexpeditor
-debian/tmp/opt/trinity/lib/kde3/libkregexpeditorgui.la
-debian/tmp/opt/trinity/lib/kde3/libkregexpeditorgui.so
+debian/tmp/opt/trinity/lib/trinity/libkregexpeditorgui.la
+debian/tmp/opt/trinity/lib/trinity/libkregexpeditorgui.so
debian/tmp/opt/trinity/lib/libkregexpeditorcommon.so.1
debian/tmp/opt/trinity/lib/libkregexpeditorcommon.so.1.0.0
debian/tmp/opt/trinity/share/applications/kde/kregexpeditor.desktop
diff --git a/debian/lenny/kdeutils/debian/ksim-trinity.install b/debian/lenny/kdeutils/debian/ksim-trinity.install
index 69550ea63..c1fcb8211 100644
--- a/debian/lenny/kdeutils/debian/ksim-trinity.install
+++ b/debian/lenny/kdeutils/debian/ksim-trinity.install
@@ -1,6 +1,6 @@
debian/tmp/etc/trinity/ksim_panelextensionrc
-debian/tmp/opt/trinity/lib/kde3/ksim_*.la
-debian/tmp/opt/trinity/lib/kde3/ksim_*.so
+debian/tmp/opt/trinity/lib/trinity/ksim_*.la
+debian/tmp/opt/trinity/lib/trinity/ksim_*.so
debian/tmp/opt/trinity/lib/libksimcore.so.1
debian/tmp/opt/trinity/lib/libksimcore.so.1.0.0
debian/tmp/opt/trinity/share/apps/kicker/extensions/ksim.desktop
diff --git a/debian/lenny/kdeutils/debian/kwalletmanager-trinity.install b/debian/lenny/kdeutils/debian/kwalletmanager-trinity.install
index 8411353e3..f711c47b8 100644
--- a/debian/lenny/kdeutils/debian/kwalletmanager-trinity.install
+++ b/debian/lenny/kdeutils/debian/kwalletmanager-trinity.install
@@ -1,6 +1,6 @@
debian/tmp/opt/trinity/bin/kwalletmanager
-debian/tmp/opt/trinity/lib/kde3/kcm_kwallet.la
-debian/tmp/opt/trinity/lib/kde3/kcm_kwallet.so
+debian/tmp/opt/trinity/lib/trinity/kcm_kwallet.la
+debian/tmp/opt/trinity/lib/trinity/kcm_kwallet.so
debian/tmp/opt/trinity/share/applications/kde/kwalletconfig.desktop
debian/tmp/opt/trinity/share/applications/kde/kwalletmanager.desktop
debian/tmp/opt/trinity/share/applications/kde/kwalletmanager-kwalletd.desktop
diff --git a/debian/lenny/kdevelop.cmake/debian/kdevelop-trinity.install b/debian/lenny/kdevelop.cmake/debian/kdevelop-trinity.install
index 43a6e5fa6..0c92940b2 100644
--- a/debian/lenny/kdevelop.cmake/debian/kdevelop-trinity.install
+++ b/debian/lenny/kdevelop.cmake/debian/kdevelop-trinity.install
@@ -9,5 +9,5 @@ debian/tmp/opt/trinity/bin/kdevelop
debian/tmp/opt/trinity/lib/kconf_update_bin/kdev-gen-settings-kconf_update
debian/tmp/opt/trinity/share/services
debian/tmp/opt/trinity/share/servicetypes
-debian/tmp/opt/trinity/lib/kde3
+debian/tmp/opt/trinity/lib/trinity
debian/tmp/opt/trinity/lib/lib*.so.*
diff --git a/debian/lenny/kdevelop/debian/kdevelop-trinity.install b/debian/lenny/kdevelop/debian/kdevelop-trinity.install
index 43a6e5fa6..0c92940b2 100644
--- a/debian/lenny/kdevelop/debian/kdevelop-trinity.install
+++ b/debian/lenny/kdevelop/debian/kdevelop-trinity.install
@@ -9,5 +9,5 @@ debian/tmp/opt/trinity/bin/kdevelop
debian/tmp/opt/trinity/lib/kconf_update_bin/kdev-gen-settings-kconf_update
debian/tmp/opt/trinity/share/services
debian/tmp/opt/trinity/share/servicetypes
-debian/tmp/opt/trinity/lib/kde3
+debian/tmp/opt/trinity/lib/trinity
debian/tmp/opt/trinity/lib/lib*.so.*
diff --git a/debian/lenny/kdewebdev/debian/kfilereplace-trinity.install b/debian/lenny/kdewebdev/debian/kfilereplace-trinity.install
index 1a39dc32e..ea0c71bee 100644
--- a/debian/lenny/kdewebdev/debian/kfilereplace-trinity.install
+++ b/debian/lenny/kdewebdev/debian/kfilereplace-trinity.install
@@ -1,6 +1,6 @@
debian/tmp/opt/trinity/bin/kfilereplace
-debian/tmp/opt/trinity/lib/kde3/libkfilereplacepart.la
-debian/tmp/opt/trinity/lib/kde3/libkfilereplacepart.so
+debian/tmp/opt/trinity/lib/trinity/libkfilereplacepart.la
+debian/tmp/opt/trinity/lib/trinity/libkfilereplacepart.so
debian/tmp/opt/trinity/share/applications/kde/kfilereplace.desktop
debian/tmp/opt/trinity/share/apps/kfilereplace/kfilereplaceui.rc
debian/tmp/opt/trinity/share/apps/kfilereplacepart
diff --git a/debian/lenny/kdewebdev/debian/kimagemapeditor-trinity.install b/debian/lenny/kdewebdev/debian/kimagemapeditor-trinity.install
index c29527c1b..62dfdcceb 100644
--- a/debian/lenny/kdewebdev/debian/kimagemapeditor-trinity.install
+++ b/debian/lenny/kdewebdev/debian/kimagemapeditor-trinity.install
@@ -1,8 +1,8 @@
debian/icons/kimagemapeditor.xpm /opt/trinity/share/pixmaps
debian/tmp/opt/trinity/bin/kimagemapeditor
-debian/tmp/opt/trinity/lib/kde3/libkimagemapeditor.la
-debian/tmp/opt/trinity/lib/kde3/libkimagemapeditor.so
+debian/tmp/opt/trinity/lib/trinity/libkimagemapeditor.la
+debian/tmp/opt/trinity/lib/trinity/libkimagemapeditor.so
debian/tmp/opt/trinity/share/applications/kde/kimagemapeditor.desktop
debian/tmp/opt/trinity/share/apps/kimagemapeditor
debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kimagemapeditor.png
diff --git a/debian/lenny/kdewebdev/debian/klinkstatus-trinity.install b/debian/lenny/kdewebdev/debian/klinkstatus-trinity.install
index b9df813b2..f483a219b 100644
--- a/debian/lenny/kdewebdev/debian/klinkstatus-trinity.install
+++ b/debian/lenny/kdewebdev/debian/klinkstatus-trinity.install
@@ -1,8 +1,8 @@
debian/icons/klinkstatus.xpm /opt/trinity/share/pixmaps
debian/tmp/opt/trinity/bin/klinkstatus
-debian/tmp/opt/trinity/lib/kde3/libklinkstatuspart.la
-debian/tmp/opt/trinity/lib/kde3/libklinkstatuspart.so
+debian/tmp/opt/trinity/lib/trinity/libklinkstatuspart.la
+debian/tmp/opt/trinity/lib/trinity/libklinkstatuspart.so
debian/tmp/opt/trinity/share/applications/kde/klinkstatus.desktop
debian/tmp/opt/trinity/share/apps/klinkstatus
debian/tmp/opt/trinity/share/apps/klinkstatuspart
diff --git a/debian/lenny/kdewebdev/debian/kommander-trinity.install b/debian/lenny/kdewebdev/debian/kommander-trinity.install
index b17b858ea..230dadb45 100644
--- a/debian/lenny/kdewebdev/debian/kommander-trinity.install
+++ b/debian/lenny/kdewebdev/debian/kommander-trinity.install
@@ -25,8 +25,8 @@ debian/tmp/opt/trinity/share/mimelnk/application/x-kommander.desktop
kommander/examples /opt/trinity/share/doc/kommander
kommander/working/extractkmdr /opt/trinity/bin
kommander/working/kmdr2po /opt/trinity/bin
-debian/tmp/opt/trinity/lib/kde3/libkommander_part.so
-debian/tmp/opt/trinity/lib/kde3/libkommander_part.la
+debian/tmp/opt/trinity/lib/trinity/libkommander_part.so
+debian/tmp/opt/trinity/lib/trinity/libkommander_part.la
debian/tmp/opt/trinity/share/apps/kommander/pics/toolbox.png
debian/tmp/opt/trinity/share/apps/kommander/pics/kfontcombo.png
debian/tmp/opt/trinity/share/apps/kommander/translating/extractkmdr
diff --git a/debian/lenny/kdewebdev/debian/kxsldbg-trinity.install b/debian/lenny/kdewebdev/debian/kxsldbg-trinity.install
index ec9b78a4b..71ccaf3ec 100644
--- a/debian/lenny/kdewebdev/debian/kxsldbg-trinity.install
+++ b/debian/lenny/kdewebdev/debian/kxsldbg-trinity.install
@@ -1,7 +1,7 @@
debian/tmp/opt/trinity/bin/kxsldbg
debian/tmp/opt/trinity/bin/xsldbg
-debian/tmp/opt/trinity/lib/kde3/libkxsldbgpart.la
-debian/tmp/opt/trinity/lib/kde3/libkxsldbgpart.so
+debian/tmp/opt/trinity/lib/trinity/libkxsldbgpart.la
+debian/tmp/opt/trinity/lib/trinity/libkxsldbgpart.so
debian/tmp/opt/trinity/share/applications/kde/kxsldbg.desktop
debian/tmp/opt/trinity/share/apps/kxsldbg
debian/tmp/opt/trinity/share/apps/kxsldbgpart
diff --git a/debian/lenny/kdewebdev/debian/quanta-trinity.install b/debian/lenny/kdewebdev/debian/quanta-trinity.install
index a65362c1e..638a01597 100644
--- a/debian/lenny/kdewebdev/debian/quanta-trinity.install
+++ b/debian/lenny/kdewebdev/debian/quanta-trinity.install
@@ -2,10 +2,10 @@ debian/docrc/*.docrc /opt/trinity/share/apps/quanta/doc
debian/icons/quanta.xpm /opt/trinity/share/pixmaps
debian/tmp/opt/trinity/bin/quanta
-debian/tmp/opt/trinity/lib/kde3/quantadebuggerdbgp.la
-debian/tmp/opt/trinity/lib/kde3/quantadebuggerdbgp.so
-debian/tmp/opt/trinity/lib/kde3/quantadebuggergubed.la
-debian/tmp/opt/trinity/lib/kde3/quantadebuggergubed.so
+debian/tmp/opt/trinity/lib/trinity/quantadebuggerdbgp.la
+debian/tmp/opt/trinity/lib/trinity/quantadebuggerdbgp.so
+debian/tmp/opt/trinity/lib/trinity/quantadebuggergubed.la
+debian/tmp/opt/trinity/lib/trinity/quantadebuggergubed.so
debian/tmp/opt/trinity/share/applications/kde/quanta.desktop
debian/tmp/opt/trinity/share/apps/kafkapart
debian/tmp/opt/trinity/share/doc/kde/HTML/en/quanta/*.bz2
diff --git a/debian/lenny/libraries/kipi-plugins/debian/kipi-plugins-trinity.install b/debian/lenny/libraries/kipi-plugins/debian/kipi-plugins-trinity.install
index ac3b45042..b01d3720f 100755
--- a/debian/lenny/libraries/kipi-plugins/debian/kipi-plugins-trinity.install
+++ b/debian/lenny/libraries/kipi-plugins/debian/kipi-plugins-trinity.install
@@ -2,6 +2,6 @@ debian/tmp/opt/trinity/share/services/kipiplugin*
debian/tmp/opt/trinity/share/apps/kipi*
debian/tmp/opt/trinity/share/config.kcfg/htmlexportconfig.kcfg
debian/tmp/opt/trinity/share/locale/*
-debian/tmp/opt/trinity/lib/kde3/kipiplugin*
+debian/tmp/opt/trinity/lib/trinity/kipiplugin*
debian/tmp/opt/trinity/lib/libkipiplugins.*
debian/tmp/opt/trinity/bin/*
diff --git a/debian/lenny/libraries/python-trinity/debian/rules b/debian/lenny/libraries/python-trinity/debian/rules
index 19e69c601..85c43a0fe 100755
--- a/debian/lenny/libraries/python-trinity/debian/rules
+++ b/debian/lenny/libraries/python-trinity/debian/rules
@@ -120,7 +120,7 @@ install-arch:
dh_install -a --sourcedir=$(CURDIR)/debian/tmp
mkdir -p $(CURDIR)/debian/python-trinity-trinity/opt/trinity/lib/
- ln -s /opt/trinity/lib/kde3/libkonsolepart.so $(CURDIR)/debian/python-trinity-trinity/opt/trinity/lib/
+ ln -s /opt/trinity/lib/trinity/libkonsolepart.so $(CURDIR)/debian/python-trinity-trinity/opt/trinity/lib/
for i in $$(find debian/python-*-dbg -name '*.so'); do \
b=$$(basename $$i .so); \
mv $$i $$(dirname $$i)/$${b}_d.so; \