diff --git a/debian/lenny/tdebase/debian/copyright b/debian/lenny/tdebase/debian/copyright
index 6455b1216..6c6bc4f78 100644
--- a/debian/lenny/tdebase/debian/copyright
+++ b/debian/lenny/tdebase/debian/copyright
@@ -29,7 +29,7 @@ konqueror, konsole, kpager, kpersonalizer, kreadconfig, kstart, ksysguard, ktip
LGPL
----
-kdebugdialog, kdesktop, khotkeys, kxkb, libkonq, nsplugins
+tdedebugdialog, kdesktop, khotkeys, kxkb, libkonq, nsplugins
----------------------
diff --git a/debian/lenny/tdebase/debian/man/kdebugdialog-trinity.1 b/debian/lenny/tdebase/debian/man/tdedebugdialog-trinity.1
similarity index 88%
rename from debian/lenny/tdebase/debian/man/kdebugdialog-trinity.1
rename to debian/lenny/tdebase/debian/man/tdedebugdialog-trinity.1
index b3b7327cf..638673127 100644
--- a/debian/lenny/tdebase/debian/man/kdebugdialog-trinity.1
+++ b/debian/lenny/tdebase/debian/man/tdedebugdialog-trinity.1
@@ -1,16 +1,16 @@
.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KDEBUGDIALOG 1 "June 2006" "K Desktop Environment" "control debug output"
+.TH TDEDEBUGDIALOG 1 "June 2006" "K Desktop Environment" "control debug output"
.SH NAME
-kdebugdialog
+tdedebugdialog
\- A dialog box for setting preferences for debug output
.SH SYNOPSIS
-\fBkdebugdialog\fP [Qt\-options] [KDE\-options] [options]
+\fBtdedebugdialog\fP [Qt\-options] [KDE\-options] [options]
.SH DESCRIPTION
-\fBKDebugDialog\fP shows a dialog box for managing diagnostic messages at runtime.
+\fBTDEDebugDialog\fP shows a dialog box for managing diagnostic messages at runtime.
.sp 1
-If you simply start \fBkdebugdialog\fP, you will see a list of \fBareas\fP, that can be disabled or enabled.
+If you simply start \fBtdedebugdialog\fP, you will see a list of \fBareas\fP, that can be disabled or enabled.
.sp 1
-If you start \fBkdebugdialog \-\-fullmode\fP, then for every severity level you can define separately what should be done with the diagnostic messages of that level, and the same for each debug area.
+If you start \fBtdedebugdialog \-\-fullmode\fP, then for every severity level you can define separately what should be done with the diagnostic messages of that level, and the same for each debug area.
.sp 1
In full mode, first you should select the debug area you are interested in from the drop down list at the top.
.sp 1
@@ -177,13 +177,13 @@ Don't run in the background.
.SH FILES
.I ~/.kde/share/config/kdebugrc
-\fBkdebugdialog\fP configuration file
+\fBtdedebugdialog\fP configuration file
.SH SEE ALSO
Full user documentation is available through the KDE Help Center. You can also enter the URL
-.BR help:/kdebugdialog/
+.BR help:/tdedebugdialog/
directly into konqueror or you can run
-.BR "khelpcenter help:/kdebugdialog/"
+.BR "khelpcenter help:/tdedebugdialog/"
from the command\-line.
.br
.SH AUTHORS
diff --git a/debian/lenny/tdebase/debian/rules b/debian/lenny/tdebase/debian/rules
index 96fa49923..015b236b2 100755
--- a/debian/lenny/tdebase/debian/rules
+++ b/debian/lenny/tdebase/debian/rules
@@ -80,7 +80,7 @@ DEB_DH_STRIP_ARGS := --dbg-package=tdebase-trinity-dbg
DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
&& echo xz || echo bzip2)
-DOC_HTML_PRUNE := kinfocenter ksplashml kcontrol khelpcenter tdesu knetattach tdeioslave kxkb kdebugdialog kdcop
+DOC_HTML_PRUNE := kinfocenter ksplashml kcontrol khelpcenter tdesu knetattach tdeioslave kxkb tdedebugdialog kdcop
PACKAGES_WITH_LIBS := kate-trinity kcontrol-trinity tdebase-trinity-bin kicker-trinity konqueror-trinity ksplash-trinity \
ksysguard-trinity twin-trinity libkonq4-trinity
diff --git a/debian/lenny/tdebase/debian/tdebase-trinity-bin.install b/debian/lenny/tdebase/debian/tdebase-trinity-bin.install
index d8c81024c..16772027a 100644
--- a/debian/lenny/tdebase/debian/tdebase-trinity-bin.install
+++ b/debian/lenny/tdebase/debian/tdebase-trinity-bin.install
@@ -6,7 +6,7 @@ debian/tmp/opt/trinity/bin/tdeinit_displayconfig
debian/tmp/opt/trinity/bin/tdmtsak
debian/tmp/opt/trinity/bin/tsak
debian/tmp/opt/trinity/bin/tdekbdledsync
-debian/tmp/opt/trinity/bin/kdebugdialog
+debian/tmp/opt/trinity/bin/tdedebugdialog
debian/tmp/opt/trinity/bin/kreadconfig
debian/tmp/opt/trinity/bin/kwriteconfig
debian/tmp/opt/trinity/bin/kstart
@@ -76,9 +76,9 @@ debian/tmp/opt/trinity/share/apps/khotkeys/printscreen.khotkeys
debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdcop/common
debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdcop/index.cache.bz2
debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdcop/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdebugdialog/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdebugdialog/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdebugdialog/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdedebugdialog/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdedebugdialog/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdedebugdialog/index.docbook
debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdesu/common
debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdesu/index.cache.bz2
debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdesu/index.docbook
diff --git a/debian/lenny/tdebase/debian/tdebase-trinity-bin.manpages b/debian/lenny/tdebase/debian/tdebase-trinity-bin.manpages
index d7be462a6..92b784172 100644
--- a/debian/lenny/tdebase/debian/tdebase-trinity-bin.manpages
+++ b/debian/lenny/tdebase/debian/tdebase-trinity-bin.manpages
@@ -3,7 +3,7 @@ debian/man/kblankscrn.kss-trinity.1
debian/man/kcheckpass-trinity.1
debian/man/kcminit-trinity.1
debian/man/kdcop-trinity.1
-debian/man/kdebugdialog-trinity.1
+debian/man/tdedebugdialog-trinity.1
debian/man/tdesu-trinity.1
debian/man/kdialog-trinity.1
debian/man/khotkeys-trinity.1
diff --git a/debian/lenny/tdebase/debian/tdebase-trinity-bin.menu b/debian/lenny/tdebase/debian/tdebase-trinity-bin.menu
index 4011466f4..920f59acd 100644
--- a/debian/lenny/tdebase/debian/tdebase-trinity-bin.menu
+++ b/debian/lenny/tdebase/debian/tdebase-trinity-bin.menu
@@ -2,8 +2,8 @@
needs="X11"\
section="Applications/System/Administration"\
hints="TDE"\
- title="KDebugDialog"\
- command="/opt/trinity/bin/kdebugdialog"
+ title="TDEDebugDialog"\
+ command="/opt/trinity/bin/tdedebugdialog"
?package(tdebase-bin):\
needs="X11"\
diff --git a/debian/squeeze/tdebase/debian/copyright b/debian/squeeze/tdebase/debian/copyright
index 6455b1216..6c6bc4f78 100644
--- a/debian/squeeze/tdebase/debian/copyright
+++ b/debian/squeeze/tdebase/debian/copyright
@@ -29,7 +29,7 @@ konqueror, konsole, kpager, kpersonalizer, kreadconfig, kstart, ksysguard, ktip
LGPL
----
-kdebugdialog, kdesktop, khotkeys, kxkb, libkonq, nsplugins
+tdedebugdialog, kdesktop, khotkeys, kxkb, libkonq, nsplugins
----------------------
diff --git a/debian/squeeze/tdebase/debian/man/kdebugdialog-trinity.1 b/debian/squeeze/tdebase/debian/man/tdedebugdialog-trinity.1
similarity index 88%
rename from debian/squeeze/tdebase/debian/man/kdebugdialog-trinity.1
rename to debian/squeeze/tdebase/debian/man/tdedebugdialog-trinity.1
index b3b7327cf..638673127 100644
--- a/debian/squeeze/tdebase/debian/man/kdebugdialog-trinity.1
+++ b/debian/squeeze/tdebase/debian/man/tdedebugdialog-trinity.1
@@ -1,16 +1,16 @@
.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KDEBUGDIALOG 1 "June 2006" "K Desktop Environment" "control debug output"
+.TH TDEDEBUGDIALOG 1 "June 2006" "K Desktop Environment" "control debug output"
.SH NAME
-kdebugdialog
+tdedebugdialog
\- A dialog box for setting preferences for debug output
.SH SYNOPSIS
-\fBkdebugdialog\fP [Qt\-options] [KDE\-options] [options]
+\fBtdedebugdialog\fP [Qt\-options] [KDE\-options] [options]
.SH DESCRIPTION
-\fBKDebugDialog\fP shows a dialog box for managing diagnostic messages at runtime.
+\fBTDEDebugDialog\fP shows a dialog box for managing diagnostic messages at runtime.
.sp 1
-If you simply start \fBkdebugdialog\fP, you will see a list of \fBareas\fP, that can be disabled or enabled.
+If you simply start \fBtdedebugdialog\fP, you will see a list of \fBareas\fP, that can be disabled or enabled.
.sp 1
-If you start \fBkdebugdialog \-\-fullmode\fP, then for every severity level you can define separately what should be done with the diagnostic messages of that level, and the same for each debug area.
+If you start \fBtdedebugdialog \-\-fullmode\fP, then for every severity level you can define separately what should be done with the diagnostic messages of that level, and the same for each debug area.
.sp 1
In full mode, first you should select the debug area you are interested in from the drop down list at the top.
.sp 1
@@ -177,13 +177,13 @@ Don't run in the background.
.SH FILES
.I ~/.kde/share/config/kdebugrc
-\fBkdebugdialog\fP configuration file
+\fBtdedebugdialog\fP configuration file
.SH SEE ALSO
Full user documentation is available through the KDE Help Center. You can also enter the URL
-.BR help:/kdebugdialog/
+.BR help:/tdedebugdialog/
directly into konqueror or you can run
-.BR "khelpcenter help:/kdebugdialog/"
+.BR "khelpcenter help:/tdedebugdialog/"
from the command\-line.
.br
.SH AUTHORS
diff --git a/debian/squeeze/tdebase/debian/rules b/debian/squeeze/tdebase/debian/rules
index 5776cd27d..64d9c11e1 100755
--- a/debian/squeeze/tdebase/debian/rules
+++ b/debian/squeeze/tdebase/debian/rules
@@ -80,7 +80,7 @@ DEB_DH_STRIP_ARGS := --dbg-package=tdebase-trinity-dbg
DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
&& echo xz || echo bzip2)
-DOC_HTML_PRUNE := kinfocenter ksplashml kcontrol khelpcenter tdesu knetattach tdeioslave kxkb kdebugdialog kdcop
+DOC_HTML_PRUNE := kinfocenter ksplashml kcontrol khelpcenter tdesu knetattach tdeioslave kxkb tdedebugdialog kdcop
PACKAGES_WITH_LIBS := kate-trinity kcontrol-trinity tdebase-trinity-bin kicker-trinity konqueror-trinity ksplash-trinity \
ksysguard-trinity twin-trinity libkonq4-trinity
diff --git a/debian/squeeze/tdebase/debian/tdebase-trinity-bin.install b/debian/squeeze/tdebase/debian/tdebase-trinity-bin.install
index d8c81024c..16772027a 100644
--- a/debian/squeeze/tdebase/debian/tdebase-trinity-bin.install
+++ b/debian/squeeze/tdebase/debian/tdebase-trinity-bin.install
@@ -6,7 +6,7 @@ debian/tmp/opt/trinity/bin/tdeinit_displayconfig
debian/tmp/opt/trinity/bin/tdmtsak
debian/tmp/opt/trinity/bin/tsak
debian/tmp/opt/trinity/bin/tdekbdledsync
-debian/tmp/opt/trinity/bin/kdebugdialog
+debian/tmp/opt/trinity/bin/tdedebugdialog
debian/tmp/opt/trinity/bin/kreadconfig
debian/tmp/opt/trinity/bin/kwriteconfig
debian/tmp/opt/trinity/bin/kstart
@@ -76,9 +76,9 @@ debian/tmp/opt/trinity/share/apps/khotkeys/printscreen.khotkeys
debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdcop/common
debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdcop/index.cache.bz2
debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdcop/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdebugdialog/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdebugdialog/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdebugdialog/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdedebugdialog/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdedebugdialog/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdedebugdialog/index.docbook
debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdesu/common
debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdesu/index.cache.bz2
debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdesu/index.docbook
diff --git a/debian/squeeze/tdebase/debian/tdebase-trinity-bin.manpages b/debian/squeeze/tdebase/debian/tdebase-trinity-bin.manpages
index d7be462a6..92b784172 100644
--- a/debian/squeeze/tdebase/debian/tdebase-trinity-bin.manpages
+++ b/debian/squeeze/tdebase/debian/tdebase-trinity-bin.manpages
@@ -3,7 +3,7 @@ debian/man/kblankscrn.kss-trinity.1
debian/man/kcheckpass-trinity.1
debian/man/kcminit-trinity.1
debian/man/kdcop-trinity.1
-debian/man/kdebugdialog-trinity.1
+debian/man/tdedebugdialog-trinity.1
debian/man/tdesu-trinity.1
debian/man/kdialog-trinity.1
debian/man/khotkeys-trinity.1
diff --git a/debian/squeeze/tdebase/debian/tdebase-trinity-bin.menu b/debian/squeeze/tdebase/debian/tdebase-trinity-bin.menu
index 4011466f4..920f59acd 100644
--- a/debian/squeeze/tdebase/debian/tdebase-trinity-bin.menu
+++ b/debian/squeeze/tdebase/debian/tdebase-trinity-bin.menu
@@ -2,8 +2,8 @@
needs="X11"\
section="Applications/System/Administration"\
hints="TDE"\
- title="KDebugDialog"\
- command="/opt/trinity/bin/kdebugdialog"
+ title="TDEDebugDialog"\
+ command="/opt/trinity/bin/tdedebugdialog"
?package(tdebase-bin):\
needs="X11"\
diff --git a/debian/wheezy/tdebase/debian/copyright b/debian/wheezy/tdebase/debian/copyright
index 6455b1216..6c6bc4f78 100644
--- a/debian/wheezy/tdebase/debian/copyright
+++ b/debian/wheezy/tdebase/debian/copyright
@@ -29,7 +29,7 @@ konqueror, konsole, kpager, kpersonalizer, kreadconfig, kstart, ksysguard, ktip
LGPL
----
-kdebugdialog, kdesktop, khotkeys, kxkb, libkonq, nsplugins
+tdedebugdialog, kdesktop, khotkeys, kxkb, libkonq, nsplugins
----------------------
diff --git a/debian/wheezy/tdebase/debian/man/kdebugdialog-trinity.1 b/debian/wheezy/tdebase/debian/man/tdedebugdialog-trinity.1
similarity index 88%
rename from debian/wheezy/tdebase/debian/man/kdebugdialog-trinity.1
rename to debian/wheezy/tdebase/debian/man/tdedebugdialog-trinity.1
index b3b7327cf..638673127 100644
--- a/debian/wheezy/tdebase/debian/man/kdebugdialog-trinity.1
+++ b/debian/wheezy/tdebase/debian/man/tdedebugdialog-trinity.1
@@ -1,16 +1,16 @@
.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KDEBUGDIALOG 1 "June 2006" "K Desktop Environment" "control debug output"
+.TH TDEDEBUGDIALOG 1 "June 2006" "K Desktop Environment" "control debug output"
.SH NAME
-kdebugdialog
+tdedebugdialog
\- A dialog box for setting preferences for debug output
.SH SYNOPSIS
-\fBkdebugdialog\fP [Qt\-options] [KDE\-options] [options]
+\fBtdedebugdialog\fP [Qt\-options] [KDE\-options] [options]
.SH DESCRIPTION
-\fBKDebugDialog\fP shows a dialog box for managing diagnostic messages at runtime.
+\fBTDEDebugDialog\fP shows a dialog box for managing diagnostic messages at runtime.
.sp 1
-If you simply start \fBkdebugdialog\fP, you will see a list of \fBareas\fP, that can be disabled or enabled.
+If you simply start \fBtdedebugdialog\fP, you will see a list of \fBareas\fP, that can be disabled or enabled.
.sp 1
-If you start \fBkdebugdialog \-\-fullmode\fP, then for every severity level you can define separately what should be done with the diagnostic messages of that level, and the same for each debug area.
+If you start \fBtdedebugdialog \-\-fullmode\fP, then for every severity level you can define separately what should be done with the diagnostic messages of that level, and the same for each debug area.
.sp 1
In full mode, first you should select the debug area you are interested in from the drop down list at the top.
.sp 1
@@ -177,13 +177,13 @@ Don't run in the background.
.SH FILES
.I ~/.kde/share/config/kdebugrc
-\fBkdebugdialog\fP configuration file
+\fBtdedebugdialog\fP configuration file
.SH SEE ALSO
Full user documentation is available through the KDE Help Center. You can also enter the URL
-.BR help:/kdebugdialog/
+.BR help:/tdedebugdialog/
directly into konqueror or you can run
-.BR "khelpcenter help:/kdebugdialog/"
+.BR "khelpcenter help:/tdedebugdialog/"
from the command\-line.
.br
.SH AUTHORS
diff --git a/debian/wheezy/tdebase/debian/rules b/debian/wheezy/tdebase/debian/rules
index 5776cd27d..64d9c11e1 100755
--- a/debian/wheezy/tdebase/debian/rules
+++ b/debian/wheezy/tdebase/debian/rules
@@ -80,7 +80,7 @@ DEB_DH_STRIP_ARGS := --dbg-package=tdebase-trinity-dbg
DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
&& echo xz || echo bzip2)
-DOC_HTML_PRUNE := kinfocenter ksplashml kcontrol khelpcenter tdesu knetattach tdeioslave kxkb kdebugdialog kdcop
+DOC_HTML_PRUNE := kinfocenter ksplashml kcontrol khelpcenter tdesu knetattach tdeioslave kxkb tdedebugdialog kdcop
PACKAGES_WITH_LIBS := kate-trinity kcontrol-trinity tdebase-trinity-bin kicker-trinity konqueror-trinity ksplash-trinity \
ksysguard-trinity twin-trinity libkonq4-trinity
diff --git a/debian/wheezy/tdebase/debian/tdebase-trinity-bin.install b/debian/wheezy/tdebase/debian/tdebase-trinity-bin.install
index d8c81024c..16772027a 100644
--- a/debian/wheezy/tdebase/debian/tdebase-trinity-bin.install
+++ b/debian/wheezy/tdebase/debian/tdebase-trinity-bin.install
@@ -6,7 +6,7 @@ debian/tmp/opt/trinity/bin/tdeinit_displayconfig
debian/tmp/opt/trinity/bin/tdmtsak
debian/tmp/opt/trinity/bin/tsak
debian/tmp/opt/trinity/bin/tdekbdledsync
-debian/tmp/opt/trinity/bin/kdebugdialog
+debian/tmp/opt/trinity/bin/tdedebugdialog
debian/tmp/opt/trinity/bin/kreadconfig
debian/tmp/opt/trinity/bin/kwriteconfig
debian/tmp/opt/trinity/bin/kstart
@@ -76,9 +76,9 @@ debian/tmp/opt/trinity/share/apps/khotkeys/printscreen.khotkeys
debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdcop/common
debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdcop/index.cache.bz2
debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdcop/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdebugdialog/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdebugdialog/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdebugdialog/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdedebugdialog/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdedebugdialog/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdedebugdialog/index.docbook
debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdesu/common
debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdesu/index.cache.bz2
debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdesu/index.docbook
diff --git a/debian/wheezy/tdebase/debian/tdebase-trinity-bin.manpages b/debian/wheezy/tdebase/debian/tdebase-trinity-bin.manpages
index d7be462a6..92b784172 100644
--- a/debian/wheezy/tdebase/debian/tdebase-trinity-bin.manpages
+++ b/debian/wheezy/tdebase/debian/tdebase-trinity-bin.manpages
@@ -3,7 +3,7 @@ debian/man/kblankscrn.kss-trinity.1
debian/man/kcheckpass-trinity.1
debian/man/kcminit-trinity.1
debian/man/kdcop-trinity.1
-debian/man/kdebugdialog-trinity.1
+debian/man/tdedebugdialog-trinity.1
debian/man/tdesu-trinity.1
debian/man/kdialog-trinity.1
debian/man/khotkeys-trinity.1
diff --git a/debian/wheezy/tdebase/debian/tdebase-trinity-bin.menu b/debian/wheezy/tdebase/debian/tdebase-trinity-bin.menu
index 4011466f4..920f59acd 100644
--- a/debian/wheezy/tdebase/debian/tdebase-trinity-bin.menu
+++ b/debian/wheezy/tdebase/debian/tdebase-trinity-bin.menu
@@ -2,8 +2,8 @@
needs="X11"\
section="Applications/System/Administration"\
hints="TDE"\
- title="KDebugDialog"\
- command="/opt/trinity/bin/kdebugdialog"
+ title="TDEDebugDialog"\
+ command="/opt/trinity/bin/tdedebugdialog"
?package(tdebase-bin):\
needs="X11"\
diff --git a/ubuntu/maverick/tdebase/debian/copyright b/ubuntu/maverick/tdebase/debian/copyright
index 6455b1216..6c6bc4f78 100644
--- a/ubuntu/maverick/tdebase/debian/copyright
+++ b/ubuntu/maverick/tdebase/debian/copyright
@@ -29,7 +29,7 @@ konqueror, konsole, kpager, kpersonalizer, kreadconfig, kstart, ksysguard, ktip
LGPL
----
-kdebugdialog, kdesktop, khotkeys, kxkb, libkonq, nsplugins
+tdedebugdialog, kdesktop, khotkeys, kxkb, libkonq, nsplugins
----------------------
diff --git a/ubuntu/maverick/tdebase/debian/man/kdebugdialog-trinity.1 b/ubuntu/maverick/tdebase/debian/man/tdedebugdialog-trinity.1
similarity index 88%
rename from ubuntu/maverick/tdebase/debian/man/kdebugdialog-trinity.1
rename to ubuntu/maverick/tdebase/debian/man/tdedebugdialog-trinity.1
index b3b7327cf..638673127 100644
--- a/ubuntu/maverick/tdebase/debian/man/kdebugdialog-trinity.1
+++ b/ubuntu/maverick/tdebase/debian/man/tdedebugdialog-trinity.1
@@ -1,16 +1,16 @@
.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KDEBUGDIALOG 1 "June 2006" "K Desktop Environment" "control debug output"
+.TH TDEDEBUGDIALOG 1 "June 2006" "K Desktop Environment" "control debug output"
.SH NAME
-kdebugdialog
+tdedebugdialog
\- A dialog box for setting preferences for debug output
.SH SYNOPSIS
-\fBkdebugdialog\fP [Qt\-options] [KDE\-options] [options]
+\fBtdedebugdialog\fP [Qt\-options] [KDE\-options] [options]
.SH DESCRIPTION
-\fBKDebugDialog\fP shows a dialog box for managing diagnostic messages at runtime.
+\fBTDEDebugDialog\fP shows a dialog box for managing diagnostic messages at runtime.
.sp 1
-If you simply start \fBkdebugdialog\fP, you will see a list of \fBareas\fP, that can be disabled or enabled.
+If you simply start \fBtdedebugdialog\fP, you will see a list of \fBareas\fP, that can be disabled or enabled.
.sp 1
-If you start \fBkdebugdialog \-\-fullmode\fP, then for every severity level you can define separately what should be done with the diagnostic messages of that level, and the same for each debug area.
+If you start \fBtdedebugdialog \-\-fullmode\fP, then for every severity level you can define separately what should be done with the diagnostic messages of that level, and the same for each debug area.
.sp 1
In full mode, first you should select the debug area you are interested in from the drop down list at the top.
.sp 1
@@ -177,13 +177,13 @@ Don't run in the background.
.SH FILES
.I ~/.kde/share/config/kdebugrc
-\fBkdebugdialog\fP configuration file
+\fBtdedebugdialog\fP configuration file
.SH SEE ALSO
Full user documentation is available through the KDE Help Center. You can also enter the URL
-.BR help:/kdebugdialog/
+.BR help:/tdedebugdialog/
directly into konqueror or you can run
-.BR "khelpcenter help:/kdebugdialog/"
+.BR "khelpcenter help:/tdedebugdialog/"
from the command\-line.
.br
.SH AUTHORS
diff --git a/ubuntu/maverick/tdebase/debian/rules b/ubuntu/maverick/tdebase/debian/rules
index e71d90afa..e0e3dd698 100755
--- a/ubuntu/maverick/tdebase/debian/rules
+++ b/ubuntu/maverick/tdebase/debian/rules
@@ -80,7 +80,7 @@ DEB_DH_STRIP_ARGS := --dbg-package=tdebase-trinity-dbg
DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
&& echo xz || echo bzip2)
-DOC_HTML_PRUNE := kinfocenter ksplashml kcontrol khelpcenter tdesu knetattach tdeioslave kxkb kdebugdialog kdcop
+DOC_HTML_PRUNE := kinfocenter ksplashml kcontrol khelpcenter tdesu knetattach tdeioslave kxkb tdedebugdialog kdcop
PACKAGES_WITH_LIBS := kate-trinity kcontrol-trinity tdebase-trinity-bin kicker-trinity konqueror-trinity ksplash-trinity \
ksysguard-trinity twin-trinity libkonq4-trinity
diff --git a/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.install b/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.install
index d8c81024c..16772027a 100644
--- a/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.install
+++ b/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.install
@@ -6,7 +6,7 @@ debian/tmp/opt/trinity/bin/tdeinit_displayconfig
debian/tmp/opt/trinity/bin/tdmtsak
debian/tmp/opt/trinity/bin/tsak
debian/tmp/opt/trinity/bin/tdekbdledsync
-debian/tmp/opt/trinity/bin/kdebugdialog
+debian/tmp/opt/trinity/bin/tdedebugdialog
debian/tmp/opt/trinity/bin/kreadconfig
debian/tmp/opt/trinity/bin/kwriteconfig
debian/tmp/opt/trinity/bin/kstart
@@ -76,9 +76,9 @@ debian/tmp/opt/trinity/share/apps/khotkeys/printscreen.khotkeys
debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdcop/common
debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdcop/index.cache.bz2
debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdcop/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdebugdialog/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdebugdialog/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdebugdialog/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdedebugdialog/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdedebugdialog/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdedebugdialog/index.docbook
debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdesu/common
debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdesu/index.cache.bz2
debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdesu/index.docbook
diff --git a/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.manpages b/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.manpages
index d7be462a6..92b784172 100644
--- a/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.manpages
+++ b/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.manpages
@@ -3,7 +3,7 @@ debian/man/kblankscrn.kss-trinity.1
debian/man/kcheckpass-trinity.1
debian/man/kcminit-trinity.1
debian/man/kdcop-trinity.1
-debian/man/kdebugdialog-trinity.1
+debian/man/tdedebugdialog-trinity.1
debian/man/tdesu-trinity.1
debian/man/kdialog-trinity.1
debian/man/khotkeys-trinity.1
diff --git a/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.menu b/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.menu
index 4011466f4..920f59acd 100644
--- a/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.menu
+++ b/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.menu
@@ -2,8 +2,8 @@
needs="X11"\
section="Applications/System/Administration"\
hints="TDE"\
- title="KDebugDialog"\
- command="/opt/trinity/bin/kdebugdialog"
+ title="TDEDebugDialog"\
+ command="/opt/trinity/bin/tdedebugdialog"
?package(tdebase-bin):\
needs="X11"\
diff --git a/ubuntu/precise/tdebase/debian/copyright b/ubuntu/precise/tdebase/debian/copyright
index 6455b1216..6c6bc4f78 100644
--- a/ubuntu/precise/tdebase/debian/copyright
+++ b/ubuntu/precise/tdebase/debian/copyright
@@ -29,7 +29,7 @@ konqueror, konsole, kpager, kpersonalizer, kreadconfig, kstart, ksysguard, ktip
LGPL
----
-kdebugdialog, kdesktop, khotkeys, kxkb, libkonq, nsplugins
+tdedebugdialog, kdesktop, khotkeys, kxkb, libkonq, nsplugins
----------------------
diff --git a/ubuntu/precise/tdebase/debian/man/kdebugdialog-trinity.1 b/ubuntu/precise/tdebase/debian/man/kdebugdialog-trinity.1
deleted file mode 100644
index b3b7327cf..000000000
--- a/ubuntu/precise/tdebase/debian/man/kdebugdialog-trinity.1
+++ /dev/null
@@ -1,200 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KDEBUGDIALOG 1 "June 2006" "K Desktop Environment" "control debug output"
-.SH NAME
-kdebugdialog
-\- A dialog box for setting preferences for debug output
-.SH SYNOPSIS
-\fBkdebugdialog\fP [Qt\-options] [KDE\-options] [options]
-.SH DESCRIPTION
-\fBKDebugDialog\fP shows a dialog box for managing diagnostic messages at runtime.
-.sp 1
-If you simply start \fBkdebugdialog\fP, you will see a list of \fBareas\fP, that can be disabled or enabled.
-.sp 1
-If you start \fBkdebugdialog \-\-fullmode\fP, then for every severity level you can define separately what should be done with the diagnostic messages of that level, and the same for each debug area.
-.sp 1
-In full mode, first you should select the debug area you are interested in from the drop down list at the top.
-.sp 1
-You may independently set the output for various types of messages:
-.sp 1
-.RS 3
-\- Information
-.br
-\- Warning
-.br
-\- Error
-.br
-\- Fatal Error
-.RE
-.PP
-For each of these types, you can set the following:
-.sp 1
-\fBOutput to\fP:
-.br
-In this Combobox, you can choose where the messages should be output. The choices are: \fBFile\fP?, \fBMessage Box\fP, \fBShell\fP (meaning stderr), \fBSyslog\fP an \fBNone\fP. Please do not direct fatal messages to syslog unless you are the system administrator yourself. The default is ?Message Box?.
-.sp 1
-\fBFilename:\fP
-.br
-This is only enabled when you have chosen \fBFile\fP as the output and provides the name of that file (which is interpreted as relative to the current folder). The default is \fIkdebug.dbg\fP.
-Apart from this, you can also tick the checkbox Abort on fatal errors. In this case, if a diagnostic message with the severity level KDEBUG_FATAL is output, the application aborts with a SIGABRT after outputting the message.
-.sp 1
-When you close the dialog by pressing OK, your entries apply immediately and are saved in \fIkdebugrc\fP. When you press Cancel, your entries are discarded and the old ones are restored.
-
-.SH OPTIONS
-.SS Options:
-.TP
-.B \-\-fullmode
-Show the fully\-fledged dialog instead of the default list dialog
-.TP
-.B \-\-on
-Turn area on
-.TP
-.B \-\-off
-Turn area off
-.SS Generic options:
-.TP
-.B \-\-help
-Show help about options
-.TP
-.B \-\-help\-qt
-Show Qt specific options
-.TP
-.B \-\-help\-kde
-Show KDE specific options
-.TP
-.B \-\-help\-all
-Show all options
-.TP
-.B \-\-author
-Show author information
-.TP
-.B \-v, \-\-version
-Show version information
-.TP
-.B \-\-license
-Show license information
-.TP
-.B \-\-
-End of options
-.SS
-.SS Qt options:
-.TP
-.B \-\-display
-Use the X-server display 'displayname'
-.TP
-.B \-\-session
-Restore the application for the given 'sessionId'
-.TP
-.B \-\-cmap
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B \-\-ncols
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B \-\-nograb
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B \-\-dograb
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B \-\-sync
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn, \-\-font
-defines the application font
-.TP
-.B \-\-bg, \-\-background
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg, \-\-foreground
-sets the default foreground color
-.TP
-.B \-\-btn, \-\-button
-sets the default button color
-.TP
-.B \-\-name
-sets the application name
-.TP
-.B \-\-title
-sets the application title (caption)
-.TP
-.B \-\-visual TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B \-\-inputstyle
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B \-\-im
-set XIM server
-.TP
-.B \-\-noxim
-disable XIM
-.TP
-.B \-\-reverse
-mirrors the whole layout of widgets
-.SS
-.SS KDE options:
-.TP
-.B \-\-caption
-Use 'caption' as name in the titlebar
-.TP
-.B \-\-icon
-Use 'icon' as the application icon
-.TP
-.B \-\-miniicon
-Use 'icon' as the icon in the titlebar
-.TP
-.B \-\-config
-Use alternative configuration file
-.TP
-.B \-\-dcopserver
-Use the DCOP Server specified by 'server'
-.TP
-.B \-\-nocrashhandler
-Disable crash handler, to get core dumps
-.TP
-.B \-\-waitforwm
-Waits for a WM_NET compatible windowmanager
-.TP
-.B \-\-style