Rename KDEHOME and KDEDIR

33 files changed, 73 insertions, 73 deletions

diff --git a/ubuntu/lucid_automake/dependencies/arts/debian/patches/11_path_max_hurd.diff b/ubuntu/lucid_automake/dependencies/arts/debian/patches/11_path_max_hurd.diff
index e2deeda88..855ba5729 100644
--- a/ubuntu/lucid_automake/dependencies/arts/debian/patches/11_path_max_hurd.diff
+++ b/ubuntu/lucid_automake/dependencies/arts/debian/patches/11_path_max_hurd.diff
@@ -38,7 +38,7 @@
 +  string user_tmp_dir;
    int uid = getuid();
    const char *home_dir = getenv("HOME");
-   const char *kde_home = uid ? getenv("KDEHOME") : getenv("KDEROOTHOME");
+   const char *kde_home = uid ? getenv("TDEHOME") : getenv("KDEROOTHOME");
 @@ -88,7 +88,7 @@
    if (!tmp || !tmp[0])
       tmp = "/tmp";
@@ -110,7 +110,7 @@
 +  result = lstat(kde_tmp_dir.c_str(), &stat_buf);
    if ((result == 0) && (S_ISDIR(stat_buf.st_mode)))
    {
-      /* $KDEHOME/socket-$HOSTNAME is a normal directory. Do nothing. */
+      /* $TDEHOME/socket-$HOSTNAME is a normal directory. Do nothing. */
 -     tmp_buf = (char *) malloc(PATH_MAX+1);
 -     if (!tmp_buf)
 -        return 0;
@@ -184,7 +184,7 @@
 +  char *tmp_buf;
    int uid = getuid();
    const char *home_dir = getenv("HOME");
-   const char *kde_home = uid ? getenv("KDEHOME") : getenv("KDEROOTHOME");
+   const char *kde_home = uid ? getenv("TDEHOME") : getenv("KDEROOTHOME");
    int result;
    struct stat stat_buf;
  
@@ -259,7 +259,7 @@
 +  result = lstat(kde_tmp_dir.c_str(), &stat_buf);
    if ((result == 0) && (S_ISDIR(stat_buf.st_mode)))
    {
-      /* $KDEHOME/tmp is a normal directory. Do nothing. */
+      /* $TDEHOME/tmp is a normal directory. Do nothing. */
 -     printf("Directory \"%s\" already exists.\n", kde_tmp_dir);
 +     printf("Directory \"%s\" already exists.\n", kde_tmp_dir.c_str());
       return 0;
diff --git a/ubuntu/lucid_automake/kdebase/debian/changelog b/ubuntu/lucid_automake/kdebase/debian/changelog
index 994546f0b..b39130360 100644
--- a/ubuntu/lucid_automake/kdebase/debian/changelog
+++ b/ubuntu/lucid_automake/kdebase/debian/changelog
@@ -196,7 +196,7 @@ kdebase-kde3 (4:3.5.10-0ubuntu3~intrepid19) intrepid; urgency=low
 
 kdebase-kde3 (4:3.5.10-0ubuntu3~intrepid18) intrepid; urgency=low
 
-  * Added XDG_DATA_DIRS and KDEDIRS to startkde, as suggested by zekica on the Kubuntu forums
+  * Added XDG_DATA_DIRS and TDEDIRS to startkde, as suggested by zekica on the Kubuntu forums
 
  -- Timothy Pearson <[email protected]>  Sat, 07 Mar 2009 13:18:00 -0600
 
@@ -780,7 +780,7 @@ kdebase (4:3.5.7-1ubuntu21) gutsy; urgency=low
 
 kdebase (4:3.5.7-1ubuntu20) gutsy; urgency=low
 
-  * Changed (again) $KDEHOME to $kdehome in kubuntu_52_gtk_qt_engine_config.diff and 
+  * Changed (again) $TDEHOME to $kdehome in kubuntu_52_gtk_qt_engine_config.diff and 
     kubuntu_53_kwallet_config.diff . (LP: #136560)
 
  -- Jonathan Riddell <[email protected]>  Sat, 15 Sep 2007 23:12:26 +0100
@@ -799,7 +799,7 @@ kdebase (4:3.5.7-1ubuntu18) gutsy; urgency=low
   [ Ryan Kavanagh ]
   * Dropping kubuntu_9902_nspluginviewer_hangs_cpu.diff and the libgtk
     build-dep as they are no longer needed
-  * Changed $KDEHOME to $kdehome in kubuntu_52_gtk_qt_engine_config.diff and 
+  * Changed $TDEHOME to $kdehome in kubuntu_52_gtk_qt_engine_config.diff and 
     kubuntu_53_kwallet_config.diff . (LP: #136560)
 
  -- Ryan Kavanagh <[email protected]>  Mon, 03 Sep 2007 10:26:36 -0400
@@ -807,7 +807,7 @@ kdebase (4:3.5.7-1ubuntu18) gutsy; urgency=low
 kdebase (4:3.5.7-1ubuntu17) gutsy; urgency=low
 
   * Edit kubuntu_52_gtk_qt_engine_config.diff and
-    kubuntu_53_kwallet_config.diff to use $KDEHOME instead of .kde
+    kubuntu_53_kwallet_config.diff to use $TDEHOME instead of .kde
   * Remove kubuntu_77_kiosystem.diff, home:/ better than /home now
   * Edit kubuntu_27_aboutscreen_searchbar.diff to work with strigi
   * Add kubuntu_9903_api_docs_move.diff for new API website
diff --git a/ubuntu/lucid_automake/kdebase/debian/kdm-kde3.conf b/ubuntu/lucid_automake/kdebase/debian/kdm-kde3.conf
index 40acdd6b6..387be8b90 100755
--- a/ubuntu/lucid_automake/kdebase/debian/kdm-kde3.conf
+++ b/ubuntu/lucid_automake/kdebase/debian/kdm-kde3.conf
@@ -38,7 +38,7 @@ script
 	export LANG LANGUAGE
     fi
 
-    KDEDIRS=/opt/kde3/
+    TDEDIRS=/opt/kde3/
     PATH=/opt/kde3/bin:/bin:/usr/bin:/sbin:/usr/sbin
 
     initctl emit starting-dm DM=kdm-kde3
diff --git a/ubuntu/lucid_automake/kdebase/debian/kdm-kde3.txt b/ubuntu/lucid_automake/kdebase/debian/kdm-kde3.txt
index 191c344fd..71b5beb79 100644
--- a/ubuntu/lucid_automake/kdebase/debian/kdm-kde3.txt
+++ b/ubuntu/lucid_automake/kdebase/debian/kdm-kde3.txt
@@ -22,7 +22,7 @@ set -e
 HEED_DEFAULT_DISPLAY_MANAGER=true
 DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager
 
-KDEDIRS=/opt/kde3/
+TDEDIRS=/opt/kde3/
 PATH=/opt/kde3/bin:/bin:/usr/bin:/sbin:/usr/sbin
 DAEMON=/opt/kde3/bin/kdm
 PIDFILE=/var/run/kdm.pid
diff --git a/ubuntu/lucid_automake/kdelibs/debian/changelog b/ubuntu/lucid_automake/kdelibs/debian/changelog
index 323cc6749..23704c831 100644
--- a/ubuntu/lucid_automake/kdelibs/debian/changelog
+++ b/ubuntu/lucid_automake/kdelibs/debian/changelog
@@ -2087,7 +2087,7 @@ kdelibs (4:3.4.0-0pre5) alioth; urgency=low
     output them expanded even when --expandvars is not used. (Closes: #287822)
 
   * Fixed the ability of the build system to find kde.pot, even when it is not
-    located at KDEDIR/include/kde.pot. This allows the use of targets such as
+    located at TDEDIR/include/kde.pot. This allows the use of targets such as
     "package-messages" without specifying includedir. (Closes: #283858)
 
   * Now that graphviz is in main, add it to Build-Depends-Indep together with
diff --git a/ubuntu/lucid_automake/kdelibs/debian/kcmshell b/ubuntu/lucid_automake/kdelibs/debian/kcmshell
index 4ca9629ed..57d0e82bb 100755
--- a/ubuntu/lucid_automake/kdelibs/debian/kcmshell
+++ b/ubuntu/lucid_automake/kdelibs/debian/kcmshell
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-export KDEDIRS=/usr/:/opt/kde3/
+export TDEDIRS=/usr/:/opt/kde3/
 /opt/kde3/bin/kcmshell.real $1 $2 $3 $4 $5 $6 $7 $8
diff --git a/ubuntu/lucid_automake/kdelibs/debian/man/kstartupconfig-kde3.1 b/ubuntu/lucid_automake/kdelibs/debian/man/kstartupconfig-kde3.1
index dca82fb5e..87733d37f 100644
--- a/ubuntu/lucid_automake/kdelibs/debian/man/kstartupconfig-kde3.1
+++ b/ubuntu/lucid_automake/kdelibs/debian/man/kstartupconfig-kde3.1
@@ -4,7 +4,7 @@
 kstartupconfig, kdostartupconfig
 \- KDE configuration options loader
 .SH SYNOPSIS
-\fBkstartupconfig\fP [$KDEHOME]
+\fBkstartupconfig\fP [$TDEHOME]
 .sp 1
 \fBkdostartupconfig\fP
 .SH DESCRIPTION
@@ -27,19 +27,19 @@ do not use frequently changed config files since the checking is timestamp\-base
 if \fBkconf_update\fP is used to update an option also touch the matching global config file to allow \fBkstartupconfig\fP to see changes
 .SH OPTIONS
 .TP
-.B $KDEHOME
+.B $TDEHOME
 KDE home directory, if different to ~/.kde
 .SS
 .SH FILES
-In case $KDEHOME is not set ~/.kde is assumed.
+In case $TDEHOME is not set ~/.kde is assumed.
 .TP
-.I $KDEHOME/share/config/startupconfig
+.I $TDEHOME/share/config/startupconfig
 script, sourced to set shell variables with configuration options
 .TP
-.I $KDEHOME/share/config/startupconfigfiles
+.I $TDEHOME/share/config/startupconfigfiles
 configuration options and files they belong to
 .TP
-.I $KDEHOME/share/config/startupconfigkeys
+.I $TDEHOME/share/config/startupconfigkeys
 configuration options to load
 .SH SEE ALSO
 .BR kconf_update (1),\  startkde (1)
diff --git a/ubuntu/lucid_automake/kdelibs/debian/man/lnusertemp-kde3.sgml b/ubuntu/lucid_automake/kdelibs/debian/man/lnusertemp-kde3.sgml
index c40c64520..a75709316 100644
--- a/ubuntu/lucid_automake/kdelibs/debian/man/lnusertemp-kde3.sgml
+++ b/ubuntu/lucid_automake/kdelibs/debian/man/lnusertemp-kde3.sgml
@@ -72,7 +72,7 @@ manpage.1: manpage.sgml
 
     <para><command>&dhpackage;</command> is used to create KDE
     resources in temporary directories and symlinks to them in
-    <envar>KDEHOME</envar>. The resource that needs to be created is
+    <envar>TDEHOME</envar>. The resource that needs to be created is
     given as an argument and can be anyone of:</para>
 
     <itemizedlist>
diff --git a/ubuntu/lucid_automake/kdelibs/debian/man/make_driver_db_cups-kde3.1 b/ubuntu/lucid_automake/kdelibs/debian/man/make_driver_db_cups-kde3.1
index e4eb8251f..15d534206 100644
--- a/ubuntu/lucid_automake/kdelibs/debian/man/make_driver_db_cups-kde3.1
+++ b/ubuntu/lucid_automake/kdelibs/debian/man/make_driver_db_cups-kde3.1
@@ -25,10 +25,10 @@ directory with ppd files
 write printer database into this file
 .SH FILES
 .TP
-.I $KDEHOME/share/apps/kdeprint/printerdb_cups.txt
+.I $TDEHOME/share/apps/kdeprint/printerdb_cups.txt
 KDE printer database
 .br
-(if $KDEHOME is not set ~/.kde is used)
+(if $TDEHOME is not set ~/.kde is used)
 .SH SEE ALSO
 .BR make_driver_db_lpr (1)
 .TP
diff --git a/ubuntu/lucid_automake/kdemultimedia/debian/man/kaboodle-kde3.1 b/ubuntu/lucid_automake/kdemultimedia/debian/man/kaboodle-kde3.1
index c7852c5db..ef2e440bd 100644
--- a/ubuntu/lucid_automake/kdemultimedia/debian/man/kaboodle-kde3.1
+++ b/ubuntu/lucid_automake/kdemultimedia/debian/man/kaboodle-kde3.1
@@ -70,7 +70,7 @@ Use an alternative configuration file, instead of the default, which
 is normally located in
 .I /usr/share/config
 or in
-.RB $ KDEHOME\fI/share/config
+.RB $ TDEHOME\fI/share/config
 .TP
 .BI \-\-dcopserver \ server
 Set the address of the DCOP server to attach to.
@@ -218,7 +218,7 @@ The session manager to use. This option is set automatically by KDE
 and is a network path to the session manager socket.
 .IP HOME
 Path to the home directory for the current user. 
-.IP KDEHOME
+.IP TDEHOME
 The KDE per-user setting directory. Default if not specified is
 .I $HOME/.kde
 .lf 55 info/kdemultimedia.kaboodle.1
diff --git a/ubuntu/lucid_automake/kdeutils/debian/man/kcharselect-kde3.1 b/ubuntu/lucid_automake/kdeutils/debian/man/kcharselect-kde3.1
index bc0fb442b..63429d234 100644
--- a/ubuntu/lucid_automake/kdeutils/debian/man/kcharselect-kde3.1
+++ b/ubuntu/lucid_automake/kdeutils/debian/man/kcharselect-kde3.1
@@ -69,7 +69,7 @@ Use an alternative configuration file, instead of the default, which
 is normally located in
 .I /usr/share/config
 or in
-.RB $ KDEHOME\fI/share/config
+.RB $ TDEHOME\fI/share/config
 .TP
 .BI \-\-dcopserver \ server
 Set the address of the DCOP server to attach to.
@@ -217,7 +217,7 @@ The session manager to use. This option is set automatically by KDE
 and is a network path to the session manager socket.
 .IP HOME
 Path to the home directory for the current user. 
-.IP KDEHOME
+.IP TDEHOME
 The KDE per-user setting directory. Default if not specified is
 .I $HOME/.kde
 .lf 50 info/kdeutils.kcharselect.1
diff --git a/ubuntu/maverick/applications/kiosktool/debian/kiosktool-kdedirs-trinity.1 b/ubuntu/maverick/applications/kiosktool/debian/kiosktool-kdedirs-trinity.1
index 62faad5d3..b03acfb84 100644
--- a/ubuntu/maverick/applications/kiosktool/debian/kiosktool-kdedirs-trinity.1
+++ b/ubuntu/maverick/applications/kiosktool/debian/kiosktool-kdedirs-trinity.1
@@ -1,8 +1,8 @@
 .\" This file was generated by kdemangen.pl
-.TH KIOSKTOOL\-KDEDIRS 1 "Ago 2004" "K Desktop Environment" "A tool to set $KDEDIRS according to the current user profile."
+.TH KIOSKTOOL\-TDEDIRS 1 "Ago 2004" "K Desktop Environment" "A tool to set $TDEDIRS according to the current user profile."
 .SH NAME
 kiosktool\-kdedirs
-\- A tool to set $KDEDIRS according to the current user profile.
+\- A tool to set $TDEDIRS according to the current user profile.
 .SH SYNOPSIS
 kiosktool\-kdedirs [Qt\-options] [KDE\-options] [options] 
 .SH DESCRIPTION
diff --git a/ubuntu/maverick/tdebase/debian/changelog b/ubuntu/maverick/tdebase/debian/changelog
index f19a0e4e8..6c2ad6722 100644
--- a/ubuntu/maverick/tdebase/debian/changelog
+++ b/ubuntu/maverick/tdebase/debian/changelog
@@ -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 starttde, as suggested by zekica on the Debian forums
+  * Added XDG_DATA_DIRS and TDEDIRS to starttde, as suggested by zekica on the Debian forums
 
  -- Timothy Pearson <[email protected]>  Sat, 07 Mar 2009 13:18:00 -0600
 
@@ -780,7 +780,7 @@ tdebase (4:3.5.7-1ubuntu21) gutsy; urgency=low
 
 tdebase (4:3.5.7-1ubuntu20) gutsy; urgency=low
 
-  * Changed (again) $KDEHOME to $kdehome in kubuntu_52_gtk_qt_engine_config.diff and 
+  * Changed (again) $TDEHOME to $kdehome in kubuntu_52_gtk_qt_engine_config.diff and 
     kubuntu_53_kwallet_config.diff . (LP: #136560)
 
  -- Jonathan Riddell <[email protected]>  Sat, 15 Sep 2007 23:12:26 +0100
@@ -799,7 +799,7 @@ tdebase (4:3.5.7-1ubuntu18) gutsy; urgency=low
   [ Ryan Kavanagh ]
   * Dropping kubuntu_9902_nspluginviewer_hangs_cpu.diff and the libgtk
     build-dep as they are no longer needed
-  * Changed $KDEHOME to $kdehome in kubuntu_52_gtk_qt_engine_config.diff and 
+  * Changed $TDEHOME to $kdehome in kubuntu_52_gtk_qt_engine_config.diff and 
     kubuntu_53_kwallet_config.diff . (LP: #136560)
 
  -- Ryan Kavanagh <[email protected]>  Mon, 03 Sep 2007 10:26:36 -0400
@@ -807,7 +807,7 @@ tdebase (4:3.5.7-1ubuntu18) gutsy; urgency=low
 tdebase (4:3.5.7-1ubuntu17) gutsy; urgency=low
 
   * Edit kubuntu_52_gtk_qt_engine_config.diff and
-    kubuntu_53_kwallet_config.diff to use $KDEHOME instead of .kde
+    kubuntu_53_kwallet_config.diff to use $TDEHOME instead of .kde
   * Remove kubuntu_77_kiosystem.diff, home:/ better than /home now
   * Edit kubuntu_27_aboutscreen_searchbar.diff to work with strigi
   * Add kubuntu_9903_api_docs_move.diff for new API website
diff --git a/ubuntu/maverick/tdebase/debian/kdm-trinity.conf b/ubuntu/maverick/tdebase/debian/kdm-trinity.conf
index 554e5a38e..95c0fcd67 100755
--- a/ubuntu/maverick/tdebase/debian/kdm-trinity.conf
+++ b/ubuntu/maverick/tdebase/debian/kdm-trinity.conf
@@ -38,7 +38,7 @@ script
 	export LANG LANGUAGE
     fi
 
-    KDEDIRS=/opt/trinity/
+    TDEDIRS=/opt/trinity/
     PATH=/opt/trinity/bin:/bin:/usr/bin:/sbin:/usr/sbin
 
     initctl emit starting-dm DM=kdm-trinity
diff --git a/ubuntu/maverick/tdebase/debian/kdm-trinity.txt b/ubuntu/maverick/tdebase/debian/kdm-trinity.txt
index effad2fd6..a1940a4d8 100644
--- a/ubuntu/maverick/tdebase/debian/kdm-trinity.txt
+++ b/ubuntu/maverick/tdebase/debian/kdm-trinity.txt
@@ -22,7 +22,7 @@ set -e
 HEED_DEFAULT_DISPLAY_MANAGER=true
 DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager
 
-KDEDIRS=/opt/trinity/
+TDEDIRS=/opt/trinity/
 PATH=/opt/trinity/bin:/bin:/usr/bin:/sbin:/usr/sbin
 DAEMON=/opt/trinity/bin/kdm
 PIDFILE=/var/run/kdm.pid
diff --git a/ubuntu/maverick/tdelibs/debian/changelog b/ubuntu/maverick/tdelibs/debian/changelog
index 936097e90..a3b13e8a4 100644
--- a/ubuntu/maverick/tdelibs/debian/changelog
+++ b/ubuntu/maverick/tdelibs/debian/changelog
@@ -2087,7 +2087,7 @@ tdelibs (4:3.4.0-0pre5) alioth; urgency=low
     output them expanded even when --expandvars is not used. (Closes: #287822)
 
   * Fixed the ability of the build system to find kde.pot, even when it is not
-    located at KDEDIR/include/kde.pot. This allows the use of targets such as
+    located at TDEDIR/include/kde.pot. This allows the use of targets such as
     "package-messages" without specifying includedir. (Closes: #283858)
 
   * Now that graphviz is in main, add it to Build-Depends-Indep together with
diff --git a/ubuntu/maverick/tdelibs/debian/kcmshell b/ubuntu/maverick/tdelibs/debian/kcmshell
index e8b3d2a84..f5b01f8f1 100755
--- a/ubuntu/maverick/tdelibs/debian/kcmshell
+++ b/ubuntu/maverick/tdelibs/debian/kcmshell
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-export KDEDIRS=/usr/:/opt/trinity/
+export TDEDIRS=/usr/:/opt/trinity/
 /opt/trinity/bin/kcmshell.real $1 $2 $3 $4 $5 $6 $7 $8
diff --git a/ubuntu/maverick/tdelibs/debian/man/kstartupconfig-trinity.1 b/ubuntu/maverick/tdelibs/debian/man/kstartupconfig-trinity.1
index 57ae12c1d..897dae97d 100644
--- a/ubuntu/maverick/tdelibs/debian/man/kstartupconfig-trinity.1
+++ b/ubuntu/maverick/tdelibs/debian/man/kstartupconfig-trinity.1
@@ -4,7 +4,7 @@
 kstartupconfig, kdostartupconfig
 \- KDE configuration options loader
 .SH SYNOPSIS
-\fBkstartupconfig\fP [$KDEHOME]
+\fBkstartupconfig\fP [$TDEHOME]
 .sp 1
 \fBkdostartupconfig\fP
 .SH DESCRIPTION
@@ -27,19 +27,19 @@ do not use frequently changed config files since the checking is timestamp\-base
 if \fBkconf_update\fP is used to update an option also touch the matching global config file to allow \fBkstartupconfig\fP to see changes
 .SH OPTIONS
 .TP
-.B $KDEHOME
+.B $TDEHOME
 KDE home directory, if different to ~/.kde
 .SS
 .SH FILES
-In case $KDEHOME is not set ~/.kde is assumed.
+In case $TDEHOME is not set ~/.kde is assumed.
 .TP
-.I $KDEHOME/share/config/startupconfig
+.I $TDEHOME/share/config/startupconfig
 script, sourced to set shell variables with configuration options
 .TP
-.I $KDEHOME/share/config/startupconfigfiles
+.I $TDEHOME/share/config/startupconfigfiles
 configuration options and files they belong to
 .TP
-.I $KDEHOME/share/config/startupconfigkeys
+.I $TDEHOME/share/config/startupconfigkeys
 configuration options to load
 .SH SEE ALSO
 .BR kconf_update (1),\  starttde (1)
diff --git a/ubuntu/maverick/tdelibs/debian/man/lnusertemp-trinity.sgml b/ubuntu/maverick/tdelibs/debian/man/lnusertemp-trinity.sgml
index d4a7162d1..1ab3ff715 100644
--- a/ubuntu/maverick/tdelibs/debian/man/lnusertemp-trinity.sgml
+++ b/ubuntu/maverick/tdelibs/debian/man/lnusertemp-trinity.sgml
@@ -72,7 +72,7 @@ manpage.1: manpage.sgml
 
     <para><command>&dhpackage;</command> is used to create KDE
     resources in temporary directories and symlinks to them in
-    <envar>KDEHOME</envar>. The resource that needs to be created is
+    <envar>TDEHOME</envar>. The resource that needs to be created is
     given as an argument and can be anyone of:</para>
 
     <itemizedlist>
diff --git a/ubuntu/maverick/tdelibs/debian/man/make_driver_db_cups-trinity.1 b/ubuntu/maverick/tdelibs/debian/man/make_driver_db_cups-trinity.1
index 0201523ce..8ca091265 100644
--- a/ubuntu/maverick/tdelibs/debian/man/make_driver_db_cups-trinity.1
+++ b/ubuntu/maverick/tdelibs/debian/man/make_driver_db_cups-trinity.1
@@ -25,10 +25,10 @@ directory with ppd files
 write printer database into this file
 .SH FILES
 .TP
-.I $KDEHOME/share/apps/tdeprint/printerdb_cups.txt
+.I $TDEHOME/share/apps/tdeprint/printerdb_cups.txt
 KDE printer database
 .br
-(if $KDEHOME is not set ~/.kde is used)
+(if $TDEHOME is not set ~/.kde is used)
 .SH SEE ALSO
 .BR make_driver_db_lpr (1)
 .TP
diff --git a/ubuntu/maverick/tdemultimedia/debian/man/kaboodle-trinity.1 b/ubuntu/maverick/tdemultimedia/debian/man/kaboodle-trinity.1
index 4475e273c..63c8895d5 100644
--- a/ubuntu/maverick/tdemultimedia/debian/man/kaboodle-trinity.1
+++ b/ubuntu/maverick/tdemultimedia/debian/man/kaboodle-trinity.1
@@ -70,7 +70,7 @@ Use an alternative configuration file, instead of the default, which
 is normally located in
 .I /usr/share/config
 or in
-.RB $ KDEHOME\fI/share/config
+.RB $ TDEHOME\fI/share/config
 .TP
 .BI \-\-dcopserver \ server
 Set the address of the DCOP server to attach to.
@@ -218,7 +218,7 @@ The session manager to use. This option is set automatically by KDE
 and is a network path to the session manager socket.
 .IP HOME
 Path to the home directory for the current user. 
-.IP KDEHOME
+.IP TDEHOME
 The KDE per-user setting directory. Default if not specified is
 .I $HOME/.kde
 .lf 55 info/tdemultimedia.kaboodle.1
diff --git a/ubuntu/maverick/tdeutils/debian/man/kcharselect-trinity.1 b/ubuntu/maverick/tdeutils/debian/man/kcharselect-trinity.1
index af601f877..490fd6985 100644
--- a/ubuntu/maverick/tdeutils/debian/man/kcharselect-trinity.1
+++ b/ubuntu/maverick/tdeutils/debian/man/kcharselect-trinity.1
@@ -69,7 +69,7 @@ Use an alternative configuration file, instead of the default, which
 is normally located in
 .I /usr/share/config
 or in
-.RB $ KDEHOME\fI/share/config
+.RB $ TDEHOME\fI/share/config
 .TP
 .BI \-\-dcopserver \ server
 Set the address of the DCOP server to attach to.
@@ -217,7 +217,7 @@ The session manager to use. This option is set automatically by KDE
 and is a network path to the session manager socket.
 .IP HOME
 Path to the home directory for the current user. 
-.IP KDEHOME
+.IP TDEHOME
 The KDE per-user setting directory. Default if not specified is
 .I $HOME/.kde
 .lf 50 info/tdeutils.kcharselect.1
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 e2deeda88..855ba5729 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
@@ -38,7 +38,7 @@
 +  string user_tmp_dir;
    int uid = getuid();
    const char *home_dir = getenv("HOME");
-   const char *kde_home = uid ? getenv("KDEHOME") : getenv("KDEROOTHOME");
+   const char *kde_home = uid ? getenv("TDEHOME") : getenv("KDEROOTHOME");
 @@ -88,7 +88,7 @@
    if (!tmp || !tmp[0])
       tmp = "/tmp";
@@ -110,7 +110,7 @@
 +  result = lstat(kde_tmp_dir.c_str(), &stat_buf);
    if ((result == 0) && (S_ISDIR(stat_buf.st_mode)))
    {
-      /* $KDEHOME/socket-$HOSTNAME is a normal directory. Do nothing. */
+      /* $TDEHOME/socket-$HOSTNAME is a normal directory. Do nothing. */
 -     tmp_buf = (char *) malloc(PATH_MAX+1);
 -     if (!tmp_buf)
 -        return 0;
@@ -184,7 +184,7 @@
 +  char *tmp_buf;
    int uid = getuid();
    const char *home_dir = getenv("HOME");
-   const char *kde_home = uid ? getenv("KDEHOME") : getenv("KDEROOTHOME");
+   const char *kde_home = uid ? getenv("TDEHOME") : getenv("KDEROOTHOME");
    int result;
    struct stat stat_buf;
  
@@ -259,7 +259,7 @@
 +  result = lstat(kde_tmp_dir.c_str(), &stat_buf);
    if ((result == 0) && (S_ISDIR(stat_buf.st_mode)))
    {
-      /* $KDEHOME/tmp is a normal directory. Do nothing. */
+      /* $TDEHOME/tmp is a normal directory. Do nothing. */
 -     printf("Directory \"%s\" already exists.\n", kde_tmp_dir);
 +     printf("Directory \"%s\" already exists.\n", kde_tmp_dir.c_str());
       return 0;
diff --git a/ubuntu/maverick_automake/kdebase/debian/changelog b/ubuntu/maverick_automake/kdebase/debian/changelog
index 994546f0b..b39130360 100644
--- a/ubuntu/maverick_automake/kdebase/debian/changelog
+++ b/ubuntu/maverick_automake/kdebase/debian/changelog
@@ -196,7 +196,7 @@ kdebase-kde3 (4:3.5.10-0ubuntu3~intrepid19) intrepid; urgency=low
 
 kdebase-kde3 (4:3.5.10-0ubuntu3~intrepid18) intrepid; urgency=low
 
-  * Added XDG_DATA_DIRS and KDEDIRS to startkde, as suggested by zekica on the Kubuntu forums
+  * Added XDG_DATA_DIRS and TDEDIRS to startkde, as suggested by zekica on the Kubuntu forums
 
  -- Timothy Pearson <[email protected]>  Sat, 07 Mar 2009 13:18:00 -0600
 
@@ -780,7 +780,7 @@ kdebase (4:3.5.7-1ubuntu21) gutsy; urgency=low
 
 kdebase (4:3.5.7-1ubuntu20) gutsy; urgency=low
 
-  * Changed (again) $KDEHOME to $kdehome in kubuntu_52_gtk_qt_engine_config.diff and 
+  * Changed (again) $TDEHOME to $kdehome in kubuntu_52_gtk_qt_engine_config.diff and 
     kubuntu_53_kwallet_config.diff . (LP: #136560)
 
  -- Jonathan Riddell <[email protected]>  Sat, 15 Sep 2007 23:12:26 +0100
@@ -799,7 +799,7 @@ kdebase (4:3.5.7-1ubuntu18) gutsy; urgency=low
   [ Ryan Kavanagh ]
   * Dropping kubuntu_9902_nspluginviewer_hangs_cpu.diff and the libgtk
     build-dep as they are no longer needed
-  * Changed $KDEHOME to $kdehome in kubuntu_52_gtk_qt_engine_config.diff and 
+  * Changed $TDEHOME to $kdehome in kubuntu_52_gtk_qt_engine_config.diff and 
     kubuntu_53_kwallet_config.diff . (LP: #136560)
 
  -- Ryan Kavanagh <[email protected]>  Mon, 03 Sep 2007 10:26:36 -0400
@@ -807,7 +807,7 @@ kdebase (4:3.5.7-1ubuntu18) gutsy; urgency=low
 kdebase (4:3.5.7-1ubuntu17) gutsy; urgency=low
 
   * Edit kubuntu_52_gtk_qt_engine_config.diff and
-    kubuntu_53_kwallet_config.diff to use $KDEHOME instead of .kde
+    kubuntu_53_kwallet_config.diff to use $TDEHOME instead of .kde
   * Remove kubuntu_77_kiosystem.diff, home:/ better than /home now
   * Edit kubuntu_27_aboutscreen_searchbar.diff to work with strigi
   * Add kubuntu_9903_api_docs_move.diff for new API website
diff --git a/ubuntu/maverick_automake/kdebase/debian/kdm-kde3.conf b/ubuntu/maverick_automake/kdebase/debian/kdm-kde3.conf
index 40acdd6b6..387be8b90 100755
--- a/ubuntu/maverick_automake/kdebase/debian/kdm-kde3.conf
+++ b/ubuntu/maverick_automake/kdebase/debian/kdm-kde3.conf
@@ -38,7 +38,7 @@ script
 	export LANG LANGUAGE
     fi
 
-    KDEDIRS=/opt/kde3/
+    TDEDIRS=/opt/kde3/
     PATH=/opt/kde3/bin:/bin:/usr/bin:/sbin:/usr/sbin
 
     initctl emit starting-dm DM=kdm-kde3
diff --git a/ubuntu/maverick_automake/kdebase/debian/kdm-kde3.txt b/ubuntu/maverick_automake/kdebase/debian/kdm-kde3.txt
index 191c344fd..71b5beb79 100644
--- a/ubuntu/maverick_automake/kdebase/debian/kdm-kde3.txt
+++ b/ubuntu/maverick_automake/kdebase/debian/kdm-kde3.txt
@@ -22,7 +22,7 @@ set -e
 HEED_DEFAULT_DISPLAY_MANAGER=true
 DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager
 
-KDEDIRS=/opt/kde3/
+TDEDIRS=/opt/kde3/
 PATH=/opt/kde3/bin:/bin:/usr/bin:/sbin:/usr/sbin
 DAEMON=/opt/kde3/bin/kdm
 PIDFILE=/var/run/kdm.pid
diff --git a/ubuntu/maverick_automake/kdelibs/debian/changelog b/ubuntu/maverick_automake/kdelibs/debian/changelog
index 323cc6749..23704c831 100644
--- a/ubuntu/maverick_automake/kdelibs/debian/changelog
+++ b/ubuntu/maverick_automake/kdelibs/debian/changelog
@@ -2087,7 +2087,7 @@ kdelibs (4:3.4.0-0pre5) alioth; urgency=low
     output them expanded even when --expandvars is not used. (Closes: #287822)
 
   * Fixed the ability of the build system to find kde.pot, even when it is not
-    located at KDEDIR/include/kde.pot. This allows the use of targets such as
+    located at TDEDIR/include/kde.pot. This allows the use of targets such as
     "package-messages" without specifying includedir. (Closes: #283858)
 
   * Now that graphviz is in main, add it to Build-Depends-Indep together with
diff --git a/ubuntu/maverick_automake/kdelibs/debian/kcmshell b/ubuntu/maverick_automake/kdelibs/debian/kcmshell
index 4ca9629ed..57d0e82bb 100755
--- a/ubuntu/maverick_automake/kdelibs/debian/kcmshell
+++ b/ubuntu/maverick_automake/kdelibs/debian/kcmshell
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-export KDEDIRS=/usr/:/opt/kde3/
+export TDEDIRS=/usr/:/opt/kde3/
 /opt/kde3/bin/kcmshell.real $1 $2 $3 $4 $5 $6 $7 $8
diff --git a/ubuntu/maverick_automake/kdelibs/debian/man/kstartupconfig-kde3.1 b/ubuntu/maverick_automake/kdelibs/debian/man/kstartupconfig-kde3.1
index dca82fb5e..87733d37f 100644
--- a/ubuntu/maverick_automake/kdelibs/debian/man/kstartupconfig-kde3.1
+++ b/ubuntu/maverick_automake/kdelibs/debian/man/kstartupconfig-kde3.1
@@ -4,7 +4,7 @@
 kstartupconfig, kdostartupconfig
 \- KDE configuration options loader
 .SH SYNOPSIS
-\fBkstartupconfig\fP [$KDEHOME]
+\fBkstartupconfig\fP [$TDEHOME]
 .sp 1
 \fBkdostartupconfig\fP
 .SH DESCRIPTION
@@ -27,19 +27,19 @@ do not use frequently changed config files since the checking is timestamp\-base
 if \fBkconf_update\fP is used to update an option also touch the matching global config file to allow \fBkstartupconfig\fP to see changes
 .SH OPTIONS
 .TP
-.B $KDEHOME
+.B $TDEHOME
 KDE home directory, if different to ~/.kde
 .SS
 .SH FILES
-In case $KDEHOME is not set ~/.kde is assumed.
+In case $TDEHOME is not set ~/.kde is assumed.
 .TP
-.I $KDEHOME/share/config/startupconfig
+.I $TDEHOME/share/config/startupconfig
 script, sourced to set shell variables with configuration options
 .TP
-.I $KDEHOME/share/config/startupconfigfiles
+.I $TDEHOME/share/config/startupconfigfiles
 configuration options and files they belong to
 .TP
-.I $KDEHOME/share/config/startupconfigkeys
+.I $TDEHOME/share/config/startupconfigkeys
 configuration options to load
 .SH SEE ALSO
 .BR kconf_update (1),\  startkde (1)
diff --git a/ubuntu/maverick_automake/kdelibs/debian/man/lnusertemp-kde3.sgml b/ubuntu/maverick_automake/kdelibs/debian/man/lnusertemp-kde3.sgml
index c40c64520..a75709316 100644
--- a/ubuntu/maverick_automake/kdelibs/debian/man/lnusertemp-kde3.sgml
+++ b/ubuntu/maverick_automake/kdelibs/debian/man/lnusertemp-kde3.sgml
@@ -72,7 +72,7 @@ manpage.1: manpage.sgml
 
     <para><command>&dhpackage;</command> is used to create KDE
     resources in temporary directories and symlinks to them in
-    <envar>KDEHOME</envar>. The resource that needs to be created is
+    <envar>TDEHOME</envar>. The resource that needs to be created is
     given as an argument and can be anyone of:</para>
 
     <itemizedlist>
diff --git a/ubuntu/maverick_automake/kdelibs/debian/man/make_driver_db_cups-kde3.1 b/ubuntu/maverick_automake/kdelibs/debian/man/make_driver_db_cups-kde3.1
index e4eb8251f..15d534206 100644
--- a/ubuntu/maverick_automake/kdelibs/debian/man/make_driver_db_cups-kde3.1
+++ b/ubuntu/maverick_automake/kdelibs/debian/man/make_driver_db_cups-kde3.1
@@ -25,10 +25,10 @@ directory with ppd files
 write printer database into this file
 .SH FILES
 .TP
-.I $KDEHOME/share/apps/kdeprint/printerdb_cups.txt
+.I $TDEHOME/share/apps/kdeprint/printerdb_cups.txt
 KDE printer database
 .br
-(if $KDEHOME is not set ~/.kde is used)
+(if $TDEHOME is not set ~/.kde is used)
 .SH SEE ALSO
 .BR make_driver_db_lpr (1)
 .TP
diff --git a/ubuntu/maverick_automake/kdemultimedia/debian/man/kaboodle-kde3.1 b/ubuntu/maverick_automake/kdemultimedia/debian/man/kaboodle-kde3.1
index c7852c5db..ef2e440bd 100644
--- a/ubuntu/maverick_automake/kdemultimedia/debian/man/kaboodle-kde3.1
+++ b/ubuntu/maverick_automake/kdemultimedia/debian/man/kaboodle-kde3.1
@@ -70,7 +70,7 @@ Use an alternative configuration file, instead of the default, which
 is normally located in
 .I /usr/share/config
 or in
-.RB $ KDEHOME\fI/share/config
+.RB $ TDEHOME\fI/share/config
 .TP
 .BI \-\-dcopserver \ server
 Set the address of the DCOP server to attach to.
@@ -218,7 +218,7 @@ The session manager to use. This option is set automatically by KDE
 and is a network path to the session manager socket.
 .IP HOME
 Path to the home directory for the current user. 
-.IP KDEHOME
+.IP TDEHOME
 The KDE per-user setting directory. Default if not specified is
 .I $HOME/.kde
 .lf 55 info/kdemultimedia.kaboodle.1
diff --git a/ubuntu/maverick_automake/kdeutils/debian/man/kcharselect-kde3.1 b/ubuntu/maverick_automake/kdeutils/debian/man/kcharselect-kde3.1
index bc0fb442b..63429d234 100644
--- a/ubuntu/maverick_automake/kdeutils/debian/man/kcharselect-kde3.1
+++ b/ubuntu/maverick_automake/kdeutils/debian/man/kcharselect-kde3.1
@@ -69,7 +69,7 @@ Use an alternative configuration file, instead of the default, which
 is normally located in
 .I /usr/share/config
 or in
-.RB $ KDEHOME\fI/share/config
+.RB $ TDEHOME\fI/share/config
 .TP
 .BI \-\-dcopserver \ server
 Set the address of the DCOP server to attach to.
@@ -217,7 +217,7 @@ The session manager to use. This option is set automatically by KDE
 and is a network path to the session manager socket.
 .IP HOME
 Path to the home directory for the current user. 
-.IP KDEHOME
+.IP TDEHOME
 The KDE per-user setting directory. Default if not specified is
 .I $HOME/.kde
 .lf 50 info/kdeutils.kcharselect.1