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

9 files changed, 170 insertions, 170 deletions

diff --git a/ubuntu/maverick/kdeaddons/debian/changelog b/ubuntu/maverick/kdeaddons/debian/changelog
index ac5bda18d..d7003caa9 100644
--- a/ubuntu/maverick/kdeaddons/debian/changelog
+++ b/ubuntu/maverick/kdeaddons/debian/changelog
@@ -12,7 +12,7 @@ kdeaddons-trinity (4:3.5.10-0ubuntu1~intrepid3) intrepid; urgency=low
 
 kdeaddons-trinity (4:3.5.10-0ubuntu1~intrepid2) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 03 March 2009 14:24:00 -0600
@@ -739,7 +739,7 @@ kdeaddons (4:3.1.0-3) unstable; urgency=low
 
 kdeaddons (4:3.1.0-2) unstable; urgency=low
 
-  * First KDE3 upload to debian!
+  * First Trinity upload to debian!
   * Applied Ewald Snel's patch for xine support.
   * Rolled the epoch to aid upgrades from the unofficial repository on
     ftp.kde.org.. *sigh*
diff --git a/ubuntu/maverick/kdeaddons/debian/control b/ubuntu/maverick/kdeaddons/debian/control
index e4043e5c2..9345f0b9b 100644
--- a/ubuntu/maverick/kdeaddons/debian/control
+++ b/ubuntu/maverick/kdeaddons/debian/control
@@ -12,14 +12,14 @@ Architecture: all
 Section: kde
 Depends: atlantikdesigner-trinity (>= ${Source-Version}), kaddressbook-plugins-trinity (>= ${Source-Version}), kate-plugins-trinity (>= ${Source-Version}), kdeaddons-kfile-plugins-trinity (>= ${Source-Version}), kicker-applets-trinity (>= ${Source-Version}), konq-plugins-trinity (>= ${Source-Version}), ksig-trinity (>= ${Source-Version}), noatun-plugins-trinity (>= ${Source-Version})
 Suggests: kdeaddons-trinity-doc-html
-Description: add-on plugins and applets provided with KDE3
+Description: add-on plugins and applets provided with Trinity
  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 add-on plugins and applets
- provided with the official release of KDE3.
+ provided with the official release of Trinity.
 
 Package: kdeaddons-trinity-doc-html
 Architecture: all
@@ -36,7 +36,7 @@ Description: KDE add-ons documentation in HTML format
  /opt/trinity/share/doc/kde/HTML/en/kicker-applets/. Documentation is provided for
  most KDE addons packages.
  .
- This package is part of KDE3, as a component of the KDE addons module.
+ This package is part of Trinity, as a component of the KDE addons module.
  See the 'kde-trinity' and 'kdeaddons-trinity' packages for more information.
 
 Package: atlantikdesigner-trinity
@@ -53,7 +53,7 @@ Description: game board designer for Atlantik
  game in which the properties include several major cities in North
  America and Europe.
  .
- This package is part of KDE3, as a component of the KDE addons module.
+ This package is part of Trinity, as a component of the KDE addons module.
  See the 'kde-trinity' and 'kdeaddons-trinity' packages for more information.
 
 Package: kaddressbook-plugins-trinity
@@ -62,7 +62,7 @@ Section: kde
 Depends: ${shlibs:Depends}
 Suggests: kworldclock-trinity, khelpcenter-trinity, kdeaddons-trinity-doc-html
 Enhances: kaddressbook-trinity
-Description: plugins for KAddressBook, the KDE3 address book
+Description: plugins for KAddressBook, the Trinity address book
  This package contains a variety of useful plugins for the KDE address
  book.  These plugins can be loaded through the KDE address book settings.
  .
@@ -70,7 +70,7 @@ Description: plugins for KAddressBook, the KDE3 address book
  as well as importing and exporting contacts in the native format used
  by the German freemail provider GMX.
  .
- This package is part of KDE3, as a component of the KDE addons module.
+ This package is part of Trinity, as a component of the KDE addons module.
  See the 'kde-trinity' and 'kdeaddons-trinity' packages for more information.
 
 Package: kate-plugins-trinity
@@ -89,7 +89,7 @@ Description: plugins for Kate, the KDE Advanced Text Editor
  and text snippets, opening of C/C++ headers, extraction of C/C++ symbols,
  a tab bar, a Python browser and even more.
  .
- This package is part of KDE3, as a component of the KDE addons module.
+ This package is part of Trinity, as a component of the KDE addons module.
  See the 'kde-trinity' and 'kdeaddons-trinity' packages for more information.
 
 Package: kdeaddons-kfile-plugins-trinity
@@ -97,7 +97,7 @@ Architecture: any
 Section: kde
 Depends: ${shlibs:Depends}
 Provides: renamedlg-plugins-trinity
-Description: KDE3 file dialog plugins for text files and folders
+Description: Trinity file dialog plugins for text files and folders
  This is a collection of plugins for the KDE file dialog.  These plugins
  extend the file dialog to offer advanced meta-information for text,
  HTML and desktop files, as well as for folders, Windows .lnk files,
