From 487cb648a65392c0e2f409a83e8ba7d37d6e04cd Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Tue, 31 Jan 2012 02:46:19 -0600
Subject: Rename ksocket and kcache on Debian and Ubuntu

---
 ubuntu/maverick/tdesdk/debian/changelog            |  14 +-
 ubuntu/maverick/tdesdk/debian/control              |  26 +-
 ubuntu/maverick/tdesdk/debian/control.in           |  14 +-
 ubuntu/maverick/tdesdk/debian/copyright            |   2 +-
 .../maverick/tdesdk/debian/icons/kcachegrind.xpm   | 289 ---------------------
 .../maverick/tdesdk/debian/icons/tdecachegrind.xpm | 289 +++++++++++++++++++++
 .../debian/kcachegrind-converters-trinity.docs     |   1 -
 .../debian/kcachegrind-converters-trinity.install  |   5 -
 .../debian/kcachegrind-converters-trinity.manpages |   5 -
 .../debian/kcachegrind-trinity.README.Debian       |   8 -
 .../tdesdk/debian/kcachegrind-trinity.docs         |   3 -
 .../tdesdk/debian/kcachegrind-trinity.install      |  19 --
 .../tdesdk/debian/kcachegrind-trinity.manpages     |   1 -
 .../tdesdk/debian/kcachegrind-trinity.menu         |   9 -
 ubuntu/maverick/tdesdk/debian/man/dprof2calltree.1 |   4 +-
 .../maverick/tdesdk/debian/man/hotshot2calltree.1  |   4 +-
 ubuntu/maverick/tdesdk/debian/man/kcachegrind.1    |  67 -----
 .../maverick/tdesdk/debian/man/memprof2calltree.1  |   2 +-
 ubuntu/maverick/tdesdk/debian/man/op2calltree.1    |   2 +-
 ubuntu/maverick/tdesdk/debian/man/pprof2calltree.1 |   4 +-
 ubuntu/maverick/tdesdk/debian/man/tdecachegrind.1  |  67 +++++
 ubuntu/maverick/tdesdk/debian/rules                |   2 +-
 .../debian/tdecachegrind-converters-trinity.docs   |   1 +
 .../tdecachegrind-converters-trinity.install       |   5 +
 .../tdecachegrind-converters-trinity.manpages      |   5 +
 .../debian/tdecachegrind-trinity.README.Debian     |   8 +
 .../tdesdk/debian/tdecachegrind-trinity.docs       |   3 +
 .../tdesdk/debian/tdecachegrind-trinity.install    |  19 ++
 .../tdesdk/debian/tdecachegrind-trinity.manpages   |   1 +
 .../tdesdk/debian/tdecachegrind-trinity.menu       |   9 +
 .../debian/tdesdk-doc-html.doc-base.kcachegrind    |  11 -
 .../debian/tdesdk-doc-html.doc-base.tdecachegrind  |  11 +
 32 files changed, 455 insertions(+), 455 deletions(-)
 delete mode 100644 ubuntu/maverick/tdesdk/debian/icons/kcachegrind.xpm
 create mode 100644 ubuntu/maverick/tdesdk/debian/icons/tdecachegrind.xpm
 delete mode 100644 ubuntu/maverick/tdesdk/debian/kcachegrind-converters-trinity.docs
 delete mode 100644 ubuntu/maverick/tdesdk/debian/kcachegrind-converters-trinity.install
 delete mode 100644 ubuntu/maverick/tdesdk/debian/kcachegrind-converters-trinity.manpages
 delete mode 100644 ubuntu/maverick/tdesdk/debian/kcachegrind-trinity.README.Debian
 delete mode 100644 ubuntu/maverick/tdesdk/debian/kcachegrind-trinity.docs
 delete mode 100644 ubuntu/maverick/tdesdk/debian/kcachegrind-trinity.install
 delete mode 100644 ubuntu/maverick/tdesdk/debian/kcachegrind-trinity.manpages
 delete mode 100644 ubuntu/maverick/tdesdk/debian/kcachegrind-trinity.menu
 delete mode 100644 ubuntu/maverick/tdesdk/debian/man/kcachegrind.1
 create mode 100644 ubuntu/maverick/tdesdk/debian/man/tdecachegrind.1
 create mode 100644 ubuntu/maverick/tdesdk/debian/tdecachegrind-converters-trinity.docs
 create mode 100644 ubuntu/maverick/tdesdk/debian/tdecachegrind-converters-trinity.install
 create mode 100644 ubuntu/maverick/tdesdk/debian/tdecachegrind-converters-trinity.manpages
 create mode 100644 ubuntu/maverick/tdesdk/debian/tdecachegrind-trinity.README.Debian
 create mode 100644 ubuntu/maverick/tdesdk/debian/tdecachegrind-trinity.docs
 create mode 100644 ubuntu/maverick/tdesdk/debian/tdecachegrind-trinity.install
 create mode 100644 ubuntu/maverick/tdesdk/debian/tdecachegrind-trinity.manpages
 create mode 100644 ubuntu/maverick/tdesdk/debian/tdecachegrind-trinity.menu
 delete mode 100644 ubuntu/maverick/tdesdk/debian/tdesdk-doc-html.doc-base.kcachegrind
 create mode 100644 ubuntu/maverick/tdesdk/debian/tdesdk-doc-html.doc-base.tdecachegrind

(limited to 'ubuntu/maverick/tdesdk')

