summaryrefslogtreecommitdiffstats
path: root/debian/squeeze/applications
diff options
context:
space:
mode:
Diffstat (limited to 'debian/squeeze/applications')
-rw-r--r--debian/squeeze/applications/amarok.cmake/debian/amarok-engine-xine-trinity.install4
-rw-r--r--debian/squeeze/applications/amarok.cmake/debian/amarok-engine-yauap-trinity.install4
-rw-r--r--debian/squeeze/applications/amarok.cmake/debian/amarok-trinity.install44
-rw-r--r--debian/squeeze/applications/amarok/debian/amarok-engine-xine-trinity.install4
-rw-r--r--debian/squeeze/applications/amarok/debian/amarok-engine-yauap-trinity.install4
-rw-r--r--debian/squeeze/applications/amarok/debian/amarok-trinity.install44
-rw-r--r--debian/squeeze/applications/k3b/debian/k3b-trinity.install4
-rw-r--r--debian/squeeze/applications/k3b/debian/libk3b3-extracodecs-trinity.install4
-rw-r--r--debian/squeeze/applications/k3b/debian/libk3b3-trinity.install44
-rw-r--r--debian/squeeze/applications/kaffeine/debian/kaffeine-gstreamer-trinity.install4
-rw-r--r--debian/squeeze/applications/kaffeine/debian/kaffeine-trinity.install8
-rw-r--r--debian/squeeze/applications/kchmviewer/debian/dirs2
-rw-r--r--debian/squeeze/applications/kde-guidance/debian/kde-guidance-trinity.install52
-rwxr-xr-xdebian/squeeze/applications/kde-guidance/debian/rules2
-rwxr-xr-xdebian/squeeze/applications/kdesvn/debian/rules28
-rwxr-xr-xdebian/squeeze/applications/kerry/debian/rules4
-rw-r--r--debian/squeeze/applications/kmplayer/debian/kmplayer-konq-plugins-trinity.install4
-rw-r--r--debian/squeeze/applications/kmplayer/debian/kmplayer-trinity.install2
-rwxr-xr-xdebian/squeeze/applications/kmyfirewall/debian/rules2
-rw-r--r--debian/squeeze/applications/kmymoney/debian/kmymoney2-trinity.install4
-rw-r--r--debian/squeeze/applications/koffice/debian/chalk-trinity.install286
-rw-r--r--debian/squeeze/applications/koffice/debian/karbon-trinity.install88
-rw-r--r--debian/squeeze/applications/koffice/debian/kchart-trinity.install36
-rw-r--r--debian/squeeze/applications/koffice/debian/kexi-trinity.install76
-rw-r--r--debian/squeeze/applications/koffice/debian/kformula-trinity.install12
-rw-r--r--debian/squeeze/applications/koffice/debian/kivio-trinity.install36
-rw-r--r--debian/squeeze/applications/koffice/debian/koffice-libs-trinity.install72
-rw-r--r--debian/squeeze/applications/koffice/debian/koshell-trinity.install4
-rw-r--r--debian/squeeze/applications/koffice/debian/kplato-trinity.install8
-rw-r--r--debian/squeeze/applications/koffice/debian/kpresenter-trinity.install48
-rw-r--r--debian/squeeze/applications/koffice/debian/kspread-trinity.install72
-rw-r--r--debian/squeeze/applications/koffice/debian/kthesaurus-trinity.install6
-rw-r--r--debian/squeeze/applications/koffice/debian/kugar-trinity.install20
-rw-r--r--debian/squeeze/applications/koffice/debian/kword-trinity.install136
-rw-r--r--debian/squeeze/applications/ktechlab/debian/debiandirs2
-rw-r--r--debian/squeeze/applications/kwin-style-crystal/debian/dirs2
36 files changed, 586 insertions, 586 deletions
diff --git a/debian/squeeze/applications/amarok.cmake/debian/amarok-engine-xine-trinity.install b/debian/squeeze/applications/amarok.cmake/debian/amarok-engine-xine-trinity.install
index 6b23c8378..c5e46604f 100644
--- a/debian/squeeze/applications/amarok.cmake/debian/amarok-engine-xine-trinity.install
+++ b/debian/squeeze/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/squeeze/applications/amarok.cmake/debian/amarok-engine-yauap-trinity.install b/debian/squeeze/applications/amarok.cmake/debian/amarok-engine-yauap-trinity.install
index 9a7c007c6..ab71ca6f9 100644
--- a/debian/squeeze/applications/amarok.cmake/debian/amarok-engine-yauap-trinity.install
+++ b/debian/squeeze/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/squeeze/applications/amarok.cmake/debian/amarok-trinity.install b/debian/squeeze/applications/amarok.cmake/debian/amarok-trinity.install
index 50181a39e..f5aeb567f 100644
--- a/debian/squeeze/applications/amarok.cmake/debian/amarok-trinity.install
+++ b/debian/squeeze/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/squeeze/applications/amarok/debian/amarok-engine-xine-trinity.install b/debian/squeeze/applications/amarok/debian/amarok-engine-xine-trinity.install
index 6b23c8378..c5e46604f 100644
--- a/debian/squeeze/applications/amarok/debian/amarok-engine-xine-trinity.install
+++ b/debian/squeeze/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/squeeze/applications/amarok/debian/amarok-engine-yauap-trinity.install b/debian/squeeze/applications/amarok/debian/amarok-engine-yauap-trinity.install
index 9a7c007c6..ab71ca6f9 100644
--- a/debian/squeeze/applications/amarok/debian/amarok-engine-yauap-trinity.install
+++ b/debian/squeeze/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/squeeze/applications/amarok/debian/amarok-trinity.install b/debian/squeeze/applications/amarok/debian/amarok-trinity.install
index 50181a39e..f5aeb567f 100644
--- a/debian/squeeze/applications/amarok/debian/amarok-trinity.install
+++ b/debian/squeeze/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/squeeze/applications/k3b/debian/k3b-trinity.install b/debian/squeeze/applications/k3b/debian/k3b-trinity.install
index e2601f7be..8e0b27b98 100644
--- a/debian/squeeze/applications/k3b/debian/k3b-trinity.install
+++ b/debian/squeeze/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/squeeze/applications/k3b/debian/libk3b3-extracodecs-trinity.install b/debian/squeeze/applications/k3b/debian/libk3b3-extracodecs-trinity.install
index 5e8cf796c..d806398ef 100644
--- a/debian/squeeze/applications/k3b/debian/libk3b3-extracodecs-trinity.install
+++ b/debian/squeeze/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/squeeze/applications/k3b/debian/libk3b3-trinity.install b/debian/squeeze/applications/k3b/debian/libk3b3-trinity.install
index ac53b1722..e18a34c1c 100644
--- a/debian/squeeze/applications/k3b/debian/libk3b3-trinity.install
+++ b/debian/squeeze/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/squeeze/applications/kaffeine/debian/kaffeine-gstreamer-trinity.install b/debian/squeeze/applications/kaffeine/debian/kaffeine-gstreamer-trinity.install
index ef17e5d67..cddfdc50f 100644
--- a/debian/squeeze/applications/kaffeine/debian/kaffeine-gstreamer-trinity.install
+++ b/debian/squeeze/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/squeeze/applications/kaffeine/debian/kaffeine-trinity.install b/debian/squeeze/applications/kaffeine/debian/kaffeine-trinity.install
index 8fbe826e1..825837cba 100644
--- a/debian/squeeze/applications/kaffeine/debian/kaffeine-trinity.install
+++ b/debian/squeeze/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/squeeze/applications/kchmviewer/debian/dirs b/debian/squeeze/applications/kchmviewer/debian/dirs
index c53a164e3..9d345cd36 100644
--- a/debian/squeeze/applications/kchmviewer/debian/dirs
+++ b/debian/squeeze/applications/kchmviewer/debian/dirs
@@ -1,2 +1,2 @@
opt/trinity/bin
-opt/trinity/lib/kde3
+opt/trinity/lib/trinity
diff --git a/debian/squeeze/applications/kde-guidance/debian/kde-guidance-trinity.install b/debian/squeeze/applications/kde-guidance/debian/kde-guidance-trinity.install
index dd8d06153..2b145ae71 100644
--- a/debian/squeeze/applications/kde-guidance/debian/kde-guidance-trinity.install
+++ b/debian/squeeze/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/squeeze/applications/kde-guidance/debian/rules b/debian/squeeze/applications/kde-guidance/debian/rules
index b388d4b12..54634ed38 100755
--- a/debian/squeeze/applications/kde-guidance/debian/rules
+++ b/debian/squeeze/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/squeeze/applications/kdesvn/debian/rules b/debian/squeeze/applications/kdesvn/debian/rules
index 66125d731..6e339cd2e 100755
--- a/debian/squeeze/applications/kdesvn/debian/rules
+++ b/debian/squeeze/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/squeeze/applications/kerry/debian/rules b/debian/squeeze/applications/kerry/debian/rules
index 8689ee969..e3861ca8d 100755
--- a/debian/squeeze/applications/kerry/debian/rules
+++ b/debian/squeeze/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/squeeze/applications/kmplayer/debian/kmplayer-konq-plugins-trinity.install b/debian/squeeze/applications/kmplayer/debian/kmplayer-konq-plugins-trinity.install
index a6db5e999..4590b56f4 100644
--- a/debian/squeeze/applications/kmplayer/debian/kmplayer-konq-plugins-trinity.install
+++ b/debian/squeeze/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/squeeze/applications/kmplayer/debian/kmplayer-trinity.install b/debian/squeeze/applications/kmplayer/debian/kmplayer-trinity.install
index 6709895c4..3c2a5f5ff 100644
--- a/debian/squeeze/applications/kmplayer/debian/kmplayer-trinity.install
+++ b/debian/squeeze/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/squeeze/applications/kmyfirewall/debian/rules b/debian/squeeze/applications/kmyfirewall/debian/rules
index 5e704e660..1993e3bfe 100755
--- a/debian/squeeze/applications/kmyfirewall/debian/rules
+++ b/debian/squeeze/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/squeeze/applications/kmymoney/debian/kmymoney2-trinity.install b/debian/squeeze/applications/kmymoney/debian/kmymoney2-trinity.install
index ace2df368..89ecca2de 100644
--- a/debian/squeeze/applications/kmymoney/debian/kmymoney2-trinity.install
+++ b/debian/squeeze/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/squeeze/applications/koffice/debian/chalk-trinity.install b/debian/squeeze/applications/koffice/debian/chalk-trinity.install
index 92ee23791..a36c77eb8 100644
--- a/debian/squeeze/applications/koffice/debian/chalk-trinity.install
+++ b/debian/squeeze/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/squeeze/applications/koffice/debian/karbon-trinity.install b/debian/squeeze/applications/koffice/debian/karbon-trinity.install
index 8ddf981d2..363bf04dc 100644
--- a/debian/squeeze/applications/koffice/debian/karbon-trinity.install
+++ b/debian/squeeze/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/squeeze/applications/koffice/debian/kchart-trinity.install b/debian/squeeze/applications/koffice/debian/kchart-trinity.install
index 0128696a2..095261d9f 100644
--- a/debian/squeeze/applications/koffice/debian/kchart-trinity.install
+++ b/debian/squeeze/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/squeeze/applications/koffice/debian/kexi-trinity.install b/debian/squeeze/applications/koffice/debian/kexi-trinity.install
index 96b6fab89..fc645134d 100644
--- a/debian/squeeze/applications/koffice/debian/kexi-trinity.install
+++ b/debian/squeeze/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/squeeze/applications/koffice/debian/kformula-trinity.install b/debian/squeeze/applications/koffice/debian/kformula-trinity.install
index 01a078f28..d9ba60a08 100644
--- a/debian/squeeze/applications/koffice/debian/kformula-trinity.install
+++ b/debian/squeeze/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/squeeze/applications/koffice/debian/kivio-trinity.install b/debian/squeeze/applications/koffice/debian/kivio-trinity.install
index e1dd97076..510c85320 100644
--- a/debian/squeeze/applications/koffice/debian/kivio-trinity.install
+++ b/debian/squeeze/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/squeeze/applications/koffice/debian/koffice-libs-trinity.install b/debian/squeeze/applications/koffice/debian/koffice-libs-trinity.install
index e6c517a10..8d1ecc1d3 100644
--- a/debian/squeeze/applications/koffice/debian/koffice-libs-trinity.install
+++ b/debian/squeeze/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/squeeze/applications/koffice/debian/koshell-trinity.install b/debian/squeeze/applications/koffice/debian/koshell-trinity.install
index b73b6b963..fc8fbb841 100644
--- a/debian/squeeze/applications/koffice/debian/koshell-trinity.install
+++ b/debian/squeeze/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/squeeze/applications/koffice/debian/kplato-trinity.install b/debian/squeeze/applications/koffice/debian/kplato-trinity.install
index 723803ff8..df01154f4 100644
--- a/debian/squeeze/applications/koffice/debian/kplato-trinity.install
+++ b/debian/squeeze/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/squeeze/applications/koffice/debian/kpresenter-trinity.install b/debian/squeeze/applications/koffice/debian/kpresenter-trinity.install
index b47947be4..fc90edce6 100644
--- a/debian/squeeze/applications/koffice/debian/kpresenter-trinity.install
+++ b/debian/squeeze/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/squeeze/applications/koffice/debian/kspread-trinity.install b/debian/squeeze/applications/koffice/debian/kspread-trinity.install
index f4570b605..9b1251bf2 100644
--- a/debian/squeeze/applications/koffice/debian/kspread-trinity.install
+++ b/debian/squeeze/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/squeeze/applications/koffice/debian/kthesaurus-trinity.install b/debian/squeeze/applications/koffice/debian/kthesaurus-trinity.install
index 1fd206695..d115bcf4b 100644
--- a/debian/squeeze/applications/koffice/debian/kthesaurus-trinity.install
+++ b/debian/squeeze/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/squeeze/applications/koffice/debian/kugar-trinity.install b/debian/squeeze/applications/koffice/debian/kugar-trinity.install
index a6cf88845..62c8c369f 100644
--- a/debian/squeeze/applications/koffice/debian/kugar-trinity.install
+++ b/debian/squeeze/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/squeeze/applications/koffice/debian/kword-trinity.install b/debian/squeeze/applications/koffice/debian/kword-trinity.install
index 3eeb32c72..d003812cd 100644
--- a/debian/squeeze/applications/koffice/debian/kword-trinity.install
+++ b/debian/squeeze/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/squeeze/applications/ktechlab/debian/debiandirs b/debian/squeeze/applications/ktechlab/debian/debiandirs
index a26d7ec9f..57c2b82b6 100644
--- a/debian/squeeze/applications/ktechlab/debian/debiandirs
+++ b/debian/squeeze/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/squeeze/applications/kwin-style-crystal/debian/dirs b/debian/squeeze/applications/kwin-style-crystal/debian/dirs
index 5a339f0ec..af39e99b5 100644
--- a/debian/squeeze/applications/kwin-style-crystal/debian/dirs
+++ b/debian/squeeze/applications/kwin-style-crystal/debian/dirs
@@ -1,2 +1,2 @@
-usr/trinity/lib/kde3
+usr/trinity/lib/trinity
usr/share/apps/kwin