Update Debian and Ubuntu packaging for latest GIT

38 files changed, 180 insertions, 180 deletions

diff --git a/ubuntu/maverick/applications/kiosktool/debian/kiosktool-tdedirs-trinity.1 b/ubuntu/maverick/applications/kiosktool/debian/kiosktool-tdedirs-trinity.1
index 773b098d6..e44c4cd99 100644
--- a/ubuntu/maverick/applications/kiosktool/debian/kiosktool-tdedirs-trinity.1
+++ b/ubuntu/maverick/applications/kiosktool/debian/kiosktool-tdedirs-trinity.1
@@ -136,9 +136,9 @@ mirrors the whole layout of widgets.
 
 .SH SEE ALSO
 Full user documentation is available through the KDE Help Center.  You can also enter the URL
-.BR help:/tdeiosktool\-tdedirs/
+.BR help:/kiosktool\-tdedirs/
 directly into konqueror or you can run 
-.BR "`khelpcenter help:/tdeiosktool\-tdedirs/'"
+.BR "`khelpcenter help:/kiosktool\-tdedirs/'"
 from the command\-line.
 .br
 .SH AUTHORS
diff --git a/ubuntu/maverick/applications/kiosktool/debian/kiosktool-trinity.1 b/ubuntu/maverick/applications/kiosktool/debian/kiosktool-trinity.1
index d510c0d6b..08ba2ec80 100644
--- a/ubuntu/maverick/applications/kiosktool/debian/kiosktool-trinity.1
+++ b/ubuntu/maverick/applications/kiosktool/debian/kiosktool-trinity.1
@@ -138,9 +138,9 @@ mirrors the whole layout of widgets.
 
 .SH SEE ALSO
 Full user documentation is available through the KDE Help Center.  You can also enter the URL
-.BR help:/tdeiosktool/
+.BR help:/kiosktool/
 directly into konqueror or you can run 
-.BR "`khelpcenter help:/tdeiosktool/'"
+.BR "`khelpcenter help:/kiosktool/'"
 from the command\-line.
 .br
 .SH AUTHORS