@@ -108,7 +108,7 @@ Description: KDE3 file dialog plugins for text files and folders
  decision regarding conflicting filenames.  Rename dialog plugins are
  provided for audio and image files.
  .
- This package is part of KDE3, as a component of the KDE addons module.
+ This package is part of Trinity, as a component of the KDE addons module.
  See the 'kde-trinity' and 'kdeaddons-trinity' packages for more information.
 
 Package: kicker-applets-trinity
@@ -118,7 +118,7 @@ Depends: ${shlibs:Depends}, kicker-trinity
 Suggests: xmms-kde-trinity, khelpcenter-trinity, kdeaddons-trinity-doc-html
 Provides: ktimemon-trinity
 Enhances: kicker-trinity
-Description: applets for Kicker, the KDE3 panel
+Description: applets for Kicker, the Trinity panel
  This package contains a variety of applets for Kicker, the KDE panel.
  These applets will appear in the panel's Add--Applet menu.
  .
@@ -129,7 +129,7 @@ Description: applets for Kicker, the KDE3 panel
  kicker-applets users to install XMMS. If you want a kicker applet that
  controls XMMS, install the xmms-kde-trinity package.
  .
- This package is part of KDE3, as a component of the KDE addons module.
+ This package is part of Trinity, as a component of the KDE addons module.
  See the 'kde-trinity' and 'kdeaddons-trinity' packages for more information.
 
 Package: knewsticker-scripts-trinity
@@ -138,7 +138,7 @@ Section: kde
 Depends: ${perl:Depends}, python, libfinance-quote-perl, libmime-perl, libnews-nntpclient-perl, libwww-perl
 Recommends: knewsticker-trinity
 Enhances: knewsticker-trinity
-Description: scripts for KNewsTicker, the KDE3 news ticker
+Description: scripts for KNewsTicker, the Trinity news ticker
  This package contains a variety of scripts that provide additional news
  sources for KNewsTicker, the news ticker applet for the KDE panel.  See
  /opt/trinity/share/doc/knewsticker-scripts/README.Debian for usage details.
@@ -146,7 +146,7 @@ Description: scripts for KNewsTicker, the KDE3 news ticker
  Highlights include newsgroup handling, stock data retrieval, sports scores
  and various local news sources.
  .
- This package is part of KDE3, as a component of the KDE addons module.
+ This package is part of Trinity, as a component of the KDE addons module.
  See the 'kde-trinity' and 'kdeaddons-trinity' packages for more information.
 
 Package: konq-plugins-trinity
@@ -157,7 +157,7 @@ Recommends: akregator-trinity, ark-trinity, imagemagick
 Suggests: khelpcenter-trinity, kdeaddons-trinity-doc-html
 Enhances: konqueror-trinity, akregator-trinity
 Provides: akregator-konq-plugin-trinity
-Description: plugins for Konqueror, the KDE3 file/web/doc browser
+Description: plugins for Konqueror, the Trinity file/web/doc browser
  This package contains a variety of useful plugins for Konqueror, the
  file manager, web browser and document viewer for KDE.  Many of these
  plugins will appear in Konqueror's Tools menu.
@@ -173,7 +173,7 @@ Description: plugins for Konqueror, the KDE3 file/web/doc browser
  media player, a file information metabar/sidebar, a media folder helper, a
  graphical disk usage viewer and image conversions and transformations.
  .
- This package is part of KDE3, as a component of the KDE addons module.
+ This package is part of Trinity, as a component of the KDE addons module.
  See the 'kde-trinity' and 'kdeaddons-trinity' packages for more information.
 
 Package: ksig-trinity
@@ -192,7 +192,7 @@ Description: graphical tool for managing multiple email signatures
  signatures in external mail clients such as KMail.  See
  /opt/trinity/share/doc/ksig/README.Debian for details on how this can be done.
  .
- This package is part of KDE3, as a component of the KDE addons module.
+ This package is part of Trinity, as a component of the KDE addons module.
  See the 'kde-trinity' and 'kdeaddons-trinity' packages for more information.
 
 Package: noatun-plugins-trinity
@@ -200,7 +200,7 @@ Architecture: any
 Section: sound
 Depends: ${shlibs:Depends}
 Enhances: noatun-trinity
-Description: plugins for Noatun, the KDE3 media player
+Description: plugins for Noatun, the Trinity media player
  This package contains a variety of useful plugins for Noatun, the audio and
  video media player for KDE.  These plugins can be loaded through the plugin
  manager in Noatun settings.
@@ -209,7 +209,7 @@ Description: plugins for Noatun, the KDE3 media player
  playback speed, capture to wave file and displaying lyrics, plus a variety
  of user interfaces, playlists and visualisation plugins.
  .
- This package is part of KDE3, as a component of the KDE addons module.
+ This package is part of Trinity, as a component of the KDE addons module.
  See the 'kde-trinity' and 'kdeaddons-trinity' packages for more information.
 
 Package: kdeaddons-trinity-dbg
