merge

17 files changed, 98 insertions, 98 deletions

diff --git a/ubuntu/maverick/tdeadmin/debian/cdbs/versions.pl b/ubuntu/maverick/tdeadmin/debian/cdbs/versions.pl
index 75c9add4b..1b110f7af 100644
--- a/ubuntu/maverick/tdeadmin/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/tdeadmin/debian/cdbs/versions.pl
@@ -13,7 +13,7 @@ my ($version2, $version2_next);
 ($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
 ($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
 
-print "KDE-Version3=$version3\n";
-print "KDE-Version2=$version2\n";
-print "KDE-Next-Version3=$version3_next\n";
-print "KDE-Next-Version2=$version2_next\n";
+print "TDE-Version3=$version3\n";
+print "TDE-Version2=$version2\n";
+print "TDE-Next-Version3=$version3_next\n";
+print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/maverick/tdeadmin/debian/control b/ubuntu/maverick/tdeadmin/debian/control
index acd744f83..553b1ed13 100644
--- a/ubuntu/maverick/tdeadmin/debian/control
+++ b/ubuntu/maverick/tdeadmin/debian/control
@@ -16,13 +16,13 @@ Depends: kcron-trinity (>= ${Source-Version}), kdat-trinity (>= ${Source-Version
 Recommends: lilo-config-trinity (>= ${Source-Version})
 Suggests: tdeadmin-trinity-doc-html (>= ${Source-Version})
 Description: system administration tools from the official Trinity release
- KDE (the K Desktop Environment) is a powerful Open Source graphical
+ TDE (the Trinity Desktop Environment) is a powerful Open Source graphical
  desktop environment for Unix workstations. It combines ease of use,
  contemporary functionality, and outstanding graphical design with the
  technological superiority of the Unix operating system.
  .
  This metapackage includes a collection of system administration tools
- provided with the official release of KDE.
+ provided with the official release of TDE.
 
 Package: tdeadmin-trinity-doc-html
 Architecture: all
@@ -30,19 +30,19 @@ Section: doc
 Replaces: kdeadmin-kde3-doc-html (<< 4:14.0.0~), kdeadmin-trinity-doc-html (<< 4:14.0.0~)
 Breaks: kdeadmin-kde3-doc-html (<< 4:14.0.0~), kdeadmin-trinity-doc-html (<< 4:14.0.0~)
 Suggests: konqueror-trinity | www-browser, tdebase-trinity
-Description: KDE administration documentation in HTML format
- By default the modules provided by KDE only provide their documentation
- in KDE docbook format, which can only be read by Konqueror or KHelpCenter.
- This package provides all of the KDE administration documentation
+Description: TDE administration documentation in HTML format
+ By default the modules provided by TDE only provide their documentation
+ in TDE docbook format, which can only be read by Konqueror or KHelpCenter.
+ This package provides all of the TDE administration documentation
  converted to HTML format so it can be read with any web browser.
  .
  The documentation will be installed into the usual directories
  /usr/share/doc/tde/HTML/<language>/<app>/, for instance
  /usr/share/doc/tde/HTML/en/kcron/. Documentation is provided for most
- KDE administration packages.
+ TDE administration packages.
  .
- This package is part of Trinity, and a component of the KDE administration
- module. See the 'kde-trinity' and 'tdeadmin-trinity' packages for more information.
+ This package is part of Trinity, and a component of the TDE administration
+ module. See the 'tde-trinity' and 'tdeadmin-trinity' packages for more information.
 
 Package: kcron-trinity
 Section: admin
@@ -55,8 +55,8 @@ Description: the Trinity crontab editor
  KCron is an application for scheduling programs to run in the background.
  It is a graphical user interface to cron, the UNIX system scheduler.
  .
- This package is part of Trinity, as a component of the KDE administration module.
- See the 'kde-trinity' and 'tdeadmin-trinity' packages for more information.
+ This package is part of Trinity, as a component of the TDE administration module.
+ See the 'tde-trinity' and 'tdeadmin-trinity' packages for more information.
 
 Package: kdat-trinity
 Section: admin
@@ -76,8 +76,8 @@ Description: a Trinity tape backup tool
   * Selective restore of files from an archive.
   * Backup profiles for frequently used backups.
  .
- This package is part of Trinity, as a component of the KDE administration module.
- See the 'kde-trinity' and 'tdeadmin-trinity' packages for more information.
+ This package is part of Trinity, as a component of the TDE administration module.
+ See the 'tde-trinity' and 'tdeadmin-trinity' packages for more information.
 
 Package: tdeadmin-tdefile-plugins-trinity
 Section: tde
@@ -88,8 +88,8 @@ Depends: ${shlibs:Depends}
 Description: Trinity file metainfo plugins for deb and rpm files
  File metainfo plugins for deb and rpm package files.
  .
- This package is part of Trinity, as a component of the KDE administration module.
- See the 'kde-trinity' and 'tdeadmin-trinity' packages for more information.
+ This package is part of Trinity, as a component of the TDE administration module.
+ See the 'tde-trinity' and 'tdeadmin-trinity' packages for more information.
 
 Package: knetworkconf-trinity
 Section: tde
@@ -98,11 +98,11 @@ Replaces: knetworkconf-kde3 (<< 4:14.0.0~), knetworkconf-trinity (<< 4:14.0.0~)
 Breaks: knetworkconf-kde3 (<< 4:14.0.0~), knetworkconf-trinity (<< 4:14.0.0~)
 Depends: ${shlibs:Depends}
 Description: Trinity network configuration tool
- This is a KDE control center module to configure TCP/IP settings.  It
+ This is a Trinity control center module to configure TCP/IP settings.  It
  can be used to manage network devices and settings for each device.
  .
- This package is part of Trinity, as a component of the KDE administration module.
- See the 'kde-trinity' and 'tdeadmin-trinity' packages for more information.
+ This package is part of Trinity, as a component of the TDE administration module.
+ See the 'tde-trinity' and 'tdeadmin-trinity' packages for more information.
 
 Package: kpackage-trinity
 Section: admin
@@ -117,8 +117,8 @@ Description: Trinity package management tool
  to view currently installed packages, browse available packages, and
  install/remove them.
  .
- This package is part of Trinity, as a component of the KDE administration module.
- See the 'kde-trinity' and 'tdeadmin-trinity' packages for more information.
+ This package is part of Trinity, as a component of the TDE administration module.
+ See the 'tde-trinity' and 'tdeadmin-trinity' packages for more information.
 
 Package: ksysv-trinity
 Section: admin
@@ -131,8 +131,8 @@ Description: Trinity SysV-style init configuration editor
  This program allows you to edit your start and stop scripts using a
  drag and drop GUI.
  .
- This package is part of Trinity, as a component of the KDE administration module.
- See the 'kde-trinity' and 'tdeadmin-trinity' packages for more information.
+ This package is part of Trinity, as a component of the TDE administration module.
+ See the 'tde-trinity' and 'tdeadmin-trinity' packages for more information.
 
 Package: kuser-trinity
 Section: admin
@@ -142,10 +142,10 @@ Breaks: kuser-kde3 (<< 4:14.0.0~), kuser-trinity (<< 4:14.0.0~)
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter-trinity
 Description: Trinity user/group administration tool
- A user/group administration tool for KDE.
+ A user/group administration tool for TDE.
  .
- This package is part of Trinity, as a component of the KDE administration module.
- See the 'kde-trinity' and 'tdeadmin-trinity' packages for more information.
+ This package is part of Trinity, as a component of the TDE administration module.
+ See the 'tde-trinity' and 'tdeadmin-trinity' packages for more information.
 
 Package: lilo-config-trinity
 Section: tde
@@ -156,14 +156,14 @@ Depends: ${shlibs:Depends}, kcontrol-trinity
 Recommends: tdebase-trinity-bin
 Suggests: lilo
 Description: Trinity frontend for lilo configuration
- lilo-config is a KDE based frontend to the lilo boot manager configuration.
- It runs out of the KDE Control Center.
+ lilo-config is a TDE based frontend to the lilo boot manager configuration.
+ It runs out of the Trinity Control Center.
  .
  If you want to use the menu entry to launch lilo-config, you need to install
  tdebase-bin since it uses the tdesu command to gain root privileges.
  .
- This package is part of Trinity, as a component of the KDE administration module.
- See the 'kde-trinity' and 'tdeadmin-trinity' packages for more information.
+ This package is part of Trinity, as a component of the TDE administration module.
+ See the 'tde-trinity' and 'tdeadmin-trinity' packages for more information.
 
 Package: tdeadmin-trinity-dbg
 Section: libdevel
diff --git a/ubuntu/maverick/tdeadmin/debian/control.in b/ubuntu/maverick/tdeadmin/debian/control.in
index 20ea38faa..2a8ac7df4 100644
--- a/ubuntu/maverick/tdeadmin/debian/control.in
+++ b/ubuntu/maverick/tdeadmin/debian/control.in
@@ -13,51 +13,51 @@ Architecture: all
 Depends: kcron (>= ${Source-Version}), kdat (>= ${Source-Version}), tdeadmin-tdefile-plugins (>= ${Source-Version}), knetworkconf (>= ${Source-Version}), kpackage (>= ${Source-Version}), ksysv (>= ${Source-Version}), kuser (>= ${Source-Version})
 Recommends: lilo-config (>= ${Source-Version})
 Suggests: tdeadmin-doc-html (>= ${Source-Version})
-Description: system administration tools from the official KDE release
- KDE (the K Desktop Environment) is a powerful Open Source graphical
+Description: system administration tools from the official TDE release
+ TDE (the Trinity Desktop Environment) is a powerful Open Source graphical
  desktop environment for Unix workstations. It combines ease of use,
  contemporary functionality, and outstanding graphical design with the
  technological superiority of the Unix operating system.
  .
  This metapackage includes a collection of system administration tools
- provided with the official release of KDE.
+ provided with the official release of TDE.
 
 Package: tdeadmin-doc-html
 Architecture: all
 Section: doc
 Suggests: konqueror | www-browser, tdebase
-Description: KDE administration documentation in HTML format
- By default the modules provided by KDE only provide their documentation
- in KDE docbook format, which can only be read by Konqueror or KHelpCenter.
- This package provides all of the KDE administration documentation
+Description: TDE administration documentation in HTML format
+ By default the modules provided by TDE only provide their documentation
+ in TDE docbook format, which can only be read by Konqueror or KHelpCenter.
+ This package provides all of the TDE administration documentation
  converted to HTML format so it can be read with any web browser.
  .
  The documentation will be installed into the usual directories
  /usr/share/doc/tde/HTML/<language>/<app>/, for instance
  /usr/share/doc/tde/HTML/en/kcron/. Documentation is provided for most
- KDE administration packages.
+ TDE administration packages.
  .
- This package is part of KDE, and a component of the KDE administration
- module. See the 'kde' and 'tdeadmin' packages for more information.
+ This package is part of TDE, and a component of the TDE administration
+ module. See the 'tde' and 'tdeadmin' packages for more information.
 
 Package: kcron
 Section: admin
 Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter
-Description: the KDE crontab editor
+Description: the TDE crontab editor
  KCron is an application for scheduling programs to run in the background.
  It is a graphical user interface to cron, the UNIX system scheduler.
  .
- This package is part of KDE, as a component of the KDE administration module.
- See the 'kde' and 'tdeadmin' packages for more information.
+ This package is part of TDE, as a component of the TDE administration module.
+ See the 'tde' and 'tdeadmin' packages for more information.
 
 Package: kdat
 Section: admin
 Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter
-Description: a KDE tape backup tool
+Description: a TDE tape backup tool
  KDat is a tar-based tape archiver. It is designed to work with multiple
  archives on a single tape.
  .
@@ -68,29 +68,29 @@ Description: a KDE tape backup tool
   * Selective restore of files from an archive.
   * Backup profiles for frequently used backups.
  .
- This package is part of KDE, as a component of the KDE administration module.
- See the 'kde' and 'tdeadmin' packages for more information.
+ This package is part of TDE, as a component of the TDE administration module.
+ See the 'tde' and 'tdeadmin' packages for more information.
 
 Package: tdeadmin-tdefile-plugins
 Section: tde
 Architecture: any
 Depends: ${shlibs:Depends}
-Description: KDE file metainfo plugins for deb and rpm files
+Description: TDE file metainfo plugins for deb and rpm files
  File metainfo plugins for deb and rpm package files.
  .
- This package is part of KDE, as a component of the KDE administration module.
- See the 'kde' and 'tdeadmin' packages for more information.
+ This package is part of TDE, as a component of the TDE administration module.
+ See the 'tde' and 'tdeadmin' packages for more information.
 
 Package: knetworkconf
 Section: tde
 Architecture: any
 Depends: ${shlibs:Depends}
-Description: KDE network configuration tool
- This is a KDE control center module to configure TCP/IP settings.  It
+Description: TDE network configuration tool
+ This is a Trinity control center module to configure TCP/IP settings.  It
  can be used to manage network devices and settings for each device.
  .
- This package is part of KDE, as a component of the KDE administration module.
- See the 'kde' and 'tdeadmin' packages for more information.
+ This package is part of TDE, as a component of the TDE administration module.
+ See the 'tde' and 'tdeadmin' packages for more information.
 
 Package: kpackage
 Section: admin
@@ -98,36 +98,36 @@ Architecture: any
 Depends: ${shlibs:Depends}
 Recommends: rpm
 Suggests: khelpcenter
-Description: KDE package management tool
+Description: TDE package management tool
  This is a frontend to both .rpm and .deb package formats. It allows you
  to view currently installed packages, browse available packages, and
  install/remove them.
  .
- This package is part of KDE, as a component of the KDE administration module.
- See the 'kde' and 'tdeadmin' packages for more information.
+ This package is part of TDE, as a component of the TDE administration module.
+ See the 'tde' and 'tdeadmin' packages for more information.
 
 Package: ksysv
 Section: admin
 Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter
-Description: KDE SysV-style init configuration editor
+Description: TDE SysV-style init configuration editor
  This program allows you to edit your start and stop scripts using a
  drag and drop GUI.
  .
- This package is part of KDE, as a component of the KDE administration module.
- See the 'kde' and 'tdeadmin' packages for more information.
+ This package is part of TDE, as a component of the TDE administration module.
+ See the 'tde' and 'tdeadmin' packages for more information.
 
 Package: kuser
 Section: admin
 Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter
-Description: KDE user/group administration tool
- A user/group administration tool for KDE.
+Description: TDE user/group administration tool
+ A user/group administration tool for TDE.
  .
- This package is part of KDE, as a component of the KDE administration module.
- See the 'kde' and 'tdeadmin' packages for more information.
+ This package is part of TDE, as a component of the TDE administration module.
+ See the 'tde' and 'tdeadmin' packages for more information.
 
 Package: lilo-config
 Section: tde
@@ -135,15 +135,15 @@ Architecture: i386 amd64
 Depends: ${shlibs:Depends}, kcontrol
 Recommends: tdebase-bin
 Suggests: lilo
-Description: KDE frontend for lilo configuration
- lilo-config is a KDE based frontend to the lilo boot manager configuration.
- It runs out of the KDE Control Center.
+Description: TDE frontend for lilo configuration
+ lilo-config is a TDE based frontend to the lilo boot manager configuration.
+ It runs out of the Trinity Control Center.
  .
  If you want to use the menu entry to launch lilo-config, you need to install
  tdebase-bin since it uses the tdesu command to gain root privileges.
  .
- This package is part of KDE, as a component of the KDE administration module.
- See the 'kde' and 'tdeadmin' packages for more information.
+ This package is part of TDE, as a component of the TDE administration module.
+ See the 'tde' and 'tdeadmin' packages for more information.
 
 Package: tdeadmin-dbg
 Section: libdevel
diff --git a/ubuntu/maverick/tdeadmin/debian/kcron-trinity.menu b/ubuntu/maverick/tdeadmin/debian/kcron-trinity.menu
index 0bb50e9c8..4bd82cc3d 100644
--- a/ubuntu/maverick/tdeadmin/debian/kcron-trinity.menu
+++ b/ubuntu/maverick/tdeadmin/debian/kcron-trinity.menu
@@ -1,4 +1,4 @@
-?package(kcron):\
+?package(kcron-trinity):\
 	needs="X11"\
 	section="Applications/Editors"\
 	hints="TDE"\
diff --git a/ubuntu/maverick/tdeadmin/debian/kdat-trinity.menu b/ubuntu/maverick/tdeadmin/debian/kdat-trinity.menu
index dc7ab1da7..0970faaf2 100644
--- a/ubuntu/maverick/tdeadmin/debian/kdat-trinity.menu
+++ b/ubuntu/maverick/tdeadmin/debian/kdat-trinity.menu
@@ -1,4 +1,4 @@
-?package(kdat):\
+?package(kdat-trinity):\
 	needs="X11"\
 	section="Applications/System/Hardware"\
 	hints="TDE"\
diff --git a/ubuntu/maverick/tdeadmin/debian/kpackage-trinity.menu b/ubuntu/maverick/tdeadmin/debian/kpackage-trinity.menu
index fb84cc32b..c1a3762b0 100644
--- a/ubuntu/maverick/tdeadmin/debian/kpackage-trinity.menu
+++ b/ubuntu/maverick/tdeadmin/debian/kpackage-trinity.menu
@@ -1,4 +1,4 @@
-?package(kpackage):\
+?package(kpackage-trinity):\
 	needs="X11"\
 	section="Applications/System/Package Management"\
 	hints="TDE"\
diff --git a/ubuntu/maverick/tdeadmin/debian/ksysv-trinity.menu b/ubuntu/maverick/tdeadmin/debian/ksysv-trinity.menu
index 45353ae4b..f28aef7bc 100644
--- a/ubuntu/maverick/tdeadmin/debian/ksysv-trinity.menu
+++ b/ubuntu/maverick/tdeadmin/debian/ksysv-trinity.menu
@@ -1,4 +1,4 @@
-?package(ksysv):\
+?package(ksysv-trinity):\
 	needs="X11"\
 	section="Applications/Editors"\
 	hints="TDE"\
diff --git a/ubuntu/maverick/tdeadmin/debian/kuser-trinity.menu b/ubuntu/maverick/tdeadmin/debian/kuser-trinity.menu
index 52d2a8afc..5280c0a09 100644
--- a/ubuntu/maverick/tdeadmin/debian/kuser-trinity.menu
+++ b/ubuntu/maverick/tdeadmin/debian/kuser-trinity.menu
@@ -1,4 +1,4 @@
-?package(kuser):\
+?package(kuser-trinity):\
 	needs="X11"\
 	section="Applications/System/Administration"\
 	hints="TDE"\
diff --git a/ubuntu/maverick/tdeadmin/debian/lilo-config-trinity.menu b/ubuntu/maverick/tdeadmin/debian/lilo-config-trinity.menu
index a0e9dc661..77a15d4a9 100644
--- a/ubuntu/maverick/tdeadmin/debian/lilo-config-trinity.menu
+++ b/ubuntu/maverick/tdeadmin/debian/lilo-config-trinity.menu
@@ -1,4 +1,4 @@
-?package(lilo-config):\
+?package(lilo-config-trinity):\
 	needs="X11"\
 	section="Applications/System/Administration"\
 	hints="TDE"\
diff --git a/ubuntu/maverick/tdeadmin/debian/man/kcron-trinity.sgml b/ubuntu/maverick/tdeadmin/debian/man/kcron-trinity.sgml
index 0a3f9b243..f07379504 100644
--- a/ubuntu/maverick/tdeadmin/debian/man/kcron-trinity.sgml
+++ b/ubuntu/maverick/tdeadmin/debian/man/kcron-trinity.sgml
@@ -52,7 +52,7 @@ manpage.1: manpage.sgml
       <command>&dhpackage;</command>
 
       <arg><option>--help<replaceable></replaceable></option></arg>
-      <arg><option>--help-kde<replaceable></replaceable></option></arg>
+      <arg><option>--help-tde<replaceable></replaceable></option></arg>
       <arg><option>--help-qt<replaceable></replaceable></option></arg>
       <arg><option>--version<replaceable> -v</replaceable></option></arg>
       <arg><option>--license<replaceable></replaceable></option></arg>
@@ -155,7 +155,7 @@ manpage.1: manpage.sgml
         <term><option>--nocrashhandler</option>
 	</term>
 	<listitem>
-	  <para>Disable KDE crash handler (enables core dumps).</para>
+	  <para>Disable TDE crash handler (enables core dumps).</para>
 	</listitem>
       </varlistentry>
       <varlistentry>
@@ -169,7 +169,7 @@ manpage.1: manpage.sgml
         <term><option>--style &lt;style&gt;</option>
 	</term>
 	<listitem>
-	  <para>Sets the application's GUI style (overrides KDE).</para>
+	  <para>Sets the application's GUI style (overrides TDE).</para>
 	</listitem>
       </varlistentry>
       <varlistentry>
diff --git a/ubuntu/maverick/tdeadmin/debian/man/kdat-trinity.sgml b/ubuntu/maverick/tdeadmin/debian/man/kdat-trinity.sgml
index a41eee990..0eebc4a91 100644
--- a/ubuntu/maverick/tdeadmin/debian/man/kdat-trinity.sgml
+++ b/ubuntu/maverick/tdeadmin/debian/man/kdat-trinity.sgml
@@ -45,14 +45,14 @@ manpage.1: manpage.sgml
   <refnamediv>
     <refname>&dhpackage;</refname>
 
-    <refpurpose>tar-based DAT archiver for KDE.</refpurpose>
+    <refpurpose>tar-based DAT archiver for TDE.</refpurpose>
   </refnamediv>
   <refsynopsisdiv>
     <cmdsynopsis>
       <command>&dhpackage;</command>
 
       <arg><option>--help<replaceable></replaceable></option></arg>
-      <arg><option>--help-kde<replaceable></replaceable></option></arg>
+      <arg><option>--help-tde<replaceable></replaceable></option></arg>
       <arg><option>--help-qt<replaceable></replaceable></option></arg>
       <arg><option>--version<replaceable> -v</replaceable></option></arg>
       <arg><option>--license<replaceable></replaceable></option></arg>
@@ -155,7 +155,7 @@ manpage.1: manpage.sgml
         <term><option>--nocrashhandler</option>
 	</term>
 	<listitem>
-	  <para>Disable KDE crash handler (enables core dumps).</para>
+	  <para>Disable TDE crash handler (enables core dumps).</para>
 	</listitem>
       </varlistentry>
       <varlistentry>
@@ -169,7 +169,7 @@ manpage.1: manpage.sgml
         <term><option>--style &lt;style&gt;</option>
 	</term>
 	<listitem>
-	  <para>Sets the application's GUI style (overrides KDE).</para>
+	  <para>Sets the application's GUI style (overrides TDE).</para>
 	</listitem>
       </varlistentry>
       <varlistentry>
diff --git a/ubuntu/maverick/tdeadmin/debian/man/kpackage-trinity.sgml b/ubuntu/maverick/tdeadmin/debian/man/kpackage-trinity.sgml
index cd625d943..e8dac316d 100644
--- a/ubuntu/maverick/tdeadmin/debian/man/kpackage-trinity.sgml
+++ b/ubuntu/maverick/tdeadmin/debian/man/kpackage-trinity.sgml
@@ -52,7 +52,7 @@ manpage.1: manpage.sgml
       <command>&dhpackage;</command>
 
       <arg><option>--help<replaceable></replaceable></option></arg>
-      <arg><option>--help-kde<replaceable></replaceable></option></arg>
+      <arg><option>--help-tde<replaceable></replaceable></option></arg>
       <arg><option>--help-qt<replaceable></replaceable></option></arg>
       <arg><option>--version<replaceable> -v</replaceable></option></arg>
       <arg><option>--license<replaceable></replaceable></option></arg>
@@ -157,7 +157,7 @@ manpage.1: manpage.sgml
         <term><option>--nocrashhandler</option>
 	</term>
 	<listitem>
-	  <para>Disable KDE crash handler (enables core dumps).</para>
+	  <para>Disable TDE crash handler (enables core dumps).</para>
 	</listitem>
       </varlistentry>
       <varlistentry>
@@ -171,7 +171,7 @@ manpage.1: manpage.sgml
         <term><option>--style &lt;style&gt;</option>
 	</term>
 	<listitem>
-	  <para>Sets the application's GUI style (overrides KDE).</para>
+	  <para>Sets the application's GUI style (overrides TDE).</para>
 	</listitem>
       </varlistentry>
       <varlistentry>
diff --git a/ubuntu/maverick/tdeadmin/debian/man/ksysv-trinity.sgml b/ubuntu/maverick/tdeadmin/debian/man/ksysv-trinity.sgml
index afa872590..059a0010d 100644
--- a/ubuntu/maverick/tdeadmin/debian/man/ksysv-trinity.sgml
+++ b/ubuntu/maverick/tdeadmin/debian/man/ksysv-trinity.sgml
@@ -52,7 +52,7 @@ manpage.1: manpage.sgml
       <command>&dhpackage;</command>
 
       <arg><option>--help<replaceable></replaceable></option></arg>
-      <arg><option>--help-kde<replaceable></replaceable></option></arg>
+      <arg><option>--help-tde<replaceable></replaceable></option></arg>
       <arg><option>--help-qt<replaceable></replaceable></option></arg>
       <arg><option>--version<replaceable> -v</replaceable></option></arg>
       <arg><option>--license<replaceable></replaceable></option></arg>
@@ -155,7 +155,7 @@ manpage.1: manpage.sgml
         <term><option>--nocrashhandler</option>
 	</term>
 	<listitem>
-	  <para>Disable KDE crash handler (enables core dumps).</para>
+	  <para>Disable TDE crash handler (enables core dumps).</para>
 	</listitem>
       </varlistentry>
       <varlistentry>
@@ -169,7 +169,7 @@ manpage.1: manpage.sgml
         <term><option>--style &lt;style&gt;</option>
 	</term>
 	<listitem>
-	  <para>Sets the application's GUI style (overrides KDE).</para>
+	  <para>Sets the application's GUI style (overrides TDE).</para>
 	</listitem>
       </varlistentry>
       <varlistentry>
diff --git a/ubuntu/maverick/tdeadmin/debian/man/kuser-trinity.sgml b/ubuntu/maverick/tdeadmin/debian/man/kuser-trinity.sgml
index c9ba9ac91..e99ddba47 100644
--- a/ubuntu/maverick/tdeadmin/debian/man/kuser-trinity.sgml
+++ b/ubuntu/maverick/tdeadmin/debian/man/kuser-trinity.sgml
@@ -52,7 +52,7 @@ manpage.1: manpage.sgml
       <command>&dhpackage;</command>
 
       <arg><option>--help<replaceable></replaceable></option></arg>
-      <arg><option>--help-kde<replaceable></replaceable></option></arg>
+      <arg><option>--help-tde<replaceable></replaceable></option></arg>
       <arg><option>--help-qt<replaceable></replaceable></option></arg>
       <arg><option>--version<replaceable> -v</replaceable></option></arg>
       <arg><option>--license<replaceable></replaceable></option></arg>
@@ -155,7 +155,7 @@ manpage.1: manpage.sgml
         <term><option>--nocrashhandler</option>
 	</term>
 	<listitem>
-	  <para>Disable KDE crash handler (enables core dumps).</para>
+	  <para>Disable TDE crash handler (enables core dumps).</para>
 	</listitem>
       </varlistentry>
       <varlistentry>
@@ -169,7 +169,7 @@ manpage.1: manpage.sgml
         <term><option>--style &lt;style&gt;</option>
 	</term>
 	<listitem>
-	  <para>Sets the application's GUI style (overrides KDE).</para>
+	  <para>Sets the application's GUI style (overrides TDE).</para>
 	</listitem>
       </varlistentry>
       <varlistentry>
diff --git a/ubuntu/maverick/tdeadmin/debian/man/secpolicy-trinity.sgml b/ubuntu/maverick/tdeadmin/debian/man/secpolicy-trinity.sgml
index a3217d584..af7be9b7f 100644
--- a/ubuntu/maverick/tdeadmin/debian/man/secpolicy-trinity.sgml
+++ b/ubuntu/maverick/tdeadmin/debian/man/secpolicy-trinity.sgml
@@ -52,7 +52,7 @@ manpage.1: manpage.sgml
       <command>&dhpackage;</command>
 
       <arg><option>--help<replaceable></replaceable></option></arg>
-      <arg><option>--help-kde<replaceable></replaceable></option></arg>
+      <arg><option>--help-tde<replaceable></replaceable></option></arg>
       <arg><option>--help-qt<replaceable></replaceable></option></arg>
       <arg><option>--version<replaceable> -v</replaceable></option></arg>
       <arg><option>--license<replaceable></replaceable></option></arg>
@@ -155,7 +155,7 @@ manpage.1: manpage.sgml
         <term><option>--nocrashhandler</option>
 	</term>
 	<listitem>
-	  <para>Disable KDE crash handler (enables core dumps).</para>
+	  <para>Disable TDE crash handler (enables core dumps).</para>
 	</listitem>
       </varlistentry>
       <varlistentry>
@@ -169,7 +169,7 @@ manpage.1: manpage.sgml
         <term><option>--style &lt;style&gt;</option>
 	</term>
 	<listitem>
-	  <para>Sets the application's GUI style (overrides KDE).</para>
+	  <para>Sets the application's GUI style (overrides TDE).</para>
 	</listitem>
       </varlistentry>
       <varlistentry>
diff --git a/ubuntu/maverick/tdeadmin/debian/rules b/ubuntu/maverick/tdeadmin/debian/rules
index ffc84dbdb..5b23fd38d 100755
--- a/ubuntu/maverick/tdeadmin/debian/rules
+++ b/ubuntu/maverick/tdeadmin/debian/rules
@@ -18,5 +18,5 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
                                && echo xz || echo bzip2)
 
 DEB_CONFIGURE_EXTRA_FLAGS := \
-	--without-rpm --with-pam=kde --with-shadow --with-nis \
+	--without-rpm --with-pam=tde --with-shadow --with-nis \
 	--with-private-groups --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib
diff --git a/ubuntu/maverick/tdeadmin/debian/tdeadmin-doc-html.doc-base.kdat b/ubuntu/maverick/tdeadmin/debian/tdeadmin-doc-html.doc-base.kdat
index 927e23227..52c649f74 100644
--- a/ubuntu/maverick/tdeadmin/debian/tdeadmin-doc-html.doc-base.kdat
+++ b/ubuntu/maverick/tdeadmin/debian/tdeadmin-doc-html.doc-base.kdat
@@ -1,7 +1,7 @@
 Document: tdeadmin-doc-html-kdat
 Title: Kdat Handbook
 Author: Sean Vyain
-Abstract: KDE tape management.
+Abstract: TDE tape management.
 Section: Admin 
 
 Format: HTML