merge

30 files changed, 129 insertions, 129 deletions

diff --git a/ubuntu/maverick/tdewebdev/debian/cdbs/versions.pl b/ubuntu/maverick/tdewebdev/debian/cdbs/versions.pl
index 75c9add4b..1b110f7af 100644
--- a/ubuntu/maverick/tdewebdev/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/tdewebdev/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/tdewebdev/debian/control b/ubuntu/maverick/tdewebdev/debian/control
index 31cd98874..731964c93 100644
--- a/ubuntu/maverick/tdewebdev/debian/control
+++ b/ubuntu/maverick/tdewebdev/debian/control
@@ -15,14 +15,14 @@ Replaces: kdewebdev-kde3 (<< 4:14.0.0~), kdewebdev-trinity (<< 4:14.0.0~)
 Breaks: kdewebdev-kde3 (<< 4:14.0.0~), kdewebdev-trinity (<< 4:14.0.0~)
 Depends: quanta-trinity (>= ${source:Version}), tdefilereplace-trinity (>= ${source:Version}), kimagemapeditor-trinity (>= ${source:Version}), klinkstatus-trinity (>= ${source:Version}), kommander-trinity (>= ${source:Version}), kxsldbg-trinity (>= ${source:Version})
 Suggests: kommander-trinity-dev (>= ${source:Version}), tdewebdev-trinity-doc-html (>= ${source:Version})
-Description: web development apps from the official KDE release [Trinity]
- KDE (the K Desktop Environment) is a powerful Open Source graphical
+Description: web development apps from the official TDE release [Trinity]
+ 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 web development applications
- provided with the official release of KDE.
+ provided with the official release of TDE.
 
 Package: tdewebdev-trinity-doc-html
 Architecture: all
@@ -30,19 +30,19 @@ Section: doc
 Replaces: kdewebdev-kde3-doc-html (<< 4:14.0.0~), kdewebdev-trinity-doc-html (<< 4:14.0.0~)
 Breaks: kdewebdev-kde3-doc-html (<< 4:14.0.0~), kdewebdev-trinity-doc-html (<< 4:14.0.0~)
 Suggests: konqueror-trinity | www-browser, tdewebdev-trinity
-Description: KDE web development documentation in HTML format [Trinity]
- 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 web development documentation converted
+Description: TDE web development documentation in HTML format [Trinity]
+ 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 web development documentation converted
  to HTML format so it can be read with any web browser.
  .
  The documentation will be installed into the usual directories
  /opt/trinity/share/doc/tde/HTML/<language>/<app>/, for instance
  /opt/trinity/share/doc/tde/HTML/en/quanta/. Documentation is provided for most
- KDE web development packages.
+ TDE web development packages.
  .
- This package is part of KDE, as a component of the KDE web development module.
- See the 'kde-trinity' and 'tdewebdev-trinity' packages for more information.
+ This package is part of TDE, as a component of the TDE web development module.
+ See the 'tde-trinity' and 'tdewebdev-trinity' packages for more information.
 
 Package: quanta-trinity
 Architecture: any
@@ -52,22 +52,22 @@ Breaks: quanta-kde3 (<< 4:14.0.0~), quanta-trinity (<< 4:14.0.0~)
 Depends: ${shlibs:Depends}, tdefilereplace-trinity, klinkstatus-trinity, kommander-trinity, quanta-data-trinity, tidy
 Recommends: cervisia-trinity, gnupg, kompare-trinity, kxsldbg-trinity, docbook-defguide
 Suggests: gubed, kimagemapeditor-trinity, wget, khelpcenter-trinity, php-doc
-Description: web development environment for KDE [Trinity]
+Description: web development environment for TDE [Trinity]
  Quanta Plus is a web development environment for working with HTML
  and associated languages. It strives to be neutral and transparent
  to all markup languages, while supporting popular web-based scripting
  languages, CSS and other emerging W3C recommendations.
  .
  Quanta Plus supports many external components, debuggers and other tools
- for web development, several of which are shipped with the KDE web
+ for web development, several of which are shipped with the TDE web
  development module.
  .
  Quanta Plus is not in any way affiliated with any commercial versions
  of Quanta. The primary coders from the original team left the GPL'd
  version to produce a commercial product.
  .
- This package is part of KDE, as a component of the KDE web development module.
- See the 'kde-trinity' and 'tdewebdev-trinity' packages for more information.
+ This package is part of TDE, as a component of the TDE web development module.
+ See the 'tde-trinity' and 'tdewebdev-trinity' packages for more information.
 
 Package: quanta-data-trinity
 Architecture: all
@@ -82,8 +82,8 @@ Description: data files for Quanta Plus web development environment [Trinity]
  .
  See the quanta package for further information.
  .
- This package is part of KDE, as a component of the KDE web development module.
- See the 'kde-trinity' and 'tdewebdev-trinity' packages for more information.
+ This package is part of TDE, as a component of the TDE web development module.
+ See the 'tde-trinity' and 'tdewebdev-trinity' packages for more information.
 
 Package: tdefilereplace-trinity
 Architecture: any
@@ -92,8 +92,8 @@ Replaces: kfilereplace-kde3 (<< 4:14.0.0~), kfilereplace-trinity (<< 4:14.0.0~)
 Breaks: kfilereplace-kde3 (<< 4:14.0.0~), kfilereplace-trinity (<< 4:14.0.0~)
 Depends: ${shlibs:Depends}
 Suggests: quanta-trinity
-Description: batch search-and-replace component for KDE [Trinity]
- KFileReplace is an embedded component for KDE that acts as a batch
+Description: batch search-and-replace component for TDE [Trinity]
+ KFileReplace is an embedded component for TDE that acts as a batch
  search-and-replace tool. It allows you to replace one expression with
  another in many files at once.
  .
@@ -101,8 +101,8 @@ Description: batch search-and-replace component for KDE [Trinity]
  application. An example of an application that uses the KFileReplace
  component is Quanta Plus (found in the package quanta).
  .