diff --git a/ubuntu/maverick/kdeaddons/debian/kaddressbook-plugins-trinity.install b/ubuntu/maverick/kdeaddons/debian/kaddressbook-plugins-trinity.install
index d324aa70a..a2102d3a8 100644
--- a/ubuntu/maverick/kdeaddons/debian/kaddressbook-plugins-trinity.install
+++ b/ubuntu/maverick/kdeaddons/debian/kaddressbook-plugins-trinity.install
@@ -1,6 +1,6 @@
-debian/tmp/opt/trinity/lib/kde3/libkaddrbk_geo_xxport.la
-debian/tmp/opt/trinity/lib/kde3/libkaddrbk_geo_xxport.so
-debian/tmp/opt/trinity/lib/kde3/libkaddrbk_gmx_xxport.la
-debian/tmp/opt/trinity/lib/kde3/libkaddrbk_gmx_xxport.so
+debian/tmp/opt/trinity/lib/trinity/libkaddrbk_geo_xxport.la
+debian/tmp/opt/trinity/lib/trinity/libkaddrbk_geo_xxport.so
+debian/tmp/opt/trinity/lib/trinity/libkaddrbk_gmx_xxport.la
+debian/tmp/opt/trinity/lib/trinity/libkaddrbk_gmx_xxport.so
 debian/tmp/opt/trinity/share/apps/kaddressbook
 debian/tmp/opt/trinity/share/services/kaddressbook
diff --git a/ubuntu/maverick/kdeaddons/debian/kate-plugins-trinity.install b/ubuntu/maverick/kdeaddons/debian/kate-plugins-trinity.install
index e0dd8bb43..9dc3f2b7d 100644
--- a/ubuntu/maverick/kdeaddons/debian/kate-plugins-trinity.install
+++ b/ubuntu/maverick/kdeaddons/debian/kate-plugins-trinity.install
@@ -1,33 +1,33 @@
-debian/tmp/opt/trinity/lib/kde3/katecppsymbolviewerplugin.la
-debian/tmp/opt/trinity/lib/kde3/katecppsymbolviewerplugin.so
-debian/tmp/opt/trinity/lib/kde3/katefiletemplates.la
-debian/tmp/opt/trinity/lib/kde3/katefiletemplates.so
-debian/tmp/opt/trinity/lib/kde3/katefll_plugin.la
-debian/tmp/opt/trinity/lib/kde3/katefll_plugin.so
-debian/tmp/opt/trinity/lib/kde3/katehelloworldplugin.la
-debian/tmp/opt/trinity/lib/kde3/katehelloworldplugin.so
-debian/tmp/opt/trinity/lib/kde3/katehtmltoolsplugin.la
-debian/tmp/opt/trinity/lib/kde3/katehtmltoolsplugin.so
-debian/tmp/opt/trinity/lib/kde3/kateinsertcommandplugin.la
-debian/tmp/opt/trinity/lib/kde3/kateinsertcommandplugin.so
-debian/tmp/opt/trinity/lib/kde3/katemakeplugin.la
-debian/tmp/opt/trinity/lib/kde3/katemakeplugin.so
-debian/tmp/opt/trinity/lib/kde3/katemodelineplugin.la
-debian/tmp/opt/trinity/lib/kde3/katemodelineplugin.so
-debian/tmp/opt/trinity/lib/kde3/kateopenheaderplugin.la
-debian/tmp/opt/trinity/lib/kde3/kateopenheaderplugin.so
-debian/tmp/opt/trinity/lib/kde3/katepybrowseplugin.la
-debian/tmp/opt/trinity/lib/kde3/katepybrowseplugin.so
-debian/tmp/opt/trinity/lib/kde3/katesnippetsplugin.la
-debian/tmp/opt/trinity/lib/kde3/katesnippetsplugin.so
-debian/tmp/opt/trinity/lib/kde3/katetextfilterplugin.la
-debian/tmp/opt/trinity/lib/kde3/katetextfilterplugin.so
-debian/tmp/opt/trinity/lib/kde3/katexmlcheckplugin.la
-debian/tmp/opt/trinity/lib/kde3/katexmlcheckplugin.so
-debian/tmp/opt/trinity/lib/kde3/katexmltoolsplugin.la
-debian/tmp/opt/trinity/lib/kde3/katexmltoolsplugin.so
-debian/tmp/opt/trinity/lib/kde3/libkatetabbarextensionplugin.la
-debian/tmp/opt/trinity/lib/kde3/libkatetabbarextensionplugin.so
+debian/tmp/opt/trinity/lib/trinity/katecppsymbolviewerplugin.la
+debian/tmp/opt/trinity/lib/trinity/katecppsymbolviewerplugin.so
+debian/tmp/opt/trinity/lib/trinity/katefiletemplates.la
+debian/tmp/opt/trinity/lib/trinity/katefiletemplates.so
+debian/tmp/opt/trinity/lib/trinity/katefll_plugin.la
+debian/tmp/opt/trinity/lib/trinity/katefll_plugin.so
+debian/tmp/opt/trinity/lib/trinity/katehelloworldplugin.la
+debian/tmp/opt/trinity/lib/trinity/katehelloworldplugin.so
+debian/tmp/opt/trinity/lib/trinity/katehtmltoolsplugin.la
+debian/tmp/opt/trinity/lib/trinity/katehtmltoolsplugin.so
+debian/tmp/opt/trinity/lib/trinity/kateinsertcommandplugin.la
+debian/tmp/opt/trinity/lib/trinity/kateinsertcommandplugin.so
+debian/tmp/opt/trinity/lib/trinity/katemakeplugin.la
+debian/tmp/opt/trinity/lib/trinity/katemakeplugin.so
+debian/tmp/opt/trinity/lib/trinity/katemodelineplugin.la
+debian/tmp/opt/trinity/lib/trinity/katemodelineplugin.so
+debian/tmp/opt/trinity/lib/trinity/kateopenheaderplugin.la
+debian/tmp/opt/trinity/lib/trinity/kateopenheaderplugin.so
+debian/tmp/opt/trinity/lib/trinity/katepybrowseplugin.la
+debian/tmp/opt/trinity/lib/trinity/katepybrowseplugin.so
+debian/tmp/opt/trinity/lib/trinity/katesnippetsplugin.la
+debian/tmp/opt/trinity/lib/trinity/katesnippetsplugin.so
+debian/tmp/opt/trinity/lib/trinity/katetextfilterplugin.la
+debian/tmp/opt/trinity/lib/trinity/katetextfilterplugin.so
+debian/tmp/opt/trinity/lib/trinity/katexmlcheckplugin.la
+debian/tmp/opt/trinity/lib/trinity/katexmlcheckplugin.so
+debian/tmp/opt/trinity/lib/trinity/katexmltoolsplugin.la
+debian/tmp/opt/trinity/lib/trinity/katexmltoolsplugin.so
+debian/tmp/opt/trinity/lib/trinity/libkatetabbarextensionplugin.la
+debian/tmp/opt/trinity/lib/trinity/libkatetabbarextensionplugin.so
 debian/tmp/opt/trinity/share/applnk/.hidden/katefll.desktop
 debian/tmp/opt/trinity/share/apps/kate
 debian/tmp/opt/trinity/share/apps/katepart
