Rename startkde to starttde on Debian and Ubuntu

39 files changed, 129 insertions, 129 deletions

diff --git a/debian/lenny/tdebase/debian/changelog b/debian/lenny/tdebase/debian/changelog
index f015b7298..f19a0e4e8 100644
--- a/debian/lenny/tdebase/debian/changelog
+++ b/debian/lenny/tdebase/debian/changelog
@@ -105,7 +105,7 @@ tdebase-trinity (4:3.5.10-0ubuntu12) karmic; urgency=low
 
 tdebase-trinity (4:3.5.10-0ubuntu11) karmic; urgency=low
 
-  * Repaired startkde script to export DESKTOP_SESSION
+  * Repaired starttde script to export DESKTOP_SESSION
   * Depends on libogg-dev-la
   * Repaired gcc4.4 compilation problems
 
@@ -196,7 +196,7 @@ tdebase-trinity (4:3.5.10-0ubuntu3~intrepid19) intrepid; urgency=low
 
 tdebase-trinity (4:3.5.10-0ubuntu3~intrepid18) intrepid; urgency=low
 
-  * Added XDG_DATA_DIRS and KDEDIRS to startkde, as suggested by zekica on the Debian forums
+  * Added XDG_DATA_DIRS and KDEDIRS to starttde, as suggested by zekica on the Debian forums
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Sat, 07 Mar 2009 13:18:00 -0600
 
@@ -240,7 +240,7 @@ tdebase-trinity (4:3.5.10-0ubuntu3~intrepid3) intrepid; urgency=low
 
 tdebase-trinity (4:3.5.10-0ubuntu3~intrepid1) intrepid; urgency=low
 
-  * Removed link /usr/lib/libkonsolepart.so for python-trinity-trinity and altered startkde script to function properly with the new .trinity home directory
+  * Removed link /usr/lib/libkonsolepart.so for python-trinity-trinity and altered starttde script to function properly with the new .trinity home directory
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Fri, 05 Dec 2008 16:15:00 -0600
 
@@ -353,7 +353,7 @@ tdebase (4:3.5.9-0ubuntu5) hardy; urgency=low
 
 tdebase (4:3.5.9-0ubuntu4) hardy; urgency=low
 
-  * Remove kubuntu_9920_startkde_dash_stupidness.diff, 
+  * Remove kubuntu_9920_starttde_dash_stupidness.diff, 
     Closes LP: #206187
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 25 Mar 2008 23:05:42 +0000
@@ -428,7 +428,7 @@ tdebase (4:3.5.8-2ubuntu17) hardy; urgency=low
 
 tdebase (4:3.5.8-2ubuntu17) hardy; urgency=low
 
-  * Added kubuntu_9920_startkde_dash_stupidness.diff:
+  * Added kubuntu_9920_starttde_dash_stupidness.diff:
     - For some stupid reasons, env scripts are not parsed correctly
       due dash. Hard to believe, but this patch fixes the issue...
     - Closes LP: #189144
