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

58 files changed, 115 insertions, 115 deletions

diff --git a/ubuntu/maverick/applications/adept/debian/changelog b/ubuntu/maverick/applications/adept/debian/changelog
index ec12c0119..332ec5674 100644
--- a/ubuntu/maverick/applications/adept/debian/changelog
+++ b/ubuntu/maverick/applications/adept/debian/changelog
@@ -378,7 +378,7 @@ adept (2.1.2ubuntu13) feisty; urgency=low
 
   * Add kubuntu_08_no_unique_application.diff don't use a unique application,
     stops it forking which broke xauthority and means debconf can't work in X mode
-  * Add kubuntu_09_no_double_kdesu.diff stop using kdesu twice
+  * Add kubuntu_09_no_double_tdesu.diff stop using tdesu twice
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  6 Feb 2007 12:38:42 +0000
 
@@ -674,7 +674,7 @@ ept (0.4) experimental; urgency=low
   * Easy Tag filter.
   * Ship own copies of nuvola icons.
   * Fix segfaulting extenders.
-  * Use kdesu for .desktop entries.
+  * Use tdesu for .desktop entries.
   * Fix crasher on cache reload with active tag filter.
   * Major speedup of the tag menu.
   * Improve handling of comments in sources.list editor.
diff --git a/ubuntu/maverick/applications/amarok.cmake/debian/changelog b/ubuntu/maverick/applications/amarok.cmake/debian/changelog
index e72612a70..c2bf1ae55 100644
--- a/ubuntu/maverick/applications/amarok.cmake/debian/changelog
+++ b/ubuntu/maverick/applications/amarok.cmake/debian/changelog
@@ -284,7 +284,7 @@ amarok (2:1.4.8-0ubuntu3) hardy; urgency=low
 
   [ Sarah Hobbs ]
   * Sponsored upload.  (Closes LP: #187406)
-  * Reworked patch to avoid setting absolute paths (eg /usr/bin/kdesu) 
+  * Reworked patch to avoid setting absolute paths (eg /usr/bin/tdesu) 
 
  -- Sarah Hobbs <hobbsee@ubuntu.com>  Wed, 12 Mar 2008 00:50:22 +1100
 
diff --git a/ubuntu/maverick/applications/amarok.cmake/debian/install-mp3 b/ubuntu/maverick/applications/amarok.cmake/debian/install-mp3
index 7b06cbd2f..ae0663182 100644
--- a/ubuntu/maverick/applications/amarok.cmake/debian/install-mp3
+++ b/ubuntu/maverick/applications/amarok.cmake/debian/install-mp3
@@ -27,8 +27,8 @@ INSTALLED=`dpkg --get-selections libxine1-ffmpeg | grep install`
 
 #is available, not installed
 if [ -z "$INSTALLED" ]; then
-  if [ -x /opt/trinity/bin/kdesu ] && [ -x /usr/bin/install-package ]; then
-    /opt/trinity/bin/kdesu -d "install-package --icon amarok --install libxine1-ffmpeg"
+  if [ -x /opt/trinity/bin/tdesu ] && [ -x /usr/bin/install-package ]; then
+    /opt/trinity/bin/tdesu -d "install-package --icon amarok --install libxine1-ffmpeg"
   elif [ -x /usr/bin/gksudo ] && [ -x /usr/sbin/synaptic ]; then
     gksudo "sh -c 'echo \"libxine1-ffmpeg i\"|synaptic --non-interactive --set-selections'"
   else
diff --git a/ubuntu/maverick/applications/amarok/debian/changelog b/ubuntu/maverick/applications/amarok/debian/changelog
index e72612a70..c2bf1ae55 100644
--- a/ubuntu/maverick/applications/amarok/debian/changelog
+++ b/ubuntu/maverick/applications/amarok/debian/changelog
@@ -284,7 +284,7 @@ amarok (2:1.4.8-0ubuntu3) hardy; urgency=low
 
   [ Sarah Hobbs ]
   * Sponsored upload.  (Closes LP: #187406)
-  * Reworked patch to avoid setting absolute paths (eg /usr/bin/kdesu) 
+  * Reworked patch to avoid setting absolute paths (eg /usr/bin/tdesu) 
 
  -- Sarah Hobbs <hobbsee@ubuntu.com>  Wed, 12 Mar 2008 00:50:22 +1100
 
diff --git a/ubuntu/maverick/applications/amarok/debian/install-mp3 b/ubuntu/maverick/applications/amarok/debian/install-mp3
index 7b06cbd2f..ae0663182 100644
--- a/ubuntu/maverick/applications/amarok/debian/install-mp3
+++ b/ubuntu/maverick/applications/amarok/debian/install-mp3
@@ -27,8 +27,8 @@ INSTALLED=`dpkg --get-selections libxine1-ffmpeg | grep install`
 
 #is available, not installed
 if [ -z "$INSTALLED" ]; then
-  if [ -x /opt/trinity/bin/kdesu ] && [ -x /usr/bin/install-package ]; then
-    /opt/trinity/bin/kdesu -d "install-package --icon amarok --install libxine1-ffmpeg"
+  if [ -x /opt/trinity/bin/tdesu ] && [ -x /usr/bin/install-package ]; then
+    /opt/trinity/bin/tdesu -d "install-package --icon amarok --install libxine1-ffmpeg"
   elif [ -x /usr/bin/gksudo ] && [ -x /usr/sbin/synaptic ]; then
     gksudo "sh -c 'echo \"libxine1-ffmpeg i\"|synaptic --non-interactive --set-selections'"
   else
diff --git a/ubuntu/maverick/applications/digikam/debian/changelog b/ubuntu/maverick/applications/digikam/debian/changelog
index 86611e634..4e7505827 100644
--- a/ubuntu/maverick/applications/digikam/debian/changelog
+++ b/ubuntu/maverick/applications/digikam/debian/changelog
@@ -772,7 +772,7 @@ digikam (0.7.4-5) unstable; urgency=low
     (Closes: #326786)
   * debian/rules enable DEB_CONFIGURE_USER_FLAGS
   * Renable debian/patches/visibility.diff for 0.7.4
-  * Recommends: kdeprint, konqueror
+  * Recommends: tdeprint, konqueror
 
  -- Mark Purcell <msp@debian.org>  Sat, 17 Sep 2005 22:09:19 +0100
 
diff --git a/ubuntu/maverick/applications/digikam/debian/control b/ubuntu/maverick/applications/digikam/debian/control
index a6e1f9889..c62380338 100644
--- a/ubuntu/maverick/applications/digikam/debian/control
+++ b/ubuntu/maverick/applications/digikam/debian/control
@@ -18,7 +18,7 @@ Architecture: any
 Depends: ${shlibs:Depends}
 Replaces: digikam-kde3 (<< 4:3.5.13)
 Breaks: digikam-kde3 (<< 4:3.5.13)
-Recommends: kipi-plugins-trinity, kdeprint-trinity, konqueror-trinity
+Recommends: kipi-plugins-trinity, tdeprint-trinity, konqueror-trinity
 Suggests: digikam-trinity-doc
 Description: digital photo management application for KDE [Trinity]
  An easy to use and powerful digital photo management
@@ -46,7 +46,7 @@ Section: graphics
 Replaces: showfoto-kde3 (<< 4:3.5.13)
 Breaks: showfoto-kde3 (<< 4:3.5.13)
 Depends: ${shlibs:Depends}, digikam-trinity
-Recommends: kipi-plugins-trinity, kdeprint-trinity, konqueror-trinity
+Recommends: kipi-plugins-trinity, tdeprint-trinity, konqueror-trinity
 Description: image viewer/editor for KDE [Trinity]
  Showphoto is part of the Digikam project.
  It allows to browse your photo collection and edit them with ease.
diff --git a/ubuntu/maverick/applications/digikam/debian/control.in b/ubuntu/maverick/applications/digikam/debian/control.in
index f0c7fd2cb..6905744a8 100644
--- a/ubuntu/maverick/applications/digikam/debian/control.in
+++ b/ubuntu/maverick/applications/digikam/debian/control.in
@@ -16,7 +16,7 @@ Homepage: http://www.digikam.org
 Package: digikam-trinity
 Architecture: any
 Depends: ${shlibs:Depends}
-Recommends: kipi-plugins-trinity, kdeprint-trinity, konqueror-trinity
+Recommends: kipi-plugins-trinity, tdeprint-trinity, konqueror-trinity
 Suggests: digikam-trinity-doc
 Description: digital photo management application for KDE [Trinity]
  An easy to use and powerful digital photo management
@@ -42,7 +42,7 @@ Package: showfoto-trinity
 Architecture: any
 Section: graphics
 Depends: ${shlibs:Depends}, digikam-trinity
-Recommends: kipi-plugins-trinity, kdeprint-trinity, konqueror-trinity
+Recommends: kipi-plugins-trinity, tdeprint-trinity, konqueror-trinity
 Description: image viewer/editor for KDE [Trinity]
  Showphoto is part of the Digikam project.
  It allows to browse your photo collection and edit them with ease.
diff --git a/ubuntu/maverick/applications/gwenview/debian/changelog b/ubuntu/maverick/applications/gwenview/debian/changelog
index 0ebf36378..25741414f 100644
--- a/ubuntu/maverick/applications/gwenview/debian/changelog
+++ b/ubuntu/maverick/applications/gwenview/debian/changelog
@@ -157,7 +157,7 @@ gwenview (1.1.8+1.2.0pre1-1) unstable; urgency=low
   * New upstream release.
     + Fixes crash when double-clicking on an image using the konqueror kpart.
       (Closes: #290097)
-    + Gwenview is now a kdeinit module - added appropriate lintian override.
+    + Gwenview is now a tdeinit module - added appropriate lintian override.
 
  -- Christopher Martin <chrsmrtn@freeshell.org>  Wed, 26 Jan 2005 09:45:17 -0500
 
diff --git a/ubuntu/maverick/applications/gwenview/debian/gwenview.lintian b/ubuntu/maverick/applications/gwenview/debian/gwenview.lintian
index 91d566d75..6fdaead63 100644
--- a/ubuntu/maverick/applications/gwenview/debian/gwenview.lintian
+++ b/ubuntu/maverick/applications/gwenview/debian/gwenview.lintian
@@ -1,3 +1,3 @@
 gwenview binary: non-dev-pkg-with-shlib-symlink opt/trinity/lib/libgwenviewcore.so.1.0.0 opt/trinity/lib/libgwenviewcore.so
-gwenview binary: shlib-missing-in-control-file libkdeinit_gwenview.so for opt/trinity/lib/libkdeinit_gwenview.so
-gwenview binary: package-name-doesnt-match-sonames libgwenviewcore1 libkdeinit-gwenview
+gwenview binary: shlib-missing-in-control-file libtdeinit_gwenview.so for opt/trinity/lib/libtdeinit_gwenview.so
+gwenview binary: package-name-doesnt-match-sonames libgwenviewcore1 libtdeinit-gwenview
diff --git a/ubuntu/maverick/applications/kaffeine/debian/install-codecs b/ubuntu/maverick/applications/kaffeine/debian/install-codecs
index 271285c4e..720dfcd4c 100644
--- a/ubuntu/maverick/applications/kaffeine/debian/install-codecs
+++ b/ubuntu/maverick/applications/kaffeine/debian/install-codecs
@@ -102,7 +102,7 @@ class CodecInstallerWidget(QDialog, apt.OpProgress):
         return True
 
     def install_cache_package(self, pkg):
-        if os.system('kdesu -d \'adept_batch install ' + pkg.name + '\'') != 0:
+        if os.system('tdesu -d \'adept_batch install ' + pkg.name + '\'') != 0:
             QApplication.exit(1)
             return
 
diff --git a/ubuntu/maverick/applications/kdiff3/debian/rules b/ubuntu/maverick/applications/kdiff3/debian/rules
index 09511bd51..90b33c108 100755
--- a/ubuntu/maverick/applications/kdiff3/debian/rules
+++ b/ubuntu/maverick/applications/kdiff3/debian/rules
@@ -45,7 +45,7 @@ build: build-stamp
 build-stamp:  config.status
 	dh_testdir
 
-	$(MAKE) LDFLAGS="-lkdecore -lkdeui" LIBS=""
+	$(MAKE) LDFLAGS="-ltdecore -ltdeui" LIBS=""
 	/usr/bin/docbook-to-man debian/kdiff3.sgml > doc/en/kdiff3.1
 	touch build-stamp
 
diff --git a/ubuntu/maverick/applications/kerry/debian/patches/kubuntu_03_no_beagle_autostart.patch b/ubuntu/maverick/applications/kerry/debian/patches/kubuntu_03_no_beagle_autostart.patch
index cbd096957..2dc15fe7f 100644
--- a/ubuntu/maverick/applications/kerry/debian/patches/kubuntu_03_no_beagle_autostart.patch
+++ b/ubuntu/maverick/applications/kerry/debian/patches/kubuntu_03_no_beagle_autostart.patch
@@ -2,7 +2,7 @@ diff -Nur kerry-0.2.1/kerry/src/Makefile.am kerry-0.2.1.new/kerry/src/Makefile.a
 --- kerry-0.2.1/kerry/src/Makefile.am	2006-12-05 18:28:31.000000000 +0100
 +++ kerry-0.2.1.new/kerry/src/Makefile.am	2006-12-05 18:28:53.000000000 +0100
 @@ -31,7 +31,7 @@
- kerry_la_LIBADD = -lkio -lkonq $(LIB_KDEUI) $(LIBBEAGLE_LIBADD) $(GLIB_LIBADD) $(LIB_KABC) 
+ kerry_la_LIBADD = -lkio -lkonq $(LIB_TDEUI) $(LIBBEAGLE_LIBADD) $(GLIB_LIBADD) $(LIB_KABC) 
  
  autostartdir = $(datadir)/autostart
 -autostart_DATA = kerry.autostart.desktop beagled.desktop
diff --git a/ubuntu/maverick/applications/kerry/debian/rules b/ubuntu/maverick/applications/kerry/debian/rules
index e3861ca8d..0d08e83f9 100755
--- a/ubuntu/maverick/applications/kerry/debian/rules
+++ b/ubuntu/maverick/applications/kerry/debian/rules
@@ -23,7 +23,7 @@ clean::
 	rm -f kerry.1
 
 binary-post-install/kerry-trinity::
-	chrpath -d debian/kerry-trinity/opt/trinity/lib/libkdeinit_kerry.so
+	chrpath -d debian/kerry-trinity/opt/trinity/lib/libtdeinit_kerry.so
 	chrpath -d debian/kerry-trinity/opt/trinity/bin/kerry
 	chrpath -d debian/kerry-trinity/opt/trinity/lib/trinity/kerry.so
 	chrpath -d debian/kerry-trinity/opt/trinity/lib/trinity/kcm_beagle.so
diff --git a/ubuntu/maverick/applications/kiosktool/debian/patches/kubuntu_03_sudo_support.diff b/ubuntu/maverick/applications/kiosktool/debian/patches/kubuntu_03_sudo_support.diff
index 5488388ad..eb8ca9a1b 100644
--- a/ubuntu/maverick/applications/kiosktool/debian/patches/kubuntu_03_sudo_support.diff
+++ b/ubuntu/maverick/applications/kiosktool/debian/patches/kubuntu_03_sudo_support.diff
@@ -34,7 +34,7 @@
  
  #include <kio/netaccess.h>
 -#define NETACCESS	KIO::NetAccess
-+// Kiosktool wants to use fish://root@localhost/... which won't work on Kubuntu because we don't run ssh by default, we don't allow ssh to do root logins and root doesn't even have a password, so implement the functions here for local copies using kdesu instead
++// Kiosktool wants to use fish://root@localhost/... which won't work on Kubuntu because we don't run ssh by default, we don't allow ssh to do root logins and root doesn't even have a password, so implement the functions here for local copies using tdesu instead
 +// #define NETACCESS	KIO::NetAccess
  
  #undef DEBUG_ENTRIES
diff --git a/ubuntu/maverick/applications/kmplayer/debian/kmplayer-trinity.install b/ubuntu/maverick/applications/kmplayer/debian/kmplayer-trinity.install
index 3c2a5f5ff..f25460f29 100644
--- a/ubuntu/maverick/applications/kmplayer/debian/kmplayer-trinity.install
+++ b/ubuntu/maverick/applications/kmplayer/debian/kmplayer-trinity.install
@@ -1,4 +1,4 @@
-opt/trinity/lib/libkdeinit_kmplayer.so
+opt/trinity/lib/libtdeinit_kmplayer.so
 opt/trinity/lib/trinity/kmplayer.so
 opt/trinity/bin/kmplayer
 opt/trinity/bin/kxvplayer
diff --git a/ubuntu/maverick/applications/kmymoney/debian/changelog b/ubuntu/maverick/applications/kmymoney/debian/changelog
index 36986fd74..a7240314d 100644
--- a/ubuntu/maverick/applications/kmymoney/debian/changelog
+++ b/ubuntu/maverick/applications/kmymoney/debian/changelog
@@ -246,7 +246,7 @@ kmymoney2 (0.8.4-4) unstable; urgency=low
 
 kmymoney2 (0.8.4-3) unstable; urgency=low
 
-  * export LDFLAGS=-lgwenhywfar -laqbanking -lqbanking -lkdeui
+  * export LDFLAGS=-lgwenhywfar -laqbanking -lqbanking -ltdeui
    -- Fixes: FTBFS in sid (problem with kbanking) (Closes: #373707)
 
  -- Mark Purcell <msp@debian.org>  Wed, 21 Jun 2006 16:34:03 +0100
diff --git a/ubuntu/maverick/applications/knetworkmanager.cmake/debian/network-manager-kde-trinity.lintian-overrides b/ubuntu/maverick/applications/knetworkmanager.cmake/debian/network-manager-kde-trinity.lintian-overrides
index 9ae01a92b..b5316fc73 100644
--- a/ubuntu/maverick/applications/knetworkmanager.cmake/debian/network-manager-kde-trinity.lintian-overrides
+++ b/ubuntu/maverick/applications/knetworkmanager.cmake/debian/network-manager-kde-trinity.lintian-overrides
@@ -1,2 +1,2 @@
-network-manager-kde: package-name-doesnt-match-sonames libkdeinit-knetworkmanager
-network-manager-kde: shlib-without-versioned-soname opt/trinity/lib/libkdeinit_knetworkmanager.so libkdeinit_knetworkmanager.so
+network-manager-kde: package-name-doesnt-match-sonames libtdeinit-knetworkmanager
+network-manager-kde: shlib-without-versioned-soname opt/trinity/lib/libtdeinit_knetworkmanager.so libtdeinit_knetworkmanager.so
diff --git a/ubuntu/maverick/applications/knetworkmanager8/debian/network-manager-kde-trinity.lintian-overrides b/ubuntu/maverick/applications/knetworkmanager8/debian/network-manager-kde-trinity.lintian-overrides
index 9ae01a92b..b5316fc73 100644
--- a/ubuntu/maverick/applications/knetworkmanager8/debian/network-manager-kde-trinity.lintian-overrides
+++ b/ubuntu/maverick/applications/knetworkmanager8/debian/network-manager-kde-trinity.lintian-overrides
@@ -1,2 +1,2 @@
-network-manager-kde: package-name-doesnt-match-sonames libkdeinit-knetworkmanager
-network-manager-kde: shlib-without-versioned-soname opt/trinity/lib/libkdeinit_knetworkmanager.so libkdeinit_knetworkmanager.so
+network-manager-kde: package-name-doesnt-match-sonames libtdeinit-knetworkmanager
+network-manager-kde: shlib-without-versioned-soname opt/trinity/lib/libtdeinit_knetworkmanager.so libtdeinit_knetworkmanager.so
diff --git a/ubuntu/maverick/applications/koffice/debian/chalk-trinity.install b/ubuntu/maverick/applications/koffice/debian/chalk-trinity.install
index a36c77eb8..4df24b77e 100644
--- a/ubuntu/maverick/applications/koffice/debian/chalk-trinity.install
+++ b/ubuntu/maverick/applications/koffice/debian/chalk-trinity.install
@@ -142,7 +142,7 @@ debian/tmp/opt/trinity/lib/trinity/libchalktiffexport.la
 debian/tmp/opt/trinity/lib/trinity/libchalktiffexport.so
 debian/tmp/opt/trinity/lib/trinity/libchalktiffimport.la
 debian/tmp/opt/trinity/lib/trinity/libchalktiffimport.so
-debian/tmp/opt/trinity/lib/libkdeinit_chalk.so
+debian/tmp/opt/trinity/lib/libtdeinit_chalk.so
 debian/tmp/opt/trinity/lib/libchalk_cmyk_*.so.*
 debian/tmp/opt/trinity/lib/libchalkcolor.so.*
 debian/tmp/opt/trinity/lib/libchalkcommon.so.*
diff --git a/ubuntu/maverick/applications/koffice/debian/chalk-trinity.lintian b/ubuntu/maverick/applications/koffice/debian/chalk-trinity.lintian
index 40bb7a6ee..08adc5291 100644
--- a/ubuntu/maverick/applications/koffice/debian/chalk-trinity.lintian
+++ b/ubuntu/maverick/applications/koffice/debian/chalk-trinity.lintian
@@ -1,4 +1,4 @@
-chalk: shlib-missing-in-control-file libkdeinit_chalk.so for usr/lib/libkdeinit_chalk.so
+chalk: shlib-missing-in-control-file libtdeinit_chalk.so for usr/lib/libtdeinit_chalk.so
 chalk: menu-icon-missing /usr/share/pixmaps/chalk.xpm
-chalk: package-name-doesnt-match-sonames libkdeinit-chalk libchalk-cmyk-u16-0 libchalk-gray-u16-0 libchalk-lms-f32-0 libchalk-rgb-f16half0 libchalk-rgb-f32-0 libchalk-rgb-u16-0 libchalk-ycbcr-u16-0 libchalk-ycbcr-u8-0 libchalkcolor1 libchalkcommon1 libchalkgrayscale0 libchalkimage1 libchalkrgb0 libchalkscripting0 libchalkui1
+chalk: package-name-doesnt-match-sonames libtdeinit-chalk libchalk-cmyk-u16-0 libchalk-gray-u16-0 libchalk-lms-f32-0 libchalk-rgb-f16half0 libchalk-rgb-f32-0 libchalk-rgb-u16-0 libchalk-ycbcr-u16-0 libchalk-ycbcr-u8-0 libchalkcolor1 libchalkcommon1 libchalkgrayscale0 libchalkimage1 libchalkrgb0 libchalkscripting0 libchalkui1
 
diff --git a/ubuntu/maverick/applications/koffice/debian/karbon-trinity.install b/ubuntu/maverick/applications/koffice/debian/karbon-trinity.install
index 363bf04dc..653f730e0 100644
--- a/ubuntu/maverick/applications/koffice/debian/karbon-trinity.install
+++ b/ubuntu/maverick/applications/koffice/debian/karbon-trinity.install
@@ -45,7 +45,7 @@ debian/tmp/opt/trinity/lib/trinity/libwmfexport.so
 debian/tmp/opt/trinity/lib/trinity/libwmfimport.la
 debian/tmp/opt/trinity/lib/trinity/libwmfimport.so
 debian/tmp/opt/trinity/lib/libkarboncommon.so.*
-debian/tmp/opt/trinity/lib/libkdeinit_karbon.so
+debian/tmp/opt/trinity/lib/libtdeinit_karbon.so
 debian/tmp/opt/trinity/share/applications/kde/karbon.desktop
 debian/tmp/opt/trinity/share/apps/karbon
 debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/karbon_konqi.desktop
diff --git a/ubuntu/maverick/applications/koffice/debian/karbon-trinity.lintian b/ubuntu/maverick/applications/koffice/debian/karbon-trinity.lintian
index e8e11eff0..9733b0a93 100644
--- a/ubuntu/maverick/applications/koffice/debian/karbon-trinity.lintian
+++ b/ubuntu/maverick/applications/koffice/debian/karbon-trinity.lintian
@@ -1,2 +1,2 @@
-karbon: shlib-missing-in-control-file libkdeinit_karbon.so for usr/lib/libkdeinit_karbon.so
-karbon: package-name-doesnt-match-sonames libkarboncommon0 libkdeinit-karbon
+karbon: shlib-missing-in-control-file libtdeinit_karbon.so for usr/lib/libtdeinit_karbon.so
+karbon: package-name-doesnt-match-sonames libkarboncommon0 libtdeinit-karbon
diff --git a/ubuntu/maverick/applications/koffice/debian/kchart-trinity.install b/ubuntu/maverick/applications/koffice/debian/kchart-trinity.install
index 095261d9f..443a6acbf 100644
--- a/ubuntu/maverick/applications/koffice/debian/kchart-trinity.install
+++ b/ubuntu/maverick/applications/koffice/debian/kchart-trinity.install
@@ -21,7 +21,7 @@ debian/tmp/opt/trinity/lib/trinity/libkchartxpmexport.so
 debian/tmp/opt/trinity/lib/libkchartcommon.so.*
 debian/tmp/opt/trinity/lib/libkchartimageexport.so.*
 debian/tmp/opt/trinity/lib/libkdchart.*
-debian/tmp/opt/trinity/lib/libkdeinit_kchart.so
+debian/tmp/opt/trinity/lib/libtdeinit_kchart.so
 debian/tmp/opt/trinity/share/applications/kde/kchart.desktop
 debian/tmp/opt/trinity/share/apps/kchart
 debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/kchart_konqi.desktop
diff --git a/ubuntu/maverick/applications/koffice/debian/kchart-trinity.lintian b/ubuntu/maverick/applications/koffice/debian/kchart-trinity.lintian
index 1c399d1f3..4a9df9c9e 100644
--- a/ubuntu/maverick/applications/koffice/debian/kchart-trinity.lintian
+++ b/ubuntu/maverick/applications/koffice/debian/kchart-trinity.lintian
@@ -1,5 +1,5 @@
 # There is no -dev package.
 kchart: non-dev-pkg-with-shlib-symlink usr/lib/libkdchart.so.0.0.0 usr/lib/libkdchart.so
-kchart: shlib-missing-in-control-file libkdeinit_kchart.so for usr/lib/libkdeinit_kchart.so
-kchart: package-name-doesnt-match-sonames libkchartcommon2 libkchartimageexport4 libkdchart0 libkdeinit-kchart
+kchart: shlib-missing-in-control-file libtdeinit_kchart.so for usr/lib/libtdeinit_kchart.so
+kchart: package-name-doesnt-match-sonames libkchartcommon2 libkchartimageexport4 libkdchart0 libtdeinit-kchart
 
diff --git a/ubuntu/maverick/applications/koffice/debian/kexi-trinity.install b/ubuntu/maverick/applications/koffice/debian/kexi-trinity.install
index fc645134d..a0b259950 100644
--- a/ubuntu/maverick/applications/koffice/debian/kexi-trinity.install
+++ b/ubuntu/maverick/applications/koffice/debian/kexi-trinity.install
@@ -46,7 +46,7 @@ debian/tmp/opt/trinity/lib/trinity/krosskexiapp.la
 debian/tmp/opt/trinity/lib/trinity/krosskexiapp.so
 debian/tmp/opt/trinity/lib/trinity/krosskexidb.la
 debian/tmp/opt/trinity/lib/trinity/krosskexidb.so
-debian/tmp/opt/trinity/lib/libkdeinit_kexi.so
+debian/tmp/opt/trinity/lib/libtdeinit_kexi.so
 debian/tmp/opt/trinity/lib/libkexicore.so.*
 debian/tmp/opt/trinity/lib/libkexidatatable.so.*
 debian/tmp/opt/trinity/lib/libkexidbparser.so.*
diff --git a/ubuntu/maverick/applications/koffice/debian/kexi-trinity.lintian b/ubuntu/maverick/applications/koffice/debian/kexi-trinity.lintian
index d1dfd14c2..5288fb87d 100644
--- a/ubuntu/maverick/applications/koffice/debian/kexi-trinity.lintian
+++ b/ubuntu/maverick/applications/koffice/debian/kexi-trinity.lintian
@@ -1,4 +1,4 @@
-kexi: shlib-missing-in-control-file libkdeinit_kexi.so for usr/lib/libkdeinit_kexi.so
+kexi: shlib-missing-in-control-file libtdeinit_kexi.so for usr/lib/libtdeinit_kexi.so
 kexi: executable-not-elf-or-script ./usr/share/apps/kexi/scripts/projectdocumentor/ProjectDocumentor.rc
 kexi: executable-not-elf-or-script ./usr/share/apps/kexi/scripts/importxhtml/ImportXHTML.py
 kexi: executable-not-elf-or-script ./usr/share/apps/kexi/scripts/copycenter/readme.html
@@ -11,4 +11,4 @@ kexi: executable-not-elf-or-script ./usr/share/apps/kexi/scripts/copycenter/Copy
 kexi: executable-not-elf-or-script ./usr/share/apps/kexi/kross/python/kexiapp/__init__.py
 kexi: executable-not-elf-or-script ./usr/share/apps/kexi/scripts/exportxhtml/ExportXHTML.rc
 kexi: executable-not-elf-or-script ./usr/share/apps/kexi/scripts/copycenter/CopyCenter.py
-kexi: package-name-doesnt-match-sonames libkdeinit-kexi libkexicore2 libkexidatatable2 libkexidb2 libkexidbparser2 libkexiextendedwidgets2 libkexiformutils2 libkexiguiutils2 libkeximain2 libkeximigrate2 libkexirelationsview2 libkexisql2-2 libkexisql3-3 libkexiutils2 libkformdesigner2
+kexi: package-name-doesnt-match-sonames libtdeinit-kexi libkexicore2 libkexidatatable2 libkexidb2 libkexidbparser2 libkexiextendedwidgets2 libkexiformutils2 libkexiguiutils2 libkeximain2 libkeximigrate2 libkexirelationsview2 libkexisql2-2 libkexisql3-3 libkexiutils2 libkformdesigner2
diff --git a/ubuntu/maverick/applications/koffice/debian/kformula-trinity.install b/ubuntu/maverick/applications/koffice/debian/kformula-trinity.install
index d9ba60a08..7c09d82a4 100644
--- a/ubuntu/maverick/applications/koffice/debian/kformula-trinity.install
+++ b/ubuntu/maverick/applications/koffice/debian/kformula-trinity.install
@@ -6,7 +6,7 @@ debian/tmp/opt/trinity/lib/trinity/libkformulapart.la
 debian/tmp/opt/trinity/lib/trinity/libkformulapart.so
 debian/tmp/opt/trinity/lib/trinity/libkfosvgexport.la
 debian/tmp/opt/trinity/lib/trinity/libkfosvgexport.so
-debian/tmp/opt/trinity/lib/libkdeinit_kformula.so
+debian/tmp/opt/trinity/lib/libtdeinit_kformula.so
 debian/tmp/opt/trinity/share/applications/kde/kformula.desktop
 debian/tmp/opt/trinity/share/apps/kformula
 debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/kformula_konqi.desktop
diff --git a/ubuntu/maverick/applications/koffice/debian/kformula-trinity.lintian b/ubuntu/maverick/applications/koffice/debian/kformula-trinity.lintian
index 1224a3094..1062b39db 100644
--- a/ubuntu/maverick/applications/koffice/debian/kformula-trinity.lintian
+++ b/ubuntu/maverick/applications/koffice/debian/kformula-trinity.lintian
@@ -1,4 +1,4 @@
-kformula: no-shlibs-control-file usr/lib/libkdeinit_kformula.so
-kformula: postinst-must-call-ldconfig usr/lib/libkdeinit_kformula.so
-kformula: postrm-should-call-ldconfig usr/lib/libkdeinit_kformula.so
-kformula: package-name-doesnt-match-sonames libkdeinit-kformula
+kformula: no-shlibs-control-file usr/lib/libtdeinit_kformula.so
+kformula: postinst-must-call-ldconfig usr/lib/libtdeinit_kformula.so
+kformula: postrm-should-call-ldconfig usr/lib/libtdeinit_kformula.so
+kformula: package-name-doesnt-match-sonames libtdeinit-kformula
diff --git a/ubuntu/maverick/applications/koffice/debian/kivio-trinity.install b/ubuntu/maverick/applications/koffice/debian/kivio-trinity.install
index 510c85320..289580d09 100644
--- a/ubuntu/maverick/applications/koffice/debian/kivio-trinity.install
+++ b/ubuntu/maverick/applications/koffice/debian/kivio-trinity.install
@@ -17,5 +17,5 @@ debian/tmp/opt/trinity/lib/trinity/libkiviozoomtool.la
 debian/tmp/opt/trinity/lib/trinity/libkiviozoomtool.so
 debian/tmp/opt/trinity/lib/trinity/straight_connector.la
 debian/tmp/opt/trinity/lib/trinity/straight_connector.so
-debian/tmp/opt/trinity/lib/libkdeinit_kivio.so
+debian/tmp/opt/trinity/lib/libtdeinit_kivio.so
 debian/tmp/opt/trinity/lib/libkiviocommon.so.*
diff --git a/ubuntu/maverick/applications/koffice/debian/kivio-trinity.lintian b/ubuntu/maverick/applications/koffice/debian/kivio-trinity.lintian
index 2d8cfc583..02a07173b 100644
--- a/ubuntu/maverick/applications/koffice/debian/kivio-trinity.lintian
+++ b/ubuntu/maverick/applications/koffice/debian/kivio-trinity.lintian
@@ -1,4 +1,4 @@
-kivio: shlib-missing-in-control-file libkdeinit_kivio.so for usr/lib/libkdeinit_kivio.so
+kivio: shlib-missing-in-control-file libtdeinit_kivio.so for usr/lib/libtdeinit_kivio.so
 kivio: menu-icon-missing /usr/share/pixmaps/kivio.xpm
-kivio: package-name-doesnt-match-sonames libkdeinit-kivio libkiviocommon0
+kivio: package-name-doesnt-match-sonames libtdeinit-kivio libkiviocommon0
 
diff --git a/ubuntu/maverick/applications/koffice/debian/koffice-dev-trinity.install b/ubuntu/maverick/applications/koffice/debian/koffice-dev-trinity.install
index c65cbd3d3..936153c99 100644
--- a/ubuntu/maverick/applications/koffice/debian/koffice-dev-trinity.install
+++ b/ubuntu/maverick/applications/koffice/debian/koffice-dev-trinity.install
@@ -5,20 +5,20 @@ debian/tmp/opt/trinity/lib/libkchartcommon.la
 debian/tmp/opt/trinity/lib/libkchartcommon.so
 debian/tmp/opt/trinity/lib/libkchartimageexport.la
 debian/tmp/opt/trinity/lib/libkchartimageexport.so
-debian/tmp/opt/trinity/lib/libkdeinit_karbon.la
-debian/tmp/opt/trinity/lib/libkdeinit_kchart.la
-debian/tmp/opt/trinity/lib/libkdeinit_kexi.la
-debian/tmp/opt/trinity/lib/libkdeinit_kformula.la
-debian/tmp/opt/trinity/lib/libkdeinit_kivio.la
-debian/tmp/opt/trinity/lib/libkdeinit_koshell.la
-debian/tmp/opt/trinity/lib/libkdeinit_kplato.la
-debian/tmp/opt/trinity/lib/libkdeinit_kpresenter.la
-debian/tmp/opt/trinity/lib/libkdeinit_chalk.la
-debian/tmp/opt/trinity/lib/libkdeinit_kspread.la
-debian/tmp/opt/trinity/lib/libkdeinit_kthesaurus.la
-debian/tmp/opt/trinity/lib/libkdeinit_kudesigner.la
-debian/tmp/opt/trinity/lib/libkdeinit_kugar.la
-debian/tmp/opt/trinity/lib/libkdeinit_kword.la
+debian/tmp/opt/trinity/lib/libtdeinit_karbon.la
+debian/tmp/opt/trinity/lib/libtdeinit_kchart.la
+debian/tmp/opt/trinity/lib/libtdeinit_kexi.la
+debian/tmp/opt/trinity/lib/libtdeinit_kformula.la
+debian/tmp/opt/trinity/lib/libtdeinit_kivio.la
+debian/tmp/opt/trinity/lib/libtdeinit_koshell.la
+debian/tmp/opt/trinity/lib/libtdeinit_kplato.la
+debian/tmp/opt/trinity/lib/libtdeinit_kpresenter.la
+debian/tmp/opt/trinity/lib/libtdeinit_chalk.la
+debian/tmp/opt/trinity/lib/libtdeinit_kspread.la
+debian/tmp/opt/trinity/lib/libtdeinit_kthesaurus.la
+debian/tmp/opt/trinity/lib/libtdeinit_kudesigner.la
+debian/tmp/opt/trinity/lib/libtdeinit_kugar.la
+debian/tmp/opt/trinity/lib/libtdeinit_kword.la
 debian/tmp/opt/trinity/lib/libkexicore.la
 debian/tmp/opt/trinity/lib/libkexicore.so
 debian/tmp/opt/trinity/lib/libkexidatatable.la
diff --git a/ubuntu/maverick/applications/koffice/debian/koshell-trinity.install b/ubuntu/maverick/applications/koffice/debian/koshell-trinity.install
index fc8fbb841..c0399020b 100644
--- a/ubuntu/maverick/applications/koffice/debian/koshell-trinity.install
+++ b/ubuntu/maverick/applications/koffice/debian/koshell-trinity.install
@@ -2,7 +2,7 @@ debian/koshell.xpm opt/trinity/share/pixmaps
 debian/tmp/opt/trinity/bin/koshell
 debian/tmp/opt/trinity/lib/trinity/koshell.la
 debian/tmp/opt/trinity/lib/trinity/koshell.so
-debian/tmp/opt/trinity/lib/libkdeinit_koshell.so
+debian/tmp/opt/trinity/lib/libtdeinit_koshell.so
 debian/tmp/opt/trinity/share/applications/kde/koshell.desktop
 debian/tmp/opt/trinity/share/apps/koshell/koshellui.rc
 debian/tmp/opt/trinity/share/config.kcfg/koshell.kcfg
diff --git a/ubuntu/maverick/applications/koffice/debian/koshell-trinity.lintian b/ubuntu/maverick/applications/koffice/debian/koshell-trinity.lintian
index e410a8d00..45d130a4e 100644
--- a/ubuntu/maverick/applications/koffice/debian/koshell-trinity.lintian
+++ b/ubuntu/maverick/applications/koffice/debian/koshell-trinity.lintian
@@ -1,4 +1,4 @@
-koshell: no-shlibs-control-file usr/lib/libkdeinit_koshell.so
-koshell: postinst-must-call-ldconfig usr/lib/libkdeinit_koshell.so
-koshell: postrm-should-call-ldconfig usr/lib/libkdeinit_koshell.so
-koshell: package-name-doesnt-match-sonames libkdeinit-koshell
+koshell: no-shlibs-control-file usr/lib/libtdeinit_koshell.so
+koshell: postinst-must-call-ldconfig usr/lib/libtdeinit_koshell.so
+koshell: postrm-should-call-ldconfig usr/lib/libtdeinit_koshell.so
+koshell: package-name-doesnt-match-sonames libtdeinit-koshell
diff --git a/ubuntu/maverick/applications/koffice/debian/kplato-trinity.install b/ubuntu/maverick/applications/koffice/debian/kplato-trinity.install
index df01154f4..d9667f9c6 100644
--- a/ubuntu/maverick/applications/koffice/debian/kplato-trinity.install
+++ b/ubuntu/maverick/applications/koffice/debian/kplato-trinity.install
@@ -3,7 +3,7 @@ debian/tmp/opt/trinity/lib/trinity/kplato.la
 debian/tmp/opt/trinity/lib/trinity/kplato.so
 debian/tmp/opt/trinity/lib/trinity/libkplatopart.la
 debian/tmp/opt/trinity/lib/trinity/libkplatopart.so
-debian/tmp/opt/trinity/lib/libkdeinit_kplato.so
+debian/tmp/opt/trinity/lib/libtdeinit_kplato.so
 debian/tmp/opt/trinity/share/applications/kde/kplato.desktop
 debian/tmp/opt/trinity/share/apps/kplato/icons/crystalsvg/22x22/actions/accounts.png
 debian/tmp/opt/trinity/share/apps/kplato/icons/crystalsvg/22x22/actions/add_milestone.png
diff --git a/ubuntu/maverick/applications/koffice/debian/kplato-trinity.lintian b/ubuntu/maverick/applications/koffice/debian/kplato-trinity.lintian
index 62e4d82ea..f08eafe73 100644
--- a/ubuntu/maverick/applications/koffice/debian/kplato-trinity.lintian
+++ b/ubuntu/maverick/applications/koffice/debian/kplato-trinity.lintian
@@ -1,4 +1,4 @@
-kplato: no-shlibs-control-file usr/lib/libkdeinit_kplato.so
-kplato: postinst-must-call-ldconfig usr/lib/libkdeinit_kplato.so
-kplato: postrm-should-call-ldconfig usr/lib/libkdeinit_kplato.so
-kplato: package-name-doesnt-match-sonames libkdeinit-kplato
+kplato: no-shlibs-control-file usr/lib/libtdeinit_kplato.so
+kplato: postinst-must-call-ldconfig usr/lib/libtdeinit_kplato.so
+kplato: postrm-should-call-ldconfig usr/lib/libtdeinit_kplato.so
+kplato: package-name-doesnt-match-sonames libtdeinit-kplato
diff --git a/ubuntu/maverick/applications/koffice/debian/kpresenter-trinity.install b/ubuntu/maverick/applications/koffice/debian/kpresenter-trinity.install
index fc90edce6..5aada1cab 100644
--- a/ubuntu/maverick/applications/koffice/debian/kpresenter-trinity.install
+++ b/ubuntu/maverick/applications/koffice/debian/kpresenter-trinity.install
@@ -24,6 +24,6 @@ debian/tmp/opt/trinity/lib/trinity/libooimpressexport.la
 debian/tmp/opt/trinity/lib/trinity/libooimpressexport.so
 debian/tmp/opt/trinity/lib/trinity/libooimpressimport.la
 debian/tmp/opt/trinity/lib/trinity/libooimpressimport.so
-debian/tmp/opt/trinity/lib/libkdeinit_kpresenter.so
+debian/tmp/opt/trinity/lib/libtdeinit_kpresenter.so
 debian/tmp/opt/trinity/lib/libkpresenterimageexport.so.*
 debian/tmp/opt/trinity/lib/libkpresenterprivate.so.*
diff --git a/ubuntu/maverick/applications/koffice/debian/kpresenter-trinity.lintian b/ubuntu/maverick/applications/koffice/debian/kpresenter-trinity.lintian
index d038ca914..6e7af5591 100644
--- a/ubuntu/maverick/applications/koffice/debian/kpresenter-trinity.lintian
+++ b/ubuntu/maverick/applications/koffice/debian/kpresenter-trinity.lintian
@@ -1,4 +1,4 @@
 kpresenter: script-with-language-extension usr/bin/kprconverter.pl
-kpresenter: shlib-missing-in-control-file libkdeinit_kpresenter.so for usr/lib/libkdeinit_kpresenter.so
+kpresenter: shlib-missing-in-control-file libtdeinit_kpresenter.so for usr/lib/libtdeinit_kpresenter.so
 kpresenter: menu-icon-missing /usr/share/pixmaps/kpresenter.xpm
-kpresenter: package-name-doesnt-match-sonames libkdeinit-kpresenter libkpresenterimageexport4 libkpresenterprivate4
+kpresenter: package-name-doesnt-match-sonames libtdeinit-kpresenter libkpresenterimageexport4 libkpresenterprivate4
diff --git a/ubuntu/maverick/applications/koffice/debian/kspread-trinity.install b/ubuntu/maverick/applications/koffice/debian/kspread-trinity.install
index 9b1251bf2..6a7228fd3 100644
--- a/ubuntu/maverick/applications/koffice/debian/kspread-trinity.install
+++ b/ubuntu/maverick/applications/koffice/debian/kspread-trinity.install
@@ -36,7 +36,7 @@ debian/tmp/opt/trinity/lib/trinity/libopencalcimport.la
 debian/tmp/opt/trinity/lib/trinity/libopencalcimport.so
 debian/tmp/opt/trinity/lib/trinity/libqproimport.la
 debian/tmp/opt/trinity/lib/trinity/libqproimport.so
-debian/tmp/opt/trinity/lib/libkdeinit_kspread.so
+debian/tmp/opt/trinity/lib/libtdeinit_kspread.so
 debian/tmp/opt/trinity/lib/libkspreadcommon.so.*
 debian/tmp/opt/trinity/share/applications/kde/kspread.desktop
 debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/kspread_konqi.desktop
diff --git a/ubuntu/maverick/applications/koffice/debian/kspread-trinity.lintian b/ubuntu/maverick/applications/koffice/debian/kspread-trinity.lintian
index 6c23d706d..b47c3a364 100644
--- a/ubuntu/maverick/applications/koffice/debian/kspread-trinity.lintian
+++ b/ubuntu/maverick/applications/koffice/debian/kspread-trinity.lintian
@@ -1,7 +1,7 @@
-kspread: shlib-missing-in-control-file libkdeinit_kspread.so for usr/lib/libkdeinit_kspread.so
+kspread: shlib-missing-in-control-file libtdeinit_kspread.so for usr/lib/libtdeinit_kspread.so
 kspread: executable-not-elf-or-script ./usr/share/apps/kspread/scripts/scripteditor/ScriptEditor.rc
 kspread: executable-not-elf-or-script ./usr/share/apps/kspread/scripts/exporthtml/ExportHtml.rc
 kspread: executable-not-elf-or-script ./usr/share/apps/kspread/scripts/exporthtml/ExportHtml.py
 kspread: executable-not-elf-or-script ./usr/share/apps/kspread/scripts/scripteditor/ScriptEditor.py
-kspread: package-name-doesnt-match-sonames libkdeinit-kspread libkspreadcommon0
+kspread: package-name-doesnt-match-sonames libtdeinit-kspread libkspreadcommon0
 
diff --git a/ubuntu/maverick/applications/koffice/debian/kthesaurus-trinity.install b/ubuntu/maverick/applications/koffice/debian/kthesaurus-trinity.install
index d115bcf4b..d0e29dd5c 100644
--- a/ubuntu/maverick/applications/koffice/debian/kthesaurus-trinity.install
+++ b/ubuntu/maverick/applications/koffice/debian/kthesaurus-trinity.install
@@ -2,7 +2,7 @@ debian/tmp/opt/trinity/bin/kthesaurus
 debian/tmp/opt/trinity/lib/trinity/kthesaurus.*
 debian/tmp/opt/trinity/lib/trinity/libthesaurustool.la
 debian/tmp/opt/trinity/lib/trinity/libthesaurustool.so
-debian/tmp/opt/trinity/lib/libkdeinit_kthesaurus.so
+debian/tmp/opt/trinity/lib/libtdeinit_kthesaurus.so
 debian/tmp/opt/trinity/share/applnk/Office/KThesaurus.desktop
 debian/tmp/opt/trinity/share/apps/thesaurus
 debian/tmp/opt/trinity/share/doc/kde/HTML/en/thesaurus/*.bz2
diff --git a/ubuntu/maverick/applications/koffice/debian/kthesaurus-trinity.lintian b/ubuntu/maverick/applications/koffice/debian/kthesaurus-trinity.lintian
index b32d255df..7d7018a77 100644
--- a/ubuntu/maverick/applications/koffice/debian/kthesaurus-trinity.lintian
+++ b/ubuntu/maverick/applications/koffice/debian/kthesaurus-trinity.lintian
@@ -1,5 +1,5 @@
-kthesaurus: no-shlibs-control-file usr/lib/libkdeinit_kthesaurus.so
-kthesaurus: postinst-must-call-ldconfig usr/lib/libkdeinit_kthesaurus.so
-kthesaurus: postrm-should-call-ldconfig usr/lib/libkdeinit_kthesaurus.so
-kthesaurus: package-name-doesnt-match-sonames libkdeinit-kthesaurus
+kthesaurus: no-shlibs-control-file usr/lib/libtdeinit_kthesaurus.so
+kthesaurus: postinst-must-call-ldconfig usr/lib/libtdeinit_kthesaurus.so
+kthesaurus: postrm-should-call-ldconfig usr/lib/libtdeinit_kthesaurus.so
+kthesaurus: package-name-doesnt-match-sonames libtdeinit-kthesaurus
 
diff --git a/ubuntu/maverick/applications/koffice/debian/kugar-trinity.install b/ubuntu/maverick/applications/koffice/debian/kugar-trinity.install
index 62c8c369f..c12230725 100644
--- a/ubuntu/maverick/applications/koffice/debian/kugar-trinity.install
+++ b/ubuntu/maverick/applications/koffice/debian/kugar-trinity.install
@@ -11,8 +11,8 @@ debian/tmp/opt/trinity/lib/trinity/libkugarnopimport.la
 debian/tmp/opt/trinity/lib/trinity/libkugarnopimport.so
 debian/tmp/opt/trinity/lib/trinity/libkugarpart.la
 debian/tmp/opt/trinity/lib/trinity/libkugarpart.so
-debian/tmp/opt/trinity/lib/libkdeinit_kudesigner.so
-debian/tmp/opt/trinity/lib/libkdeinit_kugar.so
+debian/tmp/opt/trinity/lib/libtdeinit_kudesigner.so
+debian/tmp/opt/trinity/lib/libtdeinit_kugar.so
 debian/tmp/opt/trinity/lib/libkudesignercore.la
 debian/tmp/opt/trinity/lib/libkudesignercore.so
 debian/tmp/opt/trinity/lib/libkugarlib.so.*
diff --git a/ubuntu/maverick/applications/koffice/debian/kugar-trinity.lintian b/ubuntu/maverick/applications/koffice/debian/kugar-trinity.lintian
index e06755739..5b8ec0d77 100644
--- a/ubuntu/maverick/applications/koffice/debian/kugar-trinity.lintian
+++ b/ubuntu/maverick/applications/koffice/debian/kugar-trinity.lintian
@@ -1,4 +1,4 @@
-kugar: shlib-missing-in-control-file libkdeinit_kudesigner.so for usr/lib/libkdeinit_kudesigner.so
-kugar: shlib-missing-in-control-file libkdeinit_kugar.so for usr/lib/libkdeinit_kugar.so
+kugar: shlib-missing-in-control-file libtdeinit_kudesigner.so for usr/lib/libtdeinit_kudesigner.so
+kugar: shlib-missing-in-control-file libtdeinit_kugar.so for usr/lib/libtdeinit_kugar.so
 kugar: shlib-missing-in-control-file libkudesignercore.so for usr/lib/libkudesignercore.so
-kugar: package-name-doesnt-match-sonames libkdeinit-kudesigner libkdeinit-kugar libkudesignercore libkugarlib1
+kugar: package-name-doesnt-match-sonames libtdeinit-kudesigner libtdeinit-kugar libkudesignercore libkugarlib1
diff --git a/ubuntu/maverick/applications/koffice/debian/kword-trinity.install b/ubuntu/maverick/applications/koffice/debian/kword-trinity.install
index d003812cd..7f3f2f954 100644
--- a/ubuntu/maverick/applications/koffice/debian/kword-trinity.install
+++ b/ubuntu/maverick/applications/koffice/debian/kword-trinity.install
@@ -67,5 +67,5 @@ debian/tmp/opt/trinity/lib/trinity/libwpexport.la
 debian/tmp/opt/trinity/lib/trinity/libwpexport.so
 debian/tmp/opt/trinity/lib/trinity/libwpimport.la
 debian/tmp/opt/trinity/lib/trinity/libwpimport.so
-debian/tmp/opt/trinity/lib/libkdeinit_kword.so
+debian/tmp/opt/trinity/lib/libtdeinit_kword.so
 debian/tmp/opt/trinity/lib/libkwordprivate.so.*
diff --git a/ubuntu/maverick/applications/koffice/debian/kword-trinity.lintian b/ubuntu/maverick/applications/koffice/debian/kword-trinity.lintian
index e18dbe8b2..5d08d84ca 100644
--- a/ubuntu/maverick/applications/koffice/debian/kword-trinity.lintian
+++ b/ubuntu/maverick/applications/koffice/debian/kword-trinity.lintian
@@ -1,4 +1,4 @@
-kword: shlib-missing-in-control-file libkdeinit_kword.so for usr/lib/libkdeinit_kword.so
+kword: shlib-missing-in-control-file libtdeinit_kword.so for usr/lib/libtdeinit_kword.so
 kword: menu-icon-missing /usr/share/pixmaps/kword.xpm
-kword: package-name-doesnt-match-sonames libkdeinit-kword libkwordprivate4
+kword: package-name-doesnt-match-sonames libtdeinit-kword libkwordprivate4
 
diff --git a/ubuntu/maverick/applications/kpowersave.cmake/debian/kpowersave-trinity.linda b/ubuntu/maverick/applications/kpowersave.cmake/debian/kpowersave-trinity.linda
index 4d9818595..ff5153632 100644
--- a/ubuntu/maverick/applications/kpowersave.cmake/debian/kpowersave-trinity.linda
+++ b/ubuntu/maverick/applications/kpowersave.cmake/debian/kpowersave-trinity.linda
@@ -1,4 +1,4 @@
 Tag: lib-not-in-shlibs
 
 Tag: no-shlib-file
-Data: /usr/trinity/lib/libkdeinit_*.so
+Data: /usr/trinity/lib/libtdeinit_*.so
diff --git a/ubuntu/maverick/applications/kpowersave.cmake/debian/kpowersave-trinity.lintian b/ubuntu/maverick/applications/kpowersave.cmake/debian/kpowersave-trinity.lintian
index 1f650ceb8..edff50852 100644
--- a/ubuntu/maverick/applications/kpowersave.cmake/debian/kpowersave-trinity.lintian
+++ b/ubuntu/maverick/applications/kpowersave.cmake/debian/kpowersave-trinity.lintian
@@ -1,5 +1,5 @@
-kpowersave: no-shlibs-control-file opt/trinity/lib/libkdeinit_kpowersave.so
-kpowersave: package-name-doesnt-match-sonames libkdeinit-kpowersave
-kpowersave: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_kpowersave.so
-kpowersave: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_kpowersave.so
+kpowersave: no-shlibs-control-file opt/trinity/lib/libtdeinit_kpowersave.so
+kpowersave: package-name-doesnt-match-sonames libtdeinit-kpowersave
+kpowersave: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so
+kpowersave: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so
 
diff --git a/ubuntu/maverick/applications/kpowersave/debian/kpowersave-trinity.linda b/ubuntu/maverick/applications/kpowersave/debian/kpowersave-trinity.linda
index 4d9818595..ff5153632 100644
--- a/ubuntu/maverick/applications/kpowersave/debian/kpowersave-trinity.linda
+++ b/ubuntu/maverick/applications/kpowersave/debian/kpowersave-trinity.linda
@@ -1,4 +1,4 @@
 Tag: lib-not-in-shlibs
 
 Tag: no-shlib-file
-Data: /usr/trinity/lib/libkdeinit_*.so
+Data: /usr/trinity/lib/libtdeinit_*.so
diff --git a/ubuntu/maverick/applications/kpowersave/debian/kpowersave-trinity.lintian b/ubuntu/maverick/applications/kpowersave/debian/kpowersave-trinity.lintian
index 1f650ceb8..edff50852 100644
--- a/ubuntu/maverick/applications/kpowersave/debian/kpowersave-trinity.lintian
+++ b/ubuntu/maverick/applications/kpowersave/debian/kpowersave-trinity.lintian
@@ -1,5 +1,5 @@
-kpowersave: no-shlibs-control-file opt/trinity/lib/libkdeinit_kpowersave.so
-kpowersave: package-name-doesnt-match-sonames libkdeinit-kpowersave
-kpowersave: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_kpowersave.so
-kpowersave: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_kpowersave.so
+kpowersave: no-shlibs-control-file opt/trinity/lib/libtdeinit_kpowersave.so
+kpowersave: package-name-doesnt-match-sonames libtdeinit-kpowersave
+kpowersave: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so
+kpowersave: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so
 
diff --git a/ubuntu/maverick/applications/krusader/debian/krusader.lintian-overrides b/ubuntu/maverick/applications/krusader/debian/krusader.lintian-overrides
index 74c03c669..62bf48233 100644
--- a/ubuntu/maverick/applications/krusader/debian/krusader.lintian-overrides
+++ b/ubuntu/maverick/applications/krusader/debian/krusader.lintian-overrides
@@ -1,2 +1,2 @@
-# package depends on tdebase-bin, which provides kdesu
-krusader-trinity: menu-command-not-in-package /usr/share/menu/krusader:17 kdesu
+# package depends on tdebase-bin, which provides tdesu
+krusader-trinity: menu-command-not-in-package /usr/share/menu/krusader:17 tdesu
diff --git a/ubuntu/maverick/applications/krusader/debian/menu b/ubuntu/maverick/applications/krusader/debian/menu
index 92d07892f..759ac536f 100644
--- a/ubuntu/maverick/applications/krusader/debian/menu
+++ b/ubuntu/maverick/applications/krusader/debian/menu
@@ -14,4 +14,4 @@
 	title="krusader - root-mode (File Manager)"\
 	icon32x32="/usr/share/pixmaps/krusader_root.xpm"\
 	icon16x16="/usr/share/pixmaps/krusader_root-16.xpm"\
-	command="kdesu -c /opt/trinity/bin/krusader"
+	command="tdesu -c /opt/trinity/bin/krusader"
diff --git a/ubuntu/maverick/applications/kuickshow/debian/kuickshow-trinity.lintian b/ubuntu/maverick/applications/kuickshow/debian/kuickshow-trinity.lintian
index dd274dba5..89f453cea 100644
--- a/ubuntu/maverick/applications/kuickshow/debian/kuickshow-trinity.lintian
+++ b/ubuntu/maverick/applications/kuickshow/debian/kuickshow-trinity.lintian
@@ -1,4 +1,4 @@
-kuickshow-trinity: no-shlibs-control-file opt/trinity/lib/libkdeinit_kuickshow.so
-kuickshow-trinity: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_kuickshow.so
-kuickshow-trinity: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_kuickshow.so
-kuickshow-trinity: package-name-doesnt-match-sonames libkdeinit-kuickshow
+kuickshow-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kuickshow.so
+kuickshow-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kuickshow.so
+kuickshow-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kuickshow.so
+kuickshow-trinity: package-name-doesnt-match-sonames libtdeinit-kuickshow
diff --git a/ubuntu/maverick/applications/tdesudo/debian/links b/ubuntu/maverick/applications/tdesudo/debian/links
index 0482e1e4f..faf8013c3 100644
--- a/ubuntu/maverick/applications/tdesudo/debian/links
+++ b/ubuntu/maverick/applications/tdesudo/debian/links
@@ -1 +1 @@
-opt/trinity/bin/tdesudo opt/trinity/bin/kdesu 
+opt/trinity/bin/tdesudo opt/trinity/bin/tdesu 
diff --git a/ubuntu/maverick/applications/tdesudo/debian/postinst b/ubuntu/maverick/applications/tdesudo/debian/postinst
index b0100d96c..9164f9d4a 100644
--- a/ubuntu/maverick/applications/tdesudo/debian/postinst
+++ b/ubuntu/maverick/applications/tdesudo/debian/postinst
@@ -12,7 +12,7 @@ fi
 case "$1" in
   configure)
 	dpkg-divert --package $package_name --rename --remove \
-                /usr/trinity/bin/kdesu || true
+                /usr/trinity/bin/tdesu || true
     ;;
   abort-upgrade)
     ;;
diff --git a/ubuntu/maverick/applications/tdesudo/debian/postrm b/ubuntu/maverick/applications/tdesudo/debian/postrm
index a5b54ebf1..dfab37030 100644
--- a/ubuntu/maverick/applications/tdesudo/debian/postrm
+++ b/ubuntu/maverick/applications/tdesudo/debian/postrm
@@ -12,7 +12,7 @@ fi
 case "$1" in
   remove)
     dpkg-divert --package $package_name --rename --remove \
-                /opt/trinity/bin/kdesu
+                /opt/trinity/bin/tdesu
     ;;
   purge)
     ;;
diff --git a/ubuntu/maverick/applications/tdesudo/debian/preinst b/ubuntu/maverick/applications/tdesudo/debian/preinst
index fe6a85b58..a13492559 100644
--- a/ubuntu/maverick/applications/tdesudo/debian/preinst
+++ b/ubuntu/maverick/applications/tdesudo/debian/preinst
@@ -12,13 +12,13 @@ fi
 case "$1" in
   install)
     dpkg-divert --package $package_name \
-    --divert /opt/trinity/bin/kdesu.distrib \
-    --rename /opt/trinity/bin/kdesu
+    --divert /opt/trinity/bin/tdesu.distrib \
+    --rename /opt/trinity/bin/tdesu
     ;;
   upgrade)
     dpkg-divert --package $package_name \
-    --divert /opt/trinity/bin/kdesu.distrib \
-    --rename /opt/trinity/bin/kdesu
+    --divert /opt/trinity/bin/tdesu.distrib \
+    --rename /opt/trinity/bin/tdesu
     ;;
   abort-upgrade)
     ;;
diff --git a/ubuntu/maverick/applications/wlassistant/debian/wlassistant-trinity.menu b/ubuntu/maverick/applications/wlassistant/debian/wlassistant-trinity.menu
index dc43a7b0f..e30b43ad8 100644
--- a/ubuntu/maverick/applications/wlassistant/debian/wlassistant-trinity.menu
+++ b/ubuntu/maverick/applications/wlassistant/debian/wlassistant-trinity.menu
@@ -5,6 +5,6 @@
         icon32x32="/usr/share/pixmaps/wlassistant.xpm"\
         icon16x16="/usr/share/pixmaps/wlassistant-16.xpm"\
         title="wlassistant"\
-        command="/opt/trinity/bin/kdesu -X -c /opt/trinity/bin/wlassistant"
+        command="/opt/trinity/bin/tdesu -X -c /opt/trinity/bin/wlassistant"