summaryrefslogtreecommitdiffstats
path: root/ubuntu/maverick_automake
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-01-31 02:46:19 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-01-31 02:46:19 -0600
commit487cb648a65392c0e2f409a83e8ba7d37d6e04cd (patch)
tree6a16c5e80fa38bdaee8baac31af644fb33730d6a /ubuntu/maverick_automake
parente7932ac715dd404fc17b20a0bca9b6a498d991c5 (diff)
downloadtde-packaging-487cb648a65392c0e2f409a83e8ba7d37d6e04cd.tar.gz
tde-packaging-487cb648a65392c0e2f409a83e8ba7d37d6e04cd.zip
Rename ksocket and kcache on Debian and Ubuntu
Diffstat (limited to 'ubuntu/maverick_automake')
-rw-r--r--ubuntu/maverick_automake/dependencies/arts/debian/patches/11_path_max_hurd.diff8
-rw-r--r--ubuntu/maverick_automake/kde-i18n/debian/changelog2
-rw-r--r--ubuntu/maverick_automake/kdelibs/debian/kdelibs4-kde3-dev.install6
-rw-r--r--ubuntu/maverick_automake/kdesdk/debian/changelog14
-rw-r--r--ubuntu/maverick_automake/kdesdk/debian/control18
-rw-r--r--ubuntu/maverick_automake/kdesdk/debian/control.in14
-rw-r--r--ubuntu/maverick_automake/kdesdk/debian/copyright2
-rw-r--r--ubuntu/maverick_automake/kdesdk/debian/icons/tdecachegrind.xpm (renamed from ubuntu/maverick_automake/kdesdk/debian/icons/kcachegrind.xpm)2
-rw-r--r--ubuntu/maverick_automake/kdesdk/debian/kcachegrind-converters-kde3.docs1
-rw-r--r--ubuntu/maverick_automake/kdesdk/debian/kcachegrind-kde3.docs3
-rw-r--r--ubuntu/maverick_automake/kdesdk/debian/kcachegrind-kde3.install19
-rw-r--r--ubuntu/maverick_automake/kdesdk/debian/kcachegrind-kde3.manpages1
-rw-r--r--ubuntu/maverick_automake/kdesdk/debian/kdesdk-doc-html.doc-base.tdecachegrind (renamed from ubuntu/maverick_automake/kdesdk/debian/kdesdk-doc-html.doc-base.kcachegrind)6
-rw-r--r--ubuntu/maverick_automake/kdesdk/debian/man/dprof2calltree.14
-rw-r--r--ubuntu/maverick_automake/kdesdk/debian/man/hotshot2calltree.14
-rw-r--r--ubuntu/maverick_automake/kdesdk/debian/man/memprof2calltree.12
-rw-r--r--ubuntu/maverick_automake/kdesdk/debian/man/op2calltree.12
-rw-r--r--ubuntu/maverick_automake/kdesdk/debian/man/pprof2calltree.14
-rw-r--r--ubuntu/maverick_automake/kdesdk/debian/man/tdecachegrind.1 (renamed from ubuntu/maverick_automake/kdesdk/debian/man/kcachegrind.1)18
-rwxr-xr-xubuntu/maverick_automake/kdesdk/debian/rules2
-rw-r--r--ubuntu/maverick_automake/kdesdk/debian/tdecachegrind-converters-kde3.docs1
-rw-r--r--ubuntu/maverick_automake/kdesdk/debian/tdecachegrind-converters-kde3.install (renamed from ubuntu/maverick_automake/kdesdk/debian/kcachegrind-converters-kde3.install)0
-rw-r--r--ubuntu/maverick_automake/kdesdk/debian/tdecachegrind-converters-kde3.manpages (renamed from ubuntu/maverick_automake/kdesdk/debian/kcachegrind-converters-kde3.manpages)0
-rw-r--r--ubuntu/maverick_automake/kdesdk/debian/tdecachegrind-kde3.README.Debian (renamed from ubuntu/maverick_automake/kdesdk/debian/kcachegrind-kde3.README.Debian)0
-rw-r--r--ubuntu/maverick_automake/kdesdk/debian/tdecachegrind-kde3.docs3
-rw-r--r--ubuntu/maverick_automake/kdesdk/debian/tdecachegrind-kde3.install19
-rw-r--r--ubuntu/maverick_automake/kdesdk/debian/tdecachegrind-kde3.manpages1
-rw-r--r--ubuntu/maverick_automake/kdesdk/debian/tdecachegrind-kde3.menu (renamed from ubuntu/maverick_automake/kdesdk/debian/kcachegrind-kde3.menu)6
28 files changed, 81 insertions, 81 deletions
diff --git a/ubuntu/maverick_automake/dependencies/arts/debian/patches/11_path_max_hurd.diff b/ubuntu/maverick_automake/dependencies/arts/debian/patches/11_path_max_hurd.diff
index 855ba5729..b35d4a2e0 100644
--- a/ubuntu/maverick_automake/dependencies/arts/debian/patches/11_path_max_hurd.diff
+++ b/ubuntu/maverick_automake/dependencies/arts/debian/patches/11_path_max_hurd.diff
@@ -54,11 +54,11 @@
- strncpy(user_tmp_dir, tmp, PATH_MAX );
- user_tmp_dir[ PATH_MAX ] = '\0';
-- strncat(user_tmp_dir, "/ksocket-", PATH_MAX - strlen(user_tmp_dir) );
+- strncat(user_tmp_dir, "/tdesocket-", PATH_MAX - strlen(user_tmp_dir) );
- user_tmp_dir[ PATH_MAX ] = '\0';
- strncat(user_tmp_dir, pw_ent->pw_name, PATH_MAX - strlen(user_tmp_dir));
- user_tmp_dir[ PATH_MAX ] = '\0';
-+ user_tmp_dir = string(tmp) + "/ksocket-" + string(pw_ent->pw_name);
++ user_tmp_dir = string(tmp) + "/tdesocket-" + string(pw_ent->pw_name);
if (!kde_home || !kde_home[0])
{
@@ -363,10 +363,10 @@
- char tmp_prefix[PATH_MAX+1];
- strcpy(tmp_prefix, tmp);
-- strcat(tmp_prefix, "/ksocket-");
+- strcat(tmp_prefix, "/tdesocket-");
-
- build_link(tmp_prefix, "/socket-");
-+ build_link(string(tmp) + "/ksocket-", "/socket-");
++ build_link(string(tmp) + "/tdesocket-", "/socket-");
mcop_dir = locate_mcop_dir();
}
if (!mcop_dir)
diff --git a/ubuntu/maverick_automake/kde-i18n/debian/changelog b/ubuntu/maverick_automake/kde-i18n/debian/changelog
index 2150d4236..b4a427061 100644
--- a/ubuntu/maverick_automake/kde-i18n/debian/changelog
+++ b/ubuntu/maverick_automake/kde-i18n/debian/changelog
@@ -300,7 +300,7 @@ kde-i18n (4:3.2.2-3) unstable; urgency=low
kde-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 kdevelop-data (kdevelop version 2)
because kdevelop version 3 translations are included in
kde-i18n
diff --git a/ubuntu/maverick_automake/kdelibs/debian/kdelibs4-kde3-dev.install b/ubuntu/maverick_automake/kdelibs/debian/kdelibs4-kde3-dev.install
index 57b3291f2..e2b5d076c 100644
--- a/ubuntu/maverick_automake/kdelibs/debian/kdelibs4-kde3-dev.install
+++ b/ubuntu/maverick_automake/kdelibs/debian/kdelibs4-kde3-dev.install
@@ -532,9 +532,9 @@ debian/tmp/opt/kde3/include/kde/kshred.h
debian/tmp/opt/kde3/include/kde/ksimpleconfig.h
debian/tmp/opt/kde3/include/kde/ksmimecrypto.h
debian/tmp/opt/kde3/include/kde/ksockaddr.h
-debian/tmp/opt/kde3/include/kde/ksocketaddress.h
-debian/tmp/opt/kde3/include/kde/ksocketbase.h
-debian/tmp/opt/kde3/include/kde/ksocketdevice.h
+debian/tmp/opt/kde3/include/kde/tdesocketaddress.h
+debian/tmp/opt/kde3/include/kde/tdesocketbase.h
+debian/tmp/opt/kde3/include/kde/tdesocketdevice.h
debian/tmp/opt/kde3/include/kde/ksock.h
debian/tmp/opt/kde3/include/kde/ksocks.h
debian/tmp/opt/kde3/include/kde/ksockssocketdevice.h
diff --git a/ubuntu/maverick_automake/kdesdk/debian/changelog b/ubuntu/maverick_automake/kdesdk/debian/changelog
index 25885a31a..6e4dc71dc 100644
--- a/ubuntu/maverick_automake/kdesdk/debian/changelog
+++ b/ubuntu/maverick_automake/kdesdk/debian/changelog
@@ -153,7 +153,7 @@ kdesdk (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 kdesdk. The devscripts package
has taken it and is working actively on it. Let kdesdk-scripts suggest
devscripts instead. (Closes: #420154)
@@ -617,7 +617,7 @@ kdesdk (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 @@ kdesdk (4:3.3.1-1) unstable; urgency=medium
kdesdk (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 @@ kdesdk (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 @@ kdesdk (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 kdesdk-doc-html for HTML documentation.
-- Ben Burton <bab@debian.org> Sat, 31 Jan 2004 12:08:48 +1100
diff --git a/ubuntu/maverick_automake/kdesdk/debian/control b/ubuntu/maverick_automake/kdesdk/debian/control
index dcd924a55..995f4136f 100644
--- a/ubuntu/maverick_automake/kdesdk/debian/control
+++ b/ubuntu/maverick_automake/kdesdk/debian/control
@@ -14,8 +14,8 @@ Standards-Version: 3.8.3
Package: kdesdk-kde3
Architecture: all
Section: kde
-Depends: cervisia-kde3 (>= ${Source-Version}), kapptemplate-kde3 (>= ${Source-Version}), kbabel-kde3 (>= ${Source-Version}), kbugbuster-kde3 (>= ${Source-Version}), kcachegrind-kde3 (>= ${Source-Version}), kdesdk-kfile-plugins-kde3 (>= ${Source-Version}), kdesdk-kio-plugins-kde3 (>= ${Source-Version}) | kdesvn-kio-plugins-kde3, kdesdk-misc-kde3 (>= ${Source-Version}), kdesdk-scripts-kde3, kmtrace-kde3 (>= ${Source-Version}), kompare-kde3 (>= ${Source-Version}), kspy-kde3 (>= ${Source-Version}), kuiviewer-kde3 (>= ${Source-Version}), kunittest-kde3 (>= ${Source-Version}), poxml-kde3 (>= ${Source-Version}), umbrello-kde3 (>= ${Source-Version})
-Suggests: kcachegrind-converters-kde3, kbabel-kde3-dev, kdesdk-kde3-doc-html
+Depends: cervisia-kde3 (>= ${Source-Version}), kapptemplate-kde3 (>= ${Source-Version}), kbabel-kde3 (>= ${Source-Version}), kbugbuster-kde3 (>= ${Source-Version}), tdecachegrind-kde3 (>= ${Source-Version}), kdesdk-kfile-plugins-kde3 (>= ${Source-Version}), kdesdk-kio-plugins-kde3 (>= ${Source-Version}) | kdesvn-kio-plugins-kde3, kdesdk-misc-kde3 (>= ${Source-Version}), kdesdk-scripts-kde3, kmtrace-kde3 (>= ${Source-Version}), kompare-kde3 (>= ${Source-Version}), kspy-kde3 (>= ${Source-Version}), kuiviewer-kde3 (>= ${Source-Version}), kunittest-kde3 (>= ${Source-Version}), poxml-kde3 (>= ${Source-Version}), umbrello-kde3 (>= ${Source-Version})
+Suggests: tdecachegrind-converters-kde3, kbabel-kde3-dev, kdesdk-kde3-doc-html
Description: software development kit from the official KDE3 release
KDE (the K Desktop Environment) is a powerful Open Source graphical
desktop environment for Unix workstations. It combines ease of use,
@@ -133,13 +133,13 @@ Description: a front end for the KDE3 bug tracking system
This package is part of KDE3, and a component of the KDE SDK module.
See the 'kde-kde3' and 'kdesdk-kde3' packages for more information.
-Package: kcachegrind-kde3
+Package: tdecachegrind-kde3
Architecture: any
Section: devel
Depends: ${shlibs:Depends}
-Conflicts: kcachegrind
+Conflicts: tdecachegrind
Recommends: valgrind-callgrind-kde3 | valgrind-calltree-kde3, graphviz
-Suggests: kcachegrind-converters-kde3, khelpcenter-kde3, kdesdk-kde3-doc-html
+Suggests: tdecachegrind-converters-kde3, khelpcenter-kde3, kdesdk-kde3-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
@@ -147,17 +147,17 @@ 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 KDE3, and a component of the KDE SDK module.
See the 'kde-kde3' and 'kdesdk-kde3' packages for more information.
-Package: kcachegrind-converters-kde3
+Package: tdecachegrind-converters-kde3
Architecture: all
Section: devel
Depends: ${perl:Depends}, php5-cli, python
-Conflicts: kcachegrind-converters
-Recommends: kcachegrind-kde3
+Conflicts: tdecachegrind-converters
+Recommends: tdecachegrind-kde3
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_automake/kdesdk/debian/control.in b/ubuntu/maverick_automake/kdesdk/debian/control.in
index 3a8aa1ced..fb2d6cec3 100644
--- a/ubuntu/maverick_automake/kdesdk/debian/control.in
+++ b/ubuntu/maverick_automake/kdesdk/debian/control.in
@@ -13,8 +13,8 @@ Standards-Version: 3.7.2
Package: kdesdk
Architecture: all
Section: kde
-Depends: cervisia (>= ${Source-Version}), kapptemplate (>= ${Source-Version}), kbabel (>= ${Source-Version}), kbugbuster (>= ${Source-Version}), kcachegrind (>= ${Source-Version}), kdesdk-kfile-plugins (>= ${Source-Version}), kdesdk-kio-plugins (>= ${Source-Version}) | kdesvn-kio-plugins, kdesdk-misc (>= ${Source-Version}), kdesdk-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, kdesdk-doc-html
+Depends: cervisia (>= ${Source-Version}), kapptemplate (>= ${Source-Version}), kbabel (>= ${Source-Version}), kbugbuster (>= ${Source-Version}), tdecachegrind (>= ${Source-Version}), kdesdk-kfile-plugins (>= ${Source-Version}), kdesdk-kio-plugins (>= ${Source-Version}) | kdesvn-kio-plugins, kdesdk-misc (>= ${Source-Version}), kdesdk-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, kdesdk-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 'kdesdk' 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, kdesdk-doc-html
+Suggests: tdecachegrind-converters, khelpcenter, kdesdk-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 'kdesdk' 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_automake/kdesdk/debian/copyright b/ubuntu/maverick_automake/kdesdk/debian/copyright
index 57c7c1593..ac5587a4a 100644
--- a/ubuntu/maverick_automake/kdesdk/debian/copyright
+++ b/ubuntu/maverick_automake/kdesdk/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_automake/kdesdk/debian/icons/kcachegrind.xpm b/ubuntu/maverick_automake/kdesdk/debian/icons/tdecachegrind.xpm
index 843263759..bfcdfc6e2 100644
--- a/ubuntu/maverick_automake/kdesdk/debian/icons/kcachegrind.xpm
+++ b/ubuntu/maverick_automake/kdesdk/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/ubuntu/maverick_automake/kdesdk/debian/kcachegrind-converters-kde3.docs b/ubuntu/maverick_automake/kdesdk/debian/kcachegrind-converters-kde3.docs
deleted file mode 100644
index b19a948df..000000000
--- a/ubuntu/maverick_automake/kdesdk/debian/kcachegrind-converters-kde3.docs
+++ /dev/null
@@ -1 +0,0 @@
-kcachegrind/converters/README
diff --git a/ubuntu/maverick_automake/kdesdk/debian/kcachegrind-kde3.docs b/ubuntu/maverick_automake/kdesdk/debian/kcachegrind-kde3.docs
deleted file mode 100644
index aef510285..000000000
--- a/ubuntu/maverick_automake/kdesdk/debian/kcachegrind-kde3.docs
+++ /dev/null
@@ -1,3 +0,0 @@
-kcachegrind/AUTHORS
-kcachegrind/README
-kcachegrind/TODO
diff --git a/ubuntu/maverick_automake/kdesdk/debian/kcachegrind-kde3.install b/ubuntu/maverick_automake/kdesdk/debian/kcachegrind-kde3.install
deleted file mode 100644
index 7b5f5605a..000000000
--- a/ubuntu/maverick_automake/kdesdk/debian/kcachegrind-kde3.install
+++ /dev/null
@@ -1,19 +0,0 @@
-debian/tmp/opt/kde3/bin/kcachegrind
-debian/tmp/opt/kde3/share/applications/kde/kcachegrind.desktop
-debian/tmp/opt/kde3/share/apps/kcachegrind/icons/hicolor/16x16/actions/fromrec.png
-debian/tmp/opt/kde3/share/apps/kcachegrind/icons/hicolor/16x16/actions/percent.png
-debian/tmp/opt/kde3/share/apps/kcachegrind/icons/hicolor/16x16/actions/recrec.png
-debian/tmp/opt/kde3/share/apps/kcachegrind/icons/hicolor/16x16/actions/torec.png
-debian/tmp/opt/kde3/share/apps/kcachegrind/icons/hicolor/22x22/actions/percent.png
-debian/tmp/opt/kde3/share/apps/kcachegrind/icons/hicolor/32x32/actions/percent.png
-debian/tmp/opt/kde3/share/apps/kcachegrind/kcachegrindui.rc
-debian/tmp/opt/kde3/share/apps/kcachegrind/tips
-debian/tmp/opt/kde3/share/doc/kde/HTML/en/kcachegrind/*.bz2
-debian/tmp/opt/kde3/share/doc/kde/HTML/en/kcachegrind/common
-debian/tmp/opt/kde3/share/doc/kde/HTML/en/kcachegrind/*.docbook
-debian/tmp/opt/kde3/share/icons/locolor/32x32/apps/kcachegrind.png
-debian/tmp/opt/kde3/share/icons/locolor/16x16/apps/kcachegrind.png
-debian/tmp/opt/kde3/share/icons/hicolor/48x48/apps/kcachegrind.png
-debian/tmp/opt/kde3/share/icons/hicolor/32x32/apps/kcachegrind.png
-debian/tmp/opt/kde3/share/mimelnk/application/x-kcachegrind.desktop
-debian/icons/kcachegrind.xpm /opt/kde3/share/pixmaps
diff --git a/ubuntu/maverick_automake/kdesdk/debian/kcachegrind-kde3.manpages b/ubuntu/maverick_automake/kdesdk/debian/kcachegrind-kde3.manpages
deleted file mode 100644
index f994baff0..000000000
--- a/ubuntu/maverick_automake/kdesdk/debian/kcachegrind-kde3.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kcachegrind.1
diff --git a/ubuntu/maverick_automake/kdesdk/debian/kdesdk-doc-html.doc-base.kcachegrind b/ubuntu/maverick_automake/kdesdk/debian/kdesdk-doc-html.doc-base.tdecachegrind
index d105a0bc8..23c698acb 100644
--- a/ubuntu/maverick_automake/kdesdk/debian/kdesdk-doc-html.doc-base.kcachegrind
+++ b/ubuntu/maverick_automake/kdesdk/debian/kdesdk-doc-html.doc-base.tdecachegrind
@@ -1,4 +1,4 @@
-Document: kdesdk-doc-html-kcachegrind
+Document: kdesdk-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/ubuntu/maverick_automake/kdesdk/debian/man/dprof2calltree.1 b/ubuntu/maverick_automake/kdesdk/debian/man/dprof2calltree.1
index f1e7691a4..ce66a6b30 100644
--- a/ubuntu/maverick_automake/kdesdk/debian/man/dprof2calltree.1
+++ b/ubuntu/maverick_automake/kdesdk/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_automake/kdesdk/debian/man/hotshot2calltree.1 b/ubuntu/maverick_automake/kdesdk/debian/man/hotshot2calltree.1
index 3b31794aa..a07ce76b4 100644
--- a/ubuntu/maverick_automake/kdesdk/debian/man/hotshot2calltree.1
+++ b/ubuntu/maverick_automake/kdesdk/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_automake/kdesdk/debian/man/memprof2calltree.1 b/ubuntu/maverick_automake/kdesdk/debian/man/memprof2calltree.1
index 0bd0582a3..c4042c126 100644
--- a/ubuntu/maverick_automake/kdesdk/debian/man/memprof2calltree.1
+++ b/ubuntu/maverick_automake/kdesdk/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_automake/kdesdk/debian/man/op2calltree.1 b/ubuntu/maverick_automake/kdesdk/debian/man/op2calltree.1
index c81836a46..d18231d3e 100644
--- a/ubuntu/maverick_automake/kdesdk/debian/man/op2calltree.1
+++ b/ubuntu/maverick_automake/kdesdk/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_automake/kdesdk/debian/man/pprof2calltree.1 b/ubuntu/maverick_automake/kdesdk/debian/man/pprof2calltree.1
index dc80f91ad..b98a06aec 100644
--- a/ubuntu/maverick_automake/kdesdk/debian/man/pprof2calltree.1
+++ b/ubuntu/maverick_automake/kdesdk/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_automake/kdesdk/debian/man/kcachegrind.1 b/ubuntu/maverick_automake/kdesdk/debian/man/tdecachegrind.1
index 4f7db6435..47f4c27b3 100644
--- a/ubuntu/maverick_automake/kdesdk/debian/man/kcachegrind.1
+++ b/ubuntu/maverick_automake/kdesdk/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
\fIkdesdk-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/ubuntu/maverick_automake/kdesdk/debian/rules b/ubuntu/maverick_automake/kdesdk/debian/rules
index d1da98bcc..bab4e2b82 100755
--- a/ubuntu/maverick_automake/kdesdk/debian/rules
+++ b/ubuntu/maverick_automake/kdesdk/debian/rules
@@ -31,7 +31,7 @@ DEB_DH_MAKESHLIBS_ARGS_umbrello-kde3 := -V'umbrello-kde3 (>= 4:3.5.8-1)'
DEB_INSTALL_CHANGELOGS_cervisia-kde3 := cervisia/ChangeLog
DEB_INSTALL_CHANGELOGS_kapptemplate-kde3 := kapptemplate/ChangeLog
DEB_INSTALL_CHANGELOGS_kbabel-kde3 := kbabel/ChangeLog
-DEB_INSTALL_CHANGELOGS_kcachegrind-kde3 := kcachegrind/ChangeLog
+DEB_INSTALL_CHANGELOGS_tdecachegrind-kde3 := tdecachegrind/ChangeLog
DEB_INSTALL_CHANGELOGS_kompare-kde3 := kompare/ChangeLog
DEB_INSTALL_CHANGELOGS_umbrello-kde3 := umbrello/ChangeLog
diff --git a/ubuntu/maverick_automake/kdesdk/debian/tdecachegrind-converters-kde3.docs b/ubuntu/maverick_automake/kdesdk/debian/tdecachegrind-converters-kde3.docs
new file mode 100644
index 000000000..613037510
--- /dev/null
+++ b/ubuntu/maverick_automake/kdesdk/debian/tdecachegrind-converters-kde3.docs
@@ -0,0 +1 @@
+tdecachegrind/converters/README
diff --git a/ubuntu/maverick_automake/kdesdk/debian/kcachegrind-converters-kde3.install b/ubuntu/maverick_automake/kdesdk/debian/tdecachegrind-converters-kde3.install
index c45981077..c45981077 100644
--- a/ubuntu/maverick_automake/kdesdk/debian/kcachegrind-converters-kde3.install
+++ b/ubuntu/maverick_automake/kdesdk/debian/tdecachegrind-converters-kde3.install
diff --git a/ubuntu/maverick_automake/kdesdk/debian/kcachegrind-converters-kde3.manpages b/ubuntu/maverick_automake/kdesdk/debian/tdecachegrind-converters-kde3.manpages
index 977c48e2d..977c48e2d 100644
--- a/ubuntu/maverick_automake/kdesdk/debian/kcachegrind-converters-kde3.manpages
+++ b/ubuntu/maverick_automake/kdesdk/debian/tdecachegrind-converters-kde3.manpages
diff --git a/ubuntu/maverick_automake/kdesdk/debian/kcachegrind-kde3.README.Debian b/ubuntu/maverick_automake/kdesdk/debian/tdecachegrind-kde3.README.Debian
index 3b9a9f290..3b9a9f290 100644
--- a/ubuntu/maverick_automake/kdesdk/debian/kcachegrind-kde3.README.Debian
+++ b/ubuntu/maverick_automake/kdesdk/debian/tdecachegrind-kde3.README.Debian
diff --git a/ubuntu/maverick_automake/kdesdk/debian/tdecachegrind-kde3.docs b/ubuntu/maverick_automake/kdesdk/debian/tdecachegrind-kde3.docs
new file mode 100644
index 000000000..dd7f4d534
--- /dev/null
+++ b/ubuntu/maverick_automake/kdesdk/debian/tdecachegrind-kde3.docs
@@ -0,0 +1,3 @@
+tdecachegrind/AUTHORS
+tdecachegrind/README
+tdecachegrind/TODO
diff --git a/ubuntu/maverick_automake/kdesdk/debian/tdecachegrind-kde3.install b/ubuntu/maverick_automake/kdesdk/debian/tdecachegrind-kde3.install
new file mode 100644
index 000000000..0a1090e0c
--- /dev/null
+++ b/ubuntu/maverick_automake/kdesdk/debian/tdecachegrind-kde3.install
@@ -0,0 +1,19 @@
+debian/tmp/opt/kde3/bin/tdecachegrind
+debian/tmp/opt/kde3/share/applications/kde/tdecachegrind.desktop
+debian/tmp/opt/kde3/share/apps/tdecachegrind/icons/hicolor/16x16/actions/fromrec.png
+debian/tmp/opt/kde3/share/apps/tdecachegrind/icons/hicolor/16x16/actions/percent.png
+debian/tmp/opt/kde3/share/apps/tdecachegrind/icons/hicolor/16x16/actions/recrec.png
+debian/tmp/opt/kde3/share/apps/tdecachegrind/icons/hicolor/16x16/actions/torec.png
+debian/tmp/opt/kde3/share/apps/tdecachegrind/icons/hicolor/22x22/actions/percent.png
+debian/tmp/opt/kde3/share/apps/tdecachegrind/icons/hicolor/32x32/actions/percent.png
+debian/tmp/opt/kde3/share/apps/tdecachegrind/tdecachegrindui.rc
+debian/tmp/opt/kde3/share/apps/tdecachegrind/tips
+debian/tmp/opt/kde3/share/doc/kde/HTML/en/tdecachegrind/*.bz2
+debian/tmp/opt/kde3/share/doc/kde/HTML/en/tdecachegrind/common
+debian/tmp/opt/kde3/share/doc/kde/HTML/en/tdecachegrind/*.docbook
+debian/tmp/opt/kde3/share/icons/locolor/32x32/apps/tdecachegrind.png
+debian/tmp/opt/kde3/share/icons/locolor/16x16/apps/tdecachegrind.png
+debian/tmp/opt/kde3/share/icons/hicolor/48x48/apps/tdecachegrind.png
+debian/tmp/opt/kde3/share/icons/hicolor/32x32/apps/tdecachegrind.png
+debian/tmp/opt/kde3/share/mimelnk/application/x-tdecachegrind.desktop
+debian/icons/tdecachegrind.xpm /opt/kde3/share/pixmaps
diff --git a/ubuntu/maverick_automake/kdesdk/debian/tdecachegrind-kde3.manpages b/ubuntu/maverick_automake/kdesdk/debian/tdecachegrind-kde3.manpages
new file mode 100644
index 000000000..367c3db5d
--- /dev/null
+++ b/ubuntu/maverick_automake/kdesdk/debian/tdecachegrind-kde3.manpages
@@ -0,0 +1 @@
+debian/man/tdecachegrind.1
diff --git a/ubuntu/maverick_automake/kdesdk/debian/kcachegrind-kde3.menu b/ubuntu/maverick_automake/kdesdk/debian/tdecachegrind-kde3.menu
index fb693d3ec..fb9e177a0 100644
--- a/ubuntu/maverick_automake/kdesdk/debian/kcachegrind-kde3.menu
+++ b/ubuntu/maverick_automake/kdesdk/debian/tdecachegrind-kde3.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/kde3/bin/kcachegrind"
+ icon="/usr/share/pixmaps/tdecachegrind.xpm"\
+ command="/opt/kde3/bin/tdecachegrind"