diff --git a/ubuntu/maverick/tdesdk/debian/changelog b/ubuntu/maverick/tdesdk/debian/changelog
index 288f761e6..276fb1d78 100644
--- a/ubuntu/maverick/tdesdk/debian/changelog
+++ b/ubuntu/maverick/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/ubuntu/maverick/tdesdk/debian/control b/ubuntu/maverick/tdesdk/debian/control
index 39fea60bc..76302c587 100644
--- a/ubuntu/maverick/tdesdk/debian/control
+++ b/ubuntu/maverick/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/ubuntu/maverick/tdesdk/debian/control.in b/ubuntu/maverick/tdesdk/debian/control.in
index c70b772a1..2e5b5c1ad 100644
--- a/ubuntu/maverick/tdesdk/debian/control.in
+++ b/ubuntu/maverick/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/ubuntu/maverick/tdesdk/debian/copyright b/ubuntu/maverick/tdesdk/debian/copyright
index ca64fadb8..8574b5937 100644
--- a/ubuntu/maverick/tdesdk/debian/copyright
+++ b/ubuntu/maverick/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/ubuntu/maverick/tdesdk/debian/icons/kcachegrind.xpm b/ubuntu/maverick/tdesdk/debian/icons/kcachegrind.xpm
deleted file mode 100644
index 843263759..000000000
--- a/ubuntu/maverick/tdesdk/debian/icons/kcachegrind.xpm
+++ /dev/null
@@ -1,289 +0,0 @@
-/* XPM */
-static char * kcachegrind_xpm[] = {
-"32 30 256 2",
-"  	c None",
-". 	c #0036CA",
-"+ 	c #003FCA",
-"@ 	c #0842D6",
-"# 	c #004AD4",
-"$ 	c #1144D1",
-"% 	c #044CD0",
-"& 	c #004FD8",
-"* 	c #0056D9",
-"= 	c #1C52D0",
-"- 	c #2053D8",
-"; 	c #135AD7",
-"> 	c #0069E4",
-", 	c #0F64E0",
-"' 	c #2B59D1",
-") 	c #1365DB",
-"! 	c #2360D6",
-"~ 	c #0E70DE",
-"{ 	c #2A64D4",
-"] 	c #206BD3",
-"^ 	c #4362A7",
-"/ 	c #556185",
-"( 	c #0078F3",
-"_ 	c #246BDB",
-": 	c #236AE7",
-"< 	c #1872E7",
-"[ 	c #8E5A28",
-"} 	c #276CE2",
-"| 	c #346BCE",
-"1 	c #8A5D2F",
-"2 	c #7A5F59",
-"3 	c #516A92",
-"4 	c #426FA5",
-"5 	c #2D71D9",
-"6 	c #137CF1",
-"7 	c #167FE6",
-"8 	c #197FED",
-"9 	c #4C74A0",
-"0 	c #297AE2",
-"a 	c #2979E8",
-"b 	c #4875AC",
-"c 	c #96672C",
-"d 	c #0B8DDE",
-"e 	c #6C6C8D",
-"f 	c #3979DC",
-"g 	c #0092F7",
-"h 	c #3E80B5",
-"i 	c #0093FF",
-"j 	c #736F8B",
-"k 	c #4778DD",
-"l 	c #3285D2",
-"m 	c #3481E3",
-"n 	c #2987E8",
-"o 	c #009CFF",
-"p 	c #4281DD",
-"q 	c #A27035",
-"r 	c #A67331",
-"s 	c #00A2FF",
-"t 	c #6182A9",
-"u 	c #3E8ADF",
-"v 	c #87777E",
-"w 	c #338EE8",
-"x 	c #1798FF",
-"y 	c #6B7FA2",
-"z 	c #6682A3",
-"A 	c #3F8AE5",
-"B 	c #787C96",
-"C 	c #00A6FF",
-"D 	c #548CAA",
-"E 	c #B67522",
-"F 	c #AC7830",
-"G 	c #00ABFF",
-"H 	c #1F9CFC",
-"I 	c #3B92ED",
-"J 	c #BB781D",
-"K 	c #458FE5",
-"L 	c #3C91F3",
-"M 	c #10A7FF",
-"N 	c #3D95EA",
-"O 	c #00B1FF",
-"P 	c #25A8CB",
-"Q 	c #7F839E",
-"R 	c #3D98E5",
-"S 	c #A18057",
-"T 	c #C17D19",
-"U 	c #00B7FF",
-"V 	c #2DA3FD",
-"W 	c #B78239",
-"X 	c #4699F5",
-"Y 	c #459BEF",
-"Z 	c #1EADFE",
-"` 	c #668EE2",
-" .	c #17B5EB",
-"..	c #1CB1F5",
-"+.	c #2DAAEF",
-"@.	c #8A8A9F",
-"#.	c #868DA1",
-"$.	c #5997E7",
-"%.	c #3EA2F6",
-"&.	c #519BEA",
-"*.	c #7293BB",
-"=.	c #AA885E",
-"-.	c #3FA1FC",
-";.	c #00C1FF",
-">.	c #49A0EE",
-",.	c #8A8DA8",
-"'.	c #6B94E2",
-").	c #CE871B",
-"!.	c #7897B3",
-"~.	c #00C7FF",
-"{.	c #15BEFF",
-"].	c #0DC6F4",
-"^.	c #8C94A8",
-"/.	c #8F92AD",
-"(.	c #00CCFF",
-"_.	c #7D99BC",
-":.	c #679EE3",
-"<.	c #3CB3F8",
-"[.	c #9696AC",
-"}.	c #43B7E2",
-"|.	c #20C4FF",
-"1.	c #3FB7F5",
-"2.	c #00D6FC",
-"3.	c #54AEEF",
-"4.	c #4DAFFD",
-"5.	c #74A0E7",
-"6.	c #05D4FF",
-"7.	c #4DB1F8",
-"8.	c #00DAF1",
-"9.	c #36BCFF",
-"0.	c #C69550",
-"a.	c #6FA5EA",
-"b.	c #49BBE6",
-"c.	c #25C9FE",
-"d.	c #35C2F9",
-"e.	c #57B3ED",
-"f.	c #45B9FE",
-"g.	c #00DCFF",
-"h.	c #7DA6CD",
-"i.	c #9C9CB2",
-"j.	c #BF9963",
-"k.	c #95A0BA",
-"l.	c #78A7E7",
-"m.	c #3BC2FF",
-"n.	c #89A5C8",
-"o.	c #65B0F3",
-"p.	c #00E3FF",
-"q.	c #14DBFF",
-"r.	c #60B7F9",
-"s.	c #3CCAF9",
-"t.	c #6FB2F0",
-"u.	c #14DFFE",
-"v.	c #DC9F3A",
-"w.	c #9BA7C1",
-"x.	c #31D2FF",
-"y.	c #A0A7BC",
-"z.	c #00ECFF",
-"A.	c #4DC7F8",
-"B.	c #42CDFD",
-"C.	c #32D6FE",
-"D.	c #6CBAF6",
-"E.	c #83B3E0",
-"F.	c #6BBCF2",
-"G.	c #4DCBF5",
-"H.	c #66C0FB",
-"I.	c #43D2FA",
-"J.	c #1BE6FE",
-"K.	c #9FAFC2",
-"L.	c #E5A739",
-"M.	c #92B6CB",
-"N.	c #35DCFD",
-"O.	c #AEABBC",
-"P.	c #A7AFC4",
-"Q.	c #E8A933",
-"R.	c #55CEFF",
-"S.	c #B7ADB3",
-"T.	c #9AB5D9",
-"U.	c #A8B3C1",
-"V.	c #56D2FD",
-"W.	c #49DAFB",
-"X.	c #95B7ED",
-"Y.	c #D7B05F",
-"Z.	c #6CCCF9",
-"`.	c #57D7FA",
-" +	c #A7BAC6",
-".+	c #F0AF3A",
-"++	c #AEB6CB",
-"@+	c #4BE0FB",
-"#+	c #3EE6FF",
-"$+	c #96C0E8",
-"%+	c #3EEAFC",
-"&+	c #D8B86B",
-"*+	c #92C5EB",
-"=+	c #AABDD6",
-"-+	c #81CEF7",
-";+	c #AFBED2",
-">+	c #5DE0FC",
-",+	c #90C8F5",
-"'+	c #B3BFCD",
-")+	c #A4C4E1",
-"!+	c #E7B969",
-"~+	c #BABECE",
-"{+	c #8CCFFA",
-"]+	c #5FE6FB",
-"^+	c #A9C9D9",
-"/+	c #9ACCF3",
-"(+	c #95D1F6",
-"_+	c #E5C36F",
-":+	c #9AD1F1",
-"<+	c #B7C7DA",
-"[+	c #57F2FE",
-"}+	c #A2CFF1",
-"|+	c #63EEFC",
-"1+	c #A1D3ED",
-"2+	c #99D5FB",
-"3+	c #EAC97B",
-"4+	c #BCD0DC",
-"5+	c #A2D9F8",
-"6+	c #ABD8EC",
-"7+	c #9DDDFB",
-"8+	c #F6CC73",
-"9+	c #A9DFF2",
-"0+	c #A5E1F9",
-"a+	c #F3D17C",
-"b+	c #F4D284",
-"c+	c #A8E4FC",
-"d+	c #ECD8A0",
-"e+	c #B0E6F9",
-"f+	c #B2E8FB",
-"g+	c #B6ECFF",
-"h+	c #B5F0FC",
-"i+	c #BCEEFB",
-"j+	c #C1EEF6",
-"k+	c #D6E7ED",
-"l+	c #B8F3FF",
-"m+	c #C0F2FF",
-"n+	c #C0F6FC",
-"o+	c #FFE8A9",
-"p+	c #C7F5FC",
-"q+	c #FAEBAA",
-"r+	c #F9EBB0",
-"s+	c #C2F9FF",
-"t+	c #D0F5FE",
-"u+	c #C4FBFF",
-"v+	c #D2F7FF",
-"w+	c #CAFDFC",
-"x+	c #D7F8FB",
-"y+	c #D2FCFD",
-"z+	c #CDFFFF",
-"A+	c #D5FFFF",
-"B+	c #E5FAF9",
-"C+	c #DDFFFF",
-"D+	c #E2FFFC",
-"E+	c #E9FFFE",
-"F+	c #F1FEFF",
-"G+	c #F8FDFF",
-"                          ++=+<+<+;+;+                          ",
-"                      P.T.*+/+{+2+2+1+)+++                      ",
-"                    w.E.,+7+0+c+0+0+e+9+1+K.                    ",
-"                  k.T.(+e+i+m+i+g+5+0+g+i+6+K.                  ",
-"                  n.,+0+i+w+A+v+i+m+f+i+m+i+^+                  ",
-"                ,.E.5+c+u+x+E+x+m+y+p+u+w+w+j+[.                ",
-"                ,.,+5+g+w+C+F+x+m+A+y+y+A+D+w+K.                ",
-"                ,.{+7+f+g+v+p+l+A+C+A+A+A+A+A+ +                ",
-"            m.g.!./+0+f+c+c+m+w+E+A+C+D+C+D+D+U.                ",
-"          -.%+p.D *+c+5+g+p+y+x+A+C+E+E+F+E+E+,.                ",
-"      q.s.A N.u.P n.7+c+c+g+s+w+C+C+E+E+G+F+k+e                 ",
-"    u.J.J.N.J.J.8.t 1+f+c+h+u+A+A+E+E+G+G+F+U.                  ",
-"    H.N.p.u.p. .| ^ _.5+i+g+u+A+A+E+E+F+G+~+B                   ",
-"    r.H.J.u.].w w l b _.6+p+s+w+A+C+E+B+'+@.i.[.                ",
-"  X K e.J.p.1.R       / z K.i+u+A+y+4+#.B i.O.S.0.).            ",
-"m.J.z.p.p.u.9.            3 3 z z 9 h d (     j.!+L.).          ",
-"r.#+p.u.g.2.c.                b.}.{.M G Z g 2 Y.q+b+.+).        ",
-"4.G.N.#+u.2.C.                W.W.Z.M s C H 4 W b+r+8+L.T       ",
-"X ' + ) Z.6.(.|.                [+>+s C u *     F &+r+b+.+J     ",
-"I ' % u D.C.(.(.9.              [+R.o C ]         r 3+o+b+L.E   ",
-"  0 a R t.C.~.c.|.+.            ]+O o o g a         q 3+r+8+v.[ ",
-"      A I.c.|.;.;.{.|.        9.Z o x H x C >         c &+d+=.v ",
-"      K `.~.~.|.s.U O O U {.9.V o o M Y V Z _           1 S v j ",
-"      K 3.x.H.f K Z.m.G M s o o g o &.= { !                     ",
-"    6 w n :.= 5 0 p <.M s <.7.r.s i %.5 #                       ",
-"      k A p ' } 5 a.1.C G >.{ p D.i o m                         ",
-"        } >     = X.-+M G w ! 5.l.H.H.}                         ",
-"                  l.p $.t.| + ` 5.'..                           ",
-"                  f ~ ) %     ' k #                             ",
-"                  % # % $                                       "};
diff --git a/ubuntu/maverick/tdesdk/debian/icons/tdecachegrind.xpm b/ubuntu/maverick/tdesdk/debian/icons/tdecachegrind.xpm
new file mode 100644
index 000000000..bfcdfc6e2
--- /dev/null
+++ b/ubuntu/maverick/tdesdk/debian/icons/tdecachegrind.xpm
@@ -0,0 +1,289 @@
+/* XPM */
+static char * tdecachegrind_xpm[] = {
+"32 30 256 2",
+"  	c None",
+". 	c #0036CA",
+"+ 	c #003FCA",
+"@ 	c #0842D6",
+"# 	c #004AD4",
+"$ 	c #1144D1",
+"% 	c #044CD0",
+"& 	c #004FD8",
+"* 	c #0056D9",
+"= 	c #1C52D0",
+"- 	c #2053D8",
+"; 	c #135AD7",
+"> 	c #0069E4",
+", 	c #0F64E0",
+"' 	c #2B59D1",
+") 	c #1365DB",
+"! 	c #2360D6",
+"~ 	c #0E70DE",
+"{ 	c #2A64D4",
+"] 	c #206BD3",
+"^ 	c #4362A7",
+"/ 	c #556185",
+"( 	c #0078F3",
+"_ 	c #246BDB",
+": 	c #236AE7",
+"< 	c #1872E7",
+"[ 	c #8E5A28",
+"} 	c #276CE2",
+"| 	c #346BCE",
+"1 	c #8A5D2F",
+"2 	c #7A5F59",
+"3 	c #516A92",
+"4 	c #426FA5",
+"5 	c #2D71D9",
+"6 	c #137CF1",
+"7 	c #167FE6",
+"8 	c #197FED",
+"9 	c #4C74A0",
+"0 	c #297AE2",
+"a 	c #2979E8",
+"b 	c #4875AC",
+"c 	c #96672C",
+"d 	c #0B8DDE",
+"e 	c #6C6C8D",
+"f 	c #3979DC",
+"g 	c #0092F7",
+"h 	c #3E80B5",
+"i 	c #0093FF",
+"j 	c #736F8B",
+"k 	c #4778DD",
+"l 	c #3285D2",
+"m 	c #3481E3",
+"n 	c #2987E8",
+"o 	c #009CFF",
+"p 	c #4281DD",
+"q 	c #A27035",
+"r 	c #A67331",
+"s 	c #00A2FF",
+"t 	c #6182A9",
+"u 	c #3E8ADF",
+"v 	c #87777E",
+"w 	c #338EE8",
+"x 	c #1798FF",
+"y 	c #6B7FA2",
+"z 	c #6682A3",
+"A 	c #3F8AE5",
+"B 	c #787C96",
+"C 	c #00A6FF",
+"D 	c #548CAA",
+"E 	c #B67522",
+"F 	c #AC7830",
+"G 	c #00ABFF",
+"H 	c #1F9CFC",
+"I 	c #3B92ED",
+"J 	c #BB781D",
+"K 	c #458FE5",
+"L 	c #3C91F3",
+"M 	c #10A7FF",
+"N 	c #3D95EA",
+"O 	c #00B1FF",
+"P 	c #25A8CB",
+"Q 	c #7F839E",
+"R 	c #3D98E5",
+"S 	c #A18057",
+"T 	c #C17D19",
+"U 	c #00B7FF",
+"V 	c #2DA3FD",
+"W 	c #B78239",
+"X 	c #4699F5",
+"Y 	c #459BEF",
+"Z 	c #1EADFE",
+"` 	c #668EE2",
+" .	c #17B5EB",
+"..	c #1CB1F5",
+"+.	c #2DAAEF",
+"@.	c #8A8A9F",
+"#.	c #868DA1",
+"$.	c #5997E7",
+"%.	c #3EA2F6",
+"&.	c #519BEA",
+"*.	c #7293BB",
+"=.	c #AA885E",
+"-.	c #3FA1FC",
+";.	c #00C1FF",
+">.	c #49A0EE",
+",.	c #8A8DA8",
+"'.	c #6B94E2",
+").	c #CE871B",
+"!.	c #7897B3",
+"~.	c #00C7FF",
+"{.	c #15BEFF",
+"].	c #0DC6F4",
+"^.	c #8C94A8",
+"/.	c #8F92AD",
+"(.	c #00CCFF",
+"_.	c #7D99BC",
+":.	c #679EE3",
+"<.	c #3CB3F8",
+"[.	c #9696AC",
+"}.	c #43B7E2",
+"|.	c #20C4FF",
+"1.	c #3FB7F5",
+"2.	c #00D6FC",
+"3.	c #54AEEF",
+"4.	c #4DAFFD",
+"5.	c #74A0E7",
+"6.	c #05D4FF",
+"7.	c #4DB1F8",
+"8.	c #00DAF1",
+"9.	c #36BCFF",
+"0.	c #C69550",
+"a.	c #6FA5EA",
+"b.	c #49BBE6",
+"c.	c #25C9FE",
+"d.	c #35C2F9",
+"e.	c #57B3ED",
+"f.	c #45B9FE",
+"g.	c #00DCFF",
+"h.	c #7DA6CD",
+"i.	c #9C9CB2",
+"j.	c #BF9963",
+"k.	c #95A0BA",
+"l.	c #78A7E7",
+"m.	c #3BC2FF",
+"n.	c #89A5C8",
+"o.	c #65B0F3",
+"p.	c #00E3FF",
+"q.	c #14DBFF",
+"r.	c #60B7F9",
+"s.	c #3CCAF9",
+"t.	c #6FB2F0",
+"u.	c #14DFFE",
+"v.	c #DC9F3A",
+"w.	c #9BA7C1",
+"x.	c #31D2FF",
+"y.	c #A0A7BC",
+"z.	c #00ECFF",
+"A.	c #4DC7F8",
+"B.	c #42CDFD",
+"C.	c #32D6FE",
+"D.	c #6CBAF6",
+"E.	c #83B3E0",
+"F.	c #6BBCF2",
+"G.	c #4DCBF5",
+"H.	c #66C0FB",
+"I.	c #43D2FA",
+"J.	c #1BE6FE",
+"K.	c #9FAFC2",
+"L.	c #E5A739",
+"M.	c #92B6CB",
+"N.	c #35DCFD",
+"O.	c #AEABBC",
+"P.	c #A7AFC4",
+"Q.	c #E8A933",
+"R.	c #55CEFF",
+"S.	c #B7ADB3",
+"T.	c #9AB5D9",
+"U.	c #A8B3C1",
+"V.	c #56D2FD",
+"W.	c #49DAFB",
+"X.	c #95B7ED",
+"Y.	c #D7B05F",
+"Z.	c #6CCCF9",
+"`.	c #57D7FA",
+" +	c #A7BAC6",
+".+	c #F0AF3A",
+"++	c #AEB6CB",
+"@+	c #4BE0FB",
+"#+	c #3EE6FF",
+"$+	c #96C0E8",
+"%+	c #3EEAFC",
+"&+	c #D8B86B",
+"*+	c #92C5EB",
+"=+	c #AABDD6",
+"-+	c #81CEF7",
+";+	c #AFBED2",
+">+	c #5DE0FC",
+",+	c #90C8F5",
+"'+	c #B3BFCD",
+")+	c #A4C4E1",
+"!+	c #E7B969",
+"~+	c #BABECE",
+"{+	c #8CCFFA",
+"]+	c #5FE6FB",
+"^+	c #A9C9D9",
+"/+	c #9ACCF3",
+"(+	c #95D1F6",
+"_+	c #E5C36F",
+":+	c #9AD1F1",
+"<+	c #B7C7DA",
+"[+	c #57F2FE",
+"}+	c #A2CFF1",
+"|+	c #63EEFC",
+"1+	c #A1D3ED",
+"2+	c #99D5FB",
+"3+	c #EAC97B",
+"4+	c #BCD0DC",
+"5+	c #A2D9F8",
+"6+	c #ABD8EC",
+"7+	c #9DDDFB",
+"8+	c #F6CC73",
+"9+	c #A9DFF2",
+"0+	c #A5E1F9",
+"a+	c #F3D17C",
+"b+	c #F4D284",
+"c+	c #A8E4FC",
+"d+	c #ECD8A0",
+"e+	c #B0E6F9",
+"f+	c #B2E8FB",
+"g+	c #B6ECFF",
+"h+	c #B5F0FC",
+"i+	c #BCEEFB",
+"j+	c #C1EEF6",
+"k+	c #D6E7ED",
+"l+	c #B8F3FF",
+"m+	c #C0F2FF",
+"n+	c #C0F6FC",
+"o+	c #FFE8A9",
+"p+	c #C7F5FC",
+"q+	c #FAEBAA",
+"r+	c #F9EBB0",
+"s+	c #C2F9FF",
+"t+	c #D0F5FE",
+"u+	c #C4FBFF",
+"v+	c #D2F7FF",
+"w+	c #CAFDFC",
+"x+	c #D7F8FB",
+"y+	c #D2FCFD",
+"z+	c #CDFFFF",
+"A+	c #D5FFFF",
+"B+	c #E5FAF9",
+"C+	c #DDFFFF",
+"D+	c #E2FFFC",
+"E+	c #E9FFFE",
+"F+	c #F1FEFF",
+"G+	c #F8FDFF",
+"                          ++=+<+<+;+;+                          ",
+"                      P.T.*+/+{+2+2+1+)+++                      ",
+"                    w.E.,+7+0+c+0+0+e+9+1+K.                    ",
+"                  k.T.(+e+i+m+i+g+5+0+g+i+6+K.                  ",
+"                  n.,+0+i+w+A+v+i+m+f+i+m+i+^+                  ",
+"                ,.E.5+c+u+x+E+x+m+y+p+u+w+w+j+[.                ",
+"                ,.,+5+g+w+C+F+x+m+A+y+y+A+D+w+K.                ",
+"                ,.{+7+f+g+v+p+l+A+C+A+A+A+A+A+ +                ",
+"            m.g.!./+0+f+c+c+m+w+E+A+C+D+C+D+D+U.                ",
+"          -.%+p.D *+c+5+g+p+y+x+A+C+E+E+F+E+E+,.                ",
+"      q.s.A N.u.P n.7+c+c+g+s+w+C+C+E+E+G+F+k+e                 ",
+"    u.J.J.N.J.J.8.t 1+f+c+h+u+A+A+E+E+G+G+F+U.                  ",
+"    H.N.p.u.p. .| ^ _.5+i+g+u+A+A+E+E+F+G+~+B                   ",
+"    r.H.J.u.].w w l b _.6+p+s+w+A+C+E+B+'+@.i.[.                ",
+"  X K e.J.p.1.R       / z K.i+u+A+y+4+#.B i.O.S.0.).            ",
+"m.J.z.p.p.u.9.            3 3 z z 9 h d (     j.!+L.).          ",
+"r.#+p.u.g.2.c.                b.}.{.M G Z g 2 Y.q+b+.+).        ",
+"4.G.N.#+u.2.C.                W.W.Z.M s C H 4 W b+r+8+L.T       ",
+"X ' + ) Z.6.(.|.                [+>+s C u *     F &+r+b+.+J     ",
+"I ' % u D.C.(.(.9.              [+R.o C ]         r 3+o+b+L.E   ",
+"  0 a R t.C.~.c.|.+.            ]+O o o g a         q 3+r+8+v.[ ",
+"      A I.c.|.;.;.{.|.        9.Z o x H x C >         c &+d+=.v ",
+"      K `.~.~.|.s.U O O U {.9.V o o M Y V Z _           1 S v j ",
+"      K 3.x.H.f K Z.m.G M s o o g o &.= { !                     ",
+"    6 w n :.= 5 0 p <.M s <.7.r.s i %.5 #                       ",
+"      k A p ' } 5 a.1.C G >.{ p D.i o m                         ",
+"        } >     = X.-+M G w ! 5.l.H.H.}                         ",
+"                  l.p $.t.| + ` 5.'..                           ",
+"                  f ~ ) %     ' k #                             ",
+"                  % # % $                                       "};
diff --git a/ubuntu/maverick/tdesdk/debian/kcachegrind-converters-trinity.docs b/ubuntu/maverick/tdesdk/debian/kcachegrind-converters-trinity.docs
deleted file mode 100644
index b19a948df..000000000
--- a/ubuntu/maverick/tdesdk/debian/kcachegrind-converters-trinity.docs
+++ /dev/null
@@ -1 +0,0 @@
-kcachegrind/converters/README
diff --git a/ubuntu/maverick/tdesdk/debian/kcachegrind-converters-trinity.install b/ubuntu/maverick/tdesdk/debian/kcachegrind-converters-trinity.install
deleted file mode 100644
index 742cfc523..000000000
--- a/ubuntu/maverick/tdesdk/debian/kcachegrind-converters-trinity.install
+++ /dev/null
@@ -1,5 +0,0 @@
-debian/tmp/opt/trinity/bin/dprof2calltree
-debian/tmp/opt/trinity/bin/hotshot2calltree
-debian/tmp/opt/trinity/bin/memprof2calltree
-debian/tmp/opt/trinity/bin/op2calltree
-debian/tmp/opt/trinity/bin/pprof2calltree
diff --git a/ubuntu/maverick/tdesdk/debian/kcachegrind-converters-trinity.manpages b/ubuntu/maverick/tdesdk/debian/kcachegrind-converters-trinity.manpages
deleted file mode 100644
index 977c48e2d..000000000
--- a/ubuntu/maverick/tdesdk/debian/kcachegrind-converters-trinity.manpages
+++ /dev/null
@@ -1,5 +0,0 @@
-debian/man/dprof2calltree.1
-debian/man/hotshot2calltree.1
-debian/man/memprof2calltree.1
-debian/man/op2calltree.1
-debian/man/pprof2calltree.1
diff --git a/ubuntu/maverick/tdesdk/debian/kcachegrind-trinity.README.Debian b/ubuntu/maverick/tdesdk/debian/kcachegrind-trinity.README.Debian
deleted file mode 100644
index 25ddc2247..000000000
--- a/ubuntu/maverick/tdesdk/debian/kcachegrind-trinity.README.Debian
+++ /dev/null
@@ -1,8 +0,0 @@
-KCachegrind for Debian
-----------------------
-
-This application provides documentation in a docbook format that the KDE
-Help Centre can display.  For HTML documentation that can be read in any
-web browser, see the package tdesdk-doc-html.
-
- -- Ben Burton <bab@debian.org>, Sat, 31 Jan 2004 12:08:48 +1100
diff --git a/ubuntu/maverick/tdesdk/debian/kcachegrind-trinity.docs b/ubuntu/maverick/tdesdk/debian/kcachegrind-trinity.docs
deleted file mode 100644
index aef510285..000000000
--- a/ubuntu/maverick/tdesdk/debian/kcachegrind-trinity.docs
+++ /dev/null
@@ -1,3 +0,0 @@
-kcachegrind/AUTHORS
-kcachegrind/README
-kcachegrind/TODO
diff --git a/ubuntu/maverick/tdesdk/debian/kcachegrind-trinity.install b/ubuntu/maverick/tdesdk/debian/kcachegrind-trinity.install
deleted file mode 100644
index eb19d1715..000000000
--- a/ubuntu/maverick/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/ubuntu/maverick/tdesdk/debian/kcachegrind-trinity.manpages b/ubuntu/maverick/tdesdk/debian/kcachegrind-trinity.manpages
deleted file mode 100644
index f994baff0..000000000
--- a/ubuntu/maverick/tdesdk/debian/kcachegrind-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kcachegrind.1
diff --git a/ubuntu/maverick/tdesdk/debian/kcachegrind-trinity.menu b/ubuntu/maverick/tdesdk/debian/kcachegrind-trinity.menu
deleted file mode 100644
index 83cd74714..000000000
--- a/ubuntu/maverick/tdesdk/debian/kcachegrind-trinity.menu
+++ /dev/null
@@ -1,9 +0,0 @@
-?package(kcachegrind):\
-  needs="x11"\
-  section="Applications/Programming"\
-  hints="KDE"\
-  title="KCachegrind"\
-  longtitle="KCachegrind (Profiler Frontend)"\
-  icon="/usr/share/pixmaps/kcachegrind.xpm"\
-  command="/opt/trinity/bin/kcachegrind"
-
diff --git a/ubuntu/maverick/tdesdk/debian/man/dprof2calltree.1 b/ubuntu/maverick/tdesdk/debian/man/dprof2calltree.1
index f1e7691a4..ce66a6b30 100644
--- a/ubuntu/maverick/tdesdk/debian/man/dprof2calltree.1
+++ b/ubuntu/maverick/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/ubuntu/maverick/tdesdk/debian/man/hotshot2calltree.1 b/ubuntu/maverick/tdesdk/debian/man/hotshot2calltree.1
index 3b31794aa..a07ce76b4 100644
--- a/ubuntu/maverick/tdesdk/debian/man/hotshot2calltree.1
+++ b/ubuntu/maverick/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/ubuntu/maverick/tdesdk/debian/man/kcachegrind.1 b/ubuntu/maverick/tdesdk/debian/man/kcachegrind.1
deleted file mode 100644
index ce3296b8c..000000000
--- a/ubuntu/maverick/tdesdk/debian/man/kcachegrind.1
+++ /dev/null
@@ -1,67 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" 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"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kcachegrind \- a visualisation tool for valgrind profiling output
-.SH SYNOPSIS
-.B kcachegrind
-.RI "[ " generic-options " ]"
-[ \fB\-r\fP \fIexec\fP ] [ \fItrace-file\fP ]
-.SH DESCRIPTION
-\fBKCachegrind\fP is a visualisation tool for the profiling data generated
-by \fBcalltree\fP, a profiling skin for \fBvalgrind\fP.  Applications can be
-profiled using calltree without being recompiled, and shared libraries
-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.
-.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.
-.TP
-\fB\-r\fP \fIexec\fP
-Run the program \fIexec\fP under cachegrind.
-.TP
-\fItrace-file\fP
-Visualise data from the given trace.
-.SH SEE ALSO
-.BR calltree (1),
-.BR dprof2calltree (1),
-.BR hotshot2calltree (1),
-.BR memprof2calltree (1),
-.BR op2calltree (1),
-.BR pprof2calltree (1),
-.BR valgrind (1).
-.PP
-Full user documentation is available through the KDE Help Centre.
-You can also enter the URL
-\fIhelp:/kcachegrind/\fP
-directly into konqueror or you can run
-`\fIkhelpcenter help:/kcachegrind/\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.
-.SH AUTHOR
-KCachegrind was written by Josef Weidendorfer <Josef.Weidendorfer@gmx.de>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/maverick/tdesdk/debian/man/memprof2calltree.1 b/ubuntu/maverick/tdesdk/debian/man/memprof2calltree.1
index 0bd0582a3..c4042c126 100644
--- a/ubuntu/maverick/tdesdk/debian/man/memprof2calltree.1
+++ b/ubuntu/maverick/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/ubuntu/maverick/tdesdk/debian/man/op2calltree.1 b/ubuntu/maverick/tdesdk/debian/man/op2calltree.1
index c81836a46..d18231d3e 100644
--- a/ubuntu/maverick/tdesdk/debian/man/op2calltree.1
+++ b/ubuntu/maverick/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/ubuntu/maverick/tdesdk/debian/man/pprof2calltree.1 b/ubuntu/maverick/tdesdk/debian/man/pprof2calltree.1
index dc80f91ad..b98a06aec 100644
--- a/ubuntu/maverick/tdesdk/debian/man/pprof2calltree.1
+++ b/ubuntu/maverick/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/ubuntu/maverick/tdesdk/debian/man/tdecachegrind.1 b/ubuntu/maverick/tdesdk/debian/man/tdecachegrind.1
new file mode 100644
index 000000000..6e4d92a15
--- /dev/null
+++ b/ubuntu/maverick/tdesdk/debian/man/tdecachegrind.1
@@ -0,0 +1,67 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" 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 TDECACHEGRIND 1 "March 25, 2005"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+tdecachegrind \- a visualisation tool for valgrind profiling output
+.SH SYNOPSIS
+.B tdecachegrind
+.RI "[ " generic-options " ]"
+[ \fB\-r\fP \fIexec\fP ] [ \fItrace-file\fP ]
+.SH DESCRIPTION
+\fBKCachegrind\fP is a visualisation tool for the profiling data generated
+by \fBcalltree\fP, a profiling skin for \fBvalgrind\fP.  Applications can be
+profiled using calltree without being recompiled, and shared libraries
+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
+\fItdecachegrind-converters\fP package.
+.PP
+This application is part of the KDE Software Development Kit.
+.SH OPTIONS
+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.
+.TP
+\fItrace-file\fP
+Visualise data from the given trace.
+.SH SEE ALSO
+.BR calltree (1),
+.BR dprof2calltree (1),
+.BR hotshot2calltree (1),
+.BR memprof2calltree (1),
+.BR op2calltree (1),
+.BR pprof2calltree (1),
+.BR valgrind (1).
+.PP
+Full user documentation is available through the KDE Help Centre.
+You can also enter the URL
+\fIhelp:/tdecachegrind/\fP
+directly into konqueror or you can run
+`\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/tdecachegrind/\fP.
+.SH AUTHOR
+KCachegrind was written by Josef Weidendorfer <Josef.Weidendorfer@gmx.de>.
+.br
+This manual page was prepared by Ben Burton <bab@debian.org>
+for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/maverick/tdesdk/debian/rules b/ubuntu/maverick/tdesdk/debian/rules
index fc163e6d7..e7b228f2b 100755
--- a/ubuntu/maverick/tdesdk/debian/rules
+++ b/ubuntu/maverick/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/ubuntu/maverick/tdesdk/debian/tdecachegrind-converters-trinity.docs b/ubuntu/maverick/tdesdk/debian/tdecachegrind-converters-trinity.docs
new file mode 100644
index 000000000..613037510
--- /dev/null
+++ b/ubuntu/maverick/tdesdk/debian/tdecachegrind-converters-trinity.docs
@@ -0,0 +1 @@
+tdecachegrind/converters/README
diff --git a/ubuntu/maverick/tdesdk/debian/tdecachegrind-converters-trinity.install b/ubuntu/maverick/tdesdk/debian/tdecachegrind-converters-trinity.install
new file mode 100644
index 000000000..742cfc523
--- /dev/null
+++ b/ubuntu/maverick/tdesdk/debian/tdecachegrind-converters-trinity.install
@@ -0,0 +1,5 @@
+debian/tmp/opt/trinity/bin/dprof2calltree
+debian/tmp/opt/trinity/bin/hotshot2calltree
+debian/tmp/opt/trinity/bin/memprof2calltree
+debian/tmp/opt/trinity/bin/op2calltree
+debian/tmp/opt/trinity/bin/pprof2calltree
diff --git a/ubuntu/maverick/tdesdk/debian/tdecachegrind-converters-trinity.manpages b/ubuntu/maverick/tdesdk/debian/tdecachegrind-converters-trinity.manpages
new file mode 100644
index 000000000..977c48e2d
--- /dev/null
+++ b/ubuntu/maverick/tdesdk/debian/tdecachegrind-converters-trinity.manpages
@@ -0,0 +1,5 @@
+debian/man/dprof2calltree.1
+debian/man/hotshot2calltree.1
+debian/man/memprof2calltree.1
+debian/man/op2calltree.1
+debian/man/pprof2calltree.1
diff --git a/ubuntu/maverick/tdesdk/debian/tdecachegrind-trinity.README.Debian b/ubuntu/maverick/tdesdk/debian/tdecachegrind-trinity.README.Debian
new file mode 100644
index 000000000..25ddc2247
--- /dev/null
+++ b/ubuntu/maverick/tdesdk/debian/tdecachegrind-trinity.README.Debian
@@ -0,0 +1,8 @@
+KCachegrind for Debian
+----------------------
+
+This application provides documentation in a docbook format that the KDE
+Help Centre can display.  For HTML documentation that can be read in any
+web browser, see the package tdesdk-doc-html.
+
+ -- Ben Burton <bab@debian.org>, Sat, 31 Jan 2004 12:08:48 +1100
diff --git a/ubuntu/maverick/tdesdk/debian/tdecachegrind-trinity.docs b/ubuntu/maverick/tdesdk/debian/tdecachegrind-trinity.docs
new file mode 100644
index 000000000..dd7f4d534
--- /dev/null
+++ b/ubuntu/maverick/tdesdk/debian/tdecachegrind-trinity.docs
@@ -0,0 +1,3 @@
+tdecachegrind/AUTHORS
+tdecachegrind/README
+tdecachegrind/TODO
diff --git a/ubuntu/maverick/tdesdk/debian/tdecachegrind-trinity.install b/ubuntu/maverick/tdesdk/debian/tdecachegrind-trinity.install
new file mode 100644
index 000000000..4bad0216b
--- /dev/null
+++ b/ubuntu/maverick/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/ubuntu/maverick/tdesdk/debian/tdecachegrind-trinity.manpages b/ubuntu/maverick/tdesdk/debian/tdecachegrind-trinity.manpages
new file mode 100644
index 000000000..367c3db5d
--- /dev/null
+++ b/ubuntu/maverick/tdesdk/debian/tdecachegrind-trinity.manpages
@@ -0,0 +1 @@
+debian/man/tdecachegrind.1
diff --git a/ubuntu/maverick/tdesdk/debian/tdecachegrind-trinity.menu b/ubuntu/maverick/tdesdk/debian/tdecachegrind-trinity.menu
new file mode 100644
index 000000000..bde1e7a53
--- /dev/null
+++ b/ubuntu/maverick/tdesdk/debian/tdecachegrind-trinity.menu
@@ -0,0 +1,9 @@
+?package(tdecachegrind):\
+  needs="x11"\
+  section="Applications/Programming"\
+  hints="KDE"\
+  title="KCachegrind"\
+  longtitle="KCachegrind (Profiler Frontend)"\
+  icon="/usr/share/pixmaps/tdecachegrind.xpm"\
+  command="/opt/trinity/bin/tdecachegrind"
+
diff --git a/ubuntu/maverick/tdesdk/debian/tdesdk-doc-html.doc-base.kcachegrind b/ubuntu/maverick/tdesdk/debian/tdesdk-doc-html.doc-base.kcachegrind
deleted file mode 100644
index 1ce09cab0..000000000
--- a/ubuntu/maverick/tdesdk/debian/tdesdk-doc-html.doc-base.kcachegrind
+++ /dev/null
@@ -1,11 +0,0 @@
-Document: tdesdk-doc-html-kcachegrind
-Title: KCachegrind Handbook
-Author: Josef Weidendorfer <Josef.Weidendorfer@gmx.de>
-Abstract: KCachegrind is a profile data visualization tool, written
- using the KDE environment.
-Section: Apps/Programming
-
-Format: HTML
-Index: /usr/share/doc/kde/HTML/en/kcachegrind/index.html
-Files: /usr/share/doc/kde/HTML/en/kcachegrind/*.html
-
diff --git a/ubuntu/maverick/tdesdk/debian/tdesdk-doc-html.doc-base.tdecachegrind b/ubuntu/maverick/tdesdk/debian/tdesdk-doc-html.doc-base.tdecachegrind
new file mode 100644
index 000000000..fca2157d6
--- /dev/null
+++ b/ubuntu/maverick/tdesdk/debian/tdesdk-doc-html.doc-base.tdecachegrind
@@ -0,0 +1,11 @@
+Document: tdesdk-doc-html-tdecachegrind
+Title: KCachegrind Handbook
+Author: Josef Weidendorfer <Josef.Weidendorfer@gmx.de>
+Abstract: KCachegrind is a profile data visualization tool, written
+ using the KDE environment.
+Section: Apps/Programming
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/tdecachegrind/index.html
+Files: /usr/share/doc/kde/HTML/en/tdecachegrind/*.html
+
-- 
cgit v1.2.1