Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging

5 files changed, 11 insertions, 11 deletions

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