@@ -677,7 +677,7 @@ tdebase (4:3.5.7-2) unstable; urgency=low
   * Add support or back references in klipper. Thanks to Sean Finney.
     (Closes: #427843)
   * Updated nb debconf translation. (Closes: #417942)
-  * Fix typo in startkde manpage. Thanks A. Costa. (Closes: #432062)
+  * Fix typo in starttde manpage. Thanks A. Costa. (Closes: #432062)
   * Fix typo in kdmrc. Thanks Greg. (Closes: #422142)
   * Updated vi debconf translation. Thanks Clytie Siddall (Closes: #426820)
   * Updated pt_BR debconf translation. Thanks Eder L. Marques. 
@@ -2132,7 +2132,7 @@ tdebase (4:3.5.1-1) unstable; urgency=low
   * Enable zeroconf support in ksysguardd; add libavahi-compat-libdnssd-dev to
     the build-depends. (Closes: #348583)
 
-  * Merge startkde manpage (and maintainer script patch to fully integrate it)
+  * Merge starttde manpage (and maintainer script patch to fully integrate it)
     from Philipp Grau. Thanks. (Closes: #348501)
 
   * Upload to unstable.
@@ -2632,7 +2632,7 @@ tdebase (4:3.5-rc2-0ubuntu1) dapper; urgency=low
   * kdm depends on xauth not xbase-clients
   * Update 18_default_fonts.diff
   * Generate .pot files
-  * Remove kubuntu_26_startkde.diff, no need to start ivman in 3.5
+  * Remove kubuntu_26_starttde.diff, no need to start ivman in 3.5
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 21 Nov 2005 17:46:39 +0000
 
@@ -2644,7 +2644,7 @@ tdebase (4:3.5-rc1-1ubuntu1) dapper; urgency=low
   * Update kubuntu_16_hide_kpager_menu_entry.diff
   * Update kubuntu_19_kdm_zsh_emulate.diff
   * Update kubuntu_25_kcontrol_only_in_kde.diff
-  * Update kubuntu_30_startkde_background_colour.diff
+  * Update kubuntu_30_starttde_background_colour.diff
   * Update kubuntu_32_usplash_console_font.diff
   * konqueror replaces old kcontrol
 
@@ -2905,7 +2905,7 @@ tdebase (4:3.4.2-0ubuntu4) breezy; urgency=low
     on desktop icons
   * Compile with GCC 3.4 on hppa, m68k, arm to prevent 
     internal compiler error
-  * Add kubuntu_30_startkde_background_colour.diff to make default
+  * Add kubuntu_30_starttde_background_colour.diff to make default
     background colour match default wallpaperchange background colour
   * Do not install SVG icons to save space
   * Install simple konqueror.rc into /usr/share/apps/konqueror, workaround
@@ -2971,7 +2971,7 @@ tdebase (4:3.4.1-0ubuntu3) breezy; urgency=low
   * Update kubuntu_23_hal_api.diff
   * Replace 19_kcontrol_only_in_kde.diff with kubuntu_25_kcontrol_only_in_kde.diff 
     which stops KControl displaying (use System Settings instead)
-  * Add kubuntu_26_startkde.diff to start ivman
+  * Add kubuntu_26_starttde.diff to start ivman
   * Add 25_khelp_htdig.diff from Debian
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 20 Jun 2005 09:15:07 +0000
@@ -3065,7 +3065,7 @@ tdebase (4:3.4.0-0pre4) alioth; urgency=low
     Debian. (Closes: #246280)
 
   * Make ksmserver Recommend kpersonalizer, since it is used when
-    running KDE for the first time. Also patch startkde so it doesn't
+    running KDE for the first time. Also patch starttde so it doesn't
     fail when kpersonalizer is not present. (Closes: #309803)
 
   * Add manpages for kdialog (thanks to Bastian Kleineidam for tracking it
@@ -3855,7 +3855,7 @@ tdebase (4:2.2.1-5) unstable; urgency=low
 tdebase (4:2.2.1-4) unstable; urgency=low
 
   * More upstream fixes
-  * don't set background in startkde script by default.  
+  * don't set background in starttde script by default.  
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 27 Sep 2001 12:13:00 -0700
 
@@ -4056,7 +4056,7 @@ tdebase (4:2.2.0-0beta1-1) unstable; urgency=low
   * Provide man link from kdm to chooser
   * More build cleanup..take more of the automation out to make sure things
     are constant
-  * Remove custom startkde
+  * Remove custom starttde
   * Revert old overrides so we can start from scratch
   * Add in new python-base dependency
   * New packages: kate, tdebase-audiolibs (so that those without sound do
@@ -4134,7 +4134,7 @@ tdebase (4:2.1.1-3) unstable; urgency=low
 
 tdebase (4:2.1.1-2) unstable; urgency=low
  
-  * Move startkde script into /etc/kde2 so that it will be a conffile and
+  * Move starttde script into /etc/kde2 so that it will be a conffile and
     link it back to /usr/bin/kde2.  (Closes: #91787)
   * Build on older libc
   * Adding in recommends for klisa
@@ -5057,9 +5057,9 @@ tdebase (1:Beta2-2.1) experimental; urgency=low
 
 tdebase (1:Beta2-2) unstable; urgency=low
 
-  * fixed kde / startkde script. added minimal documentation.
+  * fixed kde / starttde script. added minimal documentation.
   * fixed klock permissions.
-  * removed startkde script.
+  * removed starttde script.
   * removed virtual package names.
   * fixed utmp file location in kvt.
 
diff --git a/debian/lenny/tdebase/debian/control b/debian/lenny/tdebase/debian/control
index 041c6e22b..41fb6f9be 100644
--- a/debian/lenny/tdebase/debian/control
+++ b/debian/lenny/tdebase/debian/control
@@ -436,7 +436,7 @@ Description: session manager for KDE
  This package contains the KDE session manager. It is responsible for
  restoring your KDE session on login. It is also needed to properly
  start a KDE session. It registers KDE with X display managers, and
- provides the 'startkde' command, for starting an X session with KDE
+ provides the 'starttde' command, for starting an X session with KDE
  from the console.
  .
  If you are running KDE for the first time for a certain user,
diff --git a/debian/lenny/tdebase/debian/control.in b/debian/lenny/tdebase/debian/control.in
index 8073d0665..58861a14d 100644
--- a/debian/lenny/tdebase/debian/control.in
+++ b/debian/lenny/tdebase/debian/control.in
@@ -428,7 +428,7 @@ Description: session manager for KDE
  This package contains the KDE session manager. It is responsible for
  restoring your KDE session on login. It is also needed to properly
  start a KDE session. It registers KDE with X display managers, and
- provides the 'startkde' command, for starting an X session with KDE
+ provides the 'starttde' command, for starting an X session with KDE
  from the console.
  .
  If you are running KDE for the first time for a certain user,
diff --git a/debian/lenny/tdebase/debian/ksmserver-trinity.install b/debian/lenny/tdebase/debian/ksmserver-trinity.install
index 0946d8a57..f8c0aa867 100644
--- a/debian/lenny/tdebase/debian/ksmserver-trinity.install
+++ b/debian/lenny/tdebase/debian/ksmserver-trinity.install
@@ -1,5 +1,5 @@
 debian/tmp/opt/trinity/bin/ksmserver
-debian/tmp/opt/trinity/bin/startkde
+debian/tmp/opt/trinity/bin/starttde
 debian/tmp/opt/trinity/lib/trinity/ksmserver.la
 debian/tmp/opt/trinity/lib/trinity/ksmserver.so
 debian/tmp/opt/trinity/lib/libtdeinit_ksmserver.so
diff --git a/debian/lenny/tdebase/debian/ksmserver-trinity.manpages b/debian/lenny/tdebase/debian/ksmserver-trinity.manpages
index 05b93960e..354e23800 100644
--- a/debian/lenny/tdebase/debian/ksmserver-trinity.manpages
+++ b/debian/lenny/tdebase/debian/ksmserver-trinity.manpages
@@ -1 +1 @@
-debian/man/startkde-trinity.1
+debian/man/starttde-trinity.1
diff --git a/debian/lenny/tdebase/debian/ksmserver-trinity.postinst b/debian/lenny/tdebase/debian/ksmserver-trinity.postinst
index 6492cbb59..f5d73b934 100644
--- a/debian/lenny/tdebase/debian/ksmserver-trinity.postinst
+++ b/debian/lenny/tdebase/debian/ksmserver-trinity.postinst
@@ -20,9 +20,9 @@ set -e
 case "$1" in
     configure)
         update-alternatives --install /usr/bin/x-session-manager \
-	x-session-manager /opt/trinity/bin/startkde 40 \
+	x-session-manager /opt/trinity/bin/starttde 40 \
 	--slave /opt/trinity/share/man/man1/x-session-manager.1.gz \
-	x-session-manager.1.gz "/opt/trinity/share/man/man1/startkde-trinity.1.gz"
+	x-session-manager.1.gz "/opt/trinity/share/man/man1/starttde-trinity.1.gz"
     
     ;;
 
diff --git a/debian/lenny/tdebase/debian/ksmserver-trinity.preinst b/debian/lenny/tdebase/debian/ksmserver-trinity.preinst
index 73ee5043a..884257d03 100644
--- a/debian/lenny/tdebase/debian/ksmserver-trinity.preinst
+++ b/debian/lenny/tdebase/debian/ksmserver-trinity.preinst
@@ -4,7 +4,7 @@ case "$1" in
 
     upgrade)
 	rm -f /etc/gdm/Sessions/KDE
-	rm -f /etc/trinity/debian/startkde
+	rm -f /etc/trinity/debian/starttde
 	/usr/sbin/update-alternatives --remove x-session-manager /usr/bin/kde2
 	/usr/sbin/update-alternatives --remove x-session-manager /usr/bin/trinity
 	mkdir -p /usr/share/autostart
diff --git a/debian/lenny/tdebase/debian/ksmserver-trinity.prerm b/debian/lenny/tdebase/debian/ksmserver-trinity.prerm
index 11b4bc08a..e9be94522 100644
--- a/debian/lenny/tdebase/debian/ksmserver-trinity.prerm
+++ b/debian/lenny/tdebase/debian/ksmserver-trinity.prerm
@@ -19,7 +19,7 @@ set -e
 
 case "$1" in
     remove)
-        /usr/sbin/update-alternatives --remove x-session-manager /usr/trinity/bin/startkde
+        /usr/sbin/update-alternatives --remove x-session-manager /usr/trinity/bin/starttde
 	dpkg-divert --rename --remove /usr/share/autostart/plasma.desktop
     ;;
 
diff --git a/debian/lenny/tdebase/debian/man/startkde-trinity.1 b/debian/lenny/tdebase/debian/man/starttde-trinity.1
index f26b7f128..76c31c9ba 100644
--- a/debian/lenny/tdebase/debian/man/startkde-trinity.1
+++ b/debian/lenny/tdebase/debian/man/starttde-trinity.1
@@ -1,26 +1,26 @@
-.TH startkde 1 "Jan 17, 2005"
+.TH starttde 1 "Jan 17, 2005"
 .SH NAME
-startkde \- Starts up the KDE Desktop Environment 
+starttde \- Starts up the KDE Desktop Environment 
 .SH SYNOPSIS
-.B startkde
+.B starttde
 .br
 .SH DESCRIPTION
 This manual page documents briefly the
-.B startkde
+.B starttde
 command.
 This manual page was written for the Debian distribution
 because the original program does not have a manual page.
 .PP
-The \fBstartkde\fP script starts up the K Desktop Environment and
+The \fBstarttde\fP script starts up the K Desktop Environment and
 is typically executed by your login manager (e.g. xdm, gdm, kdm, wdm or from
-your X startup scripts). \fBstartkde\fP in turn launches ksmserver, which
+your X startup scripts). \fBstarttde\fP in turn launches ksmserver, which
 will load your last session, or a default session that includes the standard
 KDE programs if no saved session is available.
 
-\fBstartkde\fP, with ksmserver, is a standard X11R6 session manager that can manage
+\fBstarttde\fP, with ksmserver, is a standard X11R6 session manager that can manage
 any X11R6 SM compliant program.
 
-\fBstartkde\fP and ksmserver use the contents of the ~/.kde directory
+\fBstarttde\fP and ksmserver use the contents of the ~/.kde directory
 for starting previously saved sessions. Source scripts found in ~/.kde/env/*.sh
 can be used to define environment variables that will be available to all KDE 
 programs.
@@ -32,15 +32,15 @@ At the end of a session, the scripts found in ~/.kde/shutdown will be executed.
 
 
 .SH OPTIONS
-\fBstartkde\fP takes no command line options.
+\fBstarttde\fP takes no command line options.
 
 .SH AUTHOR
-\fBstartkde\fP is written by the KDE Project.
+\fBstarttde\fP is written by the KDE Project.
 
 This manual page was written by Philipp Grau.
 
 .SH "REPORTING BUGS"
-Report bugs of this modified Debian version of startkde to the Bug
+Report bugs of this modified Debian version of starttde to the Bug
 Tracking System at: http://bugs.debian.org
 .SH COPYRIGHT
 Copyright \(co 2005 Philipp Grau.
diff --git a/ubuntu/maverick/tdebase/debian/patches/disable_startkde_wallpaper.diff b/debian/lenny/tdebase/debian/patches/disable_starttde_wallpaper.diff
index 838bbec11..0eebed280 100644
--- a/ubuntu/maverick/tdebase/debian/patches/disable_startkde_wallpaper.diff
+++ b/debian/lenny/tdebase/debian/patches/disable_starttde_wallpaper.diff
@@ -1,5 +1,5 @@
---- startkde
-+++ startkde
+--- starttde
++++ starttde
 @@ -184,17 +184,17 @@
    . $kdehome/share/config/startupconfig
  fi
diff --git a/debian/lenny/tdelibs/debian/man/kstartupconfig-trinity.1 b/debian/lenny/tdelibs/debian/man/kstartupconfig-trinity.1
index dca82fb5e..57ae12c1d 100644
--- a/debian/lenny/tdelibs/debian/man/kstartupconfig-trinity.1
+++ b/debian/lenny/tdelibs/debian/man/kstartupconfig-trinity.1
@@ -8,7 +8,7 @@ kstartupconfig, kdostartupconfig
 .sp 1
 \fBkdostartupconfig\fP
 .SH DESCRIPTION
-\fBkstartupconfig\fP loads configuration options for use in \fBstartkde\fP. It saves loading time as there is no need to launch programs linked to KDE libraries. \fBstartupconfig\fP uses a cache of some Kconfig options that are updated by \fBkdostartupconfig\fP. The cache is implemented as script file that is sourced and provides the options as shell variables.
+\fBkstartupconfig\fP loads configuration options for use in \fBstarttde\fP. It saves loading time as there is no need to launch programs linked to KDE libraries. \fBstartupconfig\fP uses a cache of some Kconfig options that are updated by \fBkdostartupconfig\fP. The cache is implemented as script file that is sourced and provides the options as shell variables.
 .sp 1
 The configuration options to load are stored in \fIstartupconfigkeys\fP as one option per line. They follow the format <file> <group> <key> <default>. A complete group is addressed as <file> [<group>]. The configuration options are processed in the specified order so the missing default values for groups can be specified as single options after the group option.
 .sp 1
@@ -42,7 +42,7 @@ configuration options and files they belong to
 .I $KDEHOME/share/config/startupconfigkeys
 configuration options to load
 .SH SEE ALSO
-.BR kconf_update (1),\  startkde (1)
+.BR kconf_update (1),\  starttde (1)
 .SH AUTHORS
 .nf
 Lubos Lunak <l.lunak@kde.org>
diff --git a/debian/lenny/tdelibs/debian/man/lnusertemp-trinity.sgml b/debian/lenny/tdelibs/debian/man/lnusertemp-trinity.sgml
index c40c64520..d4a7162d1 100644
--- a/debian/lenny/tdelibs/debian/man/lnusertemp-trinity.sgml
+++ b/debian/lenny/tdelibs/debian/man/lnusertemp-trinity.sgml
@@ -105,7 +105,7 @@ manpage.1: manpage.sgml
     attacks.  </para>
 
     <para><command>&dhpackage;</command> is usually called by the
-    <command>startkde</command> script.</para>
+    <command>starttde</command> script.</para>
 
   </refsect1>
   <refsect1>
diff --git a/debian/lenny/tdelibs/debian/man/tdeinit-trinity.1 b/debian/lenny/tdelibs/debian/man/tdeinit-trinity.1
index 1c3861783..63c5935b6 100644
--- a/debian/lenny/tdelibs/debian/man/tdeinit-trinity.1
+++ b/debian/lenny/tdelibs/debian/man/tdeinit-trinity.1
@@ -10,7 +10,7 @@ tdeinit
 .sp 1
 \fBtdeinit\fP is used to start all other KDE programs. It can start binary program files as well as tdeinit loadable modules (KLMs).
 .sp 1
-When \fBtdeinit\fP starts for the first time it launches \fBdcopserver\fP, \fBklauncher\fP, \fBkded\fP and some additional programs specified on its command line in the \fBstartkde\fP script (normally \fBkcminit\fP and \fBknotify\fP).
+When \fBtdeinit\fP starts for the first time it launches \fBdcopserver\fP, \fBklauncher\fP, \fBkded\fP and some additional programs specified on its command line in the \fBstarttde\fP script (normally \fBkcminit\fP and \fBknotify\fP).
 .sp 1
 The \fBtdeinit\fP master process can be used to start additional KDE programs via \fBtdeinit_wrapper\fP, \fBkshell\fP and \fBkwrapper\fP.
 .sp 1
@@ -29,7 +29,7 @@ Terminate when no KDE applications are left running
 .I /usr/lib/trinity
 directory with KLMs (tdeinit loadable modules)
 .SH SEE ALSO
-.BR dcopserver (1),\  kded (1),\  kcminit (1),\  tdeinit_wrapper (1),\  klauncher (1),\  kshell (1),\  kwrapper (1),\  startkde (1)
+.BR dcopserver (1),\  kded (1),\  kcminit (1),\  tdeinit_wrapper (1),\  klauncher (1),\  kshell (1),\  kwrapper (1),\  starttde (1)
 .SH AUTHORS
 .nf
 Waldo Bastian <bastian@kde.org>
diff --git a/debian/squeeze/tdebase/debian/changelog b/debian/squeeze/tdebase/debian/changelog
index f015b7298..f19a0e4e8 100644
--- a/debian/squeeze/tdebase/debian/changelog
+++ b/debian/squeeze/tdebase/debian/changelog
@@ -105,7 +105,7 @@ tdebase-trinity (4:3.5.10-0ubuntu12) karmic; urgency=low
 
 tdebase-trinity (4:3.5.10-0ubuntu11) karmic; urgency=low
 
-  * Repaired startkde script to export DESKTOP_SESSION
+  * Repaired starttde script to export DESKTOP_SESSION
   * Depends on libogg-dev-la
   * Repaired gcc4.4 compilation problems
 
@@ -196,7 +196,7 @@ tdebase-trinity (4:3.5.10-0ubuntu3~intrepid19) intrepid; urgency=low
 
 tdebase-trinity (4:3.5.10-0ubuntu3~intrepid18) intrepid; urgency=low
 
-  * Added XDG_DATA_DIRS and KDEDIRS to startkde, as suggested by zekica on the Debian forums
+  * Added XDG_DATA_DIRS and KDEDIRS to starttde, as suggested by zekica on the Debian forums
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Sat, 07 Mar 2009 13:18:00 -0600
 
@@ -240,7 +240,7 @@ tdebase-trinity (4:3.5.10-0ubuntu3~intrepid3) intrepid; urgency=low
 
 tdebase-trinity (4:3.5.10-0ubuntu3~intrepid1) intrepid; urgency=low
 
-  * Removed link /usr/lib/libkonsolepart.so for python-trinity-trinity and altered startkde script to function properly with the new .trinity home directory
+  * Removed link /usr/lib/libkonsolepart.so for python-trinity-trinity and altered starttde script to function properly with the new .trinity home directory
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Fri, 05 Dec 2008 16:15:00 -0600
 
@@ -353,7 +353,7 @@ tdebase (4:3.5.9-0ubuntu5) hardy; urgency=low
 
 tdebase (4:3.5.9-0ubuntu4) hardy; urgency=low
 
-  * Remove kubuntu_9920_startkde_dash_stupidness.diff, 
+  * Remove kubuntu_9920_starttde_dash_stupidness.diff, 
     Closes LP: #206187
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 25 Mar 2008 23:05:42 +0000
@@ -428,7 +428,7 @@ tdebase (4:3.5.8-2ubuntu17) hardy; urgency=low
 
 tdebase (4:3.5.8-2ubuntu17) hardy; urgency=low
 
-  * Added kubuntu_9920_startkde_dash_stupidness.diff:
+  * Added kubuntu_9920_starttde_dash_stupidness.diff:
     - For some stupid reasons, env scripts are not parsed correctly
       due dash. Hard to believe, but this patch fixes the issue...
     - Closes LP: #189144
@@ -677,7 +677,7 @@ tdebase (4:3.5.7-2) unstable; urgency=low
   * Add support or back references in klipper. Thanks to Sean Finney.
     (Closes: #427843)
   * Updated nb debconf translation. (Closes: #417942)
-  * Fix typo in startkde manpage. Thanks A. Costa. (Closes: #432062)
+  * Fix typo in starttde manpage. Thanks A. Costa. (Closes: #432062)
   * Fix typo in kdmrc. Thanks Greg. (Closes: #422142)
   * Updated vi debconf translation. Thanks Clytie Siddall (Closes: #426820)
   * Updated pt_BR debconf translation. Thanks Eder L. Marques. 
@@ -2132,7 +2132,7 @@ tdebase (4:3.5.1-1) unstable; urgency=low
   * Enable zeroconf support in ksysguardd; add libavahi-compat-libdnssd-dev to
     the build-depends. (Closes: #348583)
 
-  * Merge startkde manpage (and maintainer script patch to fully integrate it)
+  * Merge starttde manpage (and maintainer script patch to fully integrate it)
     from Philipp Grau. Thanks. (Closes: #348501)
 
   * Upload to unstable.
@@ -2632,7 +2632,7 @@ tdebase (4:3.5-rc2-0ubuntu1) dapper; urgency=low
   * kdm depends on xauth not xbase-clients
   * Update 18_default_fonts.diff
   * Generate .pot files
-  * Remove kubuntu_26_startkde.diff, no need to start ivman in 3.5
+  * Remove kubuntu_26_starttde.diff, no need to start ivman in 3.5
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 21 Nov 2005 17:46:39 +0000
 
@@ -2644,7 +2644,7 @@ tdebase (4:3.5-rc1-1ubuntu1) dapper; urgency=low
   * Update kubuntu_16_hide_kpager_menu_entry.diff
   * Update kubuntu_19_kdm_zsh_emulate.diff
   * Update kubuntu_25_kcontrol_only_in_kde.diff
-  * Update kubuntu_30_startkde_background_colour.diff
+  * Update kubuntu_30_starttde_background_colour.diff
   * Update kubuntu_32_usplash_console_font.diff
   * konqueror replaces old kcontrol
 
@@ -2905,7 +2905,7 @@ tdebase (4:3.4.2-0ubuntu4) breezy; urgency=low
     on desktop icons
   * Compile with GCC 3.4 on hppa, m68k, arm to prevent 
     internal compiler error
-  * Add kubuntu_30_startkde_background_colour.diff to make default
+  * Add kubuntu_30_starttde_background_colour.diff to make default
     background colour match default wallpaperchange background colour
   * Do not install SVG icons to save space
   * Install simple konqueror.rc into /usr/share/apps/konqueror, workaround
@@ -2971,7 +2971,7 @@ tdebase (4:3.4.1-0ubuntu3) breezy; urgency=low
   * Update kubuntu_23_hal_api.diff
   * Replace 19_kcontrol_only_in_kde.diff with kubuntu_25_kcontrol_only_in_kde.diff 
     which stops KControl displaying (use System Settings instead)
-  * Add kubuntu_26_startkde.diff to start ivman
+  * Add kubuntu_26_starttde.diff to start ivman
   * Add 25_khelp_htdig.diff from Debian
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 20 Jun 2005 09:15:07 +0000
@@ -3065,7 +3065,7 @@ tdebase (4:3.4.0-0pre4) alioth; urgency=low
     Debian. (Closes: #246280)
 
   * Make ksmserver Recommend kpersonalizer, since it is used when
-    running KDE for the first time. Also patch startkde so it doesn't
+    running KDE for the first time. Also patch starttde so it doesn't
     fail when kpersonalizer is not present. (Closes: #309803)
 
   * Add manpages for kdialog (thanks to Bastian Kleineidam for tracking it
@@ -3855,7 +3855,7 @@ tdebase (4:2.2.1-5) unstable; urgency=low
 tdebase (4:2.2.1-4) unstable; urgency=low
 
   * More upstream fixes
-  * don't set background in startkde script by default.  
+  * don't set background in starttde script by default.  
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 27 Sep 2001 12:13:00 -0700
 
@@ -4056,7 +4056,7 @@ tdebase (4:2.2.0-0beta1-1) unstable; urgency=low
   * Provide man link from kdm to chooser
   * More build cleanup..take more of the automation out to make sure things
     are constant
-  * Remove custom startkde
+  * Remove custom starttde
   * Revert old overrides so we can start from scratch
   * Add in new python-base dependency
   * New packages: kate, tdebase-audiolibs (so that those without sound do
@@ -4134,7 +4134,7 @@ tdebase (4:2.1.1-3) unstable; urgency=low
 
 tdebase (4:2.1.1-2) unstable; urgency=low
  
-  * Move startkde script into /etc/kde2 so that it will be a conffile and
+  * Move starttde script into /etc/kde2 so that it will be a conffile and
     link it back to /usr/bin/kde2.  (Closes: #91787)
   * Build on older libc
   * Adding in recommends for klisa
@@ -5057,9 +5057,9 @@ tdebase (1:Beta2-2.1) experimental; urgency=low
 
 tdebase (1:Beta2-2) unstable; urgency=low
 
-  * fixed kde / startkde script. added minimal documentation.
+  * fixed kde / starttde script. added minimal documentation.
   * fixed klock permissions.
-  * removed startkde script.
+  * removed starttde script.
   * removed virtual package names.
   * fixed utmp file location in kvt.
 
diff --git a/debian/squeeze/tdebase/debian/control b/debian/squeeze/tdebase/debian/control
index 25be7033c..28d7b6ba9 100644
--- a/debian/squeeze/tdebase/debian/control
+++ b/debian/squeeze/tdebase/debian/control
@@ -436,7 +436,7 @@ Description: session manager for KDE
  This package contains the KDE session manager. It is responsible for
  restoring your KDE session on login. It is also needed to properly
  start a KDE session. It registers KDE with X display managers, and
- provides the 'startkde' command, for starting an X session with KDE
+ provides the 'starttde' command, for starting an X session with KDE
  from the console.
  .
  If you are running KDE for the first time for a certain user,
diff --git a/debian/squeeze/tdebase/debian/control.in b/debian/squeeze/tdebase/debian/control.in
index 8073d0665..58861a14d 100644
--- a/debian/squeeze/tdebase/debian/control.in
+++ b/debian/squeeze/tdebase/debian/control.in
@@ -428,7 +428,7 @@ Description: session manager for KDE
  This package contains the KDE session manager. It is responsible for
  restoring your KDE session on login. It is also needed to properly
  start a KDE session. It registers KDE with X display managers, and
- provides the 'startkde' command, for starting an X session with KDE
+ provides the 'starttde' command, for starting an X session with KDE
  from the console.
  .
  If you are running KDE for the first time for a certain user,
diff --git a/debian/squeeze/tdebase/debian/ksmserver-trinity.install b/debian/squeeze/tdebase/debian/ksmserver-trinity.install
index 0946d8a57..f8c0aa867 100644
--- a/debian/squeeze/tdebase/debian/ksmserver-trinity.install
+++ b/debian/squeeze/tdebase/debian/ksmserver-trinity.install
@@ -1,5 +1,5 @@
 debian/tmp/opt/trinity/bin/ksmserver
-debian/tmp/opt/trinity/bin/startkde
+debian/tmp/opt/trinity/bin/starttde
 debian/tmp/opt/trinity/lib/trinity/ksmserver.la
 debian/tmp/opt/trinity/lib/trinity/ksmserver.so
 debian/tmp/opt/trinity/lib/libtdeinit_ksmserver.so
diff --git a/debian/squeeze/tdebase/debian/ksmserver-trinity.manpages b/debian/squeeze/tdebase/debian/ksmserver-trinity.manpages
index 05b93960e..354e23800 100644
--- a/debian/squeeze/tdebase/debian/ksmserver-trinity.manpages
+++ b/debian/squeeze/tdebase/debian/ksmserver-trinity.manpages
@@ -1 +1 @@
-debian/man/startkde-trinity.1
+debian/man/starttde-trinity.1
diff --git a/debian/squeeze/tdebase/debian/ksmserver-trinity.postinst b/debian/squeeze/tdebase/debian/ksmserver-trinity.postinst
index 6492cbb59..f5d73b934 100644
--- a/debian/squeeze/tdebase/debian/ksmserver-trinity.postinst
+++ b/debian/squeeze/tdebase/debian/ksmserver-trinity.postinst
@@ -20,9 +20,9 @@ set -e
 case "$1" in
     configure)
         update-alternatives --install /usr/bin/x-session-manager \
-	x-session-manager /opt/trinity/bin/startkde 40 \
+	x-session-manager /opt/trinity/bin/starttde 40 \
 	--slave /opt/trinity/share/man/man1/x-session-manager.1.gz \
-	x-session-manager.1.gz "/opt/trinity/share/man/man1/startkde-trinity.1.gz"
+	x-session-manager.1.gz "/opt/trinity/share/man/man1/starttde-trinity.1.gz"
     
     ;;
 
diff --git a/debian/squeeze/tdebase/debian/ksmserver-trinity.preinst b/debian/squeeze/tdebase/debian/ksmserver-trinity.preinst
index 73ee5043a..884257d03 100644
--- a/debian/squeeze/tdebase/debian/ksmserver-trinity.preinst
+++ b/debian/squeeze/tdebase/debian/ksmserver-trinity.preinst
@@ -4,7 +4,7 @@ case "$1" in
 
     upgrade)
 	rm -f /etc/gdm/Sessions/KDE
-	rm -f /etc/trinity/debian/startkde
+	rm -f /etc/trinity/debian/starttde
 	/usr/sbin/update-alternatives --remove x-session-manager /usr/bin/kde2
 	/usr/sbin/update-alternatives --remove x-session-manager /usr/bin/trinity
 	mkdir -p /usr/share/autostart
diff --git a/debian/squeeze/tdebase/debian/ksmserver-trinity.prerm b/debian/squeeze/tdebase/debian/ksmserver-trinity.prerm
index 11b4bc08a..e9be94522 100644
--- a/debian/squeeze/tdebase/debian/ksmserver-trinity.prerm
+++ b/debian/squeeze/tdebase/debian/ksmserver-trinity.prerm
@@ -19,7 +19,7 @@ set -e
 
 case "$1" in
     remove)
-        /usr/sbin/update-alternatives --remove x-session-manager /usr/trinity/bin/startkde
+        /usr/sbin/update-alternatives --remove x-session-manager /usr/trinity/bin/starttde
 	dpkg-divert --rename --remove /usr/share/autostart/plasma.desktop
     ;;
 
diff --git a/ubuntu/maverick/tdebase/debian/man/startkde-trinity.1 b/debian/squeeze/tdebase/debian/man/starttde-trinity.1
index f26b7f128..76c31c9ba 100644
--- a/ubuntu/maverick/tdebase/debian/man/startkde-trinity.1
+++ b/debian/squeeze/tdebase/debian/man/starttde-trinity.1
@@ -1,26 +1,26 @@
-.TH startkde 1 "Jan 17, 2005"
+.TH starttde 1 "Jan 17, 2005"
 .SH NAME
-startkde \- Starts up the KDE Desktop Environment 
+starttde \- Starts up the KDE Desktop Environment 
 .SH SYNOPSIS
-.B startkde
+.B starttde
 .br
 .SH DESCRIPTION
 This manual page documents briefly the
-.B startkde
+.B starttde
 command.
 This manual page was written for the Debian distribution
 because the original program does not have a manual page.
 .PP
-The \fBstartkde\fP script starts up the K Desktop Environment and
+The \fBstarttde\fP script starts up the K Desktop Environment and
 is typically executed by your login manager (e.g. xdm, gdm, kdm, wdm or from
-your X startup scripts). \fBstartkde\fP in turn launches ksmserver, which
+your X startup scripts). \fBstarttde\fP in turn launches ksmserver, which
 will load your last session, or a default session that includes the standard
 KDE programs if no saved session is available.
 
-\fBstartkde\fP, with ksmserver, is a standard X11R6 session manager that can manage
+\fBstarttde\fP, with ksmserver, is a standard X11R6 session manager that can manage
 any X11R6 SM compliant program.
 
-\fBstartkde\fP and ksmserver use the contents of the ~/.kde directory
+\fBstarttde\fP and ksmserver use the contents of the ~/.kde directory
 for starting previously saved sessions. Source scripts found in ~/.kde/env/*.sh
 can be used to define environment variables that will be available to all KDE 
 programs.
@@ -32,15 +32,15 @@ At the end of a session, the scripts found in ~/.kde/shutdown will be executed.
 
 
 .SH OPTIONS
-\fBstartkde\fP takes no command line options.
+\fBstarttde\fP takes no command line options.
 
 .SH AUTHOR
-\fBstartkde\fP is written by the KDE Project.
+\fBstarttde\fP is written by the KDE Project.
 
 This manual page was written by Philipp Grau.
 
 .SH "REPORTING BUGS"
-Report bugs of this modified Debian version of startkde to the Bug
+Report bugs of this modified Debian version of starttde to the Bug
 Tracking System at: http://bugs.debian.org
 .SH COPYRIGHT
 Copyright \(co 2005 Philipp Grau.
diff --git a/debian/lenny/tdebase/debian/patches/disable_startkde_wallpaper.diff b/debian/squeeze/tdebase/debian/patches/disable_starttde_wallpaper.diff
index 838bbec11..0eebed280 100644
--- a/debian/lenny/tdebase/debian/patches/disable_startkde_wallpaper.diff
+++ b/debian/squeeze/tdebase/debian/patches/disable_starttde_wallpaper.diff
@@ -1,5 +1,5 @@
---- startkde
-+++ startkde
+--- starttde
++++ starttde
 @@ -184,17 +184,17 @@
    . $kdehome/share/config/startupconfig
  fi
diff --git a/debian/squeeze/tdelibs/debian/man/kstartupconfig-trinity.1 b/debian/squeeze/tdelibs/debian/man/kstartupconfig-trinity.1
index dca82fb5e..57ae12c1d 100644
--- a/debian/squeeze/tdelibs/debian/man/kstartupconfig-trinity.1
+++ b/debian/squeeze/tdelibs/debian/man/kstartupconfig-trinity.1
@@ -8,7 +8,7 @@ kstartupconfig, kdostartupconfig
 .sp 1
 \fBkdostartupconfig\fP
 .SH DESCRIPTION
-\fBkstartupconfig\fP loads configuration options for use in \fBstartkde\fP. It saves loading time as there is no need to launch programs linked to KDE libraries. \fBstartupconfig\fP uses a cache of some Kconfig options that are updated by \fBkdostartupconfig\fP. The cache is implemented as script file that is sourced and provides the options as shell variables.
+\fBkstartupconfig\fP loads configuration options for use in \fBstarttde\fP. It saves loading time as there is no need to launch programs linked to KDE libraries. \fBstartupconfig\fP uses a cache of some Kconfig options that are updated by \fBkdostartupconfig\fP. The cache is implemented as script file that is sourced and provides the options as shell variables.
 .sp 1
 The configuration options to load are stored in \fIstartupconfigkeys\fP as one option per line. They follow the format <file> <group> <key> <default>. A complete group is addressed as <file> [<group>]. The configuration options are processed in the specified order so the missing default values for groups can be specified as single options after the group option.
 .sp 1
@@ -42,7 +42,7 @@ configuration options and files they belong to
 .I $KDEHOME/share/config/startupconfigkeys
 configuration options to load
 .SH SEE ALSO
-.BR kconf_update (1),\  startkde (1)
+.BR kconf_update (1),\  starttde (1)
 .SH AUTHORS
 .nf
 Lubos Lunak <l.lunak@kde.org>
diff --git a/debian/squeeze/tdelibs/debian/man/lnusertemp-trinity.sgml b/debian/squeeze/tdelibs/debian/man/lnusertemp-trinity.sgml
index c40c64520..d4a7162d1 100644
--- a/debian/squeeze/tdelibs/debian/man/lnusertemp-trinity.sgml
+++ b/debian/squeeze/tdelibs/debian/man/lnusertemp-trinity.sgml
@@ -105,7 +105,7 @@ manpage.1: manpage.sgml
     attacks.  </para>
 
     <para><command>&dhpackage;</command> is usually called by the
-    <command>startkde</command> script.</para>
+    <command>starttde</command> script.</para>
 
   </refsect1>
   <refsect1>
diff --git a/debian/squeeze/tdelibs/debian/man/tdeinit-trinity.1 b/debian/squeeze/tdelibs/debian/man/tdeinit-trinity.1
index 1c3861783..63c5935b6 100644
--- a/debian/squeeze/tdelibs/debian/man/tdeinit-trinity.1
+++ b/debian/squeeze/tdelibs/debian/man/tdeinit-trinity.1
@@ -10,7 +10,7 @@ tdeinit
 .sp 1
 \fBtdeinit\fP is used to start all other KDE programs. It can start binary program files as well as tdeinit loadable modules (KLMs).
 .sp 1
-When \fBtdeinit\fP starts for the first time it launches \fBdcopserver\fP, \fBklauncher\fP, \fBkded\fP and some additional programs specified on its command line in the \fBstartkde\fP script (normally \fBkcminit\fP and \fBknotify\fP).
+When \fBtdeinit\fP starts for the first time it launches \fBdcopserver\fP, \fBklauncher\fP, \fBkded\fP and some additional programs specified on its command line in the \fBstarttde\fP script (normally \fBkcminit\fP and \fBknotify\fP).
 .sp 1
 The \fBtdeinit\fP master process can be used to start additional KDE programs via \fBtdeinit_wrapper\fP, \fBkshell\fP and \fBkwrapper\fP.
 .sp 1
@@ -29,7 +29,7 @@ Terminate when no KDE applications are left running
 .I /usr/lib/trinity
 directory with KLMs (tdeinit loadable modules)
 .SH SEE ALSO
-.BR dcopserver (1),\  kded (1),\  kcminit (1),\  tdeinit_wrapper (1),\  klauncher (1),\  kshell (1),\  kwrapper (1),\  startkde (1)
+.BR dcopserver (1),\  kded (1),\  kcminit (1),\  tdeinit_wrapper (1),\  klauncher (1),\  kshell (1),\  kwrapper (1),\  starttde (1)
 .SH AUTHORS
 .nf
 Waldo Bastian <bastian@kde.org>
diff --git a/ubuntu/maverick/tdebase/debian/changelog b/ubuntu/maverick/tdebase/debian/changelog
index f015b7298..f19a0e4e8 100644
--- a/ubuntu/maverick/tdebase/debian/changelog
+++ b/ubuntu/maverick/tdebase/debian/changelog
@@ -105,7 +105,7 @@ tdebase-trinity (4:3.5.10-0ubuntu12) karmic; urgency=low
 
 tdebase-trinity (4:3.5.10-0ubuntu11) karmic; urgency=low
 
-  * Repaired startkde script to export DESKTOP_SESSION
+  * Repaired starttde script to export DESKTOP_SESSION
   * Depends on libogg-dev-la
   * Repaired gcc4.4 compilation problems
 
@@ -196,7 +196,7 @@ tdebase-trinity (4:3.5.10-0ubuntu3~intrepid19) intrepid; urgency=low
 
 tdebase-trinity (4:3.5.10-0ubuntu3~intrepid18) intrepid; urgency=low
 
-  * Added XDG_DATA_DIRS and KDEDIRS to startkde, as suggested by zekica on the Debian forums
+  * Added XDG_DATA_DIRS and KDEDIRS to starttde, as suggested by zekica on the Debian forums
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Sat, 07 Mar 2009 13:18:00 -0600
 
@@ -240,7 +240,7 @@ tdebase-trinity (4:3.5.10-0ubuntu3~intrepid3) intrepid; urgency=low
 
 tdebase-trinity (4:3.5.10-0ubuntu3~intrepid1) intrepid; urgency=low
 
-  * Removed link /usr/lib/libkonsolepart.so for python-trinity-trinity and altered startkde script to function properly with the new .trinity home directory
+  * Removed link /usr/lib/libkonsolepart.so for python-trinity-trinity and altered starttde script to function properly with the new .trinity home directory
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Fri, 05 Dec 2008 16:15:00 -0600
 
@@ -353,7 +353,7 @@ tdebase (4:3.5.9-0ubuntu5) hardy; urgency=low
 
 tdebase (4:3.5.9-0ubuntu4) hardy; urgency=low
 
-  * Remove kubuntu_9920_startkde_dash_stupidness.diff, 
+  * Remove kubuntu_9920_starttde_dash_stupidness.diff, 
     Closes LP: #206187
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 25 Mar 2008 23:05:42 +0000
@@ -428,7 +428,7 @@ tdebase (4:3.5.8-2ubuntu17) hardy; urgency=low
 
 tdebase (4:3.5.8-2ubuntu17) hardy; urgency=low
 
-  * Added kubuntu_9920_startkde_dash_stupidness.diff:
+  * Added kubuntu_9920_starttde_dash_stupidness.diff:
     - For some stupid reasons, env scripts are not parsed correctly
       due dash. Hard to believe, but this patch fixes the issue...
     - Closes LP: #189144
@@ -677,7 +677,7 @@ tdebase (4:3.5.7-2) unstable; urgency=low
   * Add support or back references in klipper. Thanks to Sean Finney.
     (Closes: #427843)
   * Updated nb debconf translation. (Closes: #417942)
-  * Fix typo in startkde manpage. Thanks A. Costa. (Closes: #432062)
+  * Fix typo in starttde manpage. Thanks A. Costa. (Closes: #432062)
   * Fix typo in kdmrc. Thanks Greg. (Closes: #422142)
   * Updated vi debconf translation. Thanks Clytie Siddall (Closes: #426820)
   * Updated pt_BR debconf translation. Thanks Eder L. Marques. 
@@ -2132,7 +2132,7 @@ tdebase (4:3.5.1-1) unstable; urgency=low
   * Enable zeroconf support in ksysguardd; add libavahi-compat-libdnssd-dev to
     the build-depends. (Closes: #348583)
 
-  * Merge startkde manpage (and maintainer script patch to fully integrate it)
+  * Merge starttde manpage (and maintainer script patch to fully integrate it)
     from Philipp Grau. Thanks. (Closes: #348501)
 
   * Upload to unstable.
@@ -2632,7 +2632,7 @@ tdebase (4:3.5-rc2-0ubuntu1) dapper; urgency=low
   * kdm depends on xauth not xbase-clients
   * Update 18_default_fonts.diff
   * Generate .pot files
-  * Remove kubuntu_26_startkde.diff, no need to start ivman in 3.5
+  * Remove kubuntu_26_starttde.diff, no need to start ivman in 3.5
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 21 Nov 2005 17:46:39 +0000
 
@@ -2644,7 +2644,7 @@ tdebase (4:3.5-rc1-1ubuntu1) dapper; urgency=low
   * Update kubuntu_16_hide_kpager_menu_entry.diff
   * Update kubuntu_19_kdm_zsh_emulate.diff
   * Update kubuntu_25_kcontrol_only_in_kde.diff
-  * Update kubuntu_30_startkde_background_colour.diff
+  * Update kubuntu_30_starttde_background_colour.diff
   * Update kubuntu_32_usplash_console_font.diff
   * konqueror replaces old kcontrol
 
@@ -2905,7 +2905,7 @@ tdebase (4:3.4.2-0ubuntu4) breezy; urgency=low
     on desktop icons
   * Compile with GCC 3.4 on hppa, m68k, arm to prevent 
     internal compiler error
-  * Add kubuntu_30_startkde_background_colour.diff to make default
+  * Add kubuntu_30_starttde_background_colour.diff to make default
     background colour match default wallpaperchange background colour
   * Do not install SVG icons to save space
   * Install simple konqueror.rc into /usr/share/apps/konqueror, workaround
@@ -2971,7 +2971,7 @@ tdebase (4:3.4.1-0ubuntu3) breezy; urgency=low
   * Update kubuntu_23_hal_api.diff
   * Replace 19_kcontrol_only_in_kde.diff with kubuntu_25_kcontrol_only_in_kde.diff 
     which stops KControl displaying (use System Settings instead)
-  * Add kubuntu_26_startkde.diff to start ivman
+  * Add kubuntu_26_starttde.diff to start ivman
   * Add 25_khelp_htdig.diff from Debian
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 20 Jun 2005 09:15:07 +0000
@@ -3065,7 +3065,7 @@ tdebase (4:3.4.0-0pre4) alioth; urgency=low
     Debian. (Closes: #246280)
 
   * Make ksmserver Recommend kpersonalizer, since it is used when
-    running KDE for the first time. Also patch startkde so it doesn't
+    running KDE for the first time. Also patch starttde so it doesn't
     fail when kpersonalizer is not present. (Closes: #309803)
 
   * Add manpages for kdialog (thanks to Bastian Kleineidam for tracking it
@@ -3855,7 +3855,7 @@ tdebase (4:2.2.1-5) unstable; urgency=low
 tdebase (4:2.2.1-4) unstable; urgency=low
 
   * More upstream fixes
-  * don't set background in startkde script by default.  
+  * don't set background in starttde script by default.  
 
  -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 27 Sep 2001 12:13:00 -0700
 
@@ -4056,7 +4056,7 @@ tdebase (4:2.2.0-0beta1-1) unstable; urgency=low
   * Provide man link from kdm to chooser
   * More build cleanup..take more of the automation out to make sure things
     are constant
-  * Remove custom startkde
+  * Remove custom starttde
   * Revert old overrides so we can start from scratch
   * Add in new python-base dependency
   * New packages: kate, tdebase-audiolibs (so that those without sound do
@@ -4134,7 +4134,7 @@ tdebase (4:2.1.1-3) unstable; urgency=low
 
 tdebase (4:2.1.1-2) unstable; urgency=low
  
-  * Move startkde script into /etc/kde2 so that it will be a conffile and
+  * Move starttde script into /etc/kde2 so that it will be a conffile and
     link it back to /usr/bin/kde2.  (Closes: #91787)
   * Build on older libc
   * Adding in recommends for klisa
@@ -5057,9 +5057,9 @@ tdebase (1:Beta2-2.1) experimental; urgency=low
 
 tdebase (1:Beta2-2) unstable; urgency=low
 
-  * fixed kde / startkde script. added minimal documentation.
+  * fixed kde / starttde script. added minimal documentation.
   * fixed klock permissions.
-  * removed startkde script.
+  * removed starttde script.
   * removed virtual package names.
   * fixed utmp file location in kvt.
 
diff --git a/ubuntu/maverick/tdebase/debian/control b/ubuntu/maverick/tdebase/debian/control
index 93b7e77e0..eef9136ec 100644
--- a/ubuntu/maverick/tdebase/debian/control
+++ b/ubuntu/maverick/tdebase/debian/control
@@ -467,7 +467,7 @@ Description: session manager for KDE
  This package contains the KDE session manager. It is responsible for
  restoring your KDE session on login. It is also needed to properly
  start a KDE session. It registers KDE with X display managers, and
- provides the 'startkde' command, for starting an X session with KDE
+ provides the 'starttde' command, for starting an X session with KDE
  from the console.
  .
  If you are running KDE for the first time for a certain user,
diff --git a/ubuntu/maverick/tdebase/debian/control.in b/ubuntu/maverick/tdebase/debian/control.in
index 8073d0665..58861a14d 100644
--- a/ubuntu/maverick/tdebase/debian/control.in
+++ b/ubuntu/maverick/tdebase/debian/control.in
@@ -428,7 +428,7 @@ Description: session manager for KDE
  This package contains the KDE session manager. It is responsible for
  restoring your KDE session on login. It is also needed to properly
  start a KDE session. It registers KDE with X display managers, and
- provides the 'startkde' command, for starting an X session with KDE
+ provides the 'starttde' command, for starting an X session with KDE
  from the console.
  .
  If you are running KDE for the first time for a certain user,
diff --git a/ubuntu/maverick/tdebase/debian/ksmserver-trinity.install b/ubuntu/maverick/tdebase/debian/ksmserver-trinity.install
index 0946d8a57..f8c0aa867 100644
--- a/ubuntu/maverick/tdebase/debian/ksmserver-trinity.install
+++ b/ubuntu/maverick/tdebase/debian/ksmserver-trinity.install
@@ -1,5 +1,5 @@
 debian/tmp/opt/trinity/bin/ksmserver
-debian/tmp/opt/trinity/bin/startkde
+debian/tmp/opt/trinity/bin/starttde
 debian/tmp/opt/trinity/lib/trinity/ksmserver.la
 debian/tmp/opt/trinity/lib/trinity/ksmserver.so
 debian/tmp/opt/trinity/lib/libtdeinit_ksmserver.so
diff --git a/ubuntu/maverick/tdebase/debian/ksmserver-trinity.manpages b/ubuntu/maverick/tdebase/debian/ksmserver-trinity.manpages
index 05b93960e..354e23800 100644
--- a/ubuntu/maverick/tdebase/debian/ksmserver-trinity.manpages
+++ b/ubuntu/maverick/tdebase/debian/ksmserver-trinity.manpages
@@ -1 +1 @@
-debian/man/startkde-trinity.1
+debian/man/starttde-trinity.1
diff --git a/ubuntu/maverick/tdebase/debian/ksmserver-trinity.postinst b/ubuntu/maverick/tdebase/debian/ksmserver-trinity.postinst
index 6492cbb59..f5d73b934 100644
--- a/ubuntu/maverick/tdebase/debian/ksmserver-trinity.postinst
+++ b/ubuntu/maverick/tdebase/debian/ksmserver-trinity.postinst
@@ -20,9 +20,9 @@ set -e
 case "$1" in
     configure)
         update-alternatives --install /usr/bin/x-session-manager \
-	x-session-manager /opt/trinity/bin/startkde 40 \
+	x-session-manager /opt/trinity/bin/starttde 40 \
 	--slave /opt/trinity/share/man/man1/x-session-manager.1.gz \
-	x-session-manager.1.gz "/opt/trinity/share/man/man1/startkde-trinity.1.gz"
+	x-session-manager.1.gz "/opt/trinity/share/man/man1/starttde-trinity.1.gz"
     
     ;;
 
diff --git a/ubuntu/maverick/tdebase/debian/ksmserver-trinity.preinst b/ubuntu/maverick/tdebase/debian/ksmserver-trinity.preinst
index 73ee5043a..884257d03 100644
--- a/ubuntu/maverick/tdebase/debian/ksmserver-trinity.preinst
+++ b/ubuntu/maverick/tdebase/debian/ksmserver-trinity.preinst
@@ -4,7 +4,7 @@ case "$1" in
 
     upgrade)
 	rm -f /etc/gdm/Sessions/KDE
-	rm -f /etc/trinity/debian/startkde
+	rm -f /etc/trinity/debian/starttde
 	/usr/sbin/update-alternatives --remove x-session-manager /usr/bin/kde2
 	/usr/sbin/update-alternatives --remove x-session-manager /usr/bin/trinity
 	mkdir -p /usr/share/autostart
diff --git a/ubuntu/maverick/tdebase/debian/ksmserver-trinity.prerm b/ubuntu/maverick/tdebase/debian/ksmserver-trinity.prerm
index 11b4bc08a..e9be94522 100644
--- a/ubuntu/maverick/tdebase/debian/ksmserver-trinity.prerm
+++ b/ubuntu/maverick/tdebase/debian/ksmserver-trinity.prerm
@@ -19,7 +19,7 @@ set -e
 
 case "$1" in
     remove)
-        /usr/sbin/update-alternatives --remove x-session-manager /usr/trinity/bin/startkde
+        /usr/sbin/update-alternatives --remove x-session-manager /usr/trinity/bin/starttde
 	dpkg-divert --rename --remove /usr/share/autostart/plasma.desktop
     ;;
 
diff --git a/debian/squeeze/tdebase/debian/man/startkde-trinity.1 b/ubuntu/maverick/tdebase/debian/man/starttde-trinity.1
index f26b7f128..76c31c9ba 100644
--- a/debian/squeeze/tdebase/debian/man/startkde-trinity.1
+++ b/ubuntu/maverick/tdebase/debian/man/starttde-trinity.1
@@ -1,26 +1,26 @@
-.TH startkde 1 "Jan 17, 2005"
+.TH starttde 1 "Jan 17, 2005"
 .SH NAME
-startkde \- Starts up the KDE Desktop Environment 
+starttde \- Starts up the KDE Desktop Environment 
 .SH SYNOPSIS
-.B startkde
+.B starttde
 .br
 .SH DESCRIPTION
 This manual page documents briefly the
-.B startkde
+.B starttde
 command.
 This manual page was written for the Debian distribution
 because the original program does not have a manual page.
 .PP
-The \fBstartkde\fP script starts up the K Desktop Environment and
+The \fBstarttde\fP script starts up the K Desktop Environment and
 is typically executed by your login manager (e.g. xdm, gdm, kdm, wdm or from
-your X startup scripts). \fBstartkde\fP in turn launches ksmserver, which
+your X startup scripts). \fBstarttde\fP in turn launches ksmserver, which
 will load your last session, or a default session that includes the standard
 KDE programs if no saved session is available.
 
-\fBstartkde\fP, with ksmserver, is a standard X11R6 session manager that can manage
+\fBstarttde\fP, with ksmserver, is a standard X11R6 session manager that can manage
 any X11R6 SM compliant program.
 
-\fBstartkde\fP and ksmserver use the contents of the ~/.kde directory
+\fBstarttde\fP and ksmserver use the contents of the ~/.kde directory
 for starting previously saved sessions. Source scripts found in ~/.kde/env/*.sh
 can be used to define environment variables that will be available to all KDE 
 programs.
@@ -32,15 +32,15 @@ At the end of a session, the scripts found in ~/.kde/shutdown will be executed.
 
 
 .SH OPTIONS
-\fBstartkde\fP takes no command line options.
+\fBstarttde\fP takes no command line options.
 
 .SH AUTHOR
-\fBstartkde\fP is written by the KDE Project.
+\fBstarttde\fP is written by the KDE Project.
 
 This manual page was written by Philipp Grau.
 
 .SH "REPORTING BUGS"
-Report bugs of this modified Debian version of startkde to the Bug
+Report bugs of this modified Debian version of starttde to the Bug
 Tracking System at: http://bugs.debian.org
 .SH COPYRIGHT
 Copyright \(co 2005 Philipp Grau.
diff --git a/debian/squeeze/tdebase/debian/patches/disable_startkde_wallpaper.diff b/ubuntu/maverick/tdebase/debian/patches/disable_starttde_wallpaper.diff
index 838bbec11..0eebed280 100644
--- a/debian/squeeze/tdebase/debian/patches/disable_startkde_wallpaper.diff
+++ b/ubuntu/maverick/tdebase/debian/patches/disable_starttde_wallpaper.diff
@@ -1,5 +1,5 @@
---- startkde
-+++ startkde
+--- starttde
++++ starttde
 @@ -184,17 +184,17 @@
    . $kdehome/share/config/startupconfig
  fi
diff --git a/ubuntu/maverick/tdelibs/debian/man/kstartupconfig-trinity.1 b/ubuntu/maverick/tdelibs/debian/man/kstartupconfig-trinity.1
index dca82fb5e..57ae12c1d 100644
--- a/ubuntu/maverick/tdelibs/debian/man/kstartupconfig-trinity.1
+++ b/ubuntu/maverick/tdelibs/debian/man/kstartupconfig-trinity.1
@@ -8,7 +8,7 @@ kstartupconfig, kdostartupconfig
 .sp 1
 \fBkdostartupconfig\fP
 .SH DESCRIPTION
-\fBkstartupconfig\fP loads configuration options for use in \fBstartkde\fP. It saves loading time as there is no need to launch programs linked to KDE libraries. \fBstartupconfig\fP uses a cache of some Kconfig options that are updated by \fBkdostartupconfig\fP. The cache is implemented as script file that is sourced and provides the options as shell variables.
+\fBkstartupconfig\fP loads configuration options for use in \fBstarttde\fP. It saves loading time as there is no need to launch programs linked to KDE libraries. \fBstartupconfig\fP uses a cache of some Kconfig options that are updated by \fBkdostartupconfig\fP. The cache is implemented as script file that is sourced and provides the options as shell variables.
 .sp 1
 The configuration options to load are stored in \fIstartupconfigkeys\fP as one option per line. They follow the format <file> <group> <key> <default>. A complete group is addressed as <file> [<group>]. The configuration options are processed in the specified order so the missing default values for groups can be specified as single options after the group option.
 .sp 1
@@ -42,7 +42,7 @@ configuration options and files they belong to
 .I $KDEHOME/share/config/startupconfigkeys
 configuration options to load
 .SH SEE ALSO
-.BR kconf_update (1),\  startkde (1)
+.BR kconf_update (1),\  starttde (1)
 .SH AUTHORS
 .nf
 Lubos Lunak <l.lunak@kde.org>
diff --git a/ubuntu/maverick/tdelibs/debian/man/lnusertemp-trinity.sgml b/ubuntu/maverick/tdelibs/debian/man/lnusertemp-trinity.sgml
index c40c64520..d4a7162d1 100644
--- a/ubuntu/maverick/tdelibs/debian/man/lnusertemp-trinity.sgml
+++ b/ubuntu/maverick/tdelibs/debian/man/lnusertemp-trinity.sgml
@@ -105,7 +105,7 @@ manpage.1: manpage.sgml
     attacks.  </para>
 
     <para><command>&dhpackage;</command> is usually called by the
-    <command>startkde</command> script.</para>
+    <command>starttde</command> script.</para>
 
   </refsect1>
   <refsect1>
diff --git a/ubuntu/maverick/tdelibs/debian/man/tdeinit-trinity.1 b/ubuntu/maverick/tdelibs/debian/man/tdeinit-trinity.1
index 1c3861783..63c5935b6 100644
--- a/ubuntu/maverick/tdelibs/debian/man/tdeinit-trinity.1
+++ b/ubuntu/maverick/tdelibs/debian/man/tdeinit-trinity.1
@@ -10,7 +10,7 @@ tdeinit
 .sp 1
 \fBtdeinit\fP is used to start all other KDE programs. It can start binary program files as well as tdeinit loadable modules (KLMs).
 .sp 1
-When \fBtdeinit\fP starts for the first time it launches \fBdcopserver\fP, \fBklauncher\fP, \fBkded\fP and some additional programs specified on its command line in the \fBstartkde\fP script (normally \fBkcminit\fP and \fBknotify\fP).
+When \fBtdeinit\fP starts for the first time it launches \fBdcopserver\fP, \fBklauncher\fP, \fBkded\fP and some additional programs specified on its command line in the \fBstarttde\fP script (normally \fBkcminit\fP and \fBknotify\fP).
 .sp 1
 The \fBtdeinit\fP master process can be used to start additional KDE programs via \fBtdeinit_wrapper\fP, \fBkshell\fP and \fBkwrapper\fP.
 .sp 1
@@ -29,7 +29,7 @@ Terminate when no KDE applications are left running
 .I /usr/lib/trinity
 directory with KLMs (tdeinit loadable modules)
 .SH SEE ALSO
-.BR dcopserver (1),\  kded (1),\  kcminit (1),\  tdeinit_wrapper (1),\  klauncher (1),\  kshell (1),\  kwrapper (1),\  startkde (1)
+.BR dcopserver (1),\  kded (1),\  kcminit (1),\  tdeinit_wrapper (1),\  klauncher (1),\  kshell (1),\  kwrapper (1),\  starttde (1)
 .SH AUTHORS
 .nf
 Waldo Bastian <bastian@kde.org>