- This package is part of KDE, as a component of the KDE web development module.
- See the 'kde-trinity' and 'tdewebdev-trinity' packages for more information.
+ This package is part of TDE, as a component of the TDE web development module.
+ See the 'tde-trinity' and 'tdewebdev-trinity' packages for more information.
 
 Package: kimagemapeditor-trinity
 Architecture: any
@@ -111,13 +111,13 @@ Replaces: kimagemapeditor-kde3 (<< 4:14.0.0~), kimagemapeditor-trinity (<< 4:14.
 Breaks: kimagemapeditor-kde3 (<< 4:14.0.0~), kimagemapeditor-trinity (<< 4:14.0.0~)
 Depends: ${shlibs:Depends}
 Suggests: quanta-trinity
-Description: HTML image map editor for KDE [Trinity]
+Description: HTML image map editor for TDE [Trinity]
  KImageMapEditor is a tool that allows you to edit image maps in HTML
  files. As well as providing a standalone application, KImageMapEditor
  makes itself available as a KPart for embedding into larger applications.
  .
- This package is part of KDE, as a component of the KDE web development module.
- See the 'kde-trinity' and 'tdewebdev-trinity' packages for more information.
+ This package is part of TDE, as a component of the TDE web development module.
+ See the 'tde-trinity' and 'tdewebdev-trinity' packages for more information.
 
 Package: klinkstatus-trinity
 Architecture: any
@@ -126,16 +126,16 @@ Replaces: klinkstatus-kde3 (<< 4:14.0.0~), klinkstatus-trinity (<< 4:14.0.0~)
 Breaks: klinkstatus-kde3 (<< 4:14.0.0~), klinkstatus-trinity (<< 4:14.0.0~)
 Depends: ${shlibs:Depends}
 Suggests: quanta-trinity, khelpcenter-trinity
-Description: web link validity checker for KDE [Trinity]
- KLinkStatus is KDE's web link validity checker. It allows you to
+Description: web link validity checker for TDE [Trinity]
+ KLinkStatus is TDE's web link validity checker. It allows you to
  search internal and external links throughout your web site. Simply
  point it to a single page and choose the depth to search.
  .
  You can also check local files, or files over ftp:, fish: or any other
  KIO protocols. For performance, links can be checked simultaneously.
  .
- This package is part of KDE, as a component of the KDE web development module.
- See the 'kde-trinity' and 'tdewebdev-trinity' packages for more information.
+ This package is part of TDE, as a component of the TDE web development module.
+ See the 'tde-trinity' and 'tdewebdev-trinity' packages for more information.
 
 Package: kommander-trinity
 Architecture: any
@@ -163,8 +163,8 @@ Description: visual dialog builder and executor tool [Trinity]
  As well as building dialogs, Kommander may be expanded to create full
  mainwindow applications.
  .
- This package is part of KDE, as a component of the KDE web development module.
- See the 'kde-trinity' and 'tdewebdev-trinity' packages for more information.
+ This package is part of TDE, as a component of the TDE web development module.
+ See the 'tde-trinity' and 'tdewebdev-trinity' packages for more information.
 
 Package: kommander-trinity-dev
 Architecture: any
@@ -182,8 +182,8 @@ Description: development files for Kommander [Trinity]
  .
  See the kommander package for further information.
  .
- This package is part of KDE, as a component of the KDE web development module.
- See the 'kde-trinity' and 'tdewebdev-trinity' packages for more information.
+ This package is part of TDE, as a component of the TDE web development module.
+ See the 'tde-trinity' and 'tdewebdev-trinity' packages for more information.
 
 Package: kxsldbg-trinity
 Architecture: any
@@ -192,17 +192,17 @@ Replaces: kxsldbg-kde3 (<< 4:14.0.0~), kxsldbg-trinity (<< 4:14.0.0~)
 Breaks: kxsldbg-kde3 (<< 4:14.0.0~), kxsldbg-trinity (<< 4:14.0.0~)
 Depends: ${shlibs:Depends}
 Suggests: quanta-trinity, khelpcenter-trinity
-Description: graphical XSLT debugger for KDE [Trinity]
+Description: graphical XSLT debugger for TDE [Trinity]
  KXSLDbg is a debugger for XSLT scripts. It includes a graphical user
  interface as well as a text-based debugger. KXSLDbg can be run as a
- standalone application or as an embedded KDE part.
+ standalone application or as an embedded TDE part.
  .
  XSLT is an XML language for defining transformations of XML files from
  XML to some other arbitrary format, such as XML, HTML, plain text, etc.,
  using standard XSLT stylesheets.
  .
- This package is part of KDE, as a component of the KDE web development module.
- See the 'kde-trinity' and 'tdewebdev-trinity' packages for more information.
+ This package is part of TDE, as a component of the TDE web development module.
+ See the 'tde-trinity' and 'tdewebdev-trinity' packages for more information.
 
 Package: tdewebdev-trinity-dbg
 Section: libdevel
diff --git a/ubuntu/maverick/tdewebdev/debian/control.in b/ubuntu/maverick/tdewebdev/debian/control.in
index 70558c570..cede6c9b5 100644
--- a/ubuntu/maverick/tdewebdev/debian/control.in
+++ b/ubuntu/maverick/tdewebdev/debian/control.in
@@ -12,56 +12,56 @@ Architecture: all
 Section: tde
 Depends: quanta (>= ${Source-Version}), tdefilereplace (>= ${Source-Version}), kimagemapeditor (>= ${Source-Version}), klinkstatus (>= ${Source-Version}), kommander (>= ${Source-Version}), kxsldbg (>= ${Source-Version})
 Suggests: kommander-dev (>= ${Source-Version}), tdewebdev-doc-html (>= ${Source-Version})
-Description: web development apps from the official KDE release
- KDE (the K Desktop Environment) is a powerful Open Source graphical
+Description: web development apps 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 web development applications
- provided with the official release of KDE.
+ provided with the official release of TDE.
 
 Package: tdewebdev-doc-html
 Architecture: all
 Section: doc
 Suggests: konqueror | www-browser, tdewebdev
 Replaces: kxsldbg (<< 1:3.3.0), quanta (<< 1:3.3.0)
-Description: KDE web development 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 web development documentation converted
+Description: TDE web development 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 web development documentation converted
  to HTML format so it can be read with any web browser.
  .
  The documentation will be installed into the usual directories
  /opt/trinity/share/doc/tde/HTML/<language>/<app>/, for instance
  /opt/trinity/share/doc/tde/HTML/en/quanta/. Documentation is provided for most
- KDE web development packages.
+ TDE web development packages.
  .
- This package is part of KDE, as a component of the KDE web development module.
- See the 'kde' and 'tdewebdev' packages for more information.
+ This package is part of TDE, as a component of the TDE web development module.
+ See the 'tde' and 'tdewebdev' packages for more information.
 
 Package: quanta
 Architecture: any
 Section: web
-Depends: ${shlibs:Depends}, tdefilereplace (= ${Source-Version}), klinkstatus (= ${Source-Version}), kommander (= ${Source-Version}), quanta-data (>> ${KDE-Version3}), quanta-data (<< ${KDE-Next-Version3}), tidy
+Depends: ${shlibs:Depends}, tdefilereplace (= ${Source-Version}), klinkstatus (= ${Source-Version}), kommander (= ${Source-Version}), quanta-data (>> ${TDE-Version3}), quanta-data (<< ${TDE-Next-Version3}), tidy
 Recommends: cervisia, gnupg, kompare, kxsldbg (= ${Source-Version}), docbook-defguide
 Suggests: gubed, kimagemapeditor (= ${Source-Version}), wget, khelpcenter, php-doc
-Description: web development environment for KDE
+Description: web development environment for TDE
  Quanta Plus is a web development environment for working with HTML
  and associated languages. It strives to be neutral and transparent
  to all markup languages, while supporting popular web-based scripting
  languages, CSS and other emerging W3C recommendations.
  .
  Quanta Plus supports many external components, debuggers and other tools
- for web development, several of which are shipped with the KDE web
+ for web development, several of which are shipped with the TDE web
  development module.
  .
  Quanta Plus is not in any way affiliated with any commercial versions
  of Quanta. The primary coders from the original team left the GPL'd
  version to produce a commercial product.
  .
- This package is part of KDE, as a component of the KDE web development module.
- See the 'kde' and 'tdewebdev' packages for more information.
+ This package is part of TDE, as a component of the TDE web development module.
+ See the 'tde' and 'tdewebdev' packages for more information.
  .
  Homepage: http://quanta.sourceforge.net
 
@@ -77,16 +77,16 @@ Description: data files for Quanta Plus web development environment
  .
  See the quanta package for further information.
  .
- This package is part of KDE, as a component of the KDE web development module.
- See the 'kde' and 'tdewebdev' packages for more information.
+ This package is part of TDE, as a component of the TDE web development module.
+ See the 'tde' and 'tdewebdev' packages for more information.
 
 Package: tdefilereplace
 Architecture: any
 Section: tde
 Depends: ${shlibs:Depends}
 Suggests: quanta (= ${Source-Version})
-Description: batch search-and-replace component for KDE
- KFileReplace is an embedded component for KDE that acts as a batch
+Description: batch search-and-replace component for TDE
+ KFileReplace is an embedded component for TDE that acts as a batch
  search-and-replace tool. It allows you to replace one expression with
  another in many files at once.
  .
@@ -94,37 +94,37 @@ Description: batch search-and-replace component for KDE
  application. An example of an application that uses the KFileReplace
  component is Quanta Plus (found in the package quanta).
  .
- This package is part of KDE, as a component of the KDE web development module.
- See the 'kde' and 'tdewebdev' packages for more information.
+ This package is part of TDE, as a component of the TDE web development module.
+ See the 'tde' and 'tdewebdev' packages for more information.
 
 Package: kimagemapeditor
 Architecture: any
 Section: editors
 Depends: ${shlibs:Depends}
 Suggests: quanta (= ${Source-Version})
-Description: HTML image map editor for KDE
+Description: HTML image map editor for TDE
  KImageMapEditor is a tool that allows you to edit image maps in HTML
  files. As well as providing a standalone application, KImageMapEditor
  makes itself available as a KPart for embedding into larger applications.
  .
- This package is part of KDE, as a component of the KDE web development module.
- See the 'kde' and 'tdewebdev' packages for more information.
+ This package is part of TDE, as a component of the TDE web development module.
+ See the 'tde' and 'tdewebdev' packages for more information.
 
 Package: klinkstatus
 Architecture: any
 Section: web
 Depends: ${shlibs:Depends}
 Suggests: quanta (= ${Source-Version}), khelpcenter
-Description: web link validity checker for KDE
- KLinkStatus is KDE's web link validity checker. It allows you to
+Description: web link validity checker for TDE
+ KLinkStatus is TDE's web link validity checker. It allows you to
  search internal and external links throughout your web site. Simply
  point it to a single page and choose the depth to search.
  .
  You can also check local files, or files over ftp:, fish: or any other
  KIO protocols. For performance, links can be checked simultaneously.
  .
- This package is part of KDE, as a component of the KDE web development module.
- See the 'kde' and 'tdewebdev' packages for more information.
+ This package is part of TDE, as a component of the TDE web development module.
+ See the 'tde' and 'tdewebdev' packages for more information.
 
 Package: kommander
 Architecture: any
@@ -151,8 +151,8 @@ Description: visual dialog builder and executor tool
  As well as building dialogs, Kommander may be expanded to create full
  mainwindow applications.
  .
- This package is part of KDE, as a component of the KDE web development module.
- See the 'kde' and 'tdewebdev' packages for more information.
+ This package is part of TDE, as a component of the TDE web development module.
+ See the 'tde' and 'tdewebdev' packages for more information.
 
 Package: kommander-dev
 Architecture: any
@@ -169,8 +169,8 @@ Description: development files for Kommander
  .
  See the kommander package for further information.
  .
- This package is part of KDE, as a component of the KDE web development module.
- See the 'kde' and 'tdewebdev' packages for more information.
+ This package is part of TDE, as a component of the TDE web development module.
+ See the 'tde' and 'tdewebdev' packages for more information.
 
 Package: kxsldbg
 Architecture: any
@@ -178,17 +178,17 @@ Section: text
 Depends: ${shlibs:Depends}
 Suggests: quanta (= ${Source-Version}), khelpcenter
 Replaces: quanta (<< 1:3.2.0)
-Description: graphical XSLT debugger for KDE
+Description: graphical XSLT debugger for TDE
  KXSLDbg is a debugger for XSLT scripts. It includes a graphical user
  interface as well as a text-based debugger. KXSLDbg can be run as a
- standalone application or as an embedded KDE part.
+ standalone application or as an embedded TDE part.
  .
  XSLT is an XML language for defining transformations of XML files from
  XML to some other arbitrary format, such as XML, HTML, plain text, etc.,
  using standard XSLT stylesheets.
  .
- This package is part of KDE, as a component of the KDE web development module.
- See the 'kde' and 'tdewebdev' packages for more information.
+ This package is part of TDE, as a component of the TDE web development module.
+ See the 'tde' and 'tdewebdev' packages for more information.
 
 Package: tdewebdev-dbg
 Section: libdevel
diff --git a/ubuntu/maverick/tdewebdev/debian/docrc/css.docrc b/ubuntu/maverick/tdewebdev/debian/docrc/css.docrc
index c5c04681f..688271b94 100644
--- a/ubuntu/maverick/tdewebdev/debian/docrc/css.docrc
+++ b/ubuntu/maverick/tdewebdev/debian/docrc/css.docrc
@@ -1,4 +1,4 @@
-# KDE Config File
+# TDE Config File
 [Tree]
 
 Doc dir=css
diff --git a/ubuntu/maverick/tdewebdev/debian/docrc/docbook.docrc b/ubuntu/maverick/tdewebdev/debian/docrc/docbook.docrc
index 41a1a6c3b..2cc0b658b 100644
--- a/ubuntu/maverick/tdewebdev/debian/docrc/docbook.docrc
+++ b/ubuntu/maverick/tdewebdev/debian/docrc/docbook.docrc
@@ -1,4 +1,4 @@
-# KDE Config File
+# TDE Config File
 [Tree]
 
 Doc dir=docbook
diff --git a/ubuntu/maverick/tdewebdev/debian/docrc/html.docrc b/ubuntu/maverick/tdewebdev/debian/docrc/html.docrc
index f0d051751..9361e5eee 100644
--- a/ubuntu/maverick/tdewebdev/debian/docrc/html.docrc
+++ b/ubuntu/maverick/tdewebdev/debian/docrc/html.docrc
@@ -1,4 +1,4 @@
-# KDE Config File
+# TDE Config File
 [Tree]
 
 Doc dir=html
diff --git a/ubuntu/maverick/tdewebdev/debian/docrc/php.docrc b/ubuntu/maverick/tdewebdev/debian/docrc/php.docrc
index db48827d4..7ff67ec65 100644
--- a/ubuntu/maverick/tdewebdev/debian/docrc/php.docrc
+++ b/ubuntu/maverick/tdewebdev/debian/docrc/php.docrc
@@ -1,7 +1,7 @@
 #This file was autogenerated.  To recreate it with a new set of PHP docs, run docgen.pl <php-version> <path-to-html-docs>
 #If you find this file broken grossly, send a rant to [email protected] or be useful and fix the bug and let me know!
 
-#KDE Config File
+#TDE Config File
 
 [Tree]
 
diff --git a/ubuntu/maverick/tdewebdev/debian/kimagemapeditor-trinity.menu b/ubuntu/maverick/tdewebdev/debian/kimagemapeditor-trinity.menu
index 8252b382f..c06259dfe 100644
--- a/ubuntu/maverick/tdewebdev/debian/kimagemapeditor-trinity.menu
+++ b/ubuntu/maverick/tdewebdev/debian/kimagemapeditor-trinity.menu
@@ -1,4 +1,4 @@
-?package(kimagemapeditor):\
+?package(kimagemapeditor-trinity):\
     needs="X11"\
     hints="TDE"\
     section="Apps/Editors"\
diff --git a/ubuntu/maverick/tdewebdev/debian/klinkstatus-trinity.README.Debian b/ubuntu/maverick/tdewebdev/debian/klinkstatus-trinity.README.Debian
index 0a62677c5..418ec3c6c 100644
--- a/ubuntu/maverick/tdewebdev/debian/klinkstatus-trinity.README.Debian
+++ b/ubuntu/maverick/tdewebdev/debian/klinkstatus-trinity.README.Debian
@@ -1,7 +1,7 @@
 KLinkStatus for Debian
 ----------------------
 
-This application provides documentation in a docbook format that the KDE
+This application provides documentation in a docbook format that the TDE
 Help Centre can display.  For HTML documentation that can be read in any
 web browser, see the package tdewebdev-doc-html.
 
diff --git a/ubuntu/maverick/tdewebdev/debian/klinkstatus-trinity.menu b/ubuntu/maverick/tdewebdev/debian/klinkstatus-trinity.menu
index b93e74555..2efac007a 100644
--- a/ubuntu/maverick/tdewebdev/debian/klinkstatus-trinity.menu
+++ b/ubuntu/maverick/tdewebdev/debian/klinkstatus-trinity.menu
@@ -1,4 +1,4 @@
-?package(klinkstatus):\
+?package(klinkstatus-trinity):\
     needs="X11"\
     hints="TDE"\
     section="Apps/Net"\
diff --git a/ubuntu/maverick/tdewebdev/debian/kommander-trinity.README.Debian b/ubuntu/maverick/tdewebdev/debian/kommander-trinity.README.Debian
index fdc07a2b2..09e21de46 100644
--- a/ubuntu/maverick/tdewebdev/debian/kommander-trinity.README.Debian
+++ b/ubuntu/maverick/tdewebdev/debian/kommander-trinity.README.Debian
@@ -1,7 +1,7 @@
 Kommander for Debian
 --------------------
 
-This application provides documentation in a docbook format that the KDE
+This application provides documentation in a docbook format that the TDE
 Help Centre can display.  For HTML documentation that can be read in any
 web browser, see the package tdewebdev-doc-html.
 
diff --git a/ubuntu/maverick/tdewebdev/debian/kommander-trinity.menu b/ubuntu/maverick/tdewebdev/debian/kommander-trinity.menu
index 4d7596c0b..327a831a9 100644
--- a/ubuntu/maverick/tdewebdev/debian/kommander-trinity.menu
+++ b/ubuntu/maverick/tdewebdev/debian/kommander-trinity.menu
@@ -1,4 +1,4 @@
-?package(kommander):\
+?package(kommander-trinity):\
     needs="X11"\
     hints="TDE"\
     section="Apps/Tools"\
diff --git a/ubuntu/maverick/tdewebdev/debian/kxsldbg-trinity.README.Debian b/ubuntu/maverick/tdewebdev/debian/kxsldbg-trinity.README.Debian
index 11d15b161..447ce09a8 100644
--- a/ubuntu/maverick/tdewebdev/debian/kxsldbg-trinity.README.Debian
+++ b/ubuntu/maverick/tdewebdev/debian/kxsldbg-trinity.README.Debian
@@ -1,7 +1,7 @@
 KXSLDbg for Debian
 ------------------
 
-This application provides documentation in a docbook format that the KDE
+This application provides documentation in a docbook format that the TDE
 Help Centre can display.  For HTML documentation that can be read in any
 web browser, see the package tdewebdev-doc-html.
 
diff --git a/ubuntu/maverick/tdewebdev/debian/kxsldbg-trinity.menu b/ubuntu/maverick/tdewebdev/debian/kxsldbg-trinity.menu
index d1c9f6f0c..685853031 100644
--- a/ubuntu/maverick/tdewebdev/debian/kxsldbg-trinity.menu
+++ b/ubuntu/maverick/tdewebdev/debian/kxsldbg-trinity.menu
@@ -1,4 +1,4 @@
-?package(kxsldbg):\
+?package(kxsldbg-trinity):\
     needs="X11"\
     hints="TDE"\
     section="Apps/Text"\
diff --git a/ubuntu/maverick/tdewebdev/debian/man/extractkmdr-trinity.1 b/ubuntu/maverick/tdewebdev/debian/man/extractkmdr-trinity.1
index 7f00356e8..5dfad28d7 100644
--- a/ubuntu/maverick/tdewebdev/debian/man/extractkmdr-trinity.1
+++ b/ubuntu/maverick/tdewebdev/debian/man/extractkmdr-trinity.1
@@ -33,7 +33,7 @@ dialog, the
 .BR kmdr2po (1)
 utility is more convenient.
 .PP
-This utility is part of the KDE web development module.
+This utility is part of the TDE web development module.
 .SH OPTIONS
 .TP
 \fB\-\-tag=\fP\fIname\fP
diff --git a/ubuntu/maverick/tdewebdev/debian/man/kimagemapeditor-trinity.1 b/ubuntu/maverick/tdewebdev/debian/man/kimagemapeditor-trinity.1
index 03642502b..681db952f 100644
--- a/ubuntu/maverick/tdewebdev/debian/man/kimagemapeditor-trinity.1
+++ b/ubuntu/maverick/tdewebdev/debian/man/kimagemapeditor-trinity.1
@@ -16,7 +16,7 @@
 .\" .sp <n>    insert n+1 empty lines
 .\" for manpage-specific macros, see man(7)
 .SH NAME
-kimagemapeditor \- an HTML image map editor for KDE
+kimagemapeditor \- an HTML image map editor for TDE
 .SH SYNOPSIS
 .B kimagemapeditor
 [ \fIgeneric-options\fP ]
@@ -31,7 +31,7 @@ larger applications.
 The files passed on the command line may be either HTML files or image
 files.
 .PP
-This application is part of the official KDE web development module.
+This application is part of the official TDE web development module.
 .SH OPTIONS
 Below are the kimagemapeditor-specific options.
 For a full summary of options, run \fIkimagemapeditor \-\-help\fP.
diff --git a/ubuntu/maverick/tdewebdev/debian/man/klinkstatus-trinity.1 b/ubuntu/maverick/tdewebdev/debian/man/klinkstatus-trinity.1
index 29cefaaa6..c1b2b61b0 100644
--- a/ubuntu/maverick/tdewebdev/debian/man/klinkstatus-trinity.1
+++ b/ubuntu/maverick/tdewebdev/debian/man/klinkstatus-trinity.1
@@ -16,33 +16,33 @@
 .\" .sp <n>    insert n+1 empty lines
 .\" for manpage-specific macros, see man(7)
 .SH NAME
-klinkstatus \- a web link validity checker for KDE
+klinkstatus \- a web link validity checker for TDE
 .SH SYNOPSIS
 .B klinkstatus
 [ \fIgeneric-options\fP ]
 [ \fIURL\fP ]
 .SH DESCRIPTION
-\fBKLinkStatus\fP is a web link validity checker for KDE.  It allows you to
+\fBKLinkStatus\fP is a web link validity checker for TDE.  It allows you to
 search internal and external links throughout your web site.  Simply
 point it to a single page and choose the depth to search.
 .PP
 You can also check local files, or files over ftp:, fish: or any other
 KIO protocols.  For performance, links can be checked simultaneously.
 .PP
-This application is part of the official KDE web development module.
+This application is part of the official TDE web development module.
 .SH OPTIONS
 For a full summary of options, run \fIklinkstatus \-\-help\fP.
 .SH SEE ALSO
 .BR quanta (1).
 .PP
-Full user documentation is available through the KDE Help Centre.
+Full user documentation is available through the TDE Help Centre.
 You can also enter the URL
 \fIhelp:/klinkstatus/\fP
 directly into konqueror or you can run
 `\fIkhelpcenter help:/klinkstatus/\fP'
 from the command-line.
 .PP
-If the KDE Help Centre is not installed then you can install the package
+If the TDE Help Centre is not installed then you can install the package
 \fItdewebdev-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/tde/HTML/en/klinkstatus/\fP.
 .SH AUTHOR
diff --git a/ubuntu/maverick/tdewebdev/debian/man/kmdr-editor-trinity.1 b/ubuntu/maverick/tdewebdev/debian/man/kmdr-editor-trinity.1
index d1568791b..5ecb637c8 100644
--- a/ubuntu/maverick/tdewebdev/debian/man/kmdr-editor-trinity.1
+++ b/ubuntu/maverick/tdewebdev/debian/man/kmdr-editor-trinity.1
@@ -41,7 +41,7 @@ user interface.  Once a dialog has been created by the editor, it is
 saved as a file with extension \fI.kmdr\fP.  The dialog that this XML file
 represents can then be run instantly with the executor (\fBkmdr-executor\fP).
 .PP
-This application is part of the official KDE web development module.
+This application is part of the official TDE web development module.
 .SH OPTIONS
 For a full summary of options, run \fIkmdr-editor \-\-help\fP.
 .SH SEE ALSO
@@ -51,14 +51,14 @@ For a full summary of options, run \fIkmdr-editor \-\-help\fP.
 .BR kmdr2po (1),
 .BR quanta (1).
 .PP
-Full user documentation is available through the KDE Help Centre.
+Full user documentation is available through the TDE Help Centre.
 You can also enter the URL
 \fIhelp:/kommander/\fP
 directly into konqueror or you can run
 `\fIkhelpcenter help:/kommander/\fP'
 from the command-line.
 .PP
-If the KDE Help Centre is not installed then you can install the package
+If the TDE Help Centre is not installed then you can install the package
 \fItdewebdev-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/tde/HTML/en/kommander/\fP.
 .SH AUTHOR
diff --git a/ubuntu/maverick/tdewebdev/debian/man/kmdr-executor-trinity.1 b/ubuntu/maverick/tdewebdev/debian/man/kmdr-executor-trinity.1
index 554bf6124..cc197d69f 100644
--- a/ubuntu/maverick/tdewebdev/debian/man/kmdr-executor-trinity.1
+++ b/ubuntu/maverick/tdewebdev/debian/man/kmdr-executor-trinity.1
@@ -47,7 +47,7 @@ the command-line, or else the option \-\-stdin should be passed and the
 dialog description should be supplied as XML on standard input.
 Additional arguments for the dialog itself may also be supplied.
 .PP
-This application is part of the official KDE web development module.
+This application is part of the official TDE web development module.
 .SH OPTIONS
 Below are the kommander-specific options.
 For a full summary of options, run \fIkmdr-editor \-\-help\fP.
@@ -68,14 +68,14 @@ Additional arguments to be passed on to the dialog itself.
 .BR kmdr2po (1),
 .BR quanta (1).
 .PP
-Full user documentation is available through the KDE Help Centre.
+Full user documentation is available through the TDE Help Centre.
 You can also enter the URL
 \fIhelp:/kommander/\fP
 directly into konqueror or you can run
 `\fIkhelpcenter help:/kommander/\fP'
 from the command-line.
 .PP
-If the KDE Help Centre is not installed then you can install the package
+If the TDE Help Centre is not installed then you can install the package
 \fItdewebdev-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/tde/HTML/en/kommander/\fP.
 .SH AUTHOR
diff --git a/ubuntu/maverick/tdewebdev/debian/man/kmdr-plugins-trinity.1 b/ubuntu/maverick/tdewebdev/debian/man/kmdr-plugins-trinity.1
index 42f0333b6..5a8d222bf 100644
--- a/ubuntu/maverick/tdewebdev/debian/man/kmdr-plugins-trinity.1
+++ b/ubuntu/maverick/tdewebdev/debian/man/kmdr-plugins-trinity.1
@@ -42,7 +42,7 @@ and
 .BR kmdr-executor (1)
 for a more detailed description of Kommander.
 .PP
-This application is part of the official KDE web development module.
+This application is part of the official TDE web development module.
 .SH OPTIONS
 For a full summary of options, run \fIkmdr-plugins \-\-help\fP.
 .SH SEE ALSO
@@ -52,14 +52,14 @@ For a full summary of options, run \fIkmdr-plugins \-\-help\fP.
 .BR kmdr2po (1),
 .BR quanta (1).
 .PP
-Full user documentation is available through the KDE Help Centre.
+Full user documentation is available through the TDE Help Centre.
 You can also enter the URL
 \fIhelp:/kommander/\fP
 directly into konqueror or you can run
 `\fIkhelpcenter help:/kommander/\fP'
 from the command-line.
 .PP
-If the KDE Help Centre is not installed then you can install the package
+If the TDE Help Centre is not installed then you can install the package
 \fItdewebdev-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/tde/HTML/en/kommander/\fP.
 .SH AUTHOR
diff --git a/ubuntu/maverick/tdewebdev/debian/man/kmdr2po-trinity.1 b/ubuntu/maverick/tdewebdev/debian/man/kmdr2po-trinity.1
index 5d2b23d3e..4693644e4 100644
--- a/ubuntu/maverick/tdewebdev/debian/man/kmdr2po-trinity.1
+++ b/ubuntu/maverick/tdewebdev/debian/man/kmdr2po-trinity.1
@@ -32,7 +32,7 @@ The final PO-file will be created in the current directory.  Its name
 will be derived from the dialog filename by replacing the suffix
 \fI.kmdr\fP with \fI.po\fP.
 .PP
-This utility is part of the KDE web development module.
+This utility is part of the TDE web development module.
 .SH WARNING
 A temporary file named \fI_from_rc.cc\fP in the current directory
 will be created and subsequently removed.
diff --git a/ubuntu/maverick/tdewebdev/debian/man/kxsldbg-trinity.1 b/ubuntu/maverick/tdewebdev/debian/man/kxsldbg-trinity.1
index fff33bb9d..11b551f69 100644
--- a/ubuntu/maverick/tdewebdev/debian/man/kxsldbg-trinity.1
+++ b/ubuntu/maverick/tdewebdev/debian/man/kxsldbg-trinity.1
@@ -16,7 +16,7 @@
 .\" .sp <n>    insert n+1 empty lines
 .\" for manpage-specific macros, see man(7)
 .SH NAME
-kxsldbg \- a graphical XSLT debugger for KDE
+kxsldbg \- a graphical XSLT debugger for TDE
 .SH SYNOPSIS
 .B kxsldbg
 [ \fIgeneric-options\fP ]
@@ -24,27 +24,27 @@ kxsldbg \- a graphical XSLT debugger for KDE
 \fBKXSLDbg\fP is a graphical debugger for XSLT scripts.  It provides
 a graphical front-end to the text-based debugger
 .BR xsldbg (1).
-KXSLDbg can be run as a standalone application or as an embedded KDE part.
+KXSLDbg can be run as a standalone application or as an embedded TDE part.
 .PP
 XSLT is an XML language for defining transformations of XML files from
 XML to some other arbitrary format, such as XML, HTML, plain text, etc.,
 using standard XSLT stylesheets.
 .PP
-This application is part of the official KDE web development module.
+This application is part of the official TDE web development module.
 .SH OPTIONS
 For a full summary of options, run \fIkxsldbg \-\-help\fP.
 .SH SEE ALSO
 .BR quanta (1),
 .BR xsldbg (1).
 .PP
-Full user documentation is available through the KDE Help Centre.
+Full user documentation is available through the TDE Help Centre.
 You can also enter the URL
 \fIhelp:/kxsldbg/\fP
 directly into konqueror or you can run
 `\fIkhelpcenter help:/kxsldbg/\fP'
 from the command-line.
 .PP
-If the KDE Help Centre is not installed then you can install the package
+If the TDE Help Centre is not installed then you can install the package
 \fItdewebdev-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/tde/HTML/en/kxsldbg/\fP.
 .SH AUTHOR
diff --git a/ubuntu/maverick/tdewebdev/debian/man/quanta-trinity.1 b/ubuntu/maverick/tdewebdev/debian/man/quanta-trinity.1
index 56c53ce9f..5640297b9 100644
--- a/ubuntu/maverick/tdewebdev/debian/man/quanta-trinity.1
+++ b/ubuntu/maverick/tdewebdev/debian/man/quanta-trinity.1
@@ -16,7 +16,7 @@
 .\" .sp <n>    insert n+1 empty lines
 .\" for manpage-specific macros, see man(7)
 .SH NAME
-quanta \- a web development environment for KDE
+quanta \- a web development environment for TDE
 .SH SYNOPSIS
 .B quanta
 [ \fIgeneric-options\fP ] [ \fB\-\-unique\fP ]
@@ -28,14 +28,14 @@ to all markup languages, while supporting popular web-based scripting
 languages, CSS and other emerging W3C recommendations.
 .PP
 Quanta Plus supports many external components, debuggers and other tools
-for web development, several of which are shipped with the KDE web development
+for web development, several of which are shipped with the TDE web development
 module.
 .PP
 Quanta Plus is not in any way affiliated with any commercial versions
 of Quanta.  The primary coders from the original team left the GPLed
 version to produce a commercial product.
 .PP
-This application is part of the official KDE web development module.
+This application is part of the official TDE web development module.
 .SH OPTIONS
 Below are the quanta-specific options.  For a full summary of options,
 run \fIquanta \-\-help\fP.
@@ -52,14 +52,14 @@ Do not show the logo during startup.
 .BR kmdr-executor (1),
 .BR kxsldbg (1).
 .PP
-Full user documentation is available through the KDE Help Centre.
+Full user documentation is available through the TDE Help Centre.
 You can also enter the URL
 \fIhelp:/quanta/\fP
 directly into konqueror or you can run
 `\fIkhelpcenter help:/quanta/\fP'
 from the command-line.
 .PP
-If the KDE Help Centre is not installed then you can install the package
+If the TDE Help Centre is not installed then you can install the package
 \fItdewebdev-doc-html\fP and read this documentation in HTML format from
 \fI/opt/trinity/share/doc/tde/HTML/en/quanta/\fP.
 .SH AUTHOR
diff --git a/ubuntu/maverick/tdewebdev/debian/man/tdefilereplace-trinity.1 b/ubuntu/maverick/tdewebdev/debian/man/tdefilereplace-trinity.1
index 6ce7a0d8c..63557c928 100644
--- a/ubuntu/maverick/tdewebdev/debian/man/tdefilereplace-trinity.1
+++ b/ubuntu/maverick/tdewebdev/debian/man/tdefilereplace-trinity.1
@@ -1,10 +1,10 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH TDEFILEREPLACE 1 "June 2006" "K Desktop Environment" "Batch search and replace tool"
+.TH TDEFILEREPLACE 1 "June 2006" "Trinity Desktop Environment" "Batch search and replace tool"
 .SH NAME
 tdefilereplace
 \- Batch search and replace tool
 .SH SYNOPSIS
-\fBtdefilereplace\fP [Qt\-options] [KDE\-options] [PATH] 
+\fBtdefilereplace\fP [Qt\-options] [TDE\-options] [PATH] 
 .SH DESCRIPTION
 \fBKFileReplace\fP is an application used to search and replace a list of strings in a file tree. The strings may be literal or Qt\-like regular expressions. There are also other options to tune your search.
 .SH OPTIONS
@@ -21,8 +21,8 @@ Show help about options
 .B  \-\-help\-qt  
 Show Qt specific options
 .TP
-.B  \-\-help\-kde  
-Show KDE specific options
+.B  \-\-help\-tde  
+Show TDE specific options
 .TP
 .B  \-\-help\-all  
 Show all options
@@ -39,7 +39,7 @@ Show license information
 .B  \-\-  
 End of options
 .SS 
-.SS KDE options:
+.SS TDE options:
 .TP
 .B  \-\-caption  <caption>
 Use 'caption' as name in the titlebar
@@ -136,7 +136,7 @@ mirrors the whole layout of widgets
 .SS 
 
 .SH SEE ALSO
-Full user documentation is available through the KDE Help Center.  You can also enter the URL
+Full user documentation is available through the TDE Help Center.  You can also enter the URL
 .BR help:/tdefilereplace/
 directly into konqueror or you can run 
 .BR "khelpcenter help:/tdefilereplace/"
@@ -153,7 +153,7 @@ Francois Dupou <[email protected]>
 
 .br
 .fi
-Please use http://bugs.kde.org to report bugs; do not mail the authors directly.
+Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
 .PP
 This manual page was written by Holger Hartmann <[email protected]> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
 .PP
diff --git a/ubuntu/maverick/tdewebdev/debian/patches/common/README b/ubuntu/maverick/tdewebdev/debian/patches/common/README
index 01a880c08..9e81cc359 100644
--- a/ubuntu/maverick/tdewebdev/debian/patches/common/README
+++ b/ubuntu/maverick/tdewebdev/debian/patches/common/README
@@ -1,7 +1,7 @@
-Common patches across KDE Debian packages
+Common patches across TDE Debian packages
 =========================================
 
-  These directory should contain patches to the admin/ subdir of KDE
+  These directory should contain patches to the admin/ subdir of TDE
   modules that are meant to be applied to all packaged modules. As the
   admin/ subdir is shared across modules (and so, it's identical for all
   modules at a certain version), I think it makes sense to have these
diff --git a/ubuntu/maverick/tdewebdev/debian/quanta-trinity.README.Debian b/ubuntu/maverick/tdewebdev/debian/quanta-trinity.README.Debian
index f9f471663..5cef23803 100644
--- a/ubuntu/maverick/tdewebdev/debian/quanta-trinity.README.Debian
+++ b/ubuntu/maverick/tdewebdev/debian/quanta-trinity.README.Debian
@@ -16,13 +16,13 @@ Reference Documentation:
   not supported natively by this package.  To make JavaScript or MySQL
   documentation accessible in Quanta Plus, download the relevant documentation
   tarball from http://sourceforge.net/projects/quanta/.  You should unpack
-  this tarball beneath ~/.kde/share/apps/quanta/doc/, so that the file
+  this tarball beneath ~/.trinity/share/apps/quanta/doc/, so that the file
   javascript.docrc or mysql.docrc is unpacked directly into this directory.
 
 HTML Documentation:
 
   Quanta Plus provides documentation in a docbook format that the
-  KDE Help Centre can display.  For HTML documentation that can be read
+  TDE Help Centre can display.  For HTML documentation that can be read
   in any web browser, see the package tdewebdev-doc-html.
 
 Kommander:
diff --git a/ubuntu/maverick/tdewebdev/debian/quanta-trinity.lintian b/ubuntu/maverick/tdewebdev/debian/quanta-trinity.lintian
index f46ec301f..b478ff37a 100644
--- a/ubuntu/maverick/tdewebdev/debian/quanta-trinity.lintian
+++ b/ubuntu/maverick/tdewebdev/debian/quanta-trinity.lintian
@@ -1,4 +1,4 @@
-# This tag is required for apps already in the KDE menu.
+# This tag is required for apps already in the TDE menu.
 quanta-trinity: menu-item-contains-unknown-tag kderemove /opt/trinity/lib/menu/quanta:9
 # This is part of the docbook docs.
 quanta-trinity: extra-license-file opt/trinity/share/doc/tde/HTML/en/quanta/credits-license.docbook
diff --git a/ubuntu/maverick/tdewebdev/debian/quanta-trinity.menu b/ubuntu/maverick/tdewebdev/debian/quanta-trinity.menu
index 65cfbdbea..eb664f95c 100644
--- a/ubuntu/maverick/tdewebdev/debian/quanta-trinity.menu
+++ b/ubuntu/maverick/tdewebdev/debian/quanta-trinity.menu
@@ -1,4 +1,4 @@
-?package(quanta):\
+?package(quanta-trinity):\
     needs="X11"\
     hints="TDE"\
     section="Apps/Editors"\
diff --git a/ubuntu/maverick/tdewebdev/debian/tdefilereplace-trinity.README.Debian b/ubuntu/maverick/tdewebdev/debian/tdefilereplace-trinity.README.Debian
index 3d186fbcf..b2f7ce2da 100644
--- a/ubuntu/maverick/tdewebdev/debian/tdefilereplace-trinity.README.Debian
+++ b/ubuntu/maverick/tdewebdev/debian/tdefilereplace-trinity.README.Debian
@@ -2,7 +2,7 @@ KFileReplace for Debian
 -----------------------
 
 KFileReplace is currently not available as a standalone application.
-Instead it is made available as a KPart (an embedded KDE component).
+Instead it is made available as a KPart (an embedded TDE component).
 
 An example of an application that uses the KFileReplace component is
 Quanta Plus, found in the package quanta.
diff --git a/ubuntu/maverick/tdewebdev/debian/tdewebdev-doc-html.doc-base.klinkstatus b/ubuntu/maverick/tdewebdev/debian/tdewebdev-doc-html.doc-base.klinkstatus
index 3113acaad..c851b8204 100644
--- a/ubuntu/maverick/tdewebdev/debian/tdewebdev-doc-html.doc-base.klinkstatus
+++ b/ubuntu/maverick/tdewebdev/debian/tdewebdev-doc-html.doc-base.klinkstatus
@@ -1,7 +1,7 @@
 Document: klinkstatus
 Title: KLinkStatus Handbook
 Author: Paulo Moura Guedes <[email protected]>
-Abstract: KLinkStatus is a link checker for KDE.
+Abstract: KLinkStatus is a link checker for TDE.
 Section: Apps/Net
 
 Format: HTML