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

20 files changed, 217 insertions, 217 deletions

diff --git a/ubuntu/maverick/kdepim/debian/akregator-trinity.install b/ubuntu/maverick/kdepim/debian/akregator-trinity.install
index 8fee8f157..e67c9c91a 100644
--- a/ubuntu/maverick/kdepim/debian/akregator-trinity.install
+++ b/ubuntu/maverick/kdepim/debian/akregator-trinity.install
@@ -1,8 +1,8 @@
 /opt/trinity/bin/akregator
-/opt/trinity/lib/kde3/libakregatorpart.la
-/opt/trinity/lib/kde3/libakregatorpart.so
-/opt/trinity/lib/kde3/libakregator_mk4storage_plugin.la
-/opt/trinity/lib/kde3/libakregator_mk4storage_plugin.so
+/opt/trinity/lib/trinity/libakregatorpart.la
+/opt/trinity/lib/trinity/libakregatorpart.so
+/opt/trinity/lib/trinity/libakregator_mk4storage_plugin.la
+/opt/trinity/lib/trinity/libakregator_mk4storage_plugin.so
 /opt/trinity/lib/libakregatorprivate.la
 /opt/trinity/lib/libakregatorprivate.so
 /opt/trinity/share/applications/kde/akregator.desktop
diff --git a/ubuntu/maverick/kdepim/debian/changelog b/ubuntu/maverick/kdepim/debian/changelog
index f4385d188..bb7a10821 100644
--- a/ubuntu/maverick/kdepim/debian/changelog
+++ b/ubuntu/maverick/kdepim/debian/changelog
@@ -12,7 +12,7 @@ kdepim-trinity (4:3.5.10-0ubuntu2) karmic; urgency=low
 
 kdepim-trinity (4:3.5.10-0ubuntu2~intrepid1) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 01 March 2009 20:46:00 -0600
diff --git a/ubuntu/maverick/kdepim/debian/control b/ubuntu/maverick/kdepim/debian/control
index d70c90998..ceb8680ae 100644
--- a/ubuntu/maverick/kdepim/debian/control
+++ b/ubuntu/maverick/kdepim/debian/control
@@ -22,14 +22,14 @@ Section: kde
 Architecture: all
 Depends: akregator-trinity (>= ${Source-Version}), kaddressbook-trinity (>= ${Source-Version}), kalarm-trinity (>= ${Source-Version}), kandy-trinity (>= ${Source-Version}), karm-trinity (>= ${Source-Version}), kdepim-kfile-plugins-trinity (>= ${Source-Version}), kdepim-kio-plugins-trinity (>= ${Source-Version}), kdepim-kresources-trinity (>= ${Source-Version}), kdepim-wizards-trinity (>= ${Source-Version}), kitchensync-trinity (>= ${Source-Version}), kleopatra-trinity (>= ${Source-Version}), kmail-trinity (>= ${Source-Version}), kmailcvt-trinity (>= ${Source-Version}), knode-trinity (>= ${Source-Version}), knotes-trinity (>= ${Source-Version}), konsolekalendar-trinity (>= ${Source-Version}), kontact-trinity (>= ${Source-Version}), korganizer-trinity (>= ${Source-Version}), korn-trinity (>= ${Source-Version}), ktnef-trinity (>= ${Source-Version}), libindex0-trinity (>= ${Source-Version}), libkcal2b-trinity (>= ${Source-Version}), libkdepim1a-trinity (>= ${Source-Version}), libkgantt0-trinity (>= ${Source-Version}), libkleopatra1-trinity (>= ${Source-Version}), libkpimexchange1-trinity (>= ${Source-Version}), libkpimidentities1-trinity (>= ${Source-Version}), libksieve0-trinity (>= ${Source-Version}), libktnef1-trinity (>= ${Source-Version}), libmimelib1c2a-trinity (>= ${Source-Version})
 Suggests: kdepim-trinity-doc-html
-Description: Personal Information Management apps from the official KDE3 release
+Description: Personal Information Management apps 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 a collection of Personal Information Management
- (PIM) applications provided with the official release of KDE3.
+ (PIM) applications provided with the official release of Trinity.
  .
   Homepage: http://pim.kde.org/
 