diff --git a/ubuntu/maverick/applications/kiosktool/debian/kiosktool-trinity.manpages b/ubuntu/maverick/applications/kiosktool/debian/kiosktool-trinity.manpages
index 62e420c43..43bd4d1b8 100644
--- a/ubuntu/maverick/applications/kiosktool/debian/kiosktool-trinity.manpages
+++ b/ubuntu/maverick/applications/kiosktool/debian/kiosktool-trinity.manpages
@@ -1,2 +1,2 @@
-debian/tdeiosktool-trinity.1
-debian/tdeiosktool-tdedirs-trinity.1
+debian/kiosktool-trinity.1
+debian/kiosktool-tdedirs-trinity.1
diff --git a/ubuntu/maverick/applications/kiosktool/debian/patches/kubuntu_02_kmenu.diff b/ubuntu/maverick/applications/kiosktool/debian/patches/kubuntu_02_kmenu.diff
index b1e39b1d4..77f7d912f 100644
--- a/ubuntu/maverick/applications/kiosktool/debian/patches/kubuntu_02_kmenu.diff
+++ b/ubuntu/maverick/applications/kiosktool/debian/patches/kubuntu_02_kmenu.diff
@@ -1,5 +1,5 @@
---- kiosktool/tdeiosktool/menueditComponent.cpp	2005-04-25 09:46:33.000000000 +0000
-+++ kiosktool/tdeiosktool/menueditComponent.cpp	2005-12-18 14:45:26.000000000 +0000
+--- kiosktool/kiosktool/menueditComponent.cpp	2005-04-25 09:46:33.000000000 +0000
++++ kiosktool/kiosktool/menueditComponent.cpp	2005-12-18 14:45:26.000000000 +0000
 @@ -104,8 +104,8 @@
  {
     bool result;
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 e7b9121ef..b5af11a0a 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
@@ -1,5 +1,5 @@
---- kiosktool/tdeiosktool/tdeioskrun.h	2005-04-25 10:46:33.000000000 +0100
-+++ kiosktool/tdeiosktool/tdeioskrun.h	2007-07-18 17:47:04.000000000 +0100
+--- kiosktool/kiosktool/tdeioskrun.h	2005-04-25 10:46:33.000000000 +0100
++++ kiosktool/kiosktool/tdeioskrun.h	2007-07-18 17:47:04.000000000 +0100
 @@ -37,6 +37,18 @@
  
  class KioskGui;
@@ -19,8 +19,8 @@
  class KioskRun : public TQObject
  {
    friend class KioskGui;
---- kiosktool/tdeiosktool/tdeioskrun.cpp	2005-04-25 10:46:33.000000000 +0100
-+++ kiosktool/tdeiosktool/tdeioskrun.cpp	2007-07-20 16:56:07.000000000 +0100
+--- kiosktool/kiosktool/tdeioskrun.cpp	2005-04-25 10:46:33.000000000 +0100
++++ kiosktool/kiosktool/tdeioskrun.cpp	2007-07-20 16:56:07.000000000 +0100
 @@ -28,6 +28,7 @@
  
  #include <tqdir.h>
@@ -34,7 +34,7 @@
  
  #include <tdeio/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 tdesu instead
++// Kiostdetool 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
@@ -71,7 +71,7 @@
 +
 +TQString NETACCESS::lastErrorString()
 +{
-+  return "Error in Kiosktool Kubuntu modifications";
++  return "Error in Kiostdetool Kubuntu modifications";
 +}
 +
 +int NETACCESS::lastError()
diff --git a/ubuntu/maverick/applications/koffice/debian/chalk-data-trinity.install b/ubuntu/maverick/applications/koffice/debian/chalk-data-trinity.install
index a0e03ae3b..0b02bd024 100644
--- a/ubuntu/maverick/applications/koffice/debian/chalk-data-trinity.install
+++ b/ubuntu/maverick/applications/koffice/debian/chalk-data-trinity.install
@@ -353,8 +353,8 @@ debian/tmp/opt/trinity/share/services/chalkrotateimage.desktop
 debian/tmp/opt/trinity/share/services/chalkroundcornersfilter.desktop
 debian/tmp/opt/trinity/share/services/chalkscreenshot.desktop
 debian/tmp/opt/trinity/share/services/chaltdescripting.desktop
-debian/tmp/opt/trinity/share/services/chalkselectiontools.desktop
-debian/tmp/opt/trinity/share/services/chalkselectopaque.desktop
+debian/tmp/opt/trinity/share/services/chaltdeselectiontools.desktop
+debian/tmp/opt/trinity/share/services/chaltdeselectopaque.desktop
 debian/tmp/opt/trinity/share/services/chalkseparatechannels.desktop
 debian/tmp/opt/trinity/share/services/chalkshearimage.desktop
 debian/tmp/opt/trinity/share/services/chalksmalltilesfilter.desktop
@@ -362,16 +362,16 @@ debian/tmp/opt/trinity/share/services/chalksobelfilter.desktop
 debian/tmp/opt/trinity/share/services/chalksubstrate.desktop
 debian/tmp/opt/trinity/share/services/chalk_tiff_export.desktop
 debian/tmp/opt/trinity/share/services/chalk_tiff_import.desktop
-debian/tmp/opt/trinity/share/services/chalktoolcrop.desktop
-debian/tmp/opt/trinity/share/services/chalktoolcurves.desktop
-debian/tmp/opt/trinity/share/services/chalktoolfilter.desktop
-debian/tmp/opt/trinity/share/services/chalktoolperspectivegrid.desktop
-debian/tmp/opt/trinity/share/services/chalktoolperspectivetransform.desktop
-debian/tmp/opt/trinity/share/services/chalktoolpolygon.desktop
-debian/tmp/opt/trinity/share/services/chalktoolpolyline.desktop
-debian/tmp/opt/trinity/share/services/chalktoolselectsimilar.desktop
-debian/tmp/opt/trinity/share/services/chalktoolstar.desktop
-debian/tmp/opt/trinity/share/services/chalktooltransform.desktop
+debian/tmp/opt/trinity/share/services/chaltdetoolcrop.desktop
+debian/tmp/opt/trinity/share/services/chaltdetoolcurves.desktop
+debian/tmp/opt/trinity/share/services/chaltdetoolfilter.desktop
+debian/tmp/opt/trinity/share/services/chaltdetoolperspectivegrid.desktop
+debian/tmp/opt/trinity/share/services/chaltdetoolperspectivetransform.desktop
+debian/tmp/opt/trinity/share/services/chaltdetoolpolygon.desktop
+debian/tmp/opt/trinity/share/services/chaltdetoolpolyline.desktop
+debian/tmp/opt/trinity/share/services/chaltdetoolselectsimilar.desktop
+debian/tmp/opt/trinity/share/services/chaltdetoolstar.desktop
+debian/tmp/opt/trinity/share/services/chaltdetooltransform.desktop
 debian/tmp/opt/trinity/share/services/chalkunsharpfilter.desktop
 debian/tmp/opt/trinity/share/services/chalkwavefilter.desktop
 debian/tmp/opt/trinity/share/services/chalkwetplugin.desktop
diff --git a/ubuntu/maverick/applications/koffice/debian/chalk-trinity.install b/ubuntu/maverick/applications/koffice/debian/chalk-trinity.install
index 66afcfbba..3bd4c6757 100644
--- a/ubuntu/maverick/applications/koffice/debian/chalk-trinity.install
+++ b/ubuntu/maverick/applications/koffice/debian/chalk-trinity.install
@@ -75,10 +75,10 @@ debian/tmp/opt/trinity/lib/trinity/chalkscreenshot.la
 debian/tmp/opt/trinity/lib/trinity/chalkscreenshot.so
 debian/tmp/opt/trinity/lib/trinity/chaltdescripting.la
 debian/tmp/opt/trinity/lib/trinity/chaltdescripting.so
-debian/tmp/opt/trinity/lib/trinity/chalkselectiontools.la
-debian/tmp/opt/trinity/lib/trinity/chalkselectiontools.so
-debian/tmp/opt/trinity/lib/trinity/chalkselectopaque.la
-debian/tmp/opt/trinity/lib/trinity/chalkselectopaque.so
+debian/tmp/opt/trinity/lib/trinity/chaltdeselectiontools.la
+debian/tmp/opt/trinity/lib/trinity/chaltdeselectiontools.so
+debian/tmp/opt/trinity/lib/trinity/chaltdeselectopaque.la
+debian/tmp/opt/trinity/lib/trinity/chaltdeselectopaque.so
 debian/tmp/opt/trinity/lib/trinity/chalkseparatechannels.la
 debian/tmp/opt/trinity/lib/trinity/chalkseparatechannels.so
 debian/tmp/opt/trinity/lib/trinity/chalkshearimage.la
@@ -90,26 +90,26 @@ debian/tmp/opt/trinity/lib/trinity/chalksobelfilter.la
 debian/tmp/opt/trinity/lib/trinity/chalksobelfilter.so
 debian/tmp/opt/trinity/lib/trinity/chalksubstrate.la
 debian/tmp/opt/trinity/lib/trinity/chalksubstrate.so
-debian/tmp/opt/trinity/lib/trinity/chalktoolcrop.la
-debian/tmp/opt/trinity/lib/trinity/chalktoolcrop.so
-debian/tmp/opt/trinity/lib/trinity/chalktoolcurves.la
-debian/tmp/opt/trinity/lib/trinity/chalktoolcurves.so
-debian/tmp/opt/trinity/lib/trinity/chalktoolfilter.la
-debian/tmp/opt/trinity/lib/trinity/chalktoolfilter.so
-debian/tmp/opt/trinity/lib/trinity/chalktoolperspectivegrid.la
-debian/tmp/opt/trinity/lib/trinity/chalktoolperspectivegrid.so
-debian/tmp/opt/trinity/lib/trinity/chalktoolperspectivetransform.la
-debian/tmp/opt/trinity/lib/trinity/chalktoolperspectivetransform.so
-debian/tmp/opt/trinity/lib/trinity/chalktoolpolygon.la
-debian/tmp/opt/trinity/lib/trinity/chalktoolpolygon.so
-debian/tmp/opt/trinity/lib/trinity/chalktoolpolyline.la
-debian/tmp/opt/trinity/lib/trinity/chalktoolpolyline.so
-debian/tmp/opt/trinity/lib/trinity/chalktoolselectsimilar.la
-debian/tmp/opt/trinity/lib/trinity/chalktoolselectsimilar.so
-debian/tmp/opt/trinity/lib/trinity/chalktoolstar.la
-debian/tmp/opt/trinity/lib/trinity/chalktoolstar.so
-debian/tmp/opt/trinity/lib/trinity/chalktooltransform.la
-debian/tmp/opt/trinity/lib/trinity/chalktooltransform.so
+debian/tmp/opt/trinity/lib/trinity/chaltdetoolcrop.la
+debian/tmp/opt/trinity/lib/trinity/chaltdetoolcrop.so
+debian/tmp/opt/trinity/lib/trinity/chaltdetoolcurves.la
+debian/tmp/opt/trinity/lib/trinity/chaltdetoolcurves.so
+debian/tmp/opt/trinity/lib/trinity/chaltdetoolfilter.la
+debian/tmp/opt/trinity/lib/trinity/chaltdetoolfilter.so
+debian/tmp/opt/trinity/lib/trinity/chaltdetoolperspectivegrid.la
+debian/tmp/opt/trinity/lib/trinity/chaltdetoolperspectivegrid.so
+debian/tmp/opt/trinity/lib/trinity/chaltdetoolperspectivetransform.la
+debian/tmp/opt/trinity/lib/trinity/chaltdetoolperspectivetransform.so
+debian/tmp/opt/trinity/lib/trinity/chaltdetoolpolygon.la
+debian/tmp/opt/trinity/lib/trinity/chaltdetoolpolygon.so
+debian/tmp/opt/trinity/lib/trinity/chaltdetoolpolyline.la
+debian/tmp/opt/trinity/lib/trinity/chaltdetoolpolyline.so
+debian/tmp/opt/trinity/lib/trinity/chaltdetoolselectsimilar.la
+debian/tmp/opt/trinity/lib/trinity/chaltdetoolselectsimilar.so
+debian/tmp/opt/trinity/lib/trinity/chaltdetoolstar.la
+debian/tmp/opt/trinity/lib/trinity/chaltdetoolstar.so
+debian/tmp/opt/trinity/lib/trinity/chaltdetooltransform.la
+debian/tmp/opt/trinity/lib/trinity/chaltdetooltransform.so
 debian/tmp/opt/trinity/lib/trinity/chalkunsharpfilter.la
 debian/tmp/opt/trinity/lib/trinity/chalkunsharpfilter.so
 debian/tmp/opt/trinity/lib/trinity/chalkwavefilter.la
diff --git a/ubuntu/maverick/applications/koffice/debian/kplato-trinity.install b/ubuntu/maverick/applications/koffice/debian/kplato-trinity.install
index 8c3df29c3..d38914b77 100644
--- a/ubuntu/maverick/applications/koffice/debian/kplato-trinity.install
+++ b/ubuntu/maverick/applications/koffice/debian/kplato-trinity.install
@@ -23,8 +23,8 @@ debian/tmp/opt/trinity/share/apps/kplato/kplato.rc
 debian/tmp/opt/trinity/share/apps/kplato/kplato_readonly.rc
 debian/tmp/opt/trinity/share/apps/kplato/reports/resourcelist.desktop
 debian/tmp/opt/trinity/share/apps/kplato/reports/.source/resourcelist.ktf
-debian/tmp/opt/trinity/share/apps/kplato/reports/.source/tasklist.ktf
-debian/tmp/opt/trinity/share/apps/kplato/reports/tasklist.desktop
+debian/tmp/opt/trinity/share/apps/kplato/reports/.source/tastdelist.ktf
+debian/tmp/opt/trinity/share/apps/kplato/reports/tastdelist.desktop
 debian/tmp/opt/trinity/share/apps/kplato/templates/Simple/8HourDay-40HourWeek.desktop
 debian/tmp/opt/trinity/share/apps/kplato/templates/Simple/.directory
 debian/tmp/opt/trinity/share/apps/kplato/templates/Simple/Plain.desktop
diff --git a/ubuntu/maverick/applications/kradio/debian/changelog b/ubuntu/maverick/applications/kradio/debian/changelog
index ad7c7832c..375e977cb 100644
--- a/ubuntu/maverick/applications/kradio/debian/changelog
+++ b/ubuntu/maverick/applications/kradio/debian/changelog
@@ -1,10 +1,10 @@
-kradio-trinity (0.1.1.1~0ubuntu0) karmic; urgency=low
+tderadio-trinity (0.1.1.1~0ubuntu0) karmic; urgency=low
 
   * Karmic upload
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Sun, 22 Nov 2009 23:25:00 -6000
 
-kradio (0.1.1.1~20061112-4) unstable; urgency=low
+tderadio (0.1.1.1~20061112-4) unstable; urgency=low
 
   * QA upload ; orphaning after discussion with maintainer
   * fix up autoconf things (Closes: 543013)
@@ -17,14 +17,14 @@ kradio (0.1.1.1~20061112-4) unstable; urgency=low
 
  -- Sune Vuorela <debian@pusling.com>  Wed, 02 Sep 2009 00:45:55 +0200
 
-kradio (0.1.1.1~20061112-3.1) unstable; urgency=low
+tderadio (0.1.1.1~20061112-3.1) unstable; urgency=low
 
   * Non-maintainer upload.
   * Fix gcc-4.3 FTBFS, patch by Kibi (Closes: #455390)
 
  -- Marc 'HE' Brockschmidt <he@debian.org>  Sun, 16 Mar 2008 19:00:02 +0100
 
-kradio (0.1.1.1~20061112-3) unstable; urgency=low
+tderadio (0.1.1.1~20061112-3) unstable; urgency=low
 
   * Modify build-system to use automake
    - Remove build-depends against unsermake as it shall be removed from
@@ -39,13 +39,13 @@ kradio (0.1.1.1~20061112-3) unstable; urgency=low
 
  -- Steffen Joeris <white@debian.org>  Wed, 20 Jun 2007 22:14:59 +0200
 
-kradio (0.1.1.1~20061112-2) unstable; urgency=low
+tderadio (0.1.1.1~20061112-2) unstable; urgency=low
 
   * Upload to unstable
 
  -- Steffen Joeris <white@debian.org>  Mon, 23 Apr 2007 05:59:03 +1000
 
-kradio (0.1.1.1~20061112-1) experimental; urgency=low
+tderadio (0.1.1.1~20061112-1) experimental; urgency=low
 
   * New upstream release
   * Fix small typo in debian/copyright
@@ -54,7 +54,7 @@ kradio (0.1.1.1~20061112-1) experimental; urgency=low
 
  -- Steffen Joeris <white@debian.org>  Sun,  7 Jan 2007 18:42:05 +0100
 
-kradio (0.1.1.1~20060920-1) unstable; urgency=low
+tderadio (0.1.1.1~20060920-1) unstable; urgency=low
 
   * New upstream version
   * Drop 10-configure.dpatch
@@ -65,13 +65,13 @@ kradio (0.1.1.1~20060920-1) unstable; urgency=low
 
  -- Steffen Joeris <steffen.joeris@skolelinux.de>  Tue,  3 Oct 2006 15:01:07 +1000
 
-kradio (0.1beta1.0snapshot20051127-2) unstable; urgency=low
+tderadio (0.1beta1.0snapshot20051127-2) unstable; urgency=low
 
   * Upload to unstable, no changes
 
  -- Steffen Joeris <steffen.joeris@skolelinux.de>  Sun,  5 Feb 2006 18:42:11 +0100
 
-kradio (0.1beta1.0snapshot20051127-1) experimental; urgency=low
+tderadio (0.1beta1.0snapshot20051127-1) experimental; urgency=low
 
   * Initial release for Debian (Closes: #341954)
   * drop debian dir from upstream and use own debian dir
diff --git a/ubuntu/maverick/applications/kradio/debian/control b/ubuntu/maverick/applications/kradio/debian/control
index 35e42b8ae..3120926d9 100644
--- a/ubuntu/maverick/applications/kradio/debian/control
+++ b/ubuntu/maverick/applications/kradio/debian/control
@@ -1,16 +1,16 @@
-Source: kradio-trinity
+Source: tderadio-trinity
 Section: sound
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 Build-Depends: debhelper (>= 5), tdelibs4-trinity-dev, liblircclient-dev, libsndfile1-dev, imagemagick, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
-Homepage: http://kradio.sourceforge.net/
+Homepage: http://tderadio.sourceforge.net/
 
-Package: kradio-trinity
+Package: tderadio-trinity
 Architecture: any
 Depends: ${shlibs:Depends}
-Replaces: kradio-trinity (<< 4:14.0.0)
-Breaks: kradio-trinity (<< 4:14.0.0)
+Replaces: tderadio-trinity (<< 4:14.0.0)
+Breaks: tderadio-trinity (<< 4:14.0.0)
 Description: Comfortable Radio Application for KDE [Trinity]
  TDERadio is a comfortable radio application for KDE 3.x with support for 
  V4L and V4L2 radio cards drivers.
diff --git a/ubuntu/maverick/applications/kradio/debian/copyright b/ubuntu/maverick/applications/kradio/debian/copyright
index 932ce3d04..365f66795 100644
--- a/ubuntu/maverick/applications/kradio/debian/copyright
+++ b/ubuntu/maverick/applications/kradio/debian/copyright
@@ -1,7 +1,7 @@
 This package was debianized by Ernst Martin Witte <emw@users.sourceforge.net> on
 Sun, 14 Sep 2003 13:31:07 +0200.
 
-It was downloaded from http://kradio.sourceforge.net/
+It was downloaded from http://tderadio.sourceforge.net/
 
 Copyright Holder: Ernst Martin Witte, Klas Kalass (C) 2002-2003 
 Additional copyright information:
@@ -15,8 +15,8 @@ Additional copyright information:
 
 		  The following files have the copyright notice
 		  Trolltech AS Copyright (C) 1996-1997
-kradio3/plugins/gui-quickbar/buttonflowlayout.h
-kradio3/plugins/gui-quickbar/buttonflowlayout.cpp
+tderadio3/plugins/gui-quickbar/buttonflowlayout.h
+tderadio3/plugins/gui-quickbar/buttonflowlayout.cpp
 
 License:
 
diff --git a/ubuntu/maverick/applications/kradio/debian/docs b/ubuntu/maverick/applications/kradio/debian/docs
index bc4a4e465..0ecc1e4f1 100644
--- a/ubuntu/maverick/applications/kradio/debian/docs
+++ b/ubuntu/maverick/applications/kradio/debian/docs
@@ -1,2 +1,2 @@
-kradio3/README
-kradio3/TODO
+tderadio3/README
+tderadio3/TODO
diff --git a/ubuntu/maverick/applications/kradio/debian/manpages b/ubuntu/maverick/applications/kradio/debian/manpages
index f37e7cfcf..4760e939e 100644
--- a/ubuntu/maverick/applications/kradio/debian/manpages
+++ b/ubuntu/maverick/applications/kradio/debian/manpages
@@ -1,2 +1,2 @@
-debian/kradio.1
+debian/tderadio.1
 debian/convert-presets.1
diff --git a/ubuntu/maverick/applications/kradio/debian/menu b/ubuntu/maverick/applications/kradio/debian/menu
index aef47274f..57401965d 100644
--- a/ubuntu/maverick/applications/kradio/debian/menu
+++ b/ubuntu/maverick/applications/kradio/debian/menu
@@ -1,7 +1,7 @@
-?package(kradio):needs="X11" \
+?package(tderadio):needs="X11" \
   section="Applications/TV and Radio" \
   hints="TDE" \
   title="TDERadio" \
   longtitle="K-Radio Application" \
-  command="/opt/trinity/bin/kradio" \
-  icon="/opt/trinity/share/pixmaps/kradio.xpm"
+  command="/opt/trinity/bin/tderadio" \
+  icon="/opt/trinity/share/pixmaps/tderadio.xpm"
diff --git a/ubuntu/maverick/applications/kradio/debian/rules b/ubuntu/maverick/applications/kradio/debian/rules
index 41840eb6e..faad3984a 100755
--- a/ubuntu/maverick/applications/kradio/debian/rules
+++ b/ubuntu/maverick/applications/kradio/debian/rules
@@ -30,7 +30,7 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
 	INSTALL_PROGRAM += -s
 endif
 
-debian/kradio.xpm: kradio3/icons/hi32-app-kradio.png
+debian/tderadio.xpm: tderadio3/icons/hi32-app-tderadio.png
 	convert $< $@
 
 configure:
@@ -55,7 +55,7 @@ config.status: configure
 															
 
 
-build: build-stamp debian/kradio.xpm
+build: build-stamp debian/tderadio.xpm
 
 build-stamp:  config.status
 	dh_testdir
@@ -68,10 +68,10 @@ clean:
 	dh_testroot
 	rm -f build-stamp 
 	rm -f debian/debiandirs 
-	rm -f debian/kradio.xpm 
+	rm -f debian/tderadio.xpm 
 	# Add here commands to clean up after the build process.
 	[ ! -f Makefile ] || $(MAKE) distclean
-#	[ ! -kradio3/src && $(MAKE) clean
+#	[ ! -tderadio3/src && $(MAKE) clean
 	for i in `find | grep .gmo` ; do rm -f $$i ; done
 	find -name Makefile.in -delete
 	rm -f config.sub config.guess configure
@@ -83,25 +83,25 @@ install:
 	dh_testroot
 	dh_clean -k 
 	dh_installdirs
-	# Add here commands to install the package into debian/kradio.
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/kradio-trinity
-	install -D -m 644 debian/kradio.xpm debian/kradio-trinity/opt/trinity/share/pixmaps/kradio.xpm
-#	chrpath -d debian/kradio/usr/lib/kradio/plugins/libalsa-sound.so
-#	chrpath -d debian/kradio/usr/lib/kradio/plugins/libtimeshifter.so
-#	chrpath -d debian/kradio/usr/lib/kradio/plugins/libstandard-display.so
-#	chrpath -d debian/kradio/usr/lib/kradio/plugins/liblirc.so
-#	chrpath -d debian/kradio/usr/lib/kradio/plugins/libstreaming.so
-#	chrpath -d debian/kradio/usr/lib/kradio/plugins/libradio.so
-#	chrpath -d debian/kradio/usr/lib/kradio/plugins/libquickbar.so
-#	chrpath -d debian/kradio/usr/lib/kradio/plugins/librecording.so
-#	chrpath -d debian/kradio/usr/lib/kradio/plugins/libv4lradio.so
-#	chrpath -d debian/kradio/usr/lib/kradio/plugins/libtimecontrol.so
-#	chrpath -d debian/kradio/usr/lib/kradio/plugins/libdocking-menu.so
-#	chrpath -d debian/kradio/usr/lib/kradio/plugins/liboss-sound.so
-#	chrpath -d debian/kradio/usr/lib/kradio/plugins/liberror-log.so
-#	chrpath -d debian/kradio/usr/lib/kradio/plugins/libsoundserver.so
-#	chrpath -d debian/kradio/usr/bin/convert-presets
-#	chrpath -d debian/kradio/usr/bin/kradio
+	# Add here commands to install the package into debian/tderadio.
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/tderadio-trinity
+	install -D -m 644 debian/tderadio.xpm debian/tderadio-trinity/opt/trinity/share/pixmaps/tderadio.xpm
+#	chrpath -d debian/tderadio/usr/lib/tderadio/plugins/libalsa-sound.so
+#	chrpath -d debian/tderadio/usr/lib/tderadio/plugins/libtimeshifter.so
+#	chrpath -d debian/tderadio/usr/lib/tderadio/plugins/libstandard-display.so
+#	chrpath -d debian/tderadio/usr/lib/tderadio/plugins/liblirc.so
+#	chrpath -d debian/tderadio/usr/lib/tderadio/plugins/libstreaming.so
+#	chrpath -d debian/tderadio/usr/lib/tderadio/plugins/libradio.so
+#	chrpath -d debian/tderadio/usr/lib/tderadio/plugins/libquickbar.so
+#	chrpath -d debian/tderadio/usr/lib/tderadio/plugins/librecording.so
+#	chrpath -d debian/tderadio/usr/lib/tderadio/plugins/libv4lradio.so
+#	chrpath -d debian/tderadio/usr/lib/tderadio/plugins/libtimecontrol.so
+#	chrpath -d debian/tderadio/usr/lib/tderadio/plugins/libdocking-menu.so
+#	chrpath -d debian/tderadio/usr/lib/tderadio/plugins/liboss-sound.so
+#	chrpath -d debian/tderadio/usr/lib/tderadio/plugins/liberror-log.so
+#	chrpath -d debian/tderadio/usr/lib/tderadio/plugins/libsoundserver.so
+#	chrpath -d debian/tderadio/usr/bin/convert-presets
+#	chrpath -d debian/tderadio/usr/bin/tderadio
 
 # Build architecture-independent files here.
 binary-indep: build install
@@ -111,11 +111,11 @@ binary-indep: build install
 binary-arch: build install
 	dh_testdir
 	dh_testroot
-	dh_installchangelogs kradio3/ChangeLog
+	dh_installchangelogs tderadio3/ChangeLog
 	dh_installdocs 
 	dh_installmenu
 	dh_installman
-	mv debian/kradio-trinity/usr/share/man debian/kradio-trinity/opt/trinity/share/
+	mv debian/tderadio-trinity/usr/share/man debian/tderadio-trinity/opt/trinity/share/
 	dh_link
 	dh_strip
 	dh_compress
diff --git a/ubuntu/maverick/applications/kradio/debian/kradio.1 b/ubuntu/maverick/applications/kradio/debian/tderadio.1
index 47fdb40d7..04a9f8c9c 100644
--- a/ubuntu/maverick/applications/kradio/debian/kradio.1
+++ b/ubuntu/maverick/applications/kradio/debian/tderadio.1
@@ -1,10 +1,10 @@
 .\" This file was generated by kdemangen.pl
 .TH KRADIO 1 "Dec 2005" "K Desktop Environment" "TDERadio"
 .SH NAME
-kradio
+tderadio
 \- TDERadio
 .SH SYNOPSIS
-kradio [Qt\-options] [KDE\-options] 
+tderadio [Qt\-options] [KDE\-options] 
 .SH DESCRIPTION
 TDERadio
 .SH OPTIONS
@@ -131,9 +131,9 @@ mirrors the whole layout of widgets
 
 .SH SEE ALSO
 Full user documentation is available through the KDE Help Center.  You can also enter the URL
-.BR help:/kradio/
+.BR help:/tderadio/
 directly into konqueror or you can run 
-.BR "`khelpcenter help:/kradio/'"
+.BR "`khelpcenter help:/tderadio/'"
 from the command-line.
 .br
 .SH AUTHORS
diff --git a/ubuntu/maverick/applications/kradio/debian/watch b/ubuntu/maverick/applications/kradio/debian/watch
index 49f735f61..033fb78b0 100644
--- a/ubuntu/maverick/applications/kradio/debian/watch
+++ b/ubuntu/maverick/applications/kradio/debian/watch
@@ -3,4 +3,4 @@
 # to check for upstream updates and more.
 # Site		Directory		Pattern			Version	Script
 version=2
-kradio.sourceforge.net /download	kradio-(.*)\.tar\.gz	debian	uupdate
+tderadio.sourceforge.net /download	tderadio-(.*)\.tar\.gz	debian	uupdate
diff --git a/ubuntu/maverick/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff b/ubuntu/maverick/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff
index 70fd0192e..5a36ab501 100644
--- a/ubuntu/maverick/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff
+++ b/ubuntu/maverick/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff
@@ -4,7 +4,7 @@ index 7c45fcf..b933832 100644
 +++ b/src/main.cpp
 @@ -24,6 +24,7 @@
  #include <kmessagebox.h>
- #include <kmainwindow.h>
+ #include <tdemainwindow.h>
  #include <kapp.h>
 +#include <kuser.h>
  
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/amarok/stylesheet.css b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/amarok/stylesheet.css
index 6bf2ded5c..2a6f0d592 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/amarok/stylesheet.css
+++ b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/amarok/stylesheet.css
@@ -161,7 +161,7 @@ background: none;
 		margin-right: 5px;
 		}
 
-/* ---Attributes for the song lists (in the "Summary" tab, not for the tracklisting in the "Album by Artist" box)--- */
+/* ---Attributes for the song lists (in the "Summary" tab, not for the tractdelisting in the "Album by Artist" box)--- */
 .song{
 }
 	.song a{
@@ -349,7 +349,7 @@ padding: 5px;
 			.album-info{
 			float: right;
 			}
-		/* album body (tracklisting) */
+		/* album body (tractdelisting) */
 		.album-body{
 		padding: 10px;
 		}
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/debian/changelog b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/debian/changelog
index 75c991484..383dd4be7 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/debian/changelog
+++ b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/debian/changelog
@@ -69,7 +69,7 @@ kubuntu-default-settings (1:8.04-19) hardy; urgency=low
 kubuntu-default-settings (1:8.04-18) hardy; urgency=low
 
   * Stop April Fools sillyness
-  * Added klaunchrc file to limit jumping busy icon to 10 seconds:
+  * Added tdelaunchrc file to limit jumping busy icon to 10 seconds:
     - Workarrounds some gtk, java ant other apps to have their icon
       jumping for ages when the applications is started.
   * Fixed Makefile for konversation oxygen theme.
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/klaunchrc b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/tdelaunchrc
index ac8e4ce06..ac8e4ce06 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/klaunchrc
+++ b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/tdelaunchrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/amarok/stylesheet.css b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/amarok/stylesheet.css
index 6bf2ded5c..2a6f0d592 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/amarok/stylesheet.css
+++ b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/amarok/stylesheet.css
@@ -161,7 +161,7 @@ background: none;
 		margin-right: 5px;
 		}
 
-/* ---Attributes for the song lists (in the "Summary" tab, not for the tracklisting in the "Album by Artist" box)--- */
+/* ---Attributes for the song lists (in the "Summary" tab, not for the tractdelisting in the "Album by Artist" box)--- */
 .song{
 }
 	.song a{
@@ -349,7 +349,7 @@ padding: 5px;
 			.album-info{
 			float: right;
 			}
-		/* album body (tracklisting) */
+		/* album body (tractdelisting) */
 		.album-body{
 		padding: 10px;
 		}
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/klaunchrc b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/tdelaunchrc
index 1ca985896..1ca985896 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/klaunchrc
+++ b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/tdelaunchrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/amarok/stylesheet.css b/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/amarok/stylesheet.css
index 6bf2ded5c..2a6f0d592 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/amarok/stylesheet.css
+++ b/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/amarok/stylesheet.css
@@ -161,7 +161,7 @@ background: none;
 		margin-right: 5px;
 		}
 
-/* ---Attributes for the song lists (in the "Summary" tab, not for the tracklisting in the "Album by Artist" box)--- */
+/* ---Attributes for the song lists (in the "Summary" tab, not for the tractdelisting in the "Album by Artist" box)--- */
 .song{
 }
 	.song a{
@@ -349,7 +349,7 @@ padding: 5px;
 			.album-info{
 			float: right;
 			}
-		/* album body (tracklisting) */
+		/* album body (tractdelisting) */
 		.album-body{
 		padding: 10px;
 		}
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/kickerrc b/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/kickerrc
index ae56bee8d..5b684602a 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/kickerrc
+++ b/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/kickerrc
@@ -29,7 +29,7 @@ WidthForHeightHint=209
 FreeSpace2=0
 
 [Applet_5]
-ConfigFile=taskbar_quicklaunchapplet_kubuntu_rc
+ConfigFile=taskbar_quictdelaunchapplet_kubuntu_rc
 DesktopFile=quictdelauncher.desktop
 WidthForHeightHint=141
 FreeSpace2=0
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/taskbar_quicklaunchapplet_kubuntu_rc b/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/taskbar_quictdelaunchapplet_kubuntu_rc
index 8f6b40439..8f6b40439 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/taskbar_quicklaunchapplet_kubuntu_rc
+++ b/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/taskbar_quictdelaunchapplet_kubuntu_rc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/klaunchrc b/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/tdelaunchrc
index 1ca985896..1ca985896 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/klaunchrc
+++ b/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/tdelaunchrc
diff --git a/ubuntu/maverick/tdebase/debian/kcontrol-trinity.install b/ubuntu/maverick/tdebase/debian/kcontrol-trinity.install
index 3bdca419e..bb25d0f14 100644
--- a/ubuntu/maverick/tdebase/debian/kcontrol-trinity.install
+++ b/ubuntu/maverick/tdebase/debian/kcontrol-trinity.install
@@ -2,8 +2,8 @@ debian/tmp/opt/trinity/bin/kaccess
 debian/tmp/opt/trinity/bin/kcontrol
 debian/tmp/opt/trinity/bin/kdeinstallktheme
 debian/tmp/opt/trinity/bin/keditfiletype
-debian/tmp/opt/trinity/bin/kfontinst
-debian/tmp/opt/trinity/bin/kfontview
+debian/tmp/opt/trinity/bin/tdefontinst
+debian/tmp/opt/trinity/bin/tdefontview
 debian/tmp/opt/trinity/bin/kinfocenter
 debian/tmp/opt/trinity/bin/klocaldomainurifilterhelper
 debian/tmp/opt/trinity/bin/tderandrtray
@@ -116,10 +116,10 @@ debian/tmp/opt/trinity/lib/trinity/tdeio_fonts.la
 debian/tmp/opt/trinity/lib/trinity/tdeio_fonts.so
 debian/tmp/opt/trinity/lib/trinity/kstyle_keramik_config.la
 debian/tmp/opt/trinity/lib/trinity/kstyle_keramik_config.so
-debian/tmp/opt/trinity/lib/trinity/libkfontviewpart.la
-debian/tmp/opt/trinity/lib/trinity/libkfontviewpart.so
-debian/tmp/opt/trinity/lib/trinity/libkshorturifilter.la
-debian/tmp/opt/trinity/lib/trinity/libkshorturifilter.so
+debian/tmp/opt/trinity/lib/trinity/libtdefontviewpart.la
+debian/tmp/opt/trinity/lib/trinity/libtdefontviewpart.so
+debian/tmp/opt/trinity/lib/trinity/libtdeshorturifilter.la
+debian/tmp/opt/trinity/lib/trinity/libtdeshorturifilter.so
 debian/tmp/opt/trinity/lib/trinity/libkuriikwsfilter.la
 debian/tmp/opt/trinity/lib/trinity/libkuriikwsfilter.so
 debian/tmp/opt/trinity/lib/trinity/libkurisearchfilter.la
@@ -128,8 +128,8 @@ debian/tmp/opt/trinity/lib/trinity/liblocaldomainurifilter.la
 debian/tmp/opt/trinity/lib/trinity/liblocaldomainurifilter.so
 debian/tmp/opt/trinity/lib/libtdeinit_kaccess.so
 debian/tmp/opt/trinity/lib/libtdeinit_kcontrol.so
-debian/tmp/opt/trinity/lib/libkfontinst.so.0
-debian/tmp/opt/trinity/lib/libkfontinst.so.0.0.0
+debian/tmp/opt/trinity/lib/libtdefontinst.so.0
+debian/tmp/opt/trinity/lib/libtdefontinst.so.0.0.0
 debian/tmp/opt/trinity/share/applications/tde/arts.desktop
 debian/tmp/opt/trinity/share/applications/tde/background.desktop
 debian/tmp/opt/trinity/share/applications/tde/bell.desktop
@@ -173,7 +173,7 @@ debian/tmp/opt/trinity/share/applications/tde/kcmview1394.desktop
 debian/tmp/opt/trinity/share/applications/tde/KControl.desktop
 debian/tmp/opt/trinity/share/applications/tde/tdm.desktop
 debian/tmp/opt/trinity/share/applications/tde/keys.desktop
-debian/tmp/opt/trinity/share/applications/tde/kfontview.desktop
+debian/tmp/opt/trinity/share/applications/tde/tdefontview.desktop
 debian/tmp/opt/trinity/share/applications/tde/tdehtml_behavior.desktop
 debian/tmp/opt/trinity/share/applications/tde/tdehtml_fonts.desktop
 debian/tmp/opt/trinity/share/applications/tde/tdehtml_java_js.desktop
@@ -234,8 +234,8 @@ debian/tmp/opt/trinity/share/services/fonts.protocol
 debian/tmp/opt/trinity/share/services/fontthumbnail.desktop
 debian/tmp/opt/trinity/share/services/kaccess.desktop
 debian/tmp/opt/trinity/share/services/tdefile_font.desktop
-debian/tmp/opt/trinity/share/services/kfontviewpart.desktop
-debian/tmp/opt/trinity/share/services/kshorturifilter.desktop
+debian/tmp/opt/trinity/share/services/tdefontviewpart.desktop
+debian/tmp/opt/trinity/share/services/tdeshorturifilter.desktop
 debian/tmp/opt/trinity/share/services/kuriikwsfilter.desktop
 debian/tmp/opt/trinity/share/services/kurisearchfilter.desktop
 debian/tmp/opt/trinity/share/services/localdomainurifilter.desktop
diff --git a/ubuntu/maverick/tdebase/debian/kdesktop-trinity.install b/ubuntu/maverick/tdebase/debian/kdesktop-trinity.install
index d34eea39d..0aa1f710d 100644
--- a/ubuntu/maverick/tdebase/debian/kdesktop-trinity.install
+++ b/ubuntu/maverick/tdebase/debian/kdesktop-trinity.install
@@ -43,6 +43,6 @@ debian/tmp/opt/trinity/share/apps/kdesktop/Desktop/Web_Browser
 debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/kdesktopSetAsBackground.desktop
 debian/tmp/opt/trinity/share/autostart/kdesktop.desktop
 debian/tmp/opt/trinity/share/config.kcfg/kdesktop.kcfg
-debian/tmp/opt/trinity/share/config.kcfg/klaunch.kcfg
+debian/tmp/opt/trinity/share/config.kcfg/tdelaunch.kcfg
 debian/tmp/opt/trinity/share/config.kcfg/kwebdesktop.kcfg
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/error.png
diff --git a/ubuntu/maverick/tdebase/debian/patches/kubuntu_15_hide_kfontview_menu_entry.diff b/ubuntu/maverick/tdebase/debian/patches/kubuntu_15_hide_kfontview_menu_entry.diff
deleted file mode 100644
index 59345d518..000000000
--- a/ubuntu/maverick/tdebase/debian/patches/kubuntu_15_hide_kfontview_menu_entry.diff
+++ /dev/null
@@ -1,7 +0,0 @@
---- tdebase/kcontrol/kfontinst/viewpart/kfontview.desktop
-+++ tdebase/kcontrol/kfontinst/viewpart/kfontview.desktop
-@@ -71,3 +71,4 @@
- Terminal=false
- InitialPreference=1
- Categories=Qt;TDE;Graphics;
-+NoDisplay=true
diff --git a/ubuntu/maverick/tdebase/debian/patches/kubuntu_15_hide_tdefontview_menu_entry.diff b/ubuntu/maverick/tdebase/debian/patches/kubuntu_15_hide_tdefontview_menu_entry.diff
new file mode 100644
index 000000000..a9123cf3b
--- /dev/null
+++ b/ubuntu/maverick/tdebase/debian/patches/kubuntu_15_hide_tdefontview_menu_entry.diff
@@ -0,0 +1,7 @@
+--- tdebase/kcontrol/tdefontinst/viewpart/tdefontview.desktop
++++ tdebase/kcontrol/tdefontinst/viewpart/tdefontview.desktop
+@@ -71,3 +71,4 @@
+ Terminal=false
+ InitialPreference=1
+ Categories=Qt;TDE;Graphics;
++NoDisplay=true
diff --git a/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install b/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install
index ae518054b..3cd4f2947 100644
--- a/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install
+++ b/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install
@@ -1,4 +1,4 @@
-debian/tmp/etc/trinity/kshorturifilterrc
+debian/tmp/etc/trinity/tdeshorturifilterrc
 debian/tmp/opt/trinity/share/applnk/.hidden/battery.desktop
 debian/tmp/opt/trinity/share/applnk/.hidden/bwarning.desktop
 debian/tmp/opt/trinity/share/applnk/.hidden/cwarning.desktop
@@ -28,7 +28,7 @@ debian/tmp/opt/trinity/share/apps/kcmkeys/win4.kksrc
 debian/tmp/opt/trinity/share/apps/kcmkeys/wm3.kksrc
 debian/tmp/opt/trinity/share/apps/kcmlocale/pics/background.png
 debian/tmp/opt/trinity/share/apps/tdeconf_update/convertShortcuts.pl
-debian/tmp/opt/trinity/share/apps/tdeconf_update/kaccel.upd
+debian/tmp/opt/trinity/share/apps/tdeconf_update/tdeaccel.upd
 debian/tmp/opt/trinity/share/apps/tdeconf_update/kcmdisplayrc.upd
 debian/tmp/opt/trinity/share/apps/tdeconf_update/kuriikwsfilter.upd
 debian/tmp/opt/trinity/share/apps/tdeconf_update/mouse_cursor_theme.upd
@@ -103,8 +103,8 @@ debian/tmp/opt/trinity/share/apps/kdisplay/color-schemes/Windows2000.kcsrc
 debian/tmp/opt/trinity/share/apps/kdisplay/color-schemes/Windows95.kcsrc
 debian/tmp/opt/trinity/share/apps/kdisplay/color-schemes/WindowsXP.kcsrc
 debian/tmp/opt/trinity/share/apps/kdisplay/color-schemes/YellowOnBlue.kcsrc
-debian/tmp/opt/trinity/share/apps/kfontview/kfontviewpart.rc
-debian/tmp/opt/trinity/share/apps/kfontview/kfontviewui.rc
+debian/tmp/opt/trinity/share/apps/tdefontview/tdefontviewpart.rc
+debian/tmp/opt/trinity/share/apps/tdefontview/tdefontviewui.rc
 debian/tmp/opt/trinity/share/apps/kinfocenter/kinfocenterui.rc
 debian/tmp/opt/trinity/share/apps/kthememanager/themes/HighContrastDark-big/HighContrastDark-big.preview.png
 debian/tmp/opt/trinity/share/apps/kthememanager/themes/HighContrastDark-big/HighContrastDark-big.xml
diff --git a/ubuntu/maverick/tdebase/debian/tdebase-trinity-dev.install b/ubuntu/maverick/tdebase/debian/tdebase-trinity-dev.install
index 80fe5d689..311603e9d 100644
--- a/ubuntu/maverick/tdebase/debian/tdebase-trinity-dev.install
+++ b/ubuntu/maverick/tdebase/debian/tdebase-trinity-dev.install
@@ -69,8 +69,8 @@ debian/tmp/opt/trinity/lib/libtdeinit_twin.la
 debian/tmp/opt/trinity/lib/libtdeinit_twin_rules_dialog.la
 debian/tmp/opt/trinity/lib/libtdeinit_kwrite.la
 debian/tmp/opt/trinity/lib/libtdeinit_kxkb.la
-debian/tmp/opt/trinity/lib/libkfontinst.la
-debian/tmp/opt/trinity/lib/libkfontinst.so
+debian/tmp/opt/trinity/lib/libtdefontinst.la
+debian/tmp/opt/trinity/lib/libtdefontinst.so
 debian/tmp/opt/trinity/lib/libkhotkeys_shared.la
 debian/tmp/opt/trinity/lib/libkhotkeys_shared.so
 debian/tmp/opt/trinity/lib/libkickermain.la
diff --git a/ubuntu/maverick/tdelibs/debian/changelog b/ubuntu/maverick/tdelibs/debian/changelog
index 3b293e399..28a76fe79 100644
--- a/ubuntu/maverick/tdelibs/debian/changelog
+++ b/ubuntu/maverick/tdelibs/debian/changelog
@@ -432,7 +432,7 @@ tdelibs (4:3.5.8-0ubuntu4) hardy; urgency=low
 
 tdelibs (4:3.5.8-0ubuntu3.1) gutsy-proposed; urgency=low
 
-  * Add kubuntu_94_kselectaction.diff Closes: LP #155144
+  * Add kubuntu_94_tdeselectaction.diff Closes: LP #155144
     Editable TDESelectAction stopped working for custom values
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Sun, 21 Oct 2007 00:09:25 +0100
@@ -1921,7 +1921,7 @@ tdelibs (4:3.4.2-2) unstable; urgency=low
 tdelibs (4:3.4.2-1) unstable; urgency=low
 
   * New upstream release. Includes a forward declaration of KXMLGUIClient in
-    kactioncollection.h, which makes gcc-4.0 happy and thus closes: #317543,
+    tdeactioncollection.h, which makes gcc-4.0 happy and thus closes: #317543,
     #318017, #319154, #323093 (arson, smb4k, kile and amarok FTBFS).
 
   * KDE_3_4_BRANCH update.
@@ -2240,7 +2240,7 @@ tdelibs (4:3.3.2-5) unstable; urgency=medium
 
   * Add GFDL to debian/copyright.
 
-  * Add another kaccel patch that fixes non-English keyboards on
+  * Add another tdeaccel patch that fixes non-English keyboards on
     SunRay terminals. Thanks to Nikita Youshchenko. (Closes: #301971)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Fri, 22 Apr 2005 11:21:11 -0400
@@ -2354,7 +2354,7 @@ tdelibs (4:3.3.2-1) unstable; urgency=medium
   * Add patch to change the group set by KDE CUPS configurator to Debian's
     default, lpadmin, rather than sys. (Closes: #263430)
 
-  * Add kaccel hack that works around a Konqueror crash with Russian keyboards.
+  * Add tdeaccel hack that works around a Konqueror crash with Russian keyboards.
     (Closes: #287566)
 
   * Change debian/copyright file to refer to licenses, instead of copyright,
diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.install b/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.install
index 43f22d823..dd503faf5 100644
--- a/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.install
+++ b/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.install
@@ -186,7 +186,7 @@ debian/tmp/opt/trinity/share/apps/tdeui/about/top-middle.png
 debian/tmp/opt/trinity/share/apps/tdeui/pics/aboutkde.png
 debian/tmp/opt/trinity/share/apps/tdeui/pics/ktip-background.png
 debian/tmp/opt/trinity/share/apps/tdeui/pics/ktip-bulb.png
-debian/tmp/opt/trinity/share/apps/kdewidgets/pics/kactionselector.png
+debian/tmp/opt/trinity/share/apps/kdewidgets/pics/tdeactionselector.png
 debian/tmp/opt/trinity/share/apps/kdewidgets/pics/kactivelabel.png
 debian/tmp/opt/trinity/share/apps/kdewidgets/pics/kcharselect.png
 debian/tmp/opt/trinity/share/apps/kdewidgets/pics/tdecmodule.png
@@ -202,8 +202,8 @@ debian/tmp/opt/trinity/share/apps/kdewidgets/pics/kdoublenuminput.png
 debian/tmp/opt/trinity/share/apps/kdewidgets/pics/kdoublespinbox.png
 debian/tmp/opt/trinity/share/apps/kdewidgets/pics/kdualcolorbutton.png
 debian/tmp/opt/trinity/share/apps/kdewidgets/pics/keditlistbox.png
-debian/tmp/opt/trinity/share/apps/kdewidgets/pics/kfontcombo.png
-debian/tmp/opt/trinity/share/apps/kdewidgets/pics/kfontrequester.png
+debian/tmp/opt/trinity/share/apps/kdewidgets/pics/tdefontcombo.png
+debian/tmp/opt/trinity/share/apps/kdewidgets/pics/tdefontrequester.png
 debian/tmp/opt/trinity/share/apps/kdewidgets/pics/kgradientselector.png
 debian/tmp/opt/trinity/share/apps/kdewidgets/pics/khistorycombo.png
 debian/tmp/opt/trinity/share/apps/kdewidgets/pics/khsselector.png
@@ -214,8 +214,8 @@ debian/tmp/opt/trinity/share/apps/kdewidgets/pics/kintspinbox.png
 debian/tmp/opt/trinity/share/apps/kdewidgets/pics/kkeybutton.png
 debian/tmp/opt/trinity/share/apps/kdewidgets/pics/kled.png
 debian/tmp/opt/trinity/share/apps/kdewidgets/pics/klineedit.png
-debian/tmp/opt/trinity/share/apps/kdewidgets/pics/klistbox.png
-debian/tmp/opt/trinity/share/apps/kdewidgets/pics/klistview.png
+debian/tmp/opt/trinity/share/apps/kdewidgets/pics/tdelistbox.png
+debian/tmp/opt/trinity/share/apps/kdewidgets/pics/tdelistview.png
 debian/tmp/opt/trinity/share/apps/kdewidgets/pics/kpalettetable.png
 debian/tmp/opt/trinity/share/apps/kdewidgets/pics/kpasswordedit.png
 debian/tmp/opt/trinity/share/apps/kdewidgets/pics/kprogress.png
diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.install b/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.install
index 1e0c80cca..431c16c55 100644
--- a/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.install
+++ b/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.install
@@ -108,15 +108,15 @@ debian/tmp/opt/trinity/include/kaboutapplication.h
 debian/tmp/opt/trinity/include/kaboutdata.h
 debian/tmp/opt/trinity/include/kaboutdialog.h
 debian/tmp/opt/trinity/include/kaboutkde.h
-debian/tmp/opt/trinity/include/kaccelgen.h
-debian/tmp/opt/trinity/include/kaccel.h
-debian/tmp/opt/trinity/include/kaccelmanager.h
+debian/tmp/opt/trinity/include/tdeaccelgen.h
+debian/tmp/opt/trinity/include/tdeaccel.h
+debian/tmp/opt/trinity/include/tdeaccelmanager.h
 debian/tmp/opt/trinity/include/kacl.h
-debian/tmp/opt/trinity/include/kactionclasses.h
-debian/tmp/opt/trinity/include/kactioncollection.h
-debian/tmp/opt/trinity/include/kaction.h
-debian/tmp/opt/trinity/include/kactionselector.h
-debian/tmp/opt/trinity/include/kactionshortcutlist.h
+debian/tmp/opt/trinity/include/tdeactionclasses.h
+debian/tmp/opt/trinity/include/tdeactioncollection.h
+debian/tmp/opt/trinity/include/tdeaction.h
+debian/tmp/opt/trinity/include/tdeactionselector.h
+debian/tmp/opt/trinity/include/tdeactionshortcutlist.h
 debian/tmp/opt/trinity/include/kactivelabel.h
 debian/tmp/opt/trinity/include/kallocator.h
 debian/tmp/opt/trinity/include/kanimwidget.h
@@ -276,9 +276,9 @@ debian/tmp/opt/trinity/include/kfilterbase.h
 debian/tmp/opt/trinity/include/kfilterdev.h
 debian/tmp/opt/trinity/include/kfinddialog.h
 debian/tmp/opt/trinity/include/kfind.h
-debian/tmp/opt/trinity/include/kfontcombo.h
-debian/tmp/opt/trinity/include/kfontdialog.h
-debian/tmp/opt/trinity/include/kfontrequester.h
+debian/tmp/opt/trinity/include/tdefontcombo.h
+debian/tmp/opt/trinity/include/tdefontdialog.h
+debian/tmp/opt/trinity/include/tdefontrequester.h
 debian/tmp/opt/trinity/include/kgenericfactory.h
 debian/tmp/opt/trinity/include/kgenericfactory.tcc
 debian/tmp/opt/trinity/include/kglobalaccel.h
@@ -378,14 +378,14 @@ debian/tmp/opt/trinity/include/kled.h
 debian/tmp/opt/trinity/include/klibloader.h
 debian/tmp/opt/trinity/include/klineeditdlg.h
 debian/tmp/opt/trinity/include/klineedit.h
-debian/tmp/opt/trinity/include/klistbox.h
-debian/tmp/opt/trinity/include/klistview.h
-debian/tmp/opt/trinity/include/klistviewsearchline.h
+debian/tmp/opt/trinity/include/tdelistbox.h
+debian/tmp/opt/trinity/include/tdelistview.h
+debian/tmp/opt/trinity/include/tdelistviewsearchline.h
 debian/tmp/opt/trinity/include/klocale.h
 debian/tmp/opt/trinity/include/klockfile.h
 debian/tmp/opt/trinity/include/kmacroexpander.h
-debian/tmp/opt/trinity/include/kmainwindow.h
-debian/tmp/opt/trinity/include/kmainwindowiface.h
+debian/tmp/opt/trinity/include/tdemainwindow.h
+debian/tmp/opt/trinity/include/tdemainwindowiface.h
 debian/tmp/opt/trinity/include/kmanagerselection.h
 debian/tmp/opt/trinity/include/kmdcodec.h
 debian/tmp/opt/trinity/include/tdemdichildarea.h
@@ -446,7 +446,7 @@ debian/tmp/opt/trinity/include/tdeparts/browserextension.h
 debian/tmp/opt/trinity/include/tdeparts/browserinterface.h
 debian/tmp/opt/trinity/include/tdeparts/browserrun.h
 debian/tmp/opt/trinity/include/tdeparts/componentfactory.h
-debian/tmp/opt/trinity/include/tdeparts/dockmainwindow.h
+debian/tmp/opt/trinity/include/tdeparts/doctdemainwindow.h
 debian/tmp/opt/trinity/include/tdeparts/event.h
 debian/tmp/opt/trinity/include/tdeparts/factory.h
 debian/tmp/opt/trinity/include/tdeparts/genericfactory.h
@@ -467,7 +467,7 @@ debian/tmp/opt/trinity/include/kpixmapregionselectorwidget.h
 debian/tmp/opt/trinity/include/kpixmapsplitter.h
 debian/tmp/opt/trinity/include/kplugininfo.h
 debian/tmp/opt/trinity/include/kpluginselector.h
-debian/tmp/opt/trinity/include/kpopupmenu.h
+debian/tmp/opt/trinity/include/tdepopupmenu.h
 debian/tmp/opt/trinity/include/kpreviewwidgetbase.h
 debian/tmp/opt/trinity/include/kprintaction.h
 debian/tmp/opt/trinity/include/kprinter.h
@@ -483,7 +483,7 @@ debian/tmp/opt/trinity/include/kprotocolmanager.h
 debian/tmp/opt/trinity/include/kpty.h
 debian/tmp/opt/trinity/include/kpushbutton.h
 debian/tmp/opt/trinity/include/krandomsequence.h
-debian/tmp/opt/trinity/include/krecentdocument.h
+debian/tmp/opt/trinity/include/tderecentdocument.h
 debian/tmp/opt/trinity/include/kregexpeditorinterface.h
 debian/tmp/opt/trinity/include/kregexp.h
 debian/tmp/opt/trinity/include/kremoteencoding.h
@@ -513,7 +513,7 @@ debian/tmp/opt/trinity/include/ksconfig.h
 debian/tmp/opt/trinity/include/tdescreensaver.h
 debian/tmp/opt/trinity/include/tdescreensaver_vroot.h
 debian/tmp/opt/trinity/include/kscrollview.h
-debian/tmp/opt/trinity/include/kselect.h
+debian/tmp/opt/trinity/include/tdeselect.h
 debian/tmp/opt/trinity/include/kseparator.h
 debian/tmp/opt/trinity/include/kserversocket.h
 debian/tmp/opt/trinity/include/kservicegroup.h
@@ -527,9 +527,9 @@ debian/tmp/opt/trinity/include/ksharedpixmap.h
 debian/tmp/opt/trinity/include/ksharedptr.h
 debian/tmp/opt/trinity/include/kshellcompletion.h
 debian/tmp/opt/trinity/include/kshell.h
-debian/tmp/opt/trinity/include/kshortcutdialog.h
-debian/tmp/opt/trinity/include/kshortcut.h
-debian/tmp/opt/trinity/include/kshortcutlist.h
+debian/tmp/opt/trinity/include/tdeshortcutdialog.h
+debian/tmp/opt/trinity/include/tdeshortcut.h
+debian/tmp/opt/trinity/include/tdeshortcutlist.h
 debian/tmp/opt/trinity/include/kshred.h
 debian/tmp/opt/trinity/include/ksimpleconfig.h
 debian/tmp/opt/trinity/include/ksmimecrypto.h
@@ -583,7 +583,7 @@ debian/tmp/opt/trinity/include/kstandarddirs.h
 debian/tmp/opt/trinity/include/kstartupinfo.h
 debian/tmp/opt/trinity/include/kstaticdeleter.h
 debian/tmp/opt/trinity/include/kstatusbar.h
-debian/tmp/opt/trinity/include/kstdaccel.h
+debian/tmp/opt/trinity/include/tdestdaccel.h
 debian/tmp/opt/trinity/include/kstdaction.h
 debian/tmp/opt/trinity/include/kstddirs.h
 debian/tmp/opt/trinity/include/kstdguiitem.h
@@ -606,7 +606,7 @@ debian/tmp/opt/trinity/include/ktempdir.h
 debian/tmp/opt/trinity/include/ktempfile.h
 debian/tmp/opt/trinity/include/ktextbrowser.h
 debian/tmp/opt/trinity/include/ktextedit.h
-debian/tmp/opt/trinity/include/tdetexteditor/blockselectioninterface.h
+debian/tmp/opt/trinity/include/tdetexteditor/bloctdeselectioninterface.h
 debian/tmp/opt/trinity/include/tdetexteditor/clipboardinterface.h
 debian/tmp/opt/trinity/include/tdetexteditor/codecompletioninterface.h
 debian/tmp/opt/trinity/include/tdetexteditor/configinterfaceextension.h
@@ -643,10 +643,10 @@ debian/tmp/opt/trinity/include/ktimewidget.h
 debian/tmp/opt/trinity/include/ktimezones.h
 debian/tmp/opt/trinity/include/ktimezonewidget.h
 debian/tmp/opt/trinity/include/ktip.h
-debian/tmp/opt/trinity/include/ktoolbarbutton.h
-debian/tmp/opt/trinity/include/ktoolbar.h
-debian/tmp/opt/trinity/include/ktoolbarlabelaction.h
-debian/tmp/opt/trinity/include/ktoolbarradiogroup.h
+debian/tmp/opt/trinity/include/tdetoolbarbutton.h
+debian/tmp/opt/trinity/include/tdetoolbar.h
+debian/tmp/opt/trinity/include/tdetoolbarlabelaction.h
+debian/tmp/opt/trinity/include/tdetoolbarradiogroup.h
 debian/tmp/opt/trinity/include/ktrader.h
 debian/tmp/opt/trinity/include/ktypelist.h
 debian/tmp/opt/trinity/include/kuniqueapp.h
diff --git a/ubuntu/maverick/tdenetwork/debian/tdenetwork-trinity-dev.install b/ubuntu/maverick/tdenetwork/debian/tdenetwork-trinity-dev.install
index e1ce52d78..83535649d 100644
--- a/ubuntu/maverick/tdenetwork/debian/tdenetwork-trinity-dev.install
+++ b/ubuntu/maverick/tdenetwork/debian/tdenetwork-trinity-dev.install
@@ -37,8 +37,8 @@ debian/tmp/opt/trinity/include/kopete/kopeteversion.h
 debian/tmp/opt/trinity/include/kopete/managedconnectionaccount.h
 debian/tmp/opt/trinity/include/kopete/ui/accountselector.h
 debian/tmp/opt/trinity/include/kopete/ui/addcontactpage.h
-debian/tmp/opt/trinity/include/kopete/ui/addressbookselectordialog.h
-debian/tmp/opt/trinity/include/kopete/ui/addressbookselectorwidget.h
+debian/tmp/opt/trinity/include/kopete/ui/addressbootdeselectordialog.h
+debian/tmp/opt/trinity/include/kopete/ui/addressbootdeselectorwidget.h
 debian/tmp/opt/trinity/include/kopete/ui/editaccountwidget.h
 debian/tmp/opt/trinity/include/kopete/ui/fileconfirmbase.h
 debian/tmp/opt/trinity/include/kopete/ui/kopeteawaydialogbase.h
diff --git a/ubuntu/maverick/tdewebdev/debian/kommander-trinity.install b/ubuntu/maverick/tdewebdev/debian/kommander-trinity.install
index 4c23ebe43..d01e867d6 100644
--- a/ubuntu/maverick/tdewebdev/debian/kommander-trinity.install
+++ b/ubuntu/maverick/tdewebdev/debian/kommander-trinity.install
@@ -28,7 +28,7 @@ kommander/working/kmdr2po /opt/trinity/bin
 debian/tmp/opt/trinity/lib/trinity/libkommander_part.so
 debian/tmp/opt/trinity/lib/trinity/libkommander_part.la
 debian/tmp/opt/trinity/share/apps/kommander/pics/toolbox.png
-debian/tmp/opt/trinity/share/apps/kommander/pics/kfontcombo.png
+debian/tmp/opt/trinity/share/apps/kommander/pics/tdefontcombo.png
 debian/tmp/opt/trinity/share/apps/kommander/translating/extractkmdr
 debian/tmp/opt/trinity/share/apps/kommander/translating/kmdr2po
 debian/tmp/opt/trinity/share/apps/kommander/icons/hicolor/22x22/actions/arrow.png