9 files changed, 80 insertions, 80 deletions
diff --git a/debian/squeeze/kdesdk/debian/cervisia-trinity.install b/debian/squeeze/kdesdk/debian/cervisia-trinity.install
index 6203b5f0c..8bbaccc5d 100644
--- a/debian/squeeze/kdesdk/debian/cervisia-trinity.install
+++ b/debian/squeeze/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/squeeze/kdesdk/debian/kbabel-trinity.install b/debian/squeeze/kdesdk/debian/kbabel-trinity.install
index 964750620..40e614c64 100644
--- a/debian/squeeze/kdesdk/debian/kbabel-trinity.install
+++ b/debian/squeeze/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/squeeze/kdesdk/debian/kbugbuster-trinity.install b/debian/squeeze/kdesdk/debian/kbugbuster-trinity.install
index 805416fc2..98cb1832e 100644
--- a/debian/squeeze/kdesdk/debian/kbugbuster-trinity.install
+++ b/debian/squeeze/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/squeeze/kdesdk/debian/kdesdk-kfile-plugins-trinity.install b/debian/squeeze/kdesdk/debian/kdesdk-kfile-plugins-trinity.install
index 17676f088..1ffa48c57 100644
--- a/debian/squeeze/kdesdk/debian/kdesdk-kfile-plugins-trinity.install
+++ b/debian/squeeze/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/squeeze/kdesdk/debian/kdesdk-kio-plugins-trinity.install b/debian/squeeze/kdesdk/debian/kdesdk-kio-plugins-trinity.install
index ce47fca1a..f3f70394c 100644
--- a/debian/squeeze/kdesdk/debian/kdesdk-kio-plugins-trinity.install
+++ b/debian/squeeze/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/squeeze/kdesdk/debian/kdesdk-misc-trinity.install b/debian/squeeze/kdesdk/debian/kdesdk-misc-trinity.install
index ac363f400..cc229ce19 100644
--- a/debian/squeeze/kdesdk/debian/kdesdk-misc-trinity.install
+++ b/debian/squeeze/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/squeeze/kdesdk/debian/kompare-trinity.install b/debian/squeeze/kdesdk/debian/kompare-trinity.install
index a97646df6..e4050e27f 100644
--- a/debian/squeeze/kdesdk/debian/kompare-trinity.install
+++ b/debian/squeeze/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/squeeze/kdesdk/debian/kuiviewer-trinity.install b/debian/squeeze/kdesdk/debian/kuiviewer-trinity.install
index 7f0461308..964614988 100644
--- a/debian/squeeze/kdesdk/debian/kuiviewer-trinity.install
+++ b/debian/squeeze/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/squeeze/kdesdk/debian/libcvsservice0-trinity.install b/debian/squeeze/kdesdk/debian/libcvsservice0-trinity.install
index fe4d6e16a..c1649ddd2 100644
--- a/debian/squeeze/kdesdk/debian/libcvsservice0-trinity.install
+++ b/debian/squeeze/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