@@ -51,7 +51,7 @@ Replaces: libkcal2-trinity-dev (<< 4:3.4.1), libmimelib1-trinity-dev (<< 4:3.4.2
 Description: KDE Personal Information Management [development]
  This package contains development files needed to compile kdepim applications.
  .
- This package is part of KDE3, and a component of the KDE PIM module.
+ This package is part of Trinity, and a component of the KDE PIM module.
  See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
  . 
   Homepage: http://pim.kde.org/
@@ -64,7 +64,7 @@ Description: KDE Personal Information Management library documentation
  KDE core library documentation. You need this documentation to develop KDE PIM
  applications.
  .
- This package is part of KDE3, and a component of the KDE PIM module.
+ This package is part of Trinity, and a component of the KDE PIM module.
  See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
  . 
   Homepage: http://pim.kde.org/
@@ -80,7 +80,7 @@ Description: KDE PIM documentation in HTML format
  KDE PIM documentation converted to HTML format so it can be read with any
  web browser.
  .
- This package is part of KDE3, and a component of the KDE PIM module.
+ This package is part of Trinity, and a component of the KDE PIM module.
  See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
  . 
   Homepage: http://pim.kde.org/
@@ -94,7 +94,7 @@ Description: RSS feed aggregator for KDE
  for KDE.  It allows you to quickly browse through hundreds of
  thousands of internet feeds in a quick, efficient, and familiar way.
  .
- This package is part of KDE3, and a component of the KDE PIM module.
+ This package is part of Trinity, and a component of the KDE PIM module.
  See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
  .
   Homepage: http://akregator.kde.org/
@@ -112,7 +112,7 @@ Description: KDE NG addressbook application
  your contacts to many different locations, including the local file system,
  LDAP servers, and SQL databases.
  .
- This package is part of KDE3, and a component of the KDE PIM module.
+ This package is part of Trinity, and a component of the KDE PIM module.
  See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
 
 Package: kalarm-trinity
@@ -120,7 +120,7 @@ Section: kde
 Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: kmix-trinity, kttsd-trinity
-Description: KDE3 alarm message, command and email scheduler
+Description: Trinity alarm message, command and email scheduler
  KAlarm provides a graphical interface to schedule personal timed events -
  pop-up alarm messages, command execution and sending emails. There is a
  range of options for configuring recurring events.
@@ -135,14 +135,14 @@ Description: KDE3 alarm message, command and email scheduler
  from the command line or via DCOP calls from other programs. KAlarm is
  KDE-based, but will also run on other desktops.
  .
- This package is part of KDE3, and a component of the KDE PIM module.
+ This package is part of Trinity, and a component of the KDE PIM module.
  See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
 
 Package: kandy-trinity
 Section: utils
 Architecture: any
 Depends: ${shlibs:Depends}
-Description: KDE3 mobile phone utility
+Description: Trinity mobile phone utility
  At the moment Kandy is more or less a terminal program with some special
  features to store commands and their parameters, but is also has a simple GUI
  to access the phone book of a mobile phone and it is able to save this phone
@@ -150,7 +150,7 @@ Description: KDE3 mobile phone utility
  .
  Kandy is aimed at mobile phones with integrated (GSM) modems.
  .
- This package is part of KDE3, and a component of the KDE PIM module.
+ This package is part of Trinity, and a component of the KDE PIM module.
  See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
 
 Package: karm-trinity
@@ -159,11 +159,11 @@ Architecture: any
 Replaces: kontact-trinity (<< 4:3.5.7-1ubuntu5)
 Conflicts: kontact-trinity (<< 4:3.5.7-1ubuntu5)
 Depends: ${shlibs:Depends}
-Description: KDE3 time tracker tool
+Description: Trinity time tracker tool
  KArm is a time tracker for busy people who need to keep track of the amount of
  time they spend on various tasks.
  .
- This package is part of KDE3, and a component of the KDE PIM module.
+ This package is part of Trinity, and a component of the KDE PIM module.
  See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
 
 Package: kdepim-kfile-plugins-trinity
@@ -173,7 +173,7 @@ Depends: ${shlibs:Depends}
 Description: KDE File dialog plugins for palm and vcf files
  File dialog plugins for palm and vcf files.
  .
- This package is part of KDE3, and a component of the KDE PIM module.
+ This package is part of Trinity, and a component of the KDE PIM module.
  See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
 
 Package: kdepim-kio-plugins-trinity
@@ -181,11 +181,11 @@ Section: kde
 Architecture: any
 Depends: ${shlibs:Depends}
 Replaces: kdebase-kio-plugins-trinity (<< 4:3.4.0)
-Description: KDE3 pim I/O Slaves
+Description: Trinity pim I/O Slaves
  This package includes the pim kioslaves. This includes imap4, sieve,
  and mbox.
  .
- This package is part of KDE3, and a component of the KDE PIM module.
+ This package is part of Trinity, and a component of the KDE PIM module.
  See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
 
 Package: kdepim-kresources-trinity
@@ -195,12 +195,12 @@ Depends: ${shlibs:Depends}
 Replaces: libkcal2a-trinity (<< 4:3.4.1), kaddressbook-trinity (<< 4:3.4.1), knotes-trinity (<< 4:3.4.1)
 Recommends: ${shlibs:Recommends}, korganizer-trinity
 Suggests: knotes-trinity
-Description: KDE3 pim resource plugins
+Description: Trinity pim resource plugins
  This package includes several plugins needed to interface with groupware
  servers. It also includes plugins for features such as blogging and
  tracking feature plans.
  .
- This package is part of KDE3, and a component of the KDE PIM module.
+ This package is part of Trinity, and a component of the KDE PIM module.
  See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
 
 Package: kdepim-wizards-trinity
@@ -209,11 +209,11 @@ Architecture: any
 Depends: ${shlibs:Depends}
 Replaces: kdepim-trinity-dev (<< 4:3.4.1-2)
 Suggests: egroupware
-Description: KDE3 server configuration wizards
+Description: Trinity server configuration wizards
  This package contains KDE-based wizards for configuring eGroupware,
  Kolab, and SUSE Linux Openexchange servers.
  .
- This package is part of KDE3, and a component of the KDE PIM module.
+ This package is part of Trinity, and a component of the KDE PIM module.
  See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
 
 Package: kitchensync-trinity
@@ -227,18 +227,18 @@ Description: Synchronization framework
  This package contains a synchronization framework, still under heavy
  development (?).  Kitchensync uses opensync.
  .
- This package is part of KDE3, and a component of the KDE PIM module.
+ This package is part of Trinity, and a component of the KDE PIM module.
  See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
 
 Package: kleopatra-trinity
 Section: net
 Architecture: any
 Depends: ${shlibs:Depends}, gnupg-agent, gnupg2, gpgsm, dirmngr, pinentry-qt | pinentry-x11
-Description: KDE3 Certificate Manager
+Description: Trinity Certificate Manager
  Kleopatra is the KDE tool for managing X.509 certificates in the gpgsm
  keybox and for retrieving certificates from LDAP servers.
  .
- This package is part of KDE3, and a component of the KDE PIM module.
+ This package is part of Trinity, and a component of the KDE PIM module.
  See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
 
 Package: kmail-trinity
@@ -250,7 +250,7 @@ Suggests: gnupg, gnupg-agent, pinentry-qt | pinentry-x11, kaddressbook-trinity,
 Conflicts: kontact-trinity (<< 4:3.5.7-1ubuntu5)
 Replaces: kdepim-trinity-dev (<< 4:3.4.0), kdebase-trinity-data (<< 4:3.4.0), kontact-trinity (<< 4:3.5.7-1ubuntu5)
 Provides: imap-client, mail-reader
-Description: KDE3 Email client
+Description: Trinity Email client
  KMail is a fully-featured email client that fits nicely into the KDE
  desktop. It has features such as support for IMAP, POP3, multiple accounts,
  mail filtering and sorting, PGP/GnuPG privacy, and inline attachments.
@@ -258,7 +258,7 @@ Description: KDE3 Email client
  You need to install kdepim-kio-plugins if you want to use IMAP or
  mbox files, and/or kdebase-kio-plugins if you want to use POP3.
  .
- This package is part of KDE3, and a component of the KDE PIM module.
+ This package is part of Trinity, and a component of the KDE PIM module.
  See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
  .
   Homepage: http://kmail.kde.org/
@@ -267,11 +267,11 @@ Package: kmailcvt-trinity
 Section: mail
 Architecture: any
 Depends: ${shlibs:Depends}, kmail-trinity
-Description: KDE3 KMail mail folder converter
+Description: Trinity KMail mail folder converter
  Converts mail folders to KMail format.  Formats supported for import
  include Outlook Express, Evolution, and plain mbox.
  .
- This package is part of KDE3, and a component of the KDE PIM module.
+ This package is part of Trinity, and a component of the KDE PIM module.
  See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
 
 Package: knode-trinity
@@ -280,13 +280,13 @@ Architecture: any
 Depends: ${shlibs:Depends}
 Replaces: kdepim-trinity-dev (<< 4:3.4.0), kontact-trinity (<< 4:3.5.7-1ubuntu2)
 Provides: news-reader
-Description: KDE3 news reader
+Description: Trinity news reader
  KNode is an easy-to-use, convenient newsreader. It is intended to be usable
  by inexperienced users, but also includes support for such features as
  MIME attachments, article scoring, and creating and verifying GnuPG
  signatures.
  .
- This package is part of KDE3, and a component of the KDE PIM module.
+ This package is part of Trinity, and a component of the KDE PIM module.
  See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
 
 Package: knotes-trinity
@@ -296,12 +296,12 @@ Depends: ${shlibs:Depends}
 Suggests: kdepim-kresources-trinity
 Replaces: kontact-trinity (<< 4:3.5.7-1ubuntu5)
 Conflicts: kontact-trinity (<< 4:3.5.7-1ubuntu5)
-Description: KDE3 sticky notes
+Description: Trinity sticky notes
  KNotes is a program that lets you write sticky notes. The notes are saved
  automatically when you exit the program, and they display when you open the
  program.  The program supports printing and mailing your notes.
  .
- This package is part of KDE3, and a component of the KDE PIM module.
+ This package is part of Trinity, and a component of the KDE PIM module.
  See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
 
 Package: kode-trinity
@@ -313,19 +313,19 @@ Description: Helper library for programmatic generation of C++ code
  and kxml_compiler for generation of C++ classes representing XML data
  described by RelaxNG schemes.
  .
- This package is part of KDE3, and a component of the KDE PIM module.
+ This package is part of Trinity, and a component of the KDE PIM module.
  See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
 
 Package: konsolekalendar-trinity
 Section: kde
 Architecture: any
 Depends: ${shlibs:Depends}
-Description: KDE3 konsole personal organizer
+Description: Trinity konsole personal organizer
  KonsoleKalendar is a command-line interface to KDE calendars.
  Konsolekalendar complements the KDE KOrganizer by providing a console
  frontend to manage your calendars.
  .
- This package is part of KDE3, and a component of the KDE PIM module.
+ This package is part of Trinity, and a component of the KDE PIM module.
  See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
 
 Package: kontact-trinity
@@ -336,13 +336,13 @@ Recommends: ${shlibs:Recommends}, kmail-trinity, knode-trinity, knotes-trinity
 Suggests: ${shlibs:Suggests}, akregator-trinity, knewsticker-trinity, kweather-trinity, gnokii
 Replaces: akregator-trinity (<< 4:3.4.0), akregator-kontact-plugin-trinity
 Conflicts: akregator-kontact-plugin-trinity
-Description: KDE3 pim application
+Description: Trinity pim application
  Kontact is the integrated solution to your personal information management
  needs. It combines KDE applications like KMail, KOrganizer, and
  KAddressBook into a single interface to provide easy access to mail,
  scheduling, address book and other PIM functionality.
  .
- This package is part of KDE3, and a component of the KDE PIM module.
+ This package is part of Trinity, and a component of the KDE PIM module.
  See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
  .
   Homepage: http://kontact.kde.org/
@@ -354,7 +354,7 @@ Depends: ${shlibs:Depends}, ${perl:Depends}
 Recommends: kghostview-trinity
 Replaces: kontact-trinity (<< 4:3.5.7-1ubuntu5)
 Conflicts: kontact-trinity (<< 4:3.5.7-1ubuntu5)
-Description: KDE3 personal organizer
+Description: Trinity personal organizer
  This package contains KOrganizer, a calendar and scheduling program.
  .
  KOrganizer aims to be a complete program for organizing appointments,
@@ -366,14 +366,14 @@ Description: KDE3 personal organizer
  KOrganizer offers full synchronization with Palm Pilots, if kpilot is
  installed.
  .
- This package is part of KDE3, and a component of the KDE PIM module.
+ This package is part of Trinity, and a component of the KDE PIM module.
  See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
 
 Package: korn-trinity
 Section: kde
 Architecture: any
 Depends: ${shlibs:Depends}, kdepim-kio-plugins-trinity, kdebase-kio-plugins-trinity
-Description: KDE3 mail checker
+Description: Trinity mail checker
  Korn is a KDE mail checker that can display a small summary in the Kicker
  tray.  It supports checking mbox, pop3, imap4, and nntp sources.
  .
@@ -381,46 +381,46 @@ Description: KDE3 mail checker
  the color/icon of the Kicker display.  In addition to this you can have
  Korn run a program once you click on the docked icon in Kicker.
  .
- This package is part of KDE3, and a component of the KDE PIM module.
+ This package is part of Trinity, and a component of the KDE PIM module.
  See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
 
 Package: ktnef-trinity
 Section: kde
 Architecture: any
 Depends: ${shlibs:Depends}
-Description: KDE3 TNEF viewer
+Description: Trinity TNEF viewer
  The TNEF File Viewer allows you to handle mail attachments using the TNEF
  format. These attachments are usually found in mails coming from Microsoft
  mail servers and embed the mail properties as well as the actual attachments.
  .
- This package is part of KDE3, and a component of the KDE PIM module.
+ This package is part of Trinity, and a component of the KDE PIM module.
  See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
 
 Package: libindex0-trinity
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
-Description: KDE3 indexing library
+Description: Trinity indexing library
  This library provides text indexing and is currently used by KMail
  to implement fast searches in mail bodies.
  .
  This is the runtime package for programs that use the libindex-trinity library.
  .
- This package is part of KDE3, and a component of the KDE PIM module.
+ This package is part of Trinity, and a component of the KDE PIM module.
  See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
 
 Package: libindex0-trinity-dev
 Section: libdevel
 Architecture: any
 Depends: libindex0-trinity (= ${Source-Version})
-Description: KDE3 indexing library [development]
+Description: Trinity indexing library [development]
  This library provides text indexing and is currently used by KMail
  to implement searching through mail text.
  .
  This is the development package which contains the headers for the libindex-trinity
  library.
  .
- This package is part of KDE3, and a component of the KDE PIM module.
+ This package is part of Trinity, and a component of the KDE PIM module.
  See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
 
 Package: libkcal2b-trinity
@@ -431,13 +431,13 @@ Recommends: ${shlibs:Recommends}
 Conflicts: libkcal2-trinity, libkcal2a-trinity
 Replaces: libkcal2a-trinity
 Suggests: kdepim-kresources-trinity
-Description: KDE3 calendaring library
+Description: Trinity calendaring library
  This library provides a C++ API for handling the vCalendar and iCalendar
  formats.
  .
  This is the runtime package for programs that use the libkcal-trinity library.
  .
- This package is part of KDE3, and a component of the KDE PIM module.
+ This package is part of Trinity, and a component of the KDE PIM module.
  See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
 
 Package: libkcal2-trinity-dev
@@ -445,14 +445,14 @@ Section: libdevel
 Architecture: any
 Depends: libkcal2b-trinity (= ${Source-Version}), libkdepim1-trinity-dev (= ${Source-Version}), libktnef1-trinity-dev (= ${Source-Version})
 Replaces: kdepim-trinity-dev (<= 4:3.5.4-1)
-Description: KDE3 calendaring library [development]
+Description: Trinity calendaring library [development]
  This library provides a C++ API for handling the vCalendar and iCalendar
  formats.
  .
  This is the development package which contains the headers for the libkcal-trinity
  library.
  .
- This package is part of KDE3, and a component of the KDE PIM module.
+ This package is part of Trinity, and a component of the KDE PIM module.
  See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
 
 Package: libkdepim1a-trinity
@@ -460,10 +460,10 @@ Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
 Replaces: akregator-trinity (<< 4:3.4.0), libkdepim1-trinity, korganizer-trinity (<< 4:3.5.7-1ubuntu3)
-Description: KDE3 PIM library
+Description: Trinity PIM library
  This is the runtime package for programs that use the libkdepim-trinity library.
  .
- This package is part of KDE3, and a component of the KDE PIM module.
+ This package is part of Trinity, and a component of the KDE PIM module.
  See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
 
 Package: libkdepim1-trinity-dev
@@ -471,32 +471,32 @@ Section: libdevel
 Architecture: any
 Depends: libkdepim1a-trinity (= ${Source-Version}), kdelibs4-trinity-dev (>= 4:3.5.7)
 Replaces: kdepim-trinity-dev (<< 4:3.4.1)
-Description: KDE3 PIM library [development]
+Description: Trinity PIM library [development]
  This is the development package which contains the headers for the libkdepim-trinity
  library.
  .
- This package is part of KDE3, and a component of the KDE PIM module.
+ This package is part of Trinity, and a component of the KDE PIM module.
  See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
 
 Package: libkgantt0-trinity
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
-Description: KDE3 gantt charting library
+Description: Trinity gantt charting library
  This is the runtime package for programs that use the libkgantt-trinity library.
  .
- This package is part of KDE3, and a component of the KDE PIM module.
+ This package is part of Trinity, and a component of the KDE PIM module.
  See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
 
 Package: libkgantt0-trinity-dev
 Section: libdevel
 Architecture: any
 Depends: libkgantt0-trinity (= ${Source-Version}), libkdepim1-trinity-dev (= ${Source-Version})
-Description: KDE3 gantt charting library [development]
+Description: Trinity gantt charting library [development]
  This is the development package which contains the headers for the libkgantt-trinity
  library.
  .
- This package is part of KDE3, and a component of the KDE PIM module.
+ This package is part of Trinity, and a component of the KDE PIM module.
  See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
 
 Package: libkleopatra1-trinity
@@ -504,14 +504,14 @@ Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${perl:Depends}, gnupg
 Conflicts: libkleopatra0-trinity
-Replaces: libkdenetwork2-kde33, libkleopatra0a-trinity
+Replaces: libkdenetwork2-trinity3, libkleopatra0a-trinity
 Description: KDE GnuPG interface libraries
  This library is used by several KDE applications to interface to the
  GnuPG program.
  .
  This is the runtime package for programs that use the libkleopatra-trinity library.
  .
- This package is part of KDE3, and a component of the KDE PIM module.
+ This package is part of Trinity, and a component of the KDE PIM module.
  See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
 
 Package: libkleopatra1-trinity-dev
@@ -520,14 +520,14 @@ Architecture: any
 Depends: libkleopatra1-trinity (= ${Source-Version}), libkdepim1-trinity-dev (= ${Source-Version})
 Conflicts: libkleopatra0-trinity-dev
 Replaces: libkleopatra0-trinity-dev
-Description: KDE3 GnuPG interface libraries [development]
+Description: Trinity GnuPG interface libraries [development]
  This library is used by several KDE applications to interface to the
  GnuPG program.
  .
  This is the development package which contains the headers for the
  libkleopatra-trinity library.
  .
- This package is part of KDE3, and a component of the KDE PIM module.
+ This package is part of Trinity, and a component of the KDE PIM module.
  See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
 
 Package: libkmime2-trinity
@@ -536,68 +536,68 @@ Architecture: any
 Depends: ${shlibs:Depends}
 Conflicts: libmimelib1a-trinity
 Replaces: libmimelib1a-trinity
-Description: KDE3 MIME interface library
+Description: Trinity MIME interface library
  This library provides a C++ interface to MIME messages, parsing them into
  an object tree.
  .
- This package is part of KDE3, and a component of the KDE PIM module.
+ This package is part of Trinity, and a component of the KDE PIM module.
  See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
 
 Package: libkpimexchange1-trinity
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
-Description: KDE3 PIM Exchange library
+Description: Trinity PIM Exchange library
  This is the runtime package for programs that use the libkpimexchange-trinity
  library. 
  .
- This package is part of KDE3, and a component of the KDE PIM module.
+ This package is part of Trinity, and a component of the KDE PIM module.
  See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
 
 Package: libkpimexchange1-trinity-dev
 Section: libdevel
 Architecture: any
 Depends: libkpimexchange1-trinity (= ${Source-Version}), libkcal2-trinity-dev (= ${Source-Version}), libkdepim1-trinity-dev (= ${Source-Version})
-Description: KDE3 PIM Exchange library [development]
+Description: Trinity PIM Exchange library [development]
  This is the development package which contains the headers for the
  libkpimexchange-trinity library.
  .
- This package is part of KDE3, and a component of the KDE PIM module.
+ This package is part of Trinity, and a component of the KDE PIM module.
  See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
 
 Package: libkpimidentities1-trinity
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
-Description: KDE3 PIM user identity information library
+Description: Trinity PIM user identity information library
  This library provides information to KDE programs about user identity,
  such as email address, organization, etc.
  .
  This is the runtime package for programs that use the libkpimidentities-trinity
  library.
  .
- This package is part of KDE3, and a component of the KDE PIM module.
+ This package is part of Trinity, and a component of the KDE PIM module.
  See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
 
 Package: libksieve0-trinity
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
-Description: KDE3 mail/news message filtering library
+Description: Trinity mail/news message filtering library
  This is the runtime package for programs that use the libksieve-trinity library.
  .
- This package is part of KDE3, and a component of the KDE PIM module.
+ This package is part of Trinity, and a component of the KDE PIM module.
  See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
 
 Package: libksieve0-trinity-dev
 Section: libdevel
 Architecture: any
 Depends: libksieve0-trinity (= ${Source-Version}), libkdepim1-trinity-dev (= ${Source-Version})
-Description: KDE3 mail/news message filtering library [development]
+Description: Trinity mail/news message filtering library [development]
  This is the development package which contains the headers for the libksieve-trinity
  library.
  .
- This package is part of KDE3, and a component of the KDE PIM module.
+ This package is part of Trinity, and a component of the KDE PIM module.
  See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
 
 Package: libktnef1-trinity
@@ -613,7 +613,7 @@ Description: Library for handling KTNEF email attachments
  .
  This is the runtime library for packages using the ktnef-trinity library.
  .
- This package is part of KDE3, and a component of the KDE PIM module.
+ This package is part of Trinity, and a component of the KDE PIM module.
  See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
 
 Package: libktnef1-trinity-dev
@@ -630,7 +630,7 @@ Description: KTNEF handler library [development]
  This is the development package which contains the headers for the
  ktnef-trinity library.
  .
- This package is part of KDE3, and a component of the KDE PIM module.
+ This package is part of Trinity, and a component of the KDE PIM module.
  See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
 
 Package: libmimelib1c2a-trinity
@@ -639,23 +639,23 @@ Architecture: any
 Depends: ${shlibs:Depends}
 Conflicts: libmimelib1a-trinity
 Replaces: libmimelib1a-trinity
-Description: KDE3 mime library
- This library is used by several KDE3 applications to handle mime types.
+Description: Trinity mime library
+ This library is used by several Trinity applications to handle mime types.
  .
  This is the runtime package for programs that use the libmimelib-trinity library.
  .
- This package is part of KDE3, and a component of the KDE PIM module.
+ This package is part of Trinity, and a component of the KDE PIM module.
  See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
 
 Package: libmimelib1-trinity-dev
 Section: libdevel
 Architecture: any
 Depends: libmimelib1c2a-trinity (= ${Source-Version})
-Description: KDE3 mime library [development]
+Description: Trinity mime library [development]
  This library is used by several KDE applications to handle mime types.
  .
  This is the development package which contains the headers for the
  libmimelib library.
  .
- This package is part of KDE3, and a component of the KDE PIM module.
+ This package is part of Trinity, and a component of the KDE PIM module.
  See the 'kde-trinity' and 'kdepim-trinity' packages for more information.
diff --git a/ubuntu/maverick/kdepim/debian/kaddressbook-trinity.install b/ubuntu/maverick/kdepim/debian/kaddressbook-trinity.install
index ff875366f..cd87d91bd 100644
--- a/ubuntu/maverick/kdepim/debian/kaddressbook-trinity.install
+++ b/ubuntu/maverick/kdepim/debian/kaddressbook-trinity.install
@@ -1,17 +1,17 @@
 /opt/trinity/bin/kabc2mutt
 /opt/trinity/bin/kaddressbook
-/opt/trinity/lib/kde3/kcm_kabconfig.la
-/opt/trinity/lib/kde3/kcm_kabconfig.so
-/opt/trinity/lib/kde3/kcm_kabcustomfields.la
-/opt/trinity/lib/kde3/kcm_kabcustomfields.so
-/opt/trinity/lib/kde3/kcm_kabldapconfig.la
-/opt/trinity/lib/kde3/kcm_kabldapconfig.so
-/opt/trinity/lib/kde3/ldifvcardthumbnail.la
-/opt/trinity/lib/kde3/ldifvcardthumbnail.so
-/opt/trinity/lib/kde3/libkaddrbk_*.la
-/opt/trinity/lib/kde3/libkaddrbk_*.so
-/opt/trinity/lib/kde3/libkaddressbookpart.la
-/opt/trinity/lib/kde3/libkaddressbookpart.so
+/opt/trinity/lib/trinity/kcm_kabconfig.la
+/opt/trinity/lib/trinity/kcm_kabconfig.so
+/opt/trinity/lib/trinity/kcm_kabcustomfields.la
+/opt/trinity/lib/trinity/kcm_kabcustomfields.so
+/opt/trinity/lib/trinity/kcm_kabldapconfig.la
+/opt/trinity/lib/trinity/kcm_kabldapconfig.so
+/opt/trinity/lib/trinity/ldifvcardthumbnail.la
+/opt/trinity/lib/trinity/ldifvcardthumbnail.so
+/opt/trinity/lib/trinity/libkaddrbk_*.la
+/opt/trinity/lib/trinity/libkaddrbk_*.so
+/opt/trinity/lib/trinity/libkaddressbookpart.la
+/opt/trinity/lib/trinity/libkaddressbookpart.so
 /opt/trinity/lib/libkabinterfaces.so.1
 /opt/trinity/lib/libkabinterfaces.so.1.0.0
 /opt/trinity/lib/libkaddressbook.so.0
diff --git a/ubuntu/maverick/kdepim/debian/karm-trinity.install b/ubuntu/maverick/kdepim/debian/karm-trinity.install
index 4ed24ce22..aab595c42 100644
--- a/ubuntu/maverick/kdepim/debian/karm-trinity.install
+++ b/ubuntu/maverick/kdepim/debian/karm-trinity.install
@@ -2,8 +2,8 @@
 /opt/trinity/lib/libkarm.so
 /opt/trinity/lib/libkarm.so.0
 /opt/trinity/lib/libkarm.so.0.0.0
-/opt/trinity/lib/kde3/libkarmpart.la
-/opt/trinity/lib/kde3/libkarmpart.so
+/opt/trinity/lib/trinity/libkarmpart.la
+/opt/trinity/lib/trinity/libkarmpart.so
 /opt/trinity/share/applications/kde/karm.desktop
 /opt/trinity/share/applnk/Utilities/karm.desktop
 /opt/trinity/share/apps/karm
diff --git a/ubuntu/maverick/kdepim/debian/kdepim-kfile-plugins-trinity.install b/ubuntu/maverick/kdepim/debian/kdepim-kfile-plugins-trinity.install
index afae2323d..3f39aaf87 100644
--- a/ubuntu/maverick/kdepim/debian/kdepim-kfile-plugins-trinity.install
+++ b/ubuntu/maverick/kdepim/debian/kdepim-kfile-plugins-trinity.install
@@ -1,6 +1,6 @@
-/opt/trinity/lib/kde3/kfile_ics.la
-/opt/trinity/lib/kde3/kfile_ics.so
-/opt/trinity/lib/kde3/kfile_vcf.la
-/opt/trinity/lib/kde3/kfile_vcf.so
+/opt/trinity/lib/trinity/kfile_ics.la
+/opt/trinity/lib/trinity/kfile_ics.so
+/opt/trinity/lib/trinity/kfile_vcf.la
+/opt/trinity/lib/trinity/kfile_vcf.so
 /opt/trinity/share/services/kfile_ics.desktop
 /opt/trinity/share/services/kfile_vcf.desktop
diff --git a/ubuntu/maverick/kdepim/debian/kdepim-kio-plugins-trinity.install b/ubuntu/maverick/kdepim/debian/kdepim-kio-plugins-trinity.install
index c08b844a5..f9cc8ca27 100644
--- a/ubuntu/maverick/kdepim/debian/kdepim-kio-plugins-trinity.install
+++ b/ubuntu/maverick/kdepim/debian/kdepim-kio-plugins-trinity.install
@@ -1,13 +1,13 @@
-/opt/trinity/lib/kde3/kio_groupwise.la
-/opt/trinity/lib/kde3/kio_groupwise.so
-/opt/trinity/lib/kde3/kio_imap4.la
-/opt/trinity/lib/kde3/kio_imap4.so
-/opt/trinity/lib/kde3/kio_mbox.la
-/opt/trinity/lib/kde3/kio_mbox.so
-/opt/trinity/lib/kde3/kio_scalix.la
-/opt/trinity/lib/kde3/kio_scalix.so
-/opt/trinity/lib/kde3/kio_sieve.la
-/opt/trinity/lib/kde3/kio_sieve.so
+/opt/trinity/lib/trinity/kio_groupwise.la
+/opt/trinity/lib/trinity/kio_groupwise.so
+/opt/trinity/lib/trinity/kio_imap4.la
+/opt/trinity/lib/trinity/kio_imap4.so
+/opt/trinity/lib/trinity/kio_mbox.la
+/opt/trinity/lib/trinity/kio_mbox.so
+/opt/trinity/lib/trinity/kio_scalix.la
+/opt/trinity/lib/trinity/kio_scalix.so
+/opt/trinity/lib/trinity/kio_sieve.la
+/opt/trinity/lib/trinity/kio_sieve.so
 /opt/trinity/share/services/groupwise.protocol
 /opt/trinity/share/services/groupwises.protocol
 /opt/trinity/share/services/imap4.protocol
diff --git a/ubuntu/maverick/kdepim/debian/kdepim-kresources-trinity.install b/ubuntu/maverick/kdepim/debian/kdepim-kresources-trinity.install
index 4fc5fef60..588b690b1 100644
--- a/ubuntu/maverick/kdepim/debian/kdepim-kresources-trinity.install
+++ b/ubuntu/maverick/kdepim/debian/kdepim-kresources-trinity.install
@@ -1,31 +1,31 @@
-/opt/trinity/lib/kde3/kabc_*.la
-/opt/trinity/lib/kde3/kabc_*.so
-/opt/trinity/lib/kde3/kcal_caldav.la
-/opt/trinity/lib/kde3/kcal_caldav.so
-/opt/trinity/lib/kde3/kabc_carddav.la
-/opt/trinity/lib/kde3/kabc_carddav.so
-/opt/trinity/lib/kde3/kcal_groupdav.la
-/opt/trinity/lib/kde3/kcal_groupdav.so
-/opt/trinity/lib/kde3/kcal_groupwise.la
-/opt/trinity/lib/kde3/kcal_groupwise.so
-/opt/trinity/lib/kde3/kcal_kolab.la
-/opt/trinity/lib/kde3/kcal_kolab.so
-/opt/trinity/lib/kde3/kcal_scalix.la
-/opt/trinity/lib/kde3/kcal_scalix.so
-/opt/trinity/lib/kde3/kcal_newexchange.la
-/opt/trinity/lib/kde3/kcal_newexchange.so
-/opt/trinity/lib/kde3/kcal_resourcefeatureplan.la
-/opt/trinity/lib/kde3/kcal_resourcefeatureplan.so
-/opt/trinity/lib/kde3/kcal_slox.la
-/opt/trinity/lib/kde3/kcal_slox.so
-/opt/trinity/lib/kde3/kcal_xmlrpc.la
-/opt/trinity/lib/kde3/kcal_xmlrpc.so
-/opt/trinity/lib/kde3/knotes_kolab.la
-/opt/trinity/lib/kde3/knotes_kolab.so
-/opt/trinity/lib/kde3/knotes_scalix.la
-/opt/trinity/lib/kde3/knotes_scalix.so
-/opt/trinity/lib/kde3/knotes_xmlrpc.la
-/opt/trinity/lib/kde3/knotes_xmlrpc.so
+/opt/trinity/lib/trinity/kabc_*.la
+/opt/trinity/lib/trinity/kabc_*.so
+/opt/trinity/lib/trinity/kcal_caldav.la
+/opt/trinity/lib/trinity/kcal_caldav.so
+/opt/trinity/lib/trinity/kabc_carddav.la
+/opt/trinity/lib/trinity/kabc_carddav.so
+/opt/trinity/lib/trinity/kcal_groupdav.la
+/opt/trinity/lib/trinity/kcal_groupdav.so
+/opt/trinity/lib/trinity/kcal_groupwise.la
+/opt/trinity/lib/trinity/kcal_groupwise.so
+/opt/trinity/lib/trinity/kcal_kolab.la
+/opt/trinity/lib/trinity/kcal_kolab.so
+/opt/trinity/lib/trinity/kcal_scalix.la
+/opt/trinity/lib/trinity/kcal_scalix.so
+/opt/trinity/lib/trinity/kcal_newexchange.la
+/opt/trinity/lib/trinity/kcal_newexchange.so
+/opt/trinity/lib/trinity/kcal_resourcefeatureplan.la
+/opt/trinity/lib/trinity/kcal_resourcefeatureplan.so
+/opt/trinity/lib/trinity/kcal_slox.la
+/opt/trinity/lib/trinity/kcal_slox.so
+/opt/trinity/lib/trinity/kcal_xmlrpc.la
+/opt/trinity/lib/trinity/kcal_xmlrpc.so
+/opt/trinity/lib/trinity/knotes_kolab.la
+/opt/trinity/lib/trinity/knotes_kolab.so
+/opt/trinity/lib/trinity/knotes_scalix.la
+/opt/trinity/lib/trinity/knotes_scalix.so
+/opt/trinity/lib/trinity/knotes_xmlrpc.la
+/opt/trinity/lib/trinity/knotes_xmlrpc.so
 /opt/trinity/lib/libkabckolab.so.0
 /opt/trinity/lib/libkabckolab.so.0.0.0
 /opt/trinity/lib/libkabcscalix.so.0
diff --git a/ubuntu/maverick/kdepim/debian/kdepim-wizards-trinity.install b/ubuntu/maverick/kdepim/debian/kdepim-wizards-trinity.install
index 31efd9d35..465782c25 100644
--- a/ubuntu/maverick/kdepim/debian/kdepim-wizards-trinity.install
+++ b/ubuntu/maverick/kdepim/debian/kdepim-wizards-trinity.install
@@ -6,18 +6,18 @@
 /opt/trinity/bin/scalixadmin
 /opt/trinity/bin/scalixwizard
 /opt/trinity/bin/sloxwizard
-/opt/trinity/lib/kde3/libegroupwarewizard.la
-/opt/trinity/lib/kde3/libegroupwarewizard.so
-/opt/trinity/lib/kde3/libexchangewizard.la
-/opt/trinity/lib/kde3/libexchangewizard.so
-/opt/trinity/lib/kde3/libgroupwisewizard.la
-/opt/trinity/lib/kde3/libgroupwisewizard.so
-/opt/trinity/lib/kde3/libkolabwizard.la
-/opt/trinity/lib/kde3/libkolabwizard.so
-/opt/trinity/lib/kde3/libscalixwizard.la
-/opt/trinity/lib/kde3/libscalixwizard.so
-/opt/trinity/lib/kde3/libsloxwizard.la
-/opt/trinity/lib/kde3/libsloxwizard.so
+/opt/trinity/lib/trinity/libegroupwarewizard.la
+/opt/trinity/lib/trinity/libegroupwarewizard.so
+/opt/trinity/lib/trinity/libexchangewizard.la
+/opt/trinity/lib/trinity/libexchangewizard.so
+/opt/trinity/lib/trinity/libgroupwisewizard.la
+/opt/trinity/lib/trinity/libgroupwisewizard.so
+/opt/trinity/lib/trinity/libkolabwizard.la
+/opt/trinity/lib/trinity/libkolabwizard.so
+/opt/trinity/lib/trinity/libscalixwizard.la
+/opt/trinity/lib/trinity/libscalixwizard.so
+/opt/trinity/lib/trinity/libsloxwizard.la
+/opt/trinity/lib/trinity/libsloxwizard.so
 /opt/trinity/share/applications/kde/groupwarewizard.desktop
 /opt/trinity/share/config.kcfg/egroupware.kcfg
 /opt/trinity/share/config.kcfg/groupwise.kcfg
diff --git a/ubuntu/maverick/kdepim/debian/kitchensync-trinity.install b/ubuntu/maverick/kdepim/debian/kitchensync-trinity.install
index 76d998e5a..cdf89734d 100644
--- a/ubuntu/maverick/kdepim/debian/kitchensync-trinity.install
+++ b/ubuntu/maverick/kdepim/debian/kitchensync-trinity.install
@@ -1,6 +1,6 @@
 /opt/trinity/bin/kitchensync
-/opt/trinity/lib/kde3/libkitchensyncpart.la
-/opt/trinity/lib/kde3/libkitchensyncpart.so
+/opt/trinity/lib/trinity/libkitchensyncpart.la
+/opt/trinity/lib/trinity/libkitchensyncpart.so
 /opt/trinity/share/apps/kitchensync
 /opt/trinity/lib/libkitchensync.so.0
 /opt/trinity/lib/libkitchensync.so.0.0.0
diff --git a/ubuntu/maverick/kdepim/debian/kleopatra-trinity.install b/ubuntu/maverick/kdepim/debian/kleopatra-trinity.install
index 5dd2c26d2..46ad1b0e9 100644
--- a/ubuntu/maverick/kdepim/debian/kleopatra-trinity.install
+++ b/ubuntu/maverick/kdepim/debian/kleopatra-trinity.install
@@ -1,7 +1,7 @@
 /opt/trinity/bin/kleopatra
 /opt/trinity/bin/kwatchgnupg
-/opt/trinity/lib/kde3/kcm_kleopatra.la
-/opt/trinity/lib/kde3/kcm_kleopatra.so
+/opt/trinity/lib/trinity/kcm_kleopatra.la
+/opt/trinity/lib/trinity/kcm_kleopatra.so
 /opt/trinity/share/applications/kde/kleopatra_import.desktop
 /opt/trinity/share/apps/kleopatra
 /opt/trinity/share/apps/kwatchgnupg
diff --git a/ubuntu/maverick/kdepim/debian/kmail-trinity.install b/ubuntu/maverick/kdepim/debian/kmail-trinity.install
index b7436c3b2..c6a5999d2 100644
--- a/ubuntu/maverick/kdepim/debian/kmail-trinity.install
+++ b/ubuntu/maverick/kdepim/debian/kmail-trinity.install
@@ -2,18 +2,18 @@
 /etc/trinity/kmail.antivirusrc
 /opt/trinity/bin/kmail
 /opt/trinity/bin/kmail_*.sh
-/opt/trinity/lib/kde3/kcm_kmail.la
-/opt/trinity/lib/kde3/kcm_kmail.so
-/opt/trinity/lib/kde3/libkmail_bodypartformatter_application_octetstream.la
-/opt/trinity/lib/kde3/libkmail_bodypartformatter_application_octetstream.so
-/opt/trinity/lib/kde3/libkmail_bodypartformatter_text_calendar.la
-/opt/trinity/lib/kde3/libkmail_bodypartformatter_text_calendar.so
-/opt/trinity/lib/kde3/libkmail_bodypartformatter_text_vcard.la
-/opt/trinity/lib/kde3/libkmail_bodypartformatter_text_vcard.so
-/opt/trinity/lib/kde3/libkmail_bodypartformatter_text_xdiff.la
-/opt/trinity/lib/kde3/libkmail_bodypartformatter_text_xdiff.so
-/opt/trinity/lib/kde3/libkmailpart.la
-/opt/trinity/lib/kde3/libkmailpart.so
+/opt/trinity/lib/trinity/kcm_kmail.la
+/opt/trinity/lib/trinity/kcm_kmail.so
+/opt/trinity/lib/trinity/libkmail_bodypartformatter_application_octetstream.la
+/opt/trinity/lib/trinity/libkmail_bodypartformatter_application_octetstream.so
+/opt/trinity/lib/trinity/libkmail_bodypartformatter_text_calendar.la
+/opt/trinity/lib/trinity/libkmail_bodypartformatter_text_calendar.so
+/opt/trinity/lib/trinity/libkmail_bodypartformatter_text_vcard.la
+/opt/trinity/lib/trinity/libkmail_bodypartformatter_text_vcard.so
+/opt/trinity/lib/trinity/libkmail_bodypartformatter_text_xdiff.la
+/opt/trinity/lib/trinity/libkmail_bodypartformatter_text_xdiff.so
+/opt/trinity/lib/trinity/libkmailpart.la
+/opt/trinity/lib/trinity/libkmailpart.so
 /opt/trinity/lib/libkmailprivate.la
 /opt/trinity/lib/libkmailprivate.so
 /opt/trinity/share/applications/kde/KMail.desktop
diff --git a/ubuntu/maverick/kdepim/debian/knode-trinity.install b/ubuntu/maverick/kdepim/debian/knode-trinity.install
index 5a7619adc..5017248f9 100644
--- a/ubuntu/maverick/kdepim/debian/knode-trinity.install
+++ b/ubuntu/maverick/kdepim/debian/knode-trinity.install
@@ -1,8 +1,8 @@
 /opt/trinity/bin/knode
-/opt/trinity/lib/kde3/kcm_knode.la
-/opt/trinity/lib/kde3/kcm_knode.so
-/opt/trinity/lib/kde3/libknodepart.la
-/opt/trinity/lib/kde3/libknodepart.so
+/opt/trinity/lib/trinity/kcm_knode.la
+/opt/trinity/lib/trinity/kcm_knode.so
+/opt/trinity/lib/trinity/libknodepart.la
+/opt/trinity/lib/trinity/libknodepart.so
 /opt/trinity/lib/libknodecommon.la
 /opt/trinity/lib/libknodecommon.so
 /opt/trinity/lib/libknodecommon.so.3
diff --git a/ubuntu/maverick/kdepim/debian/knotes-trinity.install b/ubuntu/maverick/kdepim/debian/knotes-trinity.install
index 976a34a44..741d0c822 100644
--- a/ubuntu/maverick/kdepim/debian/knotes-trinity.install
+++ b/ubuntu/maverick/kdepim/debian/knotes-trinity.install
@@ -1,6 +1,6 @@
 /opt/trinity/bin/knotes
-/opt/trinity/lib/kde3/knotes_local.la
-/opt/trinity/lib/kde3/knotes_local.so
+/opt/trinity/lib/trinity/knotes_local.la
+/opt/trinity/lib/trinity/knotes_local.so
 /opt/trinity/lib/libknotes.so
 /opt/trinity/lib/libknotes.so.0
 /opt/trinity/lib/libknotes.so.0.0.0
diff --git a/ubuntu/maverick/kdepim/debian/kontact-trinity.install b/ubuntu/maverick/kdepim/debian/kontact-trinity.install
index e7e97a798..93065d1f8 100644
--- a/ubuntu/maverick/kdepim/debian/kontact-trinity.install
+++ b/ubuntu/maverick/kdepim/debian/kontact-trinity.install
@@ -1,18 +1,18 @@
 /opt/trinity/bin/kontact
-/opt/trinity/lib/kde3/kcm_kmailsummary.la
-/opt/trinity/lib/kde3/kcm_kmailsummary.so
-/opt/trinity/lib/kde3/kcm_kontact.la
-/opt/trinity/lib/kde3/kcm_kontact.so
-/opt/trinity/lib/kde3/kcm_kontactknt.la
-/opt/trinity/lib/kde3/kcm_kontactknt.so
-/opt/trinity/lib/kde3/kcm_kontactsummary.la
-/opt/trinity/lib/kde3/kcm_kontactsummary.so
-/opt/trinity/lib/kde3/kcm_korgsummary.la
-/opt/trinity/lib/kde3/kcm_korgsummary.so
-/opt/trinity/lib/kde3/kcm_sdsummary.la
-/opt/trinity/lib/kde3/kcm_sdsummary.so
-/opt/trinity/lib/kde3/libkontact_*.la
-/opt/trinity/lib/kde3/libkontact_*.so
+/opt/trinity/lib/trinity/kcm_kmailsummary.la
+/opt/trinity/lib/trinity/kcm_kmailsummary.so
+/opt/trinity/lib/trinity/kcm_kontact.la
+/opt/trinity/lib/trinity/kcm_kontact.so
+/opt/trinity/lib/trinity/kcm_kontactknt.la
+/opt/trinity/lib/trinity/kcm_kontactknt.so
+/opt/trinity/lib/trinity/kcm_kontactsummary.la
+/opt/trinity/lib/trinity/kcm_kontactsummary.so
+/opt/trinity/lib/trinity/kcm_korgsummary.la
+/opt/trinity/lib/trinity/kcm_korgsummary.so
+/opt/trinity/lib/trinity/kcm_sdsummary.la
+/opt/trinity/lib/trinity/kcm_sdsummary.so
+/opt/trinity/lib/trinity/libkontact_*.la
+/opt/trinity/lib/trinity/libkontact_*.so
 /opt/trinity/lib/libkontact.so.1
 /opt/trinity/lib/libkontact.so.1.0.0
 /opt/trinity/lib/libkpinterfaces.so.1
diff --git a/ubuntu/maverick/kdepim/debian/korganizer-trinity.install b/ubuntu/maverick/kdepim/debian/korganizer-trinity.install
index addb79f24..6b6ce856b 100644
--- a/ubuntu/maverick/kdepim/debian/korganizer-trinity.install
+++ b/ubuntu/maverick/kdepim/debian/korganizer-trinity.install
@@ -1,12 +1,12 @@
 /opt/trinity/bin/ical2vcal
 /opt/trinity/bin/korgac
 /opt/trinity/bin/korganizer
-/opt/trinity/lib/kde3/kcm_korganizer.la
-/opt/trinity/lib/kde3/kcm_korganizer.so
-/opt/trinity/lib/kde3/libkorg_*.la
-/opt/trinity/lib/kde3/libkorg_*.so
-/opt/trinity/lib/kde3/libkorganizerpart.la
-/opt/trinity/lib/kde3/libkorganizerpart.so
+/opt/trinity/lib/trinity/kcm_korganizer.la
+/opt/trinity/lib/trinity/kcm_korganizer.so
+/opt/trinity/lib/trinity/libkorg_*.la
+/opt/trinity/lib/trinity/libkorg_*.so
+/opt/trinity/lib/trinity/libkorganizerpart.la
+/opt/trinity/lib/trinity/libkorganizerpart.so
 /opt/trinity/lib/libkocorehelper.so.1
 /opt/trinity/lib/libkocorehelper.so.1.0.0
 /opt/trinity/lib/libkorg_stdprinting.so.1
diff --git a/ubuntu/maverick/kdepim/debian/libkcal2b-trinity.install b/ubuntu/maverick/kdepim/debian/libkcal2b-trinity.install
index d871d449a..ca6e71652 100644
--- a/ubuntu/maverick/kdepim/debian/libkcal2b-trinity.install
+++ b/ubuntu/maverick/kdepim/debian/libkcal2b-trinity.install
@@ -1,11 +1,11 @@
-/opt/trinity/lib/kde3/kcal_kabc.la
-/opt/trinity/lib/kde3/kcal_kabc.so
-/opt/trinity/lib/kde3/kcal_localdir.la
-/opt/trinity/lib/kde3/kcal_localdir.so
-/opt/trinity/lib/kde3/kcal_local.la
-/opt/trinity/lib/kde3/kcal_local.so
-/opt/trinity/lib/kde3/kcal_remote.la
-/opt/trinity/lib/kde3/kcal_remote.so
+/opt/trinity/lib/trinity/kcal_kabc.la
+/opt/trinity/lib/trinity/kcal_kabc.so
+/opt/trinity/lib/trinity/kcal_localdir.la
+/opt/trinity/lib/trinity/kcal_localdir.so
+/opt/trinity/lib/trinity/kcal_local.la
+/opt/trinity/lib/trinity/kcal_local.so
+/opt/trinity/lib/trinity/kcal_remote.la
+/opt/trinity/lib/trinity/kcal_remote.so
 /opt/trinity/lib/libkcal.so.2
 /opt/trinity/lib/libkcal.so.2.0.0
 /opt/trinity/lib/libkcal_resourceremote.so.1
diff --git a/ubuntu/maverick/kdepim/debian/libkdepim1a-trinity.install b/ubuntu/maverick/kdepim/debian/libkdepim1a-trinity.install
index 0d4e75cb4..b7799470a 100644
--- a/ubuntu/maverick/kdepim/debian/libkdepim1a-trinity.install
+++ b/ubuntu/maverick/kdepim/debian/libkdepim1a-trinity.install
@@ -1,7 +1,7 @@
-/opt/trinity/lib/kde3/plugins/designer/kdepimwidgets.la
-/opt/trinity/lib/kde3/plugins/designer/kdepimwidgets.so
-/opt/trinity/lib/kde3/plugins/designer/kpartsdesignerplugin.la
-/opt/trinity/lib/kde3/plugins/designer/kpartsdesignerplugin.so
+/opt/trinity/lib/trinity/plugins/designer/kdepimwidgets.la
+/opt/trinity/lib/trinity/plugins/designer/kdepimwidgets.so
+/opt/trinity/lib/trinity/plugins/designer/kpartsdesignerplugin.la
+/opt/trinity/lib/trinity/plugins/designer/kpartsdesignerplugin.so
 /opt/trinity/lib/libkdepim.so.1
 /opt/trinity/lib/libkdepim.so.1.0.0
 /opt/trinity/share/apps/kdepimwidgets
diff --git a/ubuntu/maverick/kdepim/debian/libkpimexchange1-trinity.install b/ubuntu/maverick/kdepim/debian/libkpimexchange1-trinity.install
index abf65f60c..f5b098575 100644
--- a/ubuntu/maverick/kdepim/debian/libkpimexchange1-trinity.install
+++ b/ubuntu/maverick/kdepim/debian/libkpimexchange1-trinity.install
@@ -1,4 +1,4 @@
-/opt/trinity/lib/kde3/resourcecalendarexchange.la
-/opt/trinity/lib/kde3/resourcecalendarexchange.so
+/opt/trinity/lib/trinity/resourcecalendarexchange.la
+/opt/trinity/lib/trinity/resourcecalendarexchange.so
 /opt/trinity/lib/libkpimexchange.so.1
 /opt/trinity/lib/libkpimexchange.so.1.0.0
diff --git a/ubuntu/maverick/kdepim/debian/rules b/ubuntu/maverick/kdepim/debian/rules
index 11b332f36..6d8c87f14 100755
--- a/ubuntu/maverick/kdepim/debian/rules
+++ b/ubuntu/maverick/kdepim/debian/rules
@@ -3,9 +3,9 @@
 # Set LD_LIBRARY_PATH to the installed library directory to allow dh_shlibdeps to function
 # Also include the main Trinity path
 ifeq ("$(LD_LIBRARY_PATH)", "")
-LD_LIBRARY_PATH=debian/tmp/opt/trinity/lib:debian/tmp/opt/trinity/lib/kde3
+LD_LIBRARY_PATH=debian/tmp/opt/trinity/lib:debian/tmp/opt/trinity/lib/trinity
 else
-LD_LIBRARY_PATH += :debian/tmp/opt/trinity/lib:debian/tmp/opt/trinity/lib/kde3
+LD_LIBRARY_PATH += :debian/tmp/opt/trinity/lib:debian/tmp/opt/trinity/lib/trinity
 endif
 export LD_LIBRARY_PATH
 
@@ -49,11 +49,11 @@ kontact-trinity_recommends_plugins := korganizer-trinity specialdates
 kontact-trinity_suggests_plugins := journal kpilot-trinity todo
 
 DEB_DH_SHLIBDEPS_ARGS_kontact-trinity := \
-	$(foreach p,$(kontact-trinity_recommends_plugins) $(kontact-trinity_suggests_plugins),-Xopt/trinity/lib/kde3/libkontact_$(p)plugin.so) \
+	$(foreach p,$(kontact-trinity_recommends_plugins) $(kontact-trinity_suggests_plugins),-Xopt/trinity/lib/trinity/libkontact_$(p)plugin.so) \
 	-- -dRecommends \
-	$(foreach p,$(kontact-trinity_recommends_plugins),debian/kontact/opt/trinity/lib/kde3/libkontact_$(p)plugin.so) \
+	$(foreach p,$(kontact-trinity_recommends_plugins),debian/kontact/opt/trinity/lib/trinity/libkontact_$(p)plugin.so) \
 	-dSuggests \
-	$(foreach p,$(kontact-trinity_suggests_plugins),debian/kontact/opt/trinity/lib/kde3/libkontact_$(p)plugin.so) \
+	$(foreach p,$(kontact-trinity_suggests_plugins),debian/kontact/opt/trinity/lib/trinity/libkontact_$(p)plugin.so) \
 	-dDepends	# Since -u args go first in dpkg-shlibdeps call
 
 ## Move kaddressbook-trinity dependency (from libkabc_xmlrpc.so) to Recommends
@@ -65,9 +65,9 @@ DEB_DH_SHLIBDEPS_ARGS_kontact-trinity := \
 #
 ## Move kaddressbook dependency of libkcal2b-trinity to Recommends
 #DEB_DH_SHLIBDEPS_ARGS_libkcal2b-trinity := \
-#	-Xopt/trinity/lib/kde3/kcal_kabc.so \
+#	-Xopt/trinity/lib/trinity/kcal_kabc.so \
 #	-- -dRecommends \
-#	debian/libkcal2b/opt/trinity/lib/kde3/kcal_kabc.so \
+#	debian/libkcal2b/opt/trinity/lib/trinity/kcal_kabc.so \
 #	-dDepends
 
 test-shlibdeps: