Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging

11 files changed, 118 insertions, 118 deletions

diff --git a/ubuntu/maverick/kdesdk/debian/cervisia-trinity.install b/ubuntu/maverick/kdesdk/debian/cervisia-trinity.install
index 6203b5f0c..8bbaccc5d 100644
--- a/ubuntu/maverick/kdesdk/debian/cervisia-trinity.install
+++ b/ubuntu/maverick/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/ubuntu/maverick/kdesdk/debian/changelog b/ubuntu/maverick/kdesdk/debian/changelog
index 45201d54b..e78025460 100644
--- a/ubuntu/maverick/kdesdk/debian/changelog
+++ b/ubuntu/maverick/kdesdk/debian/changelog
@@ -6,7 +6,7 @@ kdesdk-trinity (4:3.5.10-0ubuntu3) karmic; urgency=low
 
 kdesdk-trinity (4:3.5.10-0ubuntu1~intrepid5) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 02 March 2009 21:41:00 -0600
@@ -832,7 +832,7 @@ kdesdk (4:3.1.0-3) unstable; urgency=low
 
 kdesdk (4:3.1.0-2) unstable; urgency=low
 
-  * First KDE3 upload to debian (closes: #167062).
+  * First Trinity upload to debian (closes: #167062).
   * Rolled the epoch to aid upgrades from the unofficial repository on
     ftp.kde.org.. *sigh*
 
diff --git a/ubuntu/maverick/kdesdk/debian/control b/ubuntu/maverick/kdesdk/debian/control
index dfd7dfc54..def7fcd4c 100644
--- a/ubuntu/maverick/kdesdk/debian/control
+++ b/ubuntu/maverick/kdesdk/debian/control
@@ -16,13 +16,13 @@ Architecture: all
 Section: kde
 Depends: cervisia-trinity (>= ${Source-Version}), kapptemplate-trinity (>= ${Source-Version}), kbabel-trinity (>= ${Source-Version}), kbugbuster-trinity (>= ${Source-Version}), kcachegrind-trinity (>= ${Source-Version}), kdesdk-kfile-plugins-trinity (>= ${Source-Version}), kdesdk-kio-plugins-trinity (>= ${Source-Version}) | kdesvn-kio-plugins-trinity, kdesdk-misc-trinity (>= ${Source-Version}), kdesdk-scripts-trinity, kmtrace-trinity (>= ${Source-Version}), kompare-trinity (>= ${Source-Version}), kspy-trinity (>= ${Source-Version}), kuiviewer-trinity (>= ${Source-Version}), kunittest-trinity (>= ${Source-Version}), poxml-trinity (>= ${Source-Version}), umbrello-trinity (>= ${Source-Version})
 Suggests: kcachegrind-converters-trinity, kbabel-trinity-dev, kdesdk-trinity-doc-html
-Description: software development kit from the official KDE3 release
+Description: software development kit from the official Trinity release
  KDE (the K Desktop Environment) is a powerful Open Source graphical
  desktop environment for Unix workstations. It combines ease of use,
  contemporary functionality, and outstanding graphical design with the
  technological superiority of the Unix operating system.
  .
- This metapackage includes the KDE3 Software Development Kit, a collection
+ This metapackage includes the Trinity Software Development Kit, a collection
  of applications and tools useful for developing KDE applications.
 
 Package: kdesdk-trinity-doc-html
@@ -30,7 +30,7 @@ Architecture: all
 Section: doc
 Suggests: konqueror-trinity | www-browser, kdesdk-trinity
 Replaces: cervisia-trinity (<< 4:3.2.0), kbabel-trinity (<< 4:3.2.0), kbugbuster-trinity (<< 4:3.2.0), kompare-trinity (<< 4:3.2.0)
-Description: KDE3 Software Development Kit documentation in HTML format
+Description: Trinity Software Development Kit documentation in HTML format
  By default the modules provided by KDE only provide their documentation
  in KDE docbook format, which can only be read by Konqueror or KHelpCenter.
  This package provides all of the KDE SDK documentation converted to
@@ -41,7 +41,7 @@ Description: KDE3 Software Development Kit documentation in HTML format
  /usr/share/doc/kde/HTML/en/umbrello/. Documentation is provided for most
  KDE SDK packages.
  .
- This package is part of KDE3, and a component of the KDE SDK module.
+ This package is part of Trinity, and a component of the KDE SDK module.
  See the 'kde-trinity' and 'kdesdk-trinity' packages for more information.
 
 Package: cervisia-trinity
@@ -50,7 +50,7 @@ Section: devel
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter-trinity, kdesdk-trinity-doc-html
 Conflicts: cervisia
-Description: a graphical CVS front end for KDE3
+Description: a graphical CVS front end for Trinity
  Cervisia is a KDE-based graphical front end for the CVS client.
  .
  As well as providing both common and advanced CVS operations, it offers
@@ -59,7 +59,7 @@ Description: a graphical CVS front end for KDE3
  versions of files.  A Changelog editor is also included and is coupled
  with the commit dialog.
  .
- This package is part of KDE3, and a component of the KDE SDK module.
+ This package is part of Trinity, and a component of the KDE SDK module.
  See the 'kde-trinity' and 'kdesdk-trinity' packages for more information.
 
 Package: kapptemplate-trinity
@@ -67,13 +67,13 @@ Architecture: all
 Section: devel
 Conflicts: kapptemplate
 Recommends: automake1.9 | automaken, kdelibs4-trinity-dev (>= 4:3.5.8)
-Description: creates a framework to develop a KDE3 application
+Description: creates a framework to develop a Trinity application
  KAppTemplate is a shell script that will create the necessary
  framework to develop various KDE applications.  It takes care of the
  autoconf/automake code as well as providing a skeleton and example of
  what the code typically looks like.
  .
- This package is part of KDE3, and a component of the KDE SDK module.
+ This package is part of Trinity, and a component of the KDE SDK module.
  See the 'kde-trinity' and 'kdesdk-trinity' packages for more information.
 
 Package: kbabel-trinity
@@ -83,7 +83,7 @@ Depends: ${shlibs:Depends}
 Conflicts: kbabel
 Recommends: gettext
 Suggests: khelpcenter-trinity, kdesdk-trinity-doc-html
-Description: PO-file editing suite for KDE3
+Description: PO-file editing suite for Trinity
  This is a suite of programs for editing gettext message files (PO-files).
  It is designed to help you translate fast and consistently.
  .
@@ -94,7 +94,7 @@ Description: PO-file editing suite for KDE3
  PO-files at once.  KBabelDict is a dictionary to assist with searching
  for common translations.
  .
- This package is part of KDE3, and a component of the KDE SDK module.
+ This package is part of Trinity, and a component of the KDE SDK module.
  See the 'kde-trinity' and 'kdesdk-trinity' packages for more information.
 
 Package: kbabel-trinity-dev
@@ -103,7 +103,7 @@ Section: libdevel
 Depends: kbabel-trinity (= ${Source-Version}), kdelibs4-trinity-dev (>= 4:3.5.8)
 Conflicts: kbabel
 Replaces: kbabel-trinity (<< 4:3.0.8-0)
-Description: PO-file editing suite for KDE3 (development files)
+Description: PO-file editing suite for Trinity (development files)
  This is a suite of programs for editing gettext message files (PO-files).
  It is designed to help you translate fast and consistently.
  .
@@ -116,7 +116,7 @@ Description: PO-file editing suite for KDE3 (development files)
  .
  This package contains the KBabel development files.
  .
- This package is part of KDE3, and a component of the KDE SDK module.
+ This package is part of Trinity, and a component of the KDE SDK module.
  See the 'kde-trinity' and 'kdesdk-trinity' packages for more information.
 
 Package: kbugbuster-trinity
@@ -125,12 +125,12 @@ Section: devel
 Depends: ${shlibs:Depends}
 Conflicts: kbugbuster
 Suggests: khelpcenter-trinity
-Description: a front end for the KDE3 bug tracking system
+Description: a front end for the Trinity bug tracking system
  KBugBuster is a GUI front end for the KDE bug tracking system.
  It allows the user to view and manipulate bug reports and provides a
  variety of options for searching through reports.
  .
- This package is part of KDE3, and a component of the KDE SDK module.
+ This package is part of Trinity, and a component of the KDE SDK module.
  See the 'kde-trinity' and 'kdesdk-trinity' packages for more information.
 
 Package: kcachegrind-trinity
@@ -149,7 +149,7 @@ Description: visualisation tool for valgrind profiling output
  For visualising the output from other profiling tools, several converters
  can be found in the kcachegrind-converters package.
  .
- This package is part of KDE3, and a component of the KDE SDK module.
+ This package is part of Trinity, and a component of the KDE SDK module.
  See the 'kde-trinity' and 'kdesdk-trinity' packages for more information.
 
 Package: kcachegrind-converters-trinity
@@ -167,7 +167,7 @@ Description: format converters for KCachegrind profiling visualisation tool
  profiled using calltree without being recompiled, and shared libraries
  and plugin architectures are supported.
  .
- This package is part of KDE3, and a component of the KDE SDK module.
+ This package is part of Trinity, and a component of the KDE SDK module.
  See the 'kde-trinity' and 'kdesdk-trinity' packages for more information.
 
 Package: kdesdk-kfile-plugins-trinity
@@ -175,12 +175,12 @@ Architecture: any
 Section: kde
 Depends: ${shlibs:Depends}
 Conflicts: kdesdk-kfile-plugins
-Description: KDE3 file dialog plugins for software development files
+Description: Trinity file dialog plugins for software development files
  This is a collection of plugins for the KDE file dialog.  These plugins
  extend the file dialog to offer advanced meta-information for source files,
  patch files and Qt Linguist data.
  .
- This package is part of KDE3, and a component of the KDE SDK module.
+ This package is part of Trinity, and a component of the KDE SDK module.
  See the 'kde-trinity' and 'kdesdk-trinity' packages for more information.
 
 Package: kdesdk-misc-trinity
@@ -191,7 +191,7 @@ Recommends: libqt3-mt-dev | libqt3-dev
 Suggests: gimp | xpaint
 Conflicts: kdepalettes-trinity (<= 4:3.1.0-1), scheck-trinity (<< 4:3.2.0-0), kdesdk-misc
 Replaces: kdepalettes-trinity (<= 4:3.1.0-1), scheck-trinity (<< 4:3.2.0-0), kdevelop3-plugins-trinity (<= 4:3.2.0-3)
-Description: various goodies from the KDE3 Software Development Kit
+Description: various goodies from the Trinity Software Development Kit
  This package contains miscellaneous goodies provided with the official
  KDE release to assist with KDE software development.
  .
@@ -201,7 +201,7 @@ Description: various goodies from the KDE3 Software Development Kit
   - palettes that match the KDE standard colour palette;
   - a KDE address book plugin that reads the list of KDE CVS accounts.
  .
- This package is part of KDE3, and a component of the KDE SDK module.
+ This package is part of Trinity, and a component of the KDE SDK module.
  See the 'kde-trinity' and 'kdesdk-trinity' packages for more information.
 
 Package: kdesdk-scripts-trinity
@@ -212,7 +212,7 @@ Recommends: automake1.9 | automaken, cvs, gawk
 Suggests: khelpcenter-trinity, kdesdk-trinity-doc-html, dmalloc, gdb, kdelibs4-trinity-doc, qt3-doc, valgrind, devscripts
 Enhances: kate-trinity
 Replaces: kdevelop-trinity (<< 1:1.4.0-3.2)
-Description: a set of useful development scripts for KDE3
+Description: a set of useful development scripts for Trinity
  This package contains a number of scripts which can be used to help in
  developing KDE-based applications.  Many of these scripts however are
  not specific to KDE, and in particular there are several general-use
@@ -224,7 +224,7 @@ Description: a set of useful development scripts for KDE3
   - bash and zsh completion controls for KDE apps;
   - valgrind error suppressions for KDE apps.
  .
- This package is part of KDE3, and a component of the KDE SDK module.
+ This package is part of Trinity, and a component of the KDE SDK module.
  See the 'kde-trinity' and 'kdesdk-trinity' packages for more information.
 
 Package: kmtrace-trinity
@@ -232,11 +232,11 @@ Architecture: any
 Section: devel
 Depends: ${shlibs:Depends}, less
 Conflicts: kmtrace
-Description: a KDE3 memory leak tracer
+Description: a Trinity memory leak tracer
  KMtrace is a KDE tool to assist with malloc debugging using glibc's
  "mtrace" functionality.
  .
- This package is part of KDE3, and a component of the KDE SDK module.
+ This package is part of Trinity, and a component of the KDE SDK module.
  See the 'kde-trinity' and 'kdesdk-trinity' packages for more information.
 
 Package: kompare-trinity
@@ -245,12 +245,12 @@ Section: devel
 Depends: ${shlibs:Depends}
 Conflicts: kompare
 Suggests: khelpcenter-trinity
-Description: a KDE3 GUI for viewing differences between files
+Description: a Trinity GUI for viewing differences between files
  Kompare is a graphical user interface for viewing the differences between
  files.  It can compare two documents, create a diff file, display a diff
  file and/or blend a diff file back into the original documents.
  .
- This package is part of KDE3, and a component of the KDE SDK module.
+ This package is part of Trinity, and a component of the KDE SDK module.
  See the 'kde-trinity' and 'kdesdk-trinity' packages for more information.
 
 Package: kspy-trinity
@@ -270,7 +270,7 @@ Description: examines the internal state of a Qt/KDE app
  .
  See /usr/share/doc/kspy/README for usage instructions.
  .
- This package is part of KDE3, and a component of the KDE SDK module.
+ This package is part of Trinity, and a component of the KDE SDK module.
  See the 'kde-trinity' and 'kdesdk-trinity' packages for more information.
 
 Package: kuiviewer-trinity
@@ -286,7 +286,7 @@ Description: viewer for Qt Designer user interface files
  .
  The Qt Designer itself is in the package qt3-designer.
  .
- This package is part of KDE3, and a component of the KDE SDK module.
+ This package is part of Trinity, and a component of the KDE SDK module.
  See the 'kde-trinity' and 'kdesdk-trinity' packages for more information.
 
 Package: libcvsservice0-trinity
@@ -303,7 +303,7 @@ Description: DCOP service for accessing CVS repositories
  .
  DCOP is the Desktop Communication Protocol used throughout KDE.
  .
- This package is part of KDE3, and a component of the KDE SDK module.
+ This package is part of Trinity, and a component of the KDE SDK module.
  See the 'kde-trinity' and 'kdesdk-trinity' packages for more information.
 
 Package: libcvsservice-trinity-dev
@@ -321,7 +321,7 @@ Description: development files for CVS DCOP service
  .
  Development files for libcvsservice are included in this package.
  .
- This package is part of KDE3, and a component of the KDE SDK module.
+ This package is part of Trinity, and a component of the KDE SDK module.
  See the 'kde-trinity' and 'kdesdk-trinity' packages for more information.
 
 Package: poxml-trinity
@@ -336,7 +336,7 @@ Description: tools for using PO-files to translate DocBook XML files
  Also included are some miscellaneous command-line utilities for
  manipulating DocBook XML files, PO-files and PO-template files.
  .
- This package is part of KDE3, and a component of the KDE SDK module.
+ This package is part of Trinity, and a component of the KDE SDK module.
  See the 'kde-trinity' and 'kdesdk-trinity' packages for more information.
 
 Package: umbrello-trinity
@@ -356,7 +356,7 @@ Description: UML modelling tool and code generator
  diagrams, use case diagrams, state diagrams, activity diagrams, component
  diagrams and deployment diagrams.
  .
- This package is part of KDE3, and a component of the KDE SDK module.
+ This package is part of Trinity, and a component of the KDE SDK module.
  See the 'kde-trinity' and 'kdesdk-trinity' packages for more information.
 
 Package: kdesdk-kio-plugins-trinity
@@ -365,12 +365,12 @@ Section: devel
 Depends: ${shlibs:Depends}, subversion
 Conflicts: kdesdk-kio-plugins
 Replaces: kdesdk-misc-trinity (<< 4:3.5.0)
-Description: subversion ioslave for KDE3
+Description: subversion ioslave for Trinity
  This package provides easy access to remote SVN repositories from within
  Konqueror, and KDE generally, by browsing them as if they were a
  filesystem, using URLs like svn://hostname/path, or svn+ssh://, etc.
  .
- This package is part of KDE3, and a component of the KDE SDK module.
+ This package is part of Trinity, and a component of the KDE SDK module.
  See the 'kde-trinity' and 'kdesdk-trinity' packages for more information.
 
 Package: kunittest-trinity
@@ -379,14 +379,14 @@ Section: devel
 Depends: ${shlibs:Depends}
 Conflicts: kunittest
 Suggests: kdelibs4-trinity-doc
-Description: unit testing library for KDE3
+Description: unit testing library for Trinity
  KUnitTest is a small library that facilitates the writing of tests for
  KDE developers. There are two ways to use the KUnitTest library. One is
  to create dynamically loadable modules and use the kunittestmodrunner or
  kunittestguimodrunner programs to run the tests. The other is to use the
  libraries to create your own testing application.
  .
- This package is part of KDE3, and a component of the KDE SDK module.
+ This package is part of Trinity, and a component of the KDE SDK module.
  See the 'kde-trinity' and 'kdesdk-trinity' packages for more information.
 
 Package: kdesdk-trinity-dbg
diff --git a/ubuntu/maverick/kdesdk/debian/kbabel-trinity.install b/ubuntu/maverick/kdesdk/debian/kbabel-trinity.install
index 964750620..40e614c64 100644
--- a/ubuntu/maverick/kdesdk/debian/kbabel-trinity.install
+++ b/ubuntu/maverick/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/ubuntu/maverick/kdesdk/debian/kbugbuster-trinity.install b/ubuntu/maverick/kdesdk/debian/kbugbuster-trinity.install
index 805416fc2..98cb1832e 100644
--- a/ubuntu/maverick/kdesdk/debian/kbugbuster-trinity.install
+++ b/ubuntu/maverick/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/ubuntu/maverick/kdesdk/debian/kdesdk-kfile-plugins-trinity.install b/ubuntu/maverick/kdesdk/debian/kdesdk-kfile-plugins-trinity.install
index 17676f088..1ffa48c57 100644
--- a/ubuntu/maverick/kdesdk/debian/kdesdk-kfile-plugins-trinity.install
+++ b/ubuntu/maverick/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/ubuntu/maverick/kdesdk/debian/kdesdk-kio-plugins-trinity.install b/ubuntu/maverick/kdesdk/debian/kdesdk-kio-plugins-trinity.install
index ce47fca1a..f3f70394c 100644
--- a/ubuntu/maverick/kdesdk/debian/kdesdk-kio-plugins-trinity.install
+++ b/ubuntu/maverick/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/ubuntu/maverick/kdesdk/debian/kdesdk-misc-trinity.install b/ubuntu/maverick/kdesdk/debian/kdesdk-misc-trinity.install
index ac363f400..cc229ce19 100644
--- a/ubuntu/maverick/kdesdk/debian/kdesdk-misc-trinity.install
+++ b/ubuntu/maverick/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/ubuntu/maverick/kdesdk/debian/kompare-trinity.install b/ubuntu/maverick/kdesdk/debian/kompare-trinity.install
index a97646df6..e4050e27f 100644
--- a/ubuntu/maverick/kdesdk/debian/kompare-trinity.install
+++ b/ubuntu/maverick/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/ubuntu/maverick/kdesdk/debian/kuiviewer-trinity.install b/ubuntu/maverick/kdesdk/debian/kuiviewer-trinity.install
index 7f0461308..964614988 100644
--- a/ubuntu/maverick/kdesdk/debian/kuiviewer-trinity.install
+++ b/ubuntu/maverick/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/ubuntu/maverick/kdesdk/debian/libcvsservice0-trinity.install b/ubuntu/maverick/kdesdk/debian/libcvsservice0-trinity.install
index fe4d6e16a..c1649ddd2 100644
--- a/ubuntu/maverick/kdesdk/debian/libcvsservice0-trinity.install
+++ b/ubuntu/maverick/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