diff --git a/ubuntu/maverick/kdeaddons/debian/kdeaddons-kfile-plugins-trinity.install b/ubuntu/maverick/kdeaddons/debian/kdeaddons-kfile-plugins-trinity.install
index 5bd8dd927..a85a16b55 100644
--- a/ubuntu/maverick/kdeaddons/debian/kdeaddons-kfile-plugins-trinity.install
+++ b/ubuntu/maverick/kdeaddons/debian/kdeaddons-kfile-plugins-trinity.install
@@ -1,22 +1,22 @@
 debian/tmp/opt/trinity/bin/lnkforward
-debian/tmp/opt/trinity/lib/kde3/kfile_cert.la
-debian/tmp/opt/trinity/lib/kde3/kfile_cert.so
-debian/tmp/opt/trinity/lib/kde3/kfile_desktop.la
-debian/tmp/opt/trinity/lib/kde3/kfile_desktop.so
-debian/tmp/opt/trinity/lib/kde3/kfile_folder.la
-debian/tmp/opt/trinity/lib/kde3/kfile_folder.so
-debian/tmp/opt/trinity/lib/kde3/kfile_html.la
-debian/tmp/opt/trinity/lib/kde3/kfile_html.so
-debian/tmp/opt/trinity/lib/kde3/kfile_lnk.la
-debian/tmp/opt/trinity/lib/kde3/kfile_lnk.so
-debian/tmp/opt/trinity/lib/kde3/kfile_mhtml.la
-debian/tmp/opt/trinity/lib/kde3/kfile_mhtml.so
-debian/tmp/opt/trinity/lib/kde3/kfile_txt.la
-debian/tmp/opt/trinity/lib/kde3/kfile_txt.so
-debian/tmp/opt/trinity/lib/kde3/librenaudioplugin.la
-debian/tmp/opt/trinity/lib/kde3/librenaudioplugin.so
-debian/tmp/opt/trinity/lib/kde3/librenimageplugin.la
-debian/tmp/opt/trinity/lib/kde3/librenimageplugin.so
+debian/tmp/opt/trinity/lib/trinity/kfile_cert.la
+debian/tmp/opt/trinity/lib/trinity/kfile_cert.so
+debian/tmp/opt/trinity/lib/trinity/kfile_desktop.la
+debian/tmp/opt/trinity/lib/trinity/kfile_desktop.so
+debian/tmp/opt/trinity/lib/trinity/kfile_folder.la
+debian/tmp/opt/trinity/lib/trinity/kfile_folder.so
+debian/tmp/opt/trinity/lib/trinity/kfile_html.la
+debian/tmp/opt/trinity/lib/trinity/kfile_html.so
+debian/tmp/opt/trinity/lib/trinity/kfile_lnk.la
+debian/tmp/opt/trinity/lib/trinity/kfile_lnk.so
+debian/tmp/opt/trinity/lib/trinity/kfile_mhtml.la
+debian/tmp/opt/trinity/lib/trinity/kfile_mhtml.so
+debian/tmp/opt/trinity/lib/trinity/kfile_txt.la
+debian/tmp/opt/trinity/lib/trinity/kfile_txt.so
+debian/tmp/opt/trinity/lib/trinity/librenaudioplugin.la
+debian/tmp/opt/trinity/lib/trinity/librenaudioplugin.so
+debian/tmp/opt/trinity/lib/trinity/librenimageplugin.la
+debian/tmp/opt/trinity/lib/trinity/librenimageplugin.so
 debian/tmp/opt/trinity/share/applnk/.hidden/lnkforward.desktop
 debian/tmp/opt/trinity/share/mimelnk/application/x-win-lnk.desktop
 debian/tmp/opt/trinity/share/services/kfile_cert.desktop
