Rename ksocket and kcache on Debian and Ubuntu

54 files changed, 162 insertions, 162 deletions

diff --git a/debian/lenny/tde-i18n/debian/changelog b/debian/lenny/tde-i18n/debian/changelog
index 1b8e2c2ba..7862961e0 100644
--- a/debian/lenny/tde-i18n/debian/changelog
+++ b/debian/lenny/tde-i18n/debian/changelog
@@ -300,7 +300,7 @@ tde-i18n (4:3.2.2-3) unstable; urgency=low
 
 tde-i18n (4:3.2.2-2) unstable; urgency=low
 
-  * corrected juk and kcachegrind conflict to <<4:3.2.1-1
+  * corrected juk and tdecachegrind conflict to <<4:3.2.1-1
   * conflicting with tdevelop-data (tdevelop version 2)
     because tdevelop version 3 translations are included in
     tde-i18n
diff --git a/debian/lenny/tdelibs/debian/tdelibs4-trinity-dev.install b/debian/lenny/tdelibs/debian/tdelibs4-trinity-dev.install
index eeb111f96..3d2e8e43b 100644
--- a/debian/lenny/tdelibs/debian/tdelibs4-trinity-dev.install
+++ b/debian/lenny/tdelibs/debian/tdelibs4-trinity-dev.install
@@ -532,9 +532,9 @@ debian/tmp/opt/trinity/include/kshred.h
 debian/tmp/opt/trinity/include/ksimpleconfig.h
 debian/tmp/opt/trinity/include/ksmimecrypto.h
 debian/tmp/opt/trinity/include/ksockaddr.h
-debian/tmp/opt/trinity/include/ksocketaddress.h
-debian/tmp/opt/trinity/include/ksocketbase.h
-debian/tmp/opt/trinity/include/ksocketdevice.h
+debian/tmp/opt/trinity/include/tdesocketaddress.h
+debian/tmp/opt/trinity/include/tdesocketbase.h
+debian/tmp/opt/trinity/include/tdesocketdevice.h
 debian/tmp/opt/trinity/include/ksock.h
 debian/tmp/opt/trinity/include/ksocks.h
 debian/tmp/opt/trinity/include/ksockssocketdevice.h
diff --git a/debian/lenny/tdesdk/debian/changelog b/debian/lenny/tdesdk/debian/changelog
index 288f761e6..276fb1d78 100644
--- a/debian/lenny/tdesdk/debian/changelog
+++ b/debian/lenny/tdesdk/debian/changelog
@@ -153,7 +153,7 @@ tdesdk (4:3.5.6-2) unstable; urgency=low
 
   +++ Changes by Sune Vuorela:
 