diff --git a/ubuntu/maverick/kdeaddons/debian/kicker-applets-trinity.install b/ubuntu/maverick/kdeaddons/debian/kicker-applets-trinity.install
index ac076f039..d4dfe6204 100644
--- a/ubuntu/maverick/kdeaddons/debian/kicker-applets-trinity.install
+++ b/ubuntu/maverick/kdeaddons/debian/kicker-applets-trinity.install
@@ -1,13 +1,13 @@
-debian/tmp/opt/trinity/lib/kde3/kolourpicker_panelapplet.la
-debian/tmp/opt/trinity/lib/kde3/kolourpicker_panelapplet.so
-debian/tmp/opt/trinity/lib/kde3/ktimemon_panelapplet.la
-debian/tmp/opt/trinity/lib/kde3/ktimemon_panelapplet.so
-debian/tmp/opt/trinity/lib/kde3/math_panelapplet.la
-debian/tmp/opt/trinity/lib/kde3/math_panelapplet.so
-debian/tmp/opt/trinity/lib/kde3/mediacontrol_panelapplet.la
-debian/tmp/opt/trinity/lib/kde3/mediacontrol_panelapplet.so
-debian/tmp/opt/trinity/lib/kde3/kbinaryclock_panelapplet.la
-debian/tmp/opt/trinity/lib/kde3/kbinaryclock_panelapplet.so
+debian/tmp/opt/trinity/lib/trinity/kolourpicker_panelapplet.la
+debian/tmp/opt/trinity/lib/trinity/kolourpicker_panelapplet.so
+debian/tmp/opt/trinity/lib/trinity/ktimemon_panelapplet.la
+debian/tmp/opt/trinity/lib/trinity/ktimemon_panelapplet.so
+debian/tmp/opt/trinity/lib/trinity/math_panelapplet.la
+debian/tmp/opt/trinity/lib/trinity/math_panelapplet.so
+debian/tmp/opt/trinity/lib/trinity/mediacontrol_panelapplet.la
+debian/tmp/opt/trinity/lib/trinity/mediacontrol_panelapplet.so
+debian/tmp/opt/trinity/lib/trinity/kbinaryclock_panelapplet.la
+debian/tmp/opt/trinity/lib/trinity/kbinaryclock_panelapplet.so
 debian/tmp/opt/trinity/share/apps/kicker/applets
 debian/tmp/opt/trinity/share/apps/mediacontrol
 debian/tmp/opt/trinity/share/config.kcfg/kbinaryclock.kcfg
diff --git a/ubuntu/maverick/kdeaddons/debian/konq-plugins-trinity.install b/ubuntu/maverick/kdeaddons/debian/konq-plugins-trinity.install
index bd06cadad..e4d4e14c7 100644
--- a/ubuntu/maverick/kdeaddons/debian/konq-plugins-trinity.install
+++ b/ubuntu/maverick/kdeaddons/debian/konq-plugins-trinity.install
@@ -2,58 +2,58 @@ debian/tmp/etc/trinity/translaterc
 debian/tmp/opt/trinity/bin/fsview
 debian/tmp/opt/trinity/bin/jpegorient
 debian/tmp/opt/trinity/bin/kio_media_realfolder
-debian/tmp/opt/trinity/lib/kde3/konq_sidebarnews.la
-debian/tmp/opt/trinity/lib/kde3/konq_sidebarnews.so
-debian/tmp/opt/trinity/lib/kde3/konqsidebar_delicious.la
-debian/tmp/opt/trinity/lib/kde3/konqsidebar_delicious.so
-debian/tmp/opt/trinity/lib/kde3/konqsidebar_mediaplayer.la
-debian/tmp/opt/trinity/lib/kde3/konqsidebar_mediaplayer.so
-debian/tmp/opt/trinity/lib/kde3/konqsidebar_metabar.la
-debian/tmp/opt/trinity/lib/kde3/konqsidebar_metabar.so
-debian/tmp/opt/trinity/lib/kde3/libakregatorkonqfeedicon.la
-debian/tmp/opt/trinity/lib/kde3/libakregatorkonqfeedicon.so
-debian/tmp/opt/trinity/lib/kde3/libakregatorkonqplugin.la
-debian/tmp/opt/trinity/lib/kde3/libakregatorkonqplugin.so
-debian/tmp/opt/trinity/lib/kde3/libarkplugin.la
-debian/tmp/opt/trinity/lib/kde3/libarkplugin.so
-debian/tmp/opt/trinity/lib/kde3/libautorefresh.la
-debian/tmp/opt/trinity/lib/kde3/libautorefresh.so
-debian/tmp/opt/trinity/lib/kde3/libbabelfishplugin.la
-debian/tmp/opt/trinity/lib/kde3/libbabelfishplugin.so
-debian/tmp/opt/trinity/lib/kde3/libcrashesplugin.la
-debian/tmp/opt/trinity/lib/kde3/libcrashesplugin.so
-debian/tmp/opt/trinity/lib/kde3/libdirfilterplugin.la
-debian/tmp/opt/trinity/lib/kde3/libdirfilterplugin.so
-debian/tmp/opt/trinity/lib/kde3/librsyncplugin.la
-debian/tmp/opt/trinity/lib/kde3/librsyncplugin.so
-debian/tmp/opt/trinity/lib/kde3/libdomtreeviewerplugin.la
-debian/tmp/opt/trinity/lib/kde3/libdomtreeviewerplugin.so
-debian/tmp/opt/trinity/lib/kde3/libfsviewpart.la
-debian/tmp/opt/trinity/lib/kde3/libfsviewpart.so
-debian/tmp/opt/trinity/lib/kde3/libkhtmlsettingsplugin.la
-debian/tmp/opt/trinity/lib/kde3/libkhtmlsettingsplugin.so
-debian/tmp/opt/trinity/lib/kde3/kcm_kuick.la
-debian/tmp/opt/trinity/lib/kde3/kcm_kuick.so
-debian/tmp/opt/trinity/lib/kde3/libkimgallery.la
-debian/tmp/opt/trinity/lib/kde3/libkimgallery.so
-debian/tmp/opt/trinity/lib/kde3/libkuickplugin.la
-debian/tmp/opt/trinity/lib/kde3/libkuickplugin.so
-debian/tmp/opt/trinity/lib/kde3/libmfkonqmficon.la
-debian/tmp/opt/trinity/lib/kde3/libmfkonqmficon.so
-debian/tmp/opt/trinity/lib/kde3/libminitoolsplugin.la
-debian/tmp/opt/trinity/lib/kde3/libminitoolsplugin.so
-debian/tmp/opt/trinity/lib/kde3/librellinksplugin.la
-debian/tmp/opt/trinity/lib/kde3/librellinksplugin.so
-debian/tmp/opt/trinity/lib/kde3/libsearchbarplugin.la
-debian/tmp/opt/trinity/lib/kde3/libsearchbarplugin.so
-debian/tmp/opt/trinity/lib/kde3/libuachangerplugin.la
-debian/tmp/opt/trinity/lib/kde3/libuachangerplugin.so
-debian/tmp/opt/trinity/lib/kde3/libvalidatorsplugin.la
-debian/tmp/opt/trinity/lib/kde3/libvalidatorsplugin.so
-debian/tmp/opt/trinity/lib/kde3/libwebarchiverplugin.la
-debian/tmp/opt/trinity/lib/kde3/libwebarchiverplugin.so
-debian/tmp/opt/trinity/lib/kde3/webarchivethumbnail.la
-debian/tmp/opt/trinity/lib/kde3/webarchivethumbnail.so
+debian/tmp/opt/trinity/lib/trinity/konq_sidebarnews.la
+debian/tmp/opt/trinity/lib/trinity/konq_sidebarnews.so
+debian/tmp/opt/trinity/lib/trinity/konqsidebar_delicious.la
+debian/tmp/opt/trinity/lib/trinity/konqsidebar_delicious.so
+debian/tmp/opt/trinity/lib/trinity/konqsidebar_mediaplayer.la
+debian/tmp/opt/trinity/lib/trinity/konqsidebar_mediaplayer.so
+debian/tmp/opt/trinity/lib/trinity/konqsidebar_metabar.la
+debian/tmp/opt/trinity/lib/trinity/konqsidebar_metabar.so
+debian/tmp/opt/trinity/lib/trinity/libakregatorkonqfeedicon.la
+debian/tmp/opt/trinity/lib/trinity/libakregatorkonqfeedicon.so
+debian/tmp/opt/trinity/lib/trinity/libakregatorkonqplugin.la
+debian/tmp/opt/trinity/lib/trinity/libakregatorkonqplugin.so
+debian/tmp/opt/trinity/lib/trinity/libarkplugin.la
+debian/tmp/opt/trinity/lib/trinity/libarkplugin.so
+debian/tmp/opt/trinity/lib/trinity/libautorefresh.la
+debian/tmp/opt/trinity/lib/trinity/libautorefresh.so
+debian/tmp/opt/trinity/lib/trinity/libbabelfishplugin.la
+debian/tmp/opt/trinity/lib/trinity/libbabelfishplugin.so
+debian/tmp/opt/trinity/lib/trinity/libcrashesplugin.la
+debian/tmp/opt/trinity/lib/trinity/libcrashesplugin.so
+debian/tmp/opt/trinity/lib/trinity/libdirfilterplugin.la
+debian/tmp/opt/trinity/lib/trinity/libdirfilterplugin.so
+debian/tmp/opt/trinity/lib/trinity/librsyncplugin.la
+debian/tmp/opt/trinity/lib/trinity/librsyncplugin.so
+debian/tmp/opt/trinity/lib/trinity/libdomtreeviewerplugin.la
+debian/tmp/opt/trinity/lib/trinity/libdomtreeviewerplugin.so
+debian/tmp/opt/trinity/lib/trinity/libfsviewpart.la
+debian/tmp/opt/trinity/lib/trinity/libfsviewpart.so
+debian/tmp/opt/trinity/lib/trinity/libkhtmlsettingsplugin.la
+debian/tmp/opt/trinity/lib/trinity/libkhtmlsettingsplugin.so
+debian/tmp/opt/trinity/lib/trinity/kcm_kuick.la
+debian/tmp/opt/trinity/lib/trinity/kcm_kuick.so
+debian/tmp/opt/trinity/lib/trinity/libkimgallery.la
+debian/tmp/opt/trinity/lib/trinity/libkimgallery.so
+debian/tmp/opt/trinity/lib/trinity/libkuickplugin.la
+debian/tmp/opt/trinity/lib/trinity/libkuickplugin.so
+debian/tmp/opt/trinity/lib/trinity/libmfkonqmficon.la
+debian/tmp/opt/trinity/lib/trinity/libmfkonqmficon.so
+debian/tmp/opt/trinity/lib/trinity/libminitoolsplugin.la
+debian/tmp/opt/trinity/lib/trinity/libminitoolsplugin.so
+debian/tmp/opt/trinity/lib/trinity/librellinksplugin.la
+debian/tmp/opt/trinity/lib/trinity/librellinksplugin.so
+debian/tmp/opt/trinity/lib/trinity/libsearchbarplugin.la
+debian/tmp/opt/trinity/lib/trinity/libsearchbarplugin.so
+debian/tmp/opt/trinity/lib/trinity/libuachangerplugin.la
+debian/tmp/opt/trinity/lib/trinity/libuachangerplugin.so
+debian/tmp/opt/trinity/lib/trinity/libvalidatorsplugin.la
+debian/tmp/opt/trinity/lib/trinity/libvalidatorsplugin.so
+debian/tmp/opt/trinity/lib/trinity/libwebarchiverplugin.la
+debian/tmp/opt/trinity/lib/trinity/libwebarchiverplugin.so
+debian/tmp/opt/trinity/lib/trinity/webarchivethumbnail.la
+debian/tmp/opt/trinity/lib/trinity/webarchivethumbnail.so
 debian/tmp/opt/trinity/share/applnk/.hidden/arkplugin.desktop
 debian/tmp/opt/trinity/share/applnk/.hidden/kcmkuick.desktop
 debian/tmp/opt/trinity/share/applnk/.hidden/kuickplugin.desktop