-  * Promote graphviz from kcachegrind Suggests to Recommends. (Closes: #407043)
+  * Promote graphviz from tdecachegrind Suggests to Recommends. (Closes: #407043)
   * Don't install the licensecheck script in tdesdk. The devscripts package
     has taken it and is working actively on it. Let tdesdk-scripts suggest
     devscripts instead. (Closes: #420154)
@@ -617,7 +617,7 @@ tdesdk (4:3.3.2-3) unstable; urgency=high
     under the LGPL.
   * Fix kdemangen.pl output to use minus instead of hyphen where appropriate,
     thanks to Achim Bohnet (closes: #295454).
-  * Fixed amd64/gcc-4.0 build by using longs for node IDs in kcachegrind,
+  * Fixed amd64/gcc-4.0 build by using longs for node IDs in tdecachegrind,
     thanks to Andreas Jochens (closes: #287032).
 
  -- Ben Burton <bab@debian.org>  Thu, 31 Mar 2005 19:59:13 +1000
@@ -672,8 +672,8 @@ tdesdk (4:3.3.1-1) unstable; urgency=medium
 tdesdk (4:3.3.0-1) unstable; urgency=low
 
   * New upstream release.
-  * New package kcachegrind-converters.  These foreign format converters
-    are packaged separately so that kcachegrind need not depend on php.
+  * New package tdecachegrind-converters.  These foreign format converters
+    are packaged separately so that tdecachegrind need not depend on php.
   * Binary package kmtrace has returned.  Note that the kmtrace libraries
     for debian are now installed in /usr/lib/kmtrace, not in /usr/lib as
     is done upstream.
@@ -712,7 +712,7 @@ tdesdk (4:3.2.2-1) unstable; urgency=low
   * New upstream bugfix release.
   * Add Conflicts/Replaces for umbrello-manual (closes: #237173).
   * Don't use Conflicts/Replaces elsewhere where we should just use Replaces.
-  * Have kcachegrind suggest graphviz (closes: #243883).
+  * Have tdecachegrind suggest graphviz (closes: #243883).
 
  -- Ben Burton <bab@debian.org>  Tue, 16 Mar 2004 09:15:01 +1100
 
@@ -735,8 +735,8 @@ tdesdk (4:3.2.0-1) unstable; urgency=low
   * New upstream release.
   * Many thanks to Ralf Nolden for all his help with packaging KDE 3.2.
   * Thanks to Robert Lemmen for previous packaging work on umbrello and
-    to Philipp Frauenfelder for previous packaging work on kcachegrind.
-  * New binary packages kcachegrind, kuiviewer and umbrello.
+    to Philipp Frauenfelder for previous packaging work on tdecachegrind.
+  * New binary packages tdecachegrind, kuiviewer and umbrello.
   * Created a new package tdesdk-doc-html for HTML documentation.
 
  -- Ben Burton <bab@debian.org>  Sat, 31 Jan 2004 12:08:48 +1100
diff --git a/debian/lenny/tdesdk/debian/control b/debian/lenny/tdesdk/debian/control
index 39fea60bc..76302c587 100644
--- a/debian/lenny/tdesdk/debian/control
+++ b/debian/lenny/tdesdk/debian/control
@@ -16,8 +16,8 @@ Architecture: all
 Section: kde
 Replaces: kdesdk-trinity (<< 4:14.0.0)
 Breaks: kdesdk-trinity (<< 4:14.0.0)
-Depends: cervisia-trinity (>= ${Source-Version}), kapptemplate-trinity (>= ${Source-Version}), kbabel-trinity (>= ${Source-Version}), kbugbuster-trinity (>= ${Source-Version}), kcachegrind-trinity (>= ${Source-Version}), tdesdk-kfile-plugins-trinity (>= ${Source-Version}), tdesdk-kio-plugins-trinity (>= ${Source-Version}) | tdesvn-kio-plugins-trinity, tdesdk-misc-trinity (>= ${Source-Version}), tdesdk-scripts-trinity, kmtrace-trinity (>= ${Source-Version}), kompare-trinity (>= ${Source-Version}), kspy-trinity (>= ${Source-Version}), kuiviewer-trinity (>= ${Source-Version}), kunittest-trinity (>= ${Source-Version}), poxml-trinity (>= ${Source-Version}), umbrello-trinity (>= ${Source-Version})
-Suggests: kcachegrind-converters-trinity, kbabel-trinity-dev, tdesdk-trinity-doc-html
+Depends: cervisia-trinity (>= ${Source-Version}), kapptemplate-trinity (>= ${Source-Version}), kbabel-trinity (>= ${Source-Version}), kbugbuster-trinity (>= ${Source-Version}), tdecachegrind-trinity (>= ${Source-Version}), tdesdk-kfile-plugins-trinity (>= ${Source-Version}), tdesdk-kio-plugins-trinity (>= ${Source-Version}) | tdesvn-kio-plugins-trinity, tdesdk-misc-trinity (>= ${Source-Version}), tdesdk-scripts-trinity, kmtrace-trinity (>= ${Source-Version}), kompare-trinity (>= ${Source-Version}), kspy-trinity (>= ${Source-Version}), kuiviewer-trinity (>= ${Source-Version}), kunittest-trinity (>= ${Source-Version}), poxml-trinity (>= ${Source-Version}), umbrello-trinity (>= ${Source-Version})
+Suggests: tdecachegrind-converters-trinity, kbabel-trinity-dev, tdesdk-trinity-doc-html
 Description: software development kit from the official Trinity release
  KDE (the K Desktop Environment) is a powerful Open Source graphical
  desktop environment for Unix workstations. It combines ease of use,
@@ -145,15 +145,15 @@ Description: a front end for the Trinity bug tracking system
  This package is part of Trinity, and a component of the KDE SDK module.
  See the 'kde-trinity' and 'tdesdk-trinity' packages for more information.
 
-Package: kcachegrind-trinity
+Package: tdecachegrind-trinity
 Architecture: any
 Section: devel
-Replaces: kcachegrind-trinity (<< 4:14.0.0)
-Breaks: kcachegrind-trinity (<< 4:14.0.0)
+Replaces: tdecachegrind-trinity (<< 4:14.0.0)
+Breaks: tdecachegrind-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}
-Conflicts: kcachegrind
+Conflicts: tdecachegrind
 Recommends: valgrind-callgrind-trinity | valgrind-calltree-trinity, graphviz
-Suggests: kcachegrind-converters-trinity, khelpcenter-trinity, tdesdk-trinity-doc-html
+Suggests: tdecachegrind-converters-trinity, khelpcenter-trinity, tdesdk-trinity-doc-html
 Description: visualisation tool for valgrind profiling output
  KCachegrind is a visualisation tool for the profiling data generated
  by calltree, a profiling skin for valgrind.  Applications can be
@@ -161,19 +161,19 @@ Description: visualisation tool for valgrind profiling output
  and plugin architectures are supported.
  .
  For visualising the output from other profiling tools, several converters
- can be found in the kcachegrind-converters package.
+ can be found in the tdecachegrind-converters package.
  .
  This package is part of Trinity, and a component of the KDE SDK module.
  See the 'kde-trinity' and 'tdesdk-trinity' packages for more information.
 
-Package: kcachegrind-converters-trinity
+Package: tdecachegrind-converters-trinity
 Architecture: all
 Section: devel
-Replaces: kcachegrind-converters-trinity (<< 4:14.0.0)
-Breaks: kcachegrind-converters-trinity (<< 4:14.0.0)
+Replaces: tdecachegrind-converters-trinity (<< 4:14.0.0)
+Breaks: tdecachegrind-converters-trinity (<< 4:14.0.0)
 Depends: ${perl:Depends}, php5-cli, python
-Conflicts: kcachegrind-converters
-Recommends: kcachegrind-trinity
+Conflicts: tdecachegrind-converters
+Recommends: tdecachegrind-trinity
 Description: format converters for KCachegrind profiling visualisation tool
  This is a collection of scripts for converting the output from
  different profiling tools into a format that KCachegrind can use.
diff --git a/debian/lenny/tdesdk/debian/control.in b/debian/lenny/tdesdk/debian/control.in
index c70b772a1..2e5b5c1ad 100644
--- a/debian/lenny/tdesdk/debian/control.in
+++ b/debian/lenny/tdesdk/debian/control.in
@@ -13,8 +13,8 @@ Standards-Version: 3.7.2
 Package: tdesdk
 Architecture: all
 Section: kde
-Depends: cervisia (>= ${Source-Version}), kapptemplate (>= ${Source-Version}), kbabel (>= ${Source-Version}), kbugbuster (>= ${Source-Version}), kcachegrind (>= ${Source-Version}), tdesdk-kfile-plugins (>= ${Source-Version}), tdesdk-kio-plugins (>= ${Source-Version}) | tdesvn-kio-plugins, tdesdk-misc (>= ${Source-Version}), tdesdk-scripts (>= ${Source-Version}), kmtrace (>= ${Source-Version}), kompare (>= ${Source-Version}), kspy (>= ${Source-Version}), kuiviewer (>= ${Source-Version}), kunittest (>= ${Source-Version}), poxml (>= ${Source-Version}), umbrello (>= ${Source-Version})
-Suggests: kcachegrind-converters, kbabel-dev, tdesdk-doc-html
+Depends: cervisia (>= ${Source-Version}), kapptemplate (>= ${Source-Version}), kbabel (>= ${Source-Version}), kbugbuster (>= ${Source-Version}), tdecachegrind (>= ${Source-Version}), tdesdk-kfile-plugins (>= ${Source-Version}), tdesdk-kio-plugins (>= ${Source-Version}) | tdesvn-kio-plugins, tdesdk-misc (>= ${Source-Version}), tdesdk-scripts (>= ${Source-Version}), kmtrace (>= ${Source-Version}), kompare (>= ${Source-Version}), kspy (>= ${Source-Version}), kuiviewer (>= ${Source-Version}), kunittest (>= ${Source-Version}), poxml (>= ${Source-Version}), umbrello (>= ${Source-Version})
+Suggests: tdecachegrind-converters, kbabel-dev, tdesdk-doc-html
 Description: software development kit from the official KDE release
  KDE (the K Desktop Environment) is a powerful Open Source graphical
  desktop environment for Unix workstations. It combines ease of use,
@@ -127,12 +127,12 @@ Description: a front end for the KDE bug tracking system
  This package is part of KDE, and a component of the KDE SDK module.
  See the 'kde' and 'tdesdk' packages for more information.
 
-Package: kcachegrind
+Package: tdecachegrind
 Architecture: any
 Section: devel
 Depends: ${shlibs:Depends}
 Recommends: valgrind-callgrind | valgrind-calltree, graphviz
-Suggests: kcachegrind-converters, khelpcenter, tdesdk-doc-html
+Suggests: tdecachegrind-converters, khelpcenter, tdesdk-doc-html
 Description: visualisation tool for valgrind profiling output
  KCachegrind is a visualisation tool for the profiling data generated
  by calltree, a profiling skin for valgrind.  Applications can be
@@ -140,16 +140,16 @@ Description: visualisation tool for valgrind profiling output
  and plugin architectures are supported.
  .
  For visualising the output from other profiling tools, several converters
- can be found in the kcachegrind-converters package.
+ can be found in the tdecachegrind-converters package.
  .
  This package is part of KDE, and a component of the KDE SDK module.
  See the 'kde' and 'tdesdk' packages for more information.
 
-Package: kcachegrind-converters
+Package: tdecachegrind-converters
 Architecture: all
 Section: devel
 Depends: ${perl:Depends}, php5-cli, python
-Recommends: kcachegrind
+Recommends: tdecachegrind
 Description: format converters for KCachegrind profiling visualisation tool
  This is a collection of scripts for converting the output from
  different profiling tools into a format that KCachegrind can use.
diff --git a/debian/lenny/tdesdk/debian/copyright b/debian/lenny/tdesdk/debian/copyright
index ca64fadb8..8574b5937 100644
--- a/debian/lenny/tdesdk/debian/copyright
+++ b/debian/lenny/tdesdk/debian/copyright
@@ -3,7 +3,7 @@ Fri, 26 Jan 2001 18:00:00 -0700.
 It was brought up to date by Ben Burton <bab@debian.org> on
 Mon, 26 Mar 2001 09:10:56 -0600.
 Thanks to Robert Lemmen and Philipp Frauenfelder for originally packaging
-umbrello and kcachegrind respectively.
+umbrello and tdecachegrind respectively.
 
 It was downloaded from: http://www.kde.org/download
 
diff --git a/debian/lenny/tdesdk/debian/icons/kcachegrind.xpm b/debian/lenny/tdesdk/debian/icons/tdecachegrind.xpm
index 843263759..bfcdfc6e2 100644
--- a/debian/lenny/tdesdk/debian/icons/kcachegrind.xpm
+++ b/debian/lenny/tdesdk/debian/icons/tdecachegrind.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * kcachegrind_xpm[] = {
+static char * tdecachegrind_xpm[] = {
 "32 30 256 2",
 "  	c None",
 ". 	c #0036CA",
diff --git a/debian/lenny/tdesdk/debian/kcachegrind-converters-trinity.docs b/debian/lenny/tdesdk/debian/kcachegrind-converters-trinity.docs
deleted file mode 100644
index b19a948df..000000000
--- a/debian/lenny/tdesdk/debian/kcachegrind-converters-trinity.docs
+++ /dev/null
@@ -1 +0,0 @@
-kcachegrind/converters/README
diff --git a/debian/lenny/tdesdk/debian/kcachegrind-trinity.docs b/debian/lenny/tdesdk/debian/kcachegrind-trinity.docs
deleted file mode 100644
index aef510285..000000000
--- a/debian/lenny/tdesdk/debian/kcachegrind-trinity.docs
+++ /dev/null
@@ -1,3 +0,0 @@
-kcachegrind/AUTHORS
-kcachegrind/README
-kcachegrind/TODO
diff --git a/debian/lenny/tdesdk/debian/kcachegrind-trinity.install b/debian/lenny/tdesdk/debian/kcachegrind-trinity.install
deleted file mode 100644
index eb19d1715..000000000
--- a/debian/lenny/tdesdk/debian/kcachegrind-trinity.install
+++ /dev/null
@@ -1,19 +0,0 @@
-debian/tmp/opt/trinity/bin/kcachegrind
-debian/tmp/opt/trinity/share/applications/kde/kcachegrind.desktop
-debian/tmp/opt/trinity/share/apps/kcachegrind/icons/hicolor/16x16/actions/fromrec.png
-debian/tmp/opt/trinity/share/apps/kcachegrind/icons/hicolor/16x16/actions/percent.png
-debian/tmp/opt/trinity/share/apps/kcachegrind/icons/hicolor/16x16/actions/recrec.png
-debian/tmp/opt/trinity/share/apps/kcachegrind/icons/hicolor/16x16/actions/torec.png
-debian/tmp/opt/trinity/share/apps/kcachegrind/icons/hicolor/22x22/actions/percent.png
-debian/tmp/opt/trinity/share/apps/kcachegrind/icons/hicolor/32x32/actions/percent.png
-debian/tmp/opt/trinity/share/apps/kcachegrind/kcachegrindui.rc
-debian/tmp/opt/trinity/share/apps/kcachegrind/tips
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcachegrind/*.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcachegrind/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcachegrind/*.docbook
-debian/tmp/opt/trinity/share/icons/locolor/32x32/apps/kcachegrind.png
-debian/tmp/opt/trinity/share/icons/locolor/16x16/apps/kcachegrind.png
-debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kcachegrind.png
-debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kcachegrind.png
-debian/tmp/opt/trinity/share/mimelnk/application/x-kcachegrind.desktop
-debian/icons/kcachegrind.xpm /opt/trinity/share/pixmaps
diff --git a/debian/lenny/tdesdk/debian/kcachegrind-trinity.manpages b/debian/lenny/tdesdk/debian/kcachegrind-trinity.manpages
deleted file mode 100644
index f994baff0..000000000
--- a/debian/lenny/tdesdk/debian/kcachegrind-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kcachegrind.1
diff --git a/debian/lenny/tdesdk/debian/man/dprof2calltree.1 b/debian/lenny/tdesdk/debian/man/dprof2calltree.1
index f1e7691a4..ce66a6b30 100644
--- a/debian/lenny/tdesdk/debian/man/dprof2calltree.1
+++ b/debian/lenny/tdesdk/debian/man/dprof2calltree.1
@@ -49,10 +49,10 @@ work with this data in KCachegrind as follows:
 .RS
 dprof2calltree -f tmin.out -o cachegrind.out.foo
 .br
-kcachegrind cachegrind.out.foo
+tdecachegrind cachegrind.out.foo
 .RE
 .SH SEE ALSO
-.BR kcachegrind (1).
+.BR tdecachegrind (1).
 .SH AUTHOR
 This converter was written by George Schlossnagle <george@omniti.com>.
 .br
diff --git a/debian/lenny/tdesdk/debian/man/hotshot2calltree.1 b/debian/lenny/tdesdk/debian/man/hotshot2calltree.1
index 3b31794aa..a07ce76b4 100644
--- a/debian/lenny/tdesdk/debian/man/hotshot2calltree.1
+++ b/debian/lenny/tdesdk/debian/man/hotshot2calltree.1
@@ -46,10 +46,10 @@ data in KCachegrind as follows.
 .RS
 hotshot2cachegrind \-o cachegrind.out.0 pythongrind.prof
 .br
-kcachegrind cachegrind.out.0
+tdecachegrind cachegrind.out.0
 .RE
 .SH SEE ALSO
-.BR kcachegrind (1).
+.BR tdecachegrind (1).
 .SH AUTHOR
 This converter was written by Jorg Beyer <job@webde-ag.de>.
 .br
diff --git a/debian/lenny/tdesdk/debian/man/memprof2calltree.1 b/debian/lenny/tdesdk/debian/man/memprof2calltree.1
index 0bd0582a3..c4042c126 100644
--- a/debian/lenny/tdesdk/debian/man/memprof2calltree.1
+++ b/debian/lenny/tdesdk/debian/man/memprof2calltree.1
@@ -28,7 +28,7 @@ corresponding calltree data will be written to standard output.
 .PP
 This utility is part of the KDE Software Development Kit.
 .SH SEE ALSO
-.BR kcachegrind (1).
+.BR tdecachegrind (1).
 .SH AUTHOR
 This converter was written by Josef Weidendorfer <Josef.Weidendorfer@gmx.de>.
 .br
diff --git a/debian/lenny/tdesdk/debian/man/op2calltree.1 b/debian/lenny/tdesdk/debian/man/op2calltree.1
index c81836a46..d18231d3e 100644
--- a/debian/lenny/tdesdk/debian/man/op2calltree.1
+++ b/debian/lenny/tdesdk/debian/man/op2calltree.1
@@ -35,7 +35,7 @@ application, to a file of the form \fIoprof.out.<app>\fP.
 .PP
 This utility is part of the KDE Software Development Kit.
 .SH SEE ALSO
-.BR kcachegrind (1).
+.BR tdecachegrind (1).
 .SH AUTHOR
 This converter was written by Josef Weidendorfer <Josef.Weidendorfer@gmx.de>.
 .br
diff --git a/debian/lenny/tdesdk/debian/man/pprof2calltree.1 b/debian/lenny/tdesdk/debian/man/pprof2calltree.1
index dc80f91ad..b98a06aec 100644
--- a/debian/lenny/tdesdk/debian/man/pprof2calltree.1
+++ b/debian/lenny/tdesdk/debian/man/pprof2calltree.1
@@ -40,11 +40,11 @@ follows.
 .RS
 pprof2calltree -f pprof.12345.1
 .br
-kcachegrind cachegrind.out.12345.1
+tdecachegrind cachegrind.out.12345.1
 .RE
 .PP
 .SH SEE ALSO
-.BR kcachegrind (1).
+.BR tdecachegrind (1).
 .SH AUTHOR
 This converter was written by George Schlossnagle <george@omniti.com>.
 .br
diff --git a/debian/lenny/tdesdk/debian/man/kcachegrind.1 b/debian/lenny/tdesdk/debian/man/tdecachegrind.1
index ce3296b8c..6e4d92a15 100644
--- a/debian/lenny/tdesdk/debian/man/kcachegrind.1
+++ b/debian/lenny/tdesdk/debian/man/tdecachegrind.1
@@ -2,7 +2,7 @@
 .\" First parameter, NAME, should be all caps
 .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
 .\" other parameters are allowed: see man(7), man(1)
-.TH KCACHEGRIND 1 "March 25, 2005"
+.TH TDECACHEGRIND 1 "March 25, 2005"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .\" Some roff macros, for reference:
@@ -16,9 +16,9 @@
 .\" .sp <n>    insert n+1 empty lines
 .\" for manpage-specific macros, see man(7)
 .SH NAME
-kcachegrind \- a visualisation tool for valgrind profiling output
+tdecachegrind \- a visualisation tool for valgrind profiling output
 .SH SYNOPSIS
-.B kcachegrind
+.B tdecachegrind
 .RI "[ " generic-options " ]"
 [ \fB\-r\fP \fIexec\fP ] [ \fItrace-file\fP ]
 .SH DESCRIPTION
@@ -29,12 +29,12 @@ and plugin architectures are supported.
 .PP
 For visualising the output from other profiling tools, several converters
 are available.  On Debian systems these can be found in the
-\fIkcachegrind-converters\fP package.
+\fItdecachegrind-converters\fP package.
 .PP
 This application is part of the KDE Software Development Kit.
 .SH OPTIONS
-Below are the kcachegrind-specific options.
-For a full summary of options, run \fIkcachegrind \-\-help\fP.
+Below are the tdecachegrind-specific options.
+For a full summary of options, run \fItdecachegrind \-\-help\fP.
 .TP
 \fB\-r\fP \fIexec\fP
 Run the program \fIexec\fP under cachegrind.
@@ -52,14 +52,14 @@ Visualise data from the given trace.
 .PP
 Full user documentation is available through the KDE Help Centre.
 You can also enter the URL
-\fIhelp:/kcachegrind/\fP
+\fIhelp:/tdecachegrind/\fP
 directly into konqueror or you can run
-`\fIkhelpcenter help:/kcachegrind/\fP'
+`\fIkhelpcenter help:/tdecachegrind/\fP'
 from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
 \fItdesdk-doc-html\fP and read this documentation in HTML format from
-\fI/usr/share/doc/kde/HTML/en/kcachegrind/\fP.
+\fI/usr/share/doc/kde/HTML/en/tdecachegrind/\fP.
 .SH AUTHOR
 KCachegrind was written by Josef Weidendorfer <Josef.Weidendorfer@gmx.de>.
 .br
diff --git a/debian/lenny/tdesdk/debian/rules b/debian/lenny/tdesdk/debian/rules
index fc163e6d7..e7b228f2b 100755
--- a/debian/lenny/tdesdk/debian/rules
+++ b/debian/lenny/tdesdk/debian/rules
@@ -31,7 +31,7 @@ DEB_DH_MAKESHLIBS_ARGS_umbrello-trinity			:= -V'umbrello-trinity (>= 4:3.5.8-1)'
 DEB_INSTALL_CHANGELOGS_cervisia-trinity := cervisia/ChangeLog
 DEB_INSTALL_CHANGELOGS_kapptemplate-trinity := kapptemplate/ChangeLog
 DEB_INSTALL_CHANGELOGS_kbabel-trinity := kbabel/ChangeLog
-DEB_INSTALL_CHANGELOGS_kcachegrind-trinity := kcachegrind/ChangeLog
+DEB_INSTALL_CHANGELOGS_tdecachegrind-trinity := tdecachegrind/ChangeLog
 DEB_INSTALL_CHANGELOGS_kompare-trinity := kompare/ChangeLog
 DEB_INSTALL_CHANGELOGS_umbrello-trinity := umbrello/ChangeLog
 
diff --git a/debian/lenny/tdesdk/debian/tdecachegrind-converters-trinity.docs b/debian/lenny/tdesdk/debian/tdecachegrind-converters-trinity.docs
new file mode 100644
index 000000000..613037510
--- /dev/null
+++ b/debian/lenny/tdesdk/debian/tdecachegrind-converters-trinity.docs
@@ -0,0 +1 @@
+tdecachegrind/converters/README
diff --git a/debian/lenny/tdesdk/debian/kcachegrind-converters-trinity.install b/debian/lenny/tdesdk/debian/tdecachegrind-converters-trinity.install
index 742cfc523..742cfc523 100644
--- a/debian/lenny/tdesdk/debian/kcachegrind-converters-trinity.install
+++ b/debian/lenny/tdesdk/debian/tdecachegrind-converters-trinity.install
diff --git a/debian/lenny/tdesdk/debian/kcachegrind-converters-trinity.manpages b/debian/lenny/tdesdk/debian/tdecachegrind-converters-trinity.manpages
index 977c48e2d..977c48e2d 100644
--- a/debian/lenny/tdesdk/debian/kcachegrind-converters-trinity.manpages
+++ b/debian/lenny/tdesdk/debian/tdecachegrind-converters-trinity.manpages
diff --git a/debian/lenny/tdesdk/debian/kcachegrind-trinity.README.Debian b/debian/lenny/tdesdk/debian/tdecachegrind-trinity.README.Debian
index 25ddc2247..25ddc2247 100644
--- a/debian/lenny/tdesdk/debian/kcachegrind-trinity.README.Debian
+++ b/debian/lenny/tdesdk/debian/tdecachegrind-trinity.README.Debian
diff --git a/debian/lenny/tdesdk/debian/tdecachegrind-trinity.docs b/debian/lenny/tdesdk/debian/tdecachegrind-trinity.docs
new file mode 100644
index 000000000..dd7f4d534
--- /dev/null
+++ b/debian/lenny/tdesdk/debian/tdecachegrind-trinity.docs
@@ -0,0 +1,3 @@
+tdecachegrind/AUTHORS
+tdecachegrind/README
+tdecachegrind/TODO
diff --git a/debian/lenny/tdesdk/debian/tdecachegrind-trinity.install b/debian/lenny/tdesdk/debian/tdecachegrind-trinity.install
new file mode 100644
index 000000000..4bad0216b
--- /dev/null
+++ b/debian/lenny/tdesdk/debian/tdecachegrind-trinity.install
@@ -0,0 +1,19 @@
+debian/tmp/opt/trinity/bin/tdecachegrind
+debian/tmp/opt/trinity/share/applications/kde/tdecachegrind.desktop
+debian/tmp/opt/trinity/share/apps/tdecachegrind/icons/hicolor/16x16/actions/fromrec.png
+debian/tmp/opt/trinity/share/apps/tdecachegrind/icons/hicolor/16x16/actions/percent.png
+debian/tmp/opt/trinity/share/apps/tdecachegrind/icons/hicolor/16x16/actions/recrec.png
+debian/tmp/opt/trinity/share/apps/tdecachegrind/icons/hicolor/16x16/actions/torec.png
+debian/tmp/opt/trinity/share/apps/tdecachegrind/icons/hicolor/22x22/actions/percent.png
+debian/tmp/opt/trinity/share/apps/tdecachegrind/icons/hicolor/32x32/actions/percent.png
+debian/tmp/opt/trinity/share/apps/tdecachegrind/tdecachegrindui.rc
+debian/tmp/opt/trinity/share/apps/tdecachegrind/tips
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdecachegrind/*.bz2
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdecachegrind/common
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdecachegrind/*.docbook
+debian/tmp/opt/trinity/share/icons/locolor/32x32/apps/tdecachegrind.png
+debian/tmp/opt/trinity/share/icons/locolor/16x16/apps/tdecachegrind.png
+debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/tdecachegrind.png
+debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/tdecachegrind.png
+debian/tmp/opt/trinity/share/mimelnk/application/x-tdecachegrind.desktop
+debian/icons/tdecachegrind.xpm /opt/trinity/share/pixmaps
diff --git a/debian/lenny/tdesdk/debian/tdecachegrind-trinity.manpages b/debian/lenny/tdesdk/debian/tdecachegrind-trinity.manpages
new file mode 100644
index 000000000..367c3db5d
--- /dev/null
+++ b/debian/lenny/tdesdk/debian/tdecachegrind-trinity.manpages
@@ -0,0 +1 @@
+debian/man/tdecachegrind.1
diff --git a/debian/lenny/tdesdk/debian/kcachegrind-trinity.menu b/debian/lenny/tdesdk/debian/tdecachegrind-trinity.menu
index 83cd74714..bde1e7a53 100644
--- a/debian/lenny/tdesdk/debian/kcachegrind-trinity.menu
+++ b/debian/lenny/tdesdk/debian/tdecachegrind-trinity.menu
@@ -1,9 +1,9 @@
-?package(kcachegrind):\
+?package(tdecachegrind):\
   needs="x11"\
   section="Applications/Programming"\
   hints="KDE"\
   title="KCachegrind"\
   longtitle="KCachegrind (Profiler Frontend)"\
-  icon="/usr/share/pixmaps/kcachegrind.xpm"\
-  command="/opt/trinity/bin/kcachegrind"
+  icon="/usr/share/pixmaps/tdecachegrind.xpm"\
+  command="/opt/trinity/bin/tdecachegrind"
 
diff --git a/debian/squeeze/tdesdk/debian/tdesdk-doc-html.doc-base.kcachegrind b/debian/lenny/tdesdk/debian/tdesdk-doc-html.doc-base.tdecachegrind
index 1ce09cab0..fca2157d6 100644
--- a/debian/squeeze/tdesdk/debian/tdesdk-doc-html.doc-base.kcachegrind
+++ b/debian/lenny/tdesdk/debian/tdesdk-doc-html.doc-base.tdecachegrind
@@ -1,4 +1,4 @@
-Document: tdesdk-doc-html-kcachegrind
+Document: tdesdk-doc-html-tdecachegrind
 Title: KCachegrind Handbook
 Author: Josef Weidendorfer <Josef.Weidendorfer@gmx.de>
 Abstract: KCachegrind is a profile data visualization tool, written
@@ -6,6 +6,6 @@ Abstract: KCachegrind is a profile data visualization tool, written
 Section: Apps/Programming
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/kcachegrind/index.html
-Files: /usr/share/doc/kde/HTML/en/kcachegrind/*.html
+Index: /usr/share/doc/kde/HTML/en/tdecachegrind/index.html
+Files: /usr/share/doc/kde/HTML/en/tdecachegrind/*.html
 
diff --git a/debian/squeeze/tde-i18n/debian/changelog b/debian/squeeze/tde-i18n/debian/changelog
index 1b8e2c2ba..7862961e0 100644
--- a/debian/squeeze/tde-i18n/debian/changelog
+++ b/debian/squeeze/tde-i18n/debian/changelog
@@ -300,7 +300,7 @@ tde-i18n (4:3.2.2-3) unstable; urgency=low
 
 tde-i18n (4:3.2.2-2) unstable; urgency=low
 
-  * corrected juk and kcachegrind conflict to <<4:3.2.1-1
+  * corrected juk and tdecachegrind conflict to <<4:3.2.1-1
   * conflicting with tdevelop-data (tdevelop version 2)
     because tdevelop version 3 translations are included in
     tde-i18n
diff --git a/debian/squeeze/tdelibs/debian/tdelibs4-trinity-dev.install b/debian/squeeze/tdelibs/debian/tdelibs4-trinity-dev.install
index eeb111f96..3d2e8e43b 100644
--- a/debian/squeeze/tdelibs/debian/tdelibs4-trinity-dev.install
+++ b/debian/squeeze/tdelibs/debian/tdelibs4-trinity-dev.install
@@ -532,9 +532,9 @@ debian/tmp/opt/trinity/include/kshred.h
 debian/tmp/opt/trinity/include/ksimpleconfig.h
 debian/tmp/opt/trinity/include/ksmimecrypto.h
 debian/tmp/opt/trinity/include/ksockaddr.h
-debian/tmp/opt/trinity/include/ksocketaddress.h
-debian/tmp/opt/trinity/include/ksocketbase.h
-debian/tmp/opt/trinity/include/ksocketdevice.h
+debian/tmp/opt/trinity/include/tdesocketaddress.h
+debian/tmp/opt/trinity/include/tdesocketbase.h
+debian/tmp/opt/trinity/include/tdesocketdevice.h
 debian/tmp/opt/trinity/include/ksock.h
 debian/tmp/opt/trinity/include/ksocks.h
 debian/tmp/opt/trinity/include/ksockssocketdevice.h
diff --git a/debian/squeeze/tdesdk/debian/changelog b/debian/squeeze/tdesdk/debian/changelog
index 288f761e6..276fb1d78 100644
--- a/debian/squeeze/tdesdk/debian/changelog
+++ b/debian/squeeze/tdesdk/debian/changelog
@@ -153,7 +153,7 @@ tdesdk (4:3.5.6-2) unstable; urgency=low
 
   +++ Changes by Sune Vuorela:
 
-  * Promote graphviz from kcachegrind Suggests to Recommends. (Closes: #407043)
+  * Promote graphviz from tdecachegrind Suggests to Recommends. (Closes: #407043)
   * Don't install the licensecheck script in tdesdk. The devscripts package
     has taken it and is working actively on it. Let tdesdk-scripts suggest
     devscripts instead. (Closes: #420154)
@@ -617,7 +617,7 @@ tdesdk (4:3.3.2-3) unstable; urgency=high
     under the LGPL.
   * Fix kdemangen.pl output to use minus instead of hyphen where appropriate,
     thanks to Achim Bohnet (closes: #295454).
-  * Fixed amd64/gcc-4.0 build by using longs for node IDs in kcachegrind,
+  * Fixed amd64/gcc-4.0 build by using longs for node IDs in tdecachegrind,
     thanks to Andreas Jochens (closes: #287032).
 
  -- Ben Burton <bab@debian.org>  Thu, 31 Mar 2005 19:59:13 +1000
@@ -672,8 +672,8 @@ tdesdk (4:3.3.1-1) unstable; urgency=medium
 tdesdk (4:3.3.0-1) unstable; urgency=low
 
   * New upstream release.
-  * New package kcachegrind-converters.  These foreign format converters
-    are packaged separately so that kcachegrind need not depend on php.
+  * New package tdecachegrind-converters.  These foreign format converters
+    are packaged separately so that tdecachegrind need not depend on php.
   * Binary package kmtrace has returned.  Note that the kmtrace libraries
     for debian are now installed in /usr/lib/kmtrace, not in /usr/lib as
     is done upstream.
@@ -712,7 +712,7 @@ tdesdk (4:3.2.2-1) unstable; urgency=low
   * New upstream bugfix release.
   * Add Conflicts/Replaces for umbrello-manual (closes: #237173).
   * Don't use Conflicts/Replaces elsewhere where we should just use Replaces.
-  * Have kcachegrind suggest graphviz (closes: #243883).
+  * Have tdecachegrind suggest graphviz (closes: #243883).
 
  -- Ben Burton <bab@debian.org>  Tue, 16 Mar 2004 09:15:01 +1100
 
@@ -735,8 +735,8 @@ tdesdk (4:3.2.0-1) unstable; urgency=low
   * New upstream release.
   * Many thanks to Ralf Nolden for all his help with packaging KDE 3.2.
   * Thanks to Robert Lemmen for previous packaging work on umbrello and
-    to Philipp Frauenfelder for previous packaging work on kcachegrind.
-  * New binary packages kcachegrind, kuiviewer and umbrello.
+    to Philipp Frauenfelder for previous packaging work on tdecachegrind.
+  * New binary packages tdecachegrind, kuiviewer and umbrello.
   * Created a new package tdesdk-doc-html for HTML documentation.
 
  -- Ben Burton <bab@debian.org>  Sat, 31 Jan 2004 12:08:48 +1100
diff --git a/debian/squeeze/tdesdk/debian/control b/debian/squeeze/tdesdk/debian/control
index 39fea60bc..76302c587 100644
--- a/debian/squeeze/tdesdk/debian/control
+++ b/debian/squeeze/tdesdk/debian/control
@@ -16,8 +16,8 @@ Architecture: all
 Section: kde
 Replaces: kdesdk-trinity (<< 4:14.0.0)
 Breaks: kdesdk-trinity (<< 4:14.0.0)
-Depends: cervisia-trinity (>= ${Source-Version}), kapptemplate-trinity (>= ${Source-Version}), kbabel-trinity (>= ${Source-Version}), kbugbuster-trinity (>= ${Source-Version}), kcachegrind-trinity (>= ${Source-Version}), tdesdk-kfile-plugins-trinity (>= ${Source-Version}), tdesdk-kio-plugins-trinity (>= ${Source-Version}) | tdesvn-kio-plugins-trinity, tdesdk-misc-trinity (>= ${Source-Version}), tdesdk-scripts-trinity, kmtrace-trinity (>= ${Source-Version}), kompare-trinity (>= ${Source-Version}), kspy-trinity (>= ${Source-Version}), kuiviewer-trinity (>= ${Source-Version}), kunittest-trinity (>= ${Source-Version}), poxml-trinity (>= ${Source-Version}), umbrello-trinity (>= ${Source-Version})
-Suggests: kcachegrind-converters-trinity, kbabel-trinity-dev, tdesdk-trinity-doc-html
+Depends: cervisia-trinity (>= ${Source-Version}), kapptemplate-trinity (>= ${Source-Version}), kbabel-trinity (>= ${Source-Version}), kbugbuster-trinity (>= ${Source-Version}), tdecachegrind-trinity (>= ${Source-Version}), tdesdk-kfile-plugins-trinity (>= ${Source-Version}), tdesdk-kio-plugins-trinity (>= ${Source-Version}) | tdesvn-kio-plugins-trinity, tdesdk-misc-trinity (>= ${Source-Version}), tdesdk-scripts-trinity, kmtrace-trinity (>= ${Source-Version}), kompare-trinity (>= ${Source-Version}), kspy-trinity (>= ${Source-Version}), kuiviewer-trinity (>= ${Source-Version}), kunittest-trinity (>= ${Source-Version}), poxml-trinity (>= ${Source-Version}), umbrello-trinity (>= ${Source-Version})
+Suggests: tdecachegrind-converters-trinity, kbabel-trinity-dev, tdesdk-trinity-doc-html
 Description: software development kit from the official Trinity release
  KDE (the K Desktop Environment) is a powerful Open Source graphical
  desktop environment for Unix workstations. It combines ease of use,
@@ -145,15 +145,15 @@ Description: a front end for the Trinity bug tracking system
  This package is part of Trinity, and a component of the KDE SDK module.
  See the 'kde-trinity' and 'tdesdk-trinity' packages for more information.
 
-Package: kcachegrind-trinity
+Package: tdecachegrind-trinity
 Architecture: any
 Section: devel
-Replaces: kcachegrind-trinity (<< 4:14.0.0)
-Breaks: kcachegrind-trinity (<< 4:14.0.0)
+Replaces: tdecachegrind-trinity (<< 4:14.0.0)
+Breaks: tdecachegrind-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}
-Conflicts: kcachegrind
+Conflicts: tdecachegrind
 Recommends: valgrind-callgrind-trinity | valgrind-calltree-trinity, graphviz
-Suggests: kcachegrind-converters-trinity, khelpcenter-trinity, tdesdk-trinity-doc-html
+Suggests: tdecachegrind-converters-trinity, khelpcenter-trinity, tdesdk-trinity-doc-html
 Description: visualisation tool for valgrind profiling output
  KCachegrind is a visualisation tool for the profiling data generated
  by calltree, a profiling skin for valgrind.  Applications can be
@@ -161,19 +161,19 @@ Description: visualisation tool for valgrind profiling output
  and plugin architectures are supported.
  .
  For visualising the output from other profiling tools, several converters
- can be found in the kcachegrind-converters package.
+ can be found in the tdecachegrind-converters package.
  .
  This package is part of Trinity, and a component of the KDE SDK module.
  See the 'kde-trinity' and 'tdesdk-trinity' packages for more information.
 
-Package: kcachegrind-converters-trinity
+Package: tdecachegrind-converters-trinity
 Architecture: all
 Section: devel
-Replaces: kcachegrind-converters-trinity (<< 4:14.0.0)
-Breaks: kcachegrind-converters-trinity (<< 4:14.0.0)
+Replaces: tdecachegrind-converters-trinity (<< 4:14.0.0)
+Breaks: tdecachegrind-converters-trinity (<< 4:14.0.0)
 Depends: ${perl:Depends}, php5-cli, python
-Conflicts: kcachegrind-converters
-Recommends: kcachegrind-trinity
+Conflicts: tdecachegrind-converters
+Recommends: tdecachegrind-trinity
 Description: format converters for KCachegrind profiling visualisation tool
  This is a collection of scripts for converting the output from
  different profiling tools into a format that KCachegrind can use.
diff --git a/debian/squeeze/tdesdk/debian/control.in b/debian/squeeze/tdesdk/debian/control.in
index c70b772a1..2e5b5c1ad 100644
--- a/debian/squeeze/tdesdk/debian/control.in
+++ b/debian/squeeze/tdesdk/debian/control.in
@@ -13,8 +13,8 @@ Standards-Version: 3.7.2
 Package: tdesdk
 Architecture: all
 Section: kde
-Depends: cervisia (>= ${Source-Version}), kapptemplate (>= ${Source-Version}), kbabel (>= ${Source-Version}), kbugbuster (>= ${Source-Version}), kcachegrind (>= ${Source-Version}), tdesdk-kfile-plugins (>= ${Source-Version}), tdesdk-kio-plugins (>= ${Source-Version}) | tdesvn-kio-plugins, tdesdk-misc (>= ${Source-Version}), tdesdk-scripts (>= ${Source-Version}), kmtrace (>= ${Source-Version}), kompare (>= ${Source-Version}), kspy (>= ${Source-Version}), kuiviewer (>= ${Source-Version}), kunittest (>= ${Source-Version}), poxml (>= ${Source-Version}), umbrello (>= ${Source-Version})
-Suggests: kcachegrind-converters, kbabel-dev, tdesdk-doc-html
+Depends: cervisia (>= ${Source-Version}), kapptemplate (>= ${Source-Version}), kbabel (>= ${Source-Version}), kbugbuster (>= ${Source-Version}), tdecachegrind (>= ${Source-Version}), tdesdk-kfile-plugins (>= ${Source-Version}), tdesdk-kio-plugins (>= ${Source-Version}) | tdesvn-kio-plugins, tdesdk-misc (>= ${Source-Version}), tdesdk-scripts (>= ${Source-Version}), kmtrace (>= ${Source-Version}), kompare (>= ${Source-Version}), kspy (>= ${Source-Version}), kuiviewer (>= ${Source-Version}), kunittest (>= ${Source-Version}), poxml (>= ${Source-Version}), umbrello (>= ${Source-Version})
+Suggests: tdecachegrind-converters, kbabel-dev, tdesdk-doc-html
 Description: software development kit from the official KDE release
  KDE (the K Desktop Environment) is a powerful Open Source graphical
  desktop environment for Unix workstations. It combines ease of use,
@@ -127,12 +127,12 @@ Description: a front end for the KDE bug tracking system
  This package is part of KDE, and a component of the KDE SDK module.
  See the 'kde' and 'tdesdk' packages for more information.
 
-Package: kcachegrind
+Package: tdecachegrind
 Architecture: any
 Section: devel
 Depends: ${shlibs:Depends}
 Recommends: valgrind-callgrind | valgrind-calltree, graphviz
-Suggests: kcachegrind-converters, khelpcenter, tdesdk-doc-html
+Suggests: tdecachegrind-converters, khelpcenter, tdesdk-doc-html
 Description: visualisation tool for valgrind profiling output
  KCachegrind is a visualisation tool for the profiling data generated
  by calltree, a profiling skin for valgrind.  Applications can be
@@ -140,16 +140,16 @@ Description: visualisation tool for valgrind profiling output
  and plugin architectures are supported.
  .
  For visualising the output from other profiling tools, several converters
- can be found in the kcachegrind-converters package.
+ can be found in the tdecachegrind-converters package.
  .
  This package is part of KDE, and a component of the KDE SDK module.
  See the 'kde' and 'tdesdk' packages for more information.
 
-Package: kcachegrind-converters
+Package: tdecachegrind-converters
 Architecture: all
 Section: devel
 Depends: ${perl:Depends}, php5-cli, python
-Recommends: kcachegrind
+Recommends: tdecachegrind
 Description: format converters for KCachegrind profiling visualisation tool
  This is a collection of scripts for converting the output from
  different profiling tools into a format that KCachegrind can use.
diff --git a/debian/squeeze/tdesdk/debian/copyright b/debian/squeeze/tdesdk/debian/copyright
index ca64fadb8..8574b5937 100644
--- a/debian/squeeze/tdesdk/debian/copyright
+++ b/debian/squeeze/tdesdk/debian/copyright
@@ -3,7 +3,7 @@ Fri, 26 Jan 2001 18:00:00 -0700.
 It was brought up to date by Ben Burton <bab@debian.org> on
 Mon, 26 Mar 2001 09:10:56 -0600.
 Thanks to Robert Lemmen and Philipp Frauenfelder for originally packaging
-umbrello and kcachegrind respectively.
+umbrello and tdecachegrind respectively.
 
 It was downloaded from: http://www.kde.org/download
 
diff --git a/debian/squeeze/tdesdk/debian/icons/kcachegrind.xpm b/debian/squeeze/tdesdk/debian/icons/tdecachegrind.xpm
index 843263759..bfcdfc6e2 100644
--- a/debian/squeeze/tdesdk/debian/icons/kcachegrind.xpm
+++ b/debian/squeeze/tdesdk/debian/icons/tdecachegrind.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * kcachegrind_xpm[] = {
+static char * tdecachegrind_xpm[] = {
 "32 30 256 2",
 "  	c None",
 ". 	c #0036CA",
diff --git a/debian/squeeze/tdesdk/debian/kcachegrind-converters-trinity.docs b/debian/squeeze/tdesdk/debian/kcachegrind-converters-trinity.docs
deleted file mode 100644
index b19a948df..000000000
--- a/debian/squeeze/tdesdk/debian/kcachegrind-converters-trinity.docs
+++ /dev/null
@@ -1 +0,0 @@
-kcachegrind/converters/README
diff --git a/debian/squeeze/tdesdk/debian/kcachegrind-trinity.docs b/debian/squeeze/tdesdk/debian/kcachegrind-trinity.docs
deleted file mode 100644
index aef510285..000000000
--- a/debian/squeeze/tdesdk/debian/kcachegrind-trinity.docs
+++ /dev/null
@@ -1,3 +0,0 @@
-kcachegrind/AUTHORS
-kcachegrind/README
-kcachegrind/TODO
diff --git a/debian/squeeze/tdesdk/debian/kcachegrind-trinity.install b/debian/squeeze/tdesdk/debian/kcachegrind-trinity.install
deleted file mode 100644
index eb19d1715..000000000
--- a/debian/squeeze/tdesdk/debian/kcachegrind-trinity.install
+++ /dev/null
@@ -1,19 +0,0 @@
-debian/tmp/opt/trinity/bin/kcachegrind
-debian/tmp/opt/trinity/share/applications/kde/kcachegrind.desktop
-debian/tmp/opt/trinity/share/apps/kcachegrind/icons/hicolor/16x16/actions/fromrec.png
-debian/tmp/opt/trinity/share/apps/kcachegrind/icons/hicolor/16x16/actions/percent.png
-debian/tmp/opt/trinity/share/apps/kcachegrind/icons/hicolor/16x16/actions/recrec.png
-debian/tmp/opt/trinity/share/apps/kcachegrind/icons/hicolor/16x16/actions/torec.png
-debian/tmp/opt/trinity/share/apps/kcachegrind/icons/hicolor/22x22/actions/percent.png
-debian/tmp/opt/trinity/share/apps/kcachegrind/icons/hicolor/32x32/actions/percent.png
-debian/tmp/opt/trinity/share/apps/kcachegrind/kcachegrindui.rc
-debian/tmp/opt/trinity/share/apps/kcachegrind/tips
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcachegrind/*.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcachegrind/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcachegrind/*.docbook
-debian/tmp/opt/trinity/share/icons/locolor/32x32/apps/kcachegrind.png
-debian/tmp/opt/trinity/share/icons/locolor/16x16/apps/kcachegrind.png
-debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kcachegrind.png
-debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kcachegrind.png
-debian/tmp/opt/trinity/share/mimelnk/application/x-kcachegrind.desktop
-debian/icons/kcachegrind.xpm /opt/trinity/share/pixmaps
diff --git a/debian/squeeze/tdesdk/debian/kcachegrind-trinity.manpages b/debian/squeeze/tdesdk/debian/kcachegrind-trinity.manpages
deleted file mode 100644
index f994baff0..000000000
--- a/debian/squeeze/tdesdk/debian/kcachegrind-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kcachegrind.1
diff --git a/debian/squeeze/tdesdk/debian/man/dprof2calltree.1 b/debian/squeeze/tdesdk/debian/man/dprof2calltree.1
index f1e7691a4..ce66a6b30 100644
--- a/debian/squeeze/tdesdk/debian/man/dprof2calltree.1
+++ b/debian/squeeze/tdesdk/debian/man/dprof2calltree.1
@@ -49,10 +49,10 @@ work with this data in KCachegrind as follows:
 .RS
 dprof2calltree -f tmin.out -o cachegrind.out.foo
 .br
-kcachegrind cachegrind.out.foo
+tdecachegrind cachegrind.out.foo
 .RE
 .SH SEE ALSO
-.BR kcachegrind (1).
+.BR tdecachegrind (1).
 .SH AUTHOR
 This converter was written by George Schlossnagle <george@omniti.com>.
 .br
diff --git a/debian/squeeze/tdesdk/debian/man/hotshot2calltree.1 b/debian/squeeze/tdesdk/debian/man/hotshot2calltree.1
index 3b31794aa..a07ce76b4 100644
--- a/debian/squeeze/tdesdk/debian/man/hotshot2calltree.1
+++ b/debian/squeeze/tdesdk/debian/man/hotshot2calltree.1
@@ -46,10 +46,10 @@ data in KCachegrind as follows.
 .RS
 hotshot2cachegrind \-o cachegrind.out.0 pythongrind.prof
 .br
-kcachegrind cachegrind.out.0
+tdecachegrind cachegrind.out.0
 .RE
 .SH SEE ALSO
-.BR kcachegrind (1).
+.BR tdecachegrind (1).
 .SH AUTHOR
 This converter was written by Jorg Beyer <job@webde-ag.de>.
 .br
diff --git a/debian/squeeze/tdesdk/debian/man/memprof2calltree.1 b/debian/squeeze/tdesdk/debian/man/memprof2calltree.1
index 0bd0582a3..c4042c126 100644
--- a/debian/squeeze/tdesdk/debian/man/memprof2calltree.1
+++ b/debian/squeeze/tdesdk/debian/man/memprof2calltree.1
@@ -28,7 +28,7 @@ corresponding calltree data will be written to standard output.
 .PP
 This utility is part of the KDE Software Development Kit.
 .SH SEE ALSO
-.BR kcachegrind (1).
+.BR tdecachegrind (1).
 .SH AUTHOR
 This converter was written by Josef Weidendorfer <Josef.Weidendorfer@gmx.de>.
 .br
diff --git a/debian/squeeze/tdesdk/debian/man/op2calltree.1 b/debian/squeeze/tdesdk/debian/man/op2calltree.1
index c81836a46..d18231d3e 100644
--- a/debian/squeeze/tdesdk/debian/man/op2calltree.1
+++ b/debian/squeeze/tdesdk/debian/man/op2calltree.1
@@ -35,7 +35,7 @@ application, to a file of the form \fIoprof.out.<app>\fP.
 .PP
 This utility is part of the KDE Software Development Kit.
 .SH SEE ALSO
-.BR kcachegrind (1).
+.BR tdecachegrind (1).
 .SH AUTHOR
 This converter was written by Josef Weidendorfer <Josef.Weidendorfer@gmx.de>.
 .br
diff --git a/debian/squeeze/tdesdk/debian/man/pprof2calltree.1 b/debian/squeeze/tdesdk/debian/man/pprof2calltree.1
index dc80f91ad..b98a06aec 100644
--- a/debian/squeeze/tdesdk/debian/man/pprof2calltree.1
+++ b/debian/squeeze/tdesdk/debian/man/pprof2calltree.1
@@ -40,11 +40,11 @@ follows.
 .RS
 pprof2calltree -f pprof.12345.1
 .br
-kcachegrind cachegrind.out.12345.1
+tdecachegrind cachegrind.out.12345.1
 .RE
 .PP
 .SH SEE ALSO
-.BR kcachegrind (1).
+.BR tdecachegrind (1).
 .SH AUTHOR
 This converter was written by George Schlossnagle <george@omniti.com>.
 .br
diff --git a/debian/squeeze/tdesdk/debian/man/kcachegrind.1 b/debian/squeeze/tdesdk/debian/man/tdecachegrind.1
index ce3296b8c..6e4d92a15 100644
--- a/debian/squeeze/tdesdk/debian/man/kcachegrind.1
+++ b/debian/squeeze/tdesdk/debian/man/tdecachegrind.1
@@ -2,7 +2,7 @@
 .\" First parameter, NAME, should be all caps
 .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
 .\" other parameters are allowed: see man(7), man(1)
-.TH KCACHEGRIND 1 "March 25, 2005"
+.TH TDECACHEGRIND 1 "March 25, 2005"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .\" Some roff macros, for reference:
@@ -16,9 +16,9 @@
 .\" .sp <n>    insert n+1 empty lines
 .\" for manpage-specific macros, see man(7)
 .SH NAME
-kcachegrind \- a visualisation tool for valgrind profiling output
+tdecachegrind \- a visualisation tool for valgrind profiling output
 .SH SYNOPSIS
-.B kcachegrind
+.B tdecachegrind
 .RI "[ " generic-options " ]"
 [ \fB\-r\fP \fIexec\fP ] [ \fItrace-file\fP ]
 .SH DESCRIPTION
@@ -29,12 +29,12 @@ and plugin architectures are supported.
 .PP
 For visualising the output from other profiling tools, several converters
 are available.  On Debian systems these can be found in the
-\fIkcachegrind-converters\fP package.
+\fItdecachegrind-converters\fP package.
 .PP
 This application is part of the KDE Software Development Kit.
 .SH OPTIONS
-Below are the kcachegrind-specific options.
-For a full summary of options, run \fIkcachegrind \-\-help\fP.
+Below are the tdecachegrind-specific options.
+For a full summary of options, run \fItdecachegrind \-\-help\fP.
 .TP
 \fB\-r\fP \fIexec\fP
 Run the program \fIexec\fP under cachegrind.
@@ -52,14 +52,14 @@ Visualise data from the given trace.
 .PP
 Full user documentation is available through the KDE Help Centre.
 You can also enter the URL
-\fIhelp:/kcachegrind/\fP
+\fIhelp:/tdecachegrind/\fP
 directly into konqueror or you can run
-`\fIkhelpcenter help:/kcachegrind/\fP'
+`\fIkhelpcenter help:/tdecachegrind/\fP'
 from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
 \fItdesdk-doc-html\fP and read this documentation in HTML format from
-\fI/usr/share/doc/kde/HTML/en/kcachegrind/\fP.
+\fI/usr/share/doc/kde/HTML/en/tdecachegrind/\fP.
 .SH AUTHOR
 KCachegrind was written by Josef Weidendorfer <Josef.Weidendorfer@gmx.de>.
 .br
diff --git a/debian/squeeze/tdesdk/debian/rules b/debian/squeeze/tdesdk/debian/rules
index fc163e6d7..e7b228f2b 100755
--- a/debian/squeeze/tdesdk/debian/rules
+++ b/debian/squeeze/tdesdk/debian/rules
@@ -31,7 +31,7 @@ DEB_DH_MAKESHLIBS_ARGS_umbrello-trinity			:= -V'umbrello-trinity (>= 4:3.5.8-1)'
 DEB_INSTALL_CHANGELOGS_cervisia-trinity := cervisia/ChangeLog
 DEB_INSTALL_CHANGELOGS_kapptemplate-trinity := kapptemplate/ChangeLog
 DEB_INSTALL_CHANGELOGS_kbabel-trinity := kbabel/ChangeLog
-DEB_INSTALL_CHANGELOGS_kcachegrind-trinity := kcachegrind/ChangeLog
+DEB_INSTALL_CHANGELOGS_tdecachegrind-trinity := tdecachegrind/ChangeLog
 DEB_INSTALL_CHANGELOGS_kompare-trinity := kompare/ChangeLog
 DEB_INSTALL_CHANGELOGS_umbrello-trinity := umbrello/ChangeLog
 
diff --git a/debian/squeeze/tdesdk/debian/tdecachegrind-converters-trinity.docs b/debian/squeeze/tdesdk/debian/tdecachegrind-converters-trinity.docs
new file mode 100644
index 000000000..613037510
--- /dev/null
+++ b/debian/squeeze/tdesdk/debian/tdecachegrind-converters-trinity.docs
@@ -0,0 +1 @@
+tdecachegrind/converters/README
diff --git a/debian/squeeze/tdesdk/debian/kcachegrind-converters-trinity.install b/debian/squeeze/tdesdk/debian/tdecachegrind-converters-trinity.install
index 742cfc523..742cfc523 100644
--- a/debian/squeeze/tdesdk/debian/kcachegrind-converters-trinity.install
+++ b/debian/squeeze/tdesdk/debian/tdecachegrind-converters-trinity.install
diff --git a/debian/squeeze/tdesdk/debian/kcachegrind-converters-trinity.manpages b/debian/squeeze/tdesdk/debian/tdecachegrind-converters-trinity.manpages
index 977c48e2d..977c48e2d 100644
--- a/debian/squeeze/tdesdk/debian/kcachegrind-converters-trinity.manpages
+++ b/debian/squeeze/tdesdk/debian/tdecachegrind-converters-trinity.manpages
diff --git a/debian/squeeze/tdesdk/debian/kcachegrind-trinity.README.Debian b/debian/squeeze/tdesdk/debian/tdecachegrind-trinity.README.Debian
index 25ddc2247..25ddc2247 100644
--- a/debian/squeeze/tdesdk/debian/kcachegrind-trinity.README.Debian
+++ b/debian/squeeze/tdesdk/debian/tdecachegrind-trinity.README.Debian
diff --git a/debian/squeeze/tdesdk/debian/tdecachegrind-trinity.docs b/debian/squeeze/tdesdk/debian/tdecachegrind-trinity.docs
new file mode 100644
index 000000000..dd7f4d534
--- /dev/null
+++ b/debian/squeeze/tdesdk/debian/tdecachegrind-trinity.docs
@@ -0,0 +1,3 @@
+tdecachegrind/AUTHORS
+tdecachegrind/README
+tdecachegrind/TODO
diff --git a/debian/squeeze/tdesdk/debian/tdecachegrind-trinity.install b/debian/squeeze/tdesdk/debian/tdecachegrind-trinity.install
new file mode 100644
index 000000000..4bad0216b
--- /dev/null
+++ b/debian/squeeze/tdesdk/debian/tdecachegrind-trinity.install
@@ -0,0 +1,19 @@
+debian/tmp/opt/trinity/bin/tdecachegrind
+debian/tmp/opt/trinity/share/applications/kde/tdecachegrind.desktop
+debian/tmp/opt/trinity/share/apps/tdecachegrind/icons/hicolor/16x16/actions/fromrec.png
+debian/tmp/opt/trinity/share/apps/tdecachegrind/icons/hicolor/16x16/actions/percent.png
+debian/tmp/opt/trinity/share/apps/tdecachegrind/icons/hicolor/16x16/actions/recrec.png
+debian/tmp/opt/trinity/share/apps/tdecachegrind/icons/hicolor/16x16/actions/torec.png
+debian/tmp/opt/trinity/share/apps/tdecachegrind/icons/hicolor/22x22/actions/percent.png
+debian/tmp/opt/trinity/share/apps/tdecachegrind/icons/hicolor/32x32/actions/percent.png
+debian/tmp/opt/trinity/share/apps/tdecachegrind/tdecachegrindui.rc
+debian/tmp/opt/trinity/share/apps/tdecachegrind/tips
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdecachegrind/*.bz2
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdecachegrind/common
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdecachegrind/*.docbook
+debian/tmp/opt/trinity/share/icons/locolor/32x32/apps/tdecachegrind.png
+debian/tmp/opt/trinity/share/icons/locolor/16x16/apps/tdecachegrind.png
+debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/tdecachegrind.png
+debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/tdecachegrind.png
+debian/tmp/opt/trinity/share/mimelnk/application/x-tdecachegrind.desktop
+debian/icons/tdecachegrind.xpm /opt/trinity/share/pixmaps
diff --git a/debian/squeeze/tdesdk/debian/tdecachegrind-trinity.manpages b/debian/squeeze/tdesdk/debian/tdecachegrind-trinity.manpages
new file mode 100644
index 000000000..367c3db5d
--- /dev/null
+++ b/debian/squeeze/tdesdk/debian/tdecachegrind-trinity.manpages
@@ -0,0 +1 @@
+debian/man/tdecachegrind.1
diff --git a/debian/squeeze/tdesdk/debian/kcachegrind-trinity.menu b/debian/squeeze/tdesdk/debian/tdecachegrind-trinity.menu
index 83cd74714..bde1e7a53 100644
--- a/debian/squeeze/tdesdk/debian/kcachegrind-trinity.menu
+++ b/debian/squeeze/tdesdk/debian/tdecachegrind-trinity.menu
@@ -1,9 +1,9 @@
-?package(kcachegrind):\
+?package(tdecachegrind):\
   needs="x11"\
   section="Applications/Programming"\
   hints="KDE"\
   title="KCachegrind"\
   longtitle="KCachegrind (Profiler Frontend)"\
-  icon="/usr/share/pixmaps/kcachegrind.xpm"\
-  command="/opt/trinity/bin/kcachegrind"
+  icon="/usr/share/pixmaps/tdecachegrind.xpm"\
+  command="/opt/trinity/bin/tdecachegrind"
 
diff --git a/debian/lenny/tdesdk/debian/tdesdk-doc-html.doc-base.kcachegrind b/debian/squeeze/tdesdk/debian/tdesdk-doc-html.doc-base.tdecachegrind
index 1ce09cab0..fca2157d6 100644
--- a/debian/lenny/tdesdk/debian/tdesdk-doc-html.doc-base.kcachegrind
+++ b/debian/squeeze/tdesdk/debian/tdesdk-doc-html.doc-base.tdecachegrind
@@ -1,4 +1,4 @@
-Document: tdesdk-doc-html-kcachegrind
+Document: tdesdk-doc-html-tdecachegrind
 Title: KCachegrind Handbook
 Author: Josef Weidendorfer <Josef.Weidendorfer@gmx.de>
 Abstract: KCachegrind is a profile data visualization tool, written
@@ -6,6 +6,6 @@ Abstract: KCachegrind is a profile data visualization tool, written
 Section: Apps/Programming
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/kcachegrind/index.html
-Files: /usr/share/doc/kde/HTML/en/kcachegrind/*.html
+Index: /usr/share/doc/kde/HTML/en/tdecachegrind/index.html
+Files: /usr/share/doc/kde/HTML/en/tdecachegrind/*.html