@@ -178,5 +178,5 @@ konq-plugins/rellinks/TODO /opt/trinity/share/doc/konq-plugins/rellinks
 konq-plugins/sidebar/mediaplayer/AUTHORS /opt/trinity/share/doc/konq-plugins/sidebar-mediaplayer
 konq-plugins/sidebar/newsticker/README /opt/trinity/share/doc/konq-plugins/sidebar-newsticker
 
-debian/tmp/opt/trinity/lib/kde3/libadblock.la
-debian/tmp/opt/trinity/lib/kde3/libadblock.so
+debian/tmp/opt/trinity/lib/trinity/libadblock.la
+debian/tmp/opt/trinity/lib/trinity/libadblock.so
diff --git a/ubuntu/maverick/kdeaddons/debian/kontact-plugins-trinity.install b/ubuntu/maverick/kdeaddons/debian/kontact-plugins-trinity.install
index a39d1d9e2..3571c1d1d 100644
--- a/ubuntu/maverick/kdeaddons/debian/kontact-plugins-trinity.install
+++ b/ubuntu/maverick/kdeaddons/debian/kontact-plugins-trinity.install
@@ -1,6 +1,6 @@
-debian/tmp/opt/trinity/lib/kde3/kcm_kontactknt.so
-debian/tmp/opt/trinity/lib/kde3/kcm_kontactknt.la
-debian/tmp/opt/trinity/lib/kde3/libkontact_newstickerplugin.so
-debian/tmp/opt/trinity/lib/kde3/libkontact_newstickerplugin.la
+debian/tmp/opt/trinity/lib/trinity/kcm_kontactknt.so
+debian/tmp/opt/trinity/lib/trinity/kcm_kontactknt.la
+debian/tmp/opt/trinity/lib/trinity/libkontact_newstickerplugin.so
+debian/tmp/opt/trinity/lib/trinity/libkontact_newstickerplugin.la
 debian/tmp/opt/trinity/share/services/kcmkontactknt.desktop
 debian/tmp/opt/trinity/share/services/kontact
diff --git a/ubuntu/maverick/kdeaddons/debian/noatun-plugins-trinity.install b/ubuntu/maverick/kdeaddons/debian/noatun-plugins-trinity.install
index adf61ad08..843bdf15c 100644
--- a/ubuntu/maverick/kdeaddons/debian/noatun-plugins-trinity.install
+++ b/ubuntu/maverick/kdeaddons/debian/noatun-plugins-trinity.install
@@ -1,36 +1,36 @@
 debian/tmp/opt/trinity/bin/noatunsynaescope.bin
 debian/tmp/opt/trinity/bin/noatuntippecanoe.bin
 debian/tmp/opt/trinity/bin/noatuntyler.bin
-debian/tmp/opt/trinity/lib/kde3/noatunalsaplayer.la
-debian/tmp/opt/trinity/lib/kde3/noatunalsaplayer.so
-debian/tmp/opt/trinity/lib/kde3/noatunblurscope.la
-debian/tmp/opt/trinity/lib/kde3/noatunblurscope.so
-debian/tmp/opt/trinity/lib/kde3/noatuncharlatan.la
-debian/tmp/opt/trinity/lib/kde3/noatuncharlatan.so
-debian/tmp/opt/trinity/lib/kde3/noatundub.la
-debian/tmp/opt/trinity/lib/kde3/noatundub.so
-debian/tmp/opt/trinity/lib/kde3/noatun_ffrs.la
-debian/tmp/opt/trinity/lib/kde3/noatun_ffrs.so
-debian/tmp/opt/trinity/lib/kde3/noatunluckytag.la
-debian/tmp/opt/trinity/lib/kde3/noatunluckytag.so
-debian/tmp/opt/trinity/lib/kde3/noatunlyrics.la
-debian/tmp/opt/trinity/lib/kde3/noatunlyrics.so
-debian/tmp/opt/trinity/lib/kde3/noatunmadness.la
-debian/tmp/opt/trinity/lib/kde3/noatunmadness.so
-debian/tmp/opt/trinity/lib/kde3/noatun_oblique.la
-debian/tmp/opt/trinity/lib/kde3/noatun_oblique.so
-debian/tmp/opt/trinity/lib/kde3/noatunpitchablespeed.la
-debian/tmp/opt/trinity/lib/kde3/noatunpitchablespeed.so
-debian/tmp/opt/trinity/lib/kde3/noatunsynaescope.la
-debian/tmp/opt/trinity/lib/kde3/noatunsynaescope.so
-debian/tmp/opt/trinity/lib/kde3/noatuntippecanoe.la
-debian/tmp/opt/trinity/lib/kde3/noatuntippecanoe.so
-debian/tmp/opt/trinity/lib/kde3/noatuntyler.la
-debian/tmp/opt/trinity/lib/kde3/noatuntyler.so
-debian/tmp/opt/trinity/lib/kde3/noatunwakeup.la
-debian/tmp/opt/trinity/lib/kde3/noatunwakeup.so
-debian/tmp/opt/trinity/lib/kde3/noatunwavecapture.la
-debian/tmp/opt/trinity/lib/kde3/noatunwavecapture.so
+debian/tmp/opt/trinity/lib/trinity/noatunalsaplayer.la
+debian/tmp/opt/trinity/lib/trinity/noatunalsaplayer.so
+debian/tmp/opt/trinity/lib/trinity/noatunblurscope.la
+debian/tmp/opt/trinity/lib/trinity/noatunblurscope.so
+debian/tmp/opt/trinity/lib/trinity/noatuncharlatan.la
+debian/tmp/opt/trinity/lib/trinity/noatuncharlatan.so
+debian/tmp/opt/trinity/lib/trinity/noatundub.la
+debian/tmp/opt/trinity/lib/trinity/noatundub.so
+debian/tmp/opt/trinity/lib/trinity/noatun_ffrs.la
+debian/tmp/opt/trinity/lib/trinity/noatun_ffrs.so
+debian/tmp/opt/trinity/lib/trinity/noatunluckytag.la
+debian/tmp/opt/trinity/lib/trinity/noatunluckytag.so
+debian/tmp/opt/trinity/lib/trinity/noatunlyrics.la
+debian/tmp/opt/trinity/lib/trinity/noatunlyrics.so
+debian/tmp/opt/trinity/lib/trinity/noatunmadness.la
+debian/tmp/opt/trinity/lib/trinity/noatunmadness.so
+debian/tmp/opt/trinity/lib/trinity/noatun_oblique.la
+debian/tmp/opt/trinity/lib/trinity/noatun_oblique.so
+debian/tmp/opt/trinity/lib/trinity/noatunpitchablespeed.la
+debian/tmp/opt/trinity/lib/trinity/noatunpitchablespeed.so
+debian/tmp/opt/trinity/lib/trinity/noatunsynaescope.la
+debian/tmp/opt/trinity/lib/trinity/noatunsynaescope.so
+debian/tmp/opt/trinity/lib/trinity/noatuntippecanoe.la
+debian/tmp/opt/trinity/lib/trinity/noatuntippecanoe.so
+debian/tmp/opt/trinity/lib/trinity/noatuntyler.la
+debian/tmp/opt/trinity/lib/trinity/noatuntyler.so
+debian/tmp/opt/trinity/lib/trinity/noatunwakeup.la
+debian/tmp/opt/trinity/lib/trinity/noatunwakeup.so
+debian/tmp/opt/trinity/lib/trinity/noatunwavecapture.la
+debian/tmp/opt/trinity/lib/trinity/noatunwavecapture.so
 debian/tmp/opt/trinity/share/apps/noatun/alsaplayerui.plugin
 debian/tmp/opt/trinity/share/apps/noatun/blurscope.plugin
 debian/tmp/opt/trinity/share/apps/noatun/charlatanui.plugin