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

24 files changed, 116 insertions, 116 deletions

diff --git a/ubuntu/maverick/tdeaddons/debian/atlantikdesigner-trinity.menu b/ubuntu/maverick/tdeaddons/debian/atlantikdesigner-trinity.menu
index f010da8d3..c195b5843 100644
--- a/ubuntu/maverick/tdeaddons/debian/atlantikdesigner-trinity.menu
+++ b/ubuntu/maverick/tdeaddons/debian/atlantikdesigner-trinity.menu
@@ -1,4 +1,4 @@
-?package(atlantikdesigner):needs="X11"\
+?package(atlantikdesigner-trinity):needs="X11"\
   section="Games/Tool"\
   hints="TDE,Monopoly"\
   title="Atlantik Designer"\
diff --git a/ubuntu/maverick/tdeaddons/debian/cdbs/versions.pl b/ubuntu/maverick/tdeaddons/debian/cdbs/versions.pl
index 75c9add4b..1b110f7af 100644
--- a/ubuntu/maverick/tdeaddons/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/tdeaddons/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/tdeaddons/debian/control b/ubuntu/maverick/tdeaddons/debian/control
index 06173be0a..ac886b9d8 100644
--- a/ubuntu/maverick/tdeaddons/debian/control
+++ b/ubuntu/maverick/tdeaddons/debian/control
@@ -15,7 +15,7 @@ Breaks: kdeaddons-kde3 (<< 4:14.0.0~), kdeaddons-trinity (<< 4:14.0.0~)
 Depends: atlantikdesigner-trinity (>= ${Source-Version}), kaddressbook-plugins-trinity (>= ${Source-Version}), kate-plugins-trinity (>= ${Source-Version}), tdeaddons-tdefile-plugins-trinity (>= ${Source-Version}), kicker-applets-trinity (>= ${Source-Version}), konq-plugins-trinity (>= ${Source-Version}), ksig-trinity (>= ${Source-Version}), noatun-plugins-trinity (>= ${Source-Version})
 Suggests: tdeaddons-trinity-doc-html
 Description: add-on plugins and applets provided with Trinity
- 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.
@@ -29,19 +29,19 @@ Section: doc
 Replaces: kdeaddons-kde3-doc-html (<< 4:14.0.0~), kdeaddons-trinity-doc-html (<< 4:14.0.0~)
 Breaks: kdeaddons-kde3-doc-html (<< 4:14.0.0~), kdeaddons-trinity-doc-html (<< 4:14.0.0~)
 Suggests: konqueror-trinity | www-browser, tdeaddons-trinity
-Description: KDE add-ons 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 addons documentation
+Description: TDE add-ons 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 addons 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/kicker-applets/. Documentation is provided for
- most KDE addons packages.
+ most TDE addons packages.
  .
- This package is part of Trinity, as a component of the KDE addons module.
- See the 'kde-trinity' and 'tdeaddons-trinity' packages for more information.
+ This package is part of Trinity, as a component of the TDE addons module.
+ See the 'tde-trinity' and 'tdeaddons-trinity' packages for more information.
 
 Package: atlantikdesigner-trinity
 Architecture: any
@@ -53,14 +53,14 @@ Enhances: atlantik-trinity
 Description: game board designer for Atlantik
  Atlantik Designer is a game board designer for the game Atlantik.
  .
- Atlantik is a KDE client for playing Monopoly-like board games on the
+ Atlantik is a TDE client for playing Monopoly-like board games on the
  monopd network.  It can play any board supported by the network
  server, including the classic Monopoly game as well as the Atlantik
  game in which the properties include several major cities in North
  America and Europe.
  .
- This package is part of Trinity, as a component of the KDE addons module.
- See the 'kde-trinity' and 'tdeaddons-trinity' packages for more information.
+ This package is part of Trinity, as a component of the TDE addons module.
+ See the 'tde-trinity' and 'tdeaddons-trinity' packages for more information.
 
 Package: kaddressbook-plugins-trinity
 Architecture: any
@@ -71,15 +71,15 @@ Depends: ${shlibs:Depends}
 Suggests: kworldclock-trinity, khelpcenter-trinity, tdeaddons-trinity-doc-html
 Enhances: kaddressbook-trinity
 Description: plugins for KAddressBook, the Trinity address book
- This package contains a variety of useful plugins for the KDE address
- book.  These plugins can be loaded through the KDE address book settings.
+ This package contains a variety of useful plugins for the TDE address
+ book.  These plugins can be loaded through the TDE address book settings.
  .
  Highlights include exporting postal addresses as flags in KWorldClock,
  as well as importing and exporting contacts in the native format used
  by the German freemail provider GMX.
  .
- This package is part of Trinity, as a component of the KDE addons module.
- See the 'kde-trinity' and 'tdeaddons-trinity' packages for more information.
+ This package is part of Trinity, as a component of the TDE addons module.
+ See the 'tde-trinity' and 'tdeaddons-trinity' packages for more information.
 
 Package: kate-plugins-trinity
 Architecture: any
@@ -89,8 +89,8 @@ Breaks: kate-plugins-kde3 (<< 4:14.0.0~), kate-plugins-trinity (<< 4:14.0.0~)
 Depends: ${shlibs:Depends}, tidy
 Suggests: khelpcenter-trinity, tdeaddons-trinity-doc-html, kaddressbook-trinity
 Enhances: kate-trinity
-Description: plugins for Kate, the KDE Advanced Text Editor
- This package contains a variety of useful plugins for Kate, the KDE
+Description: plugins for Kate, the TDE Advanced Text Editor
+ This package contains a variety of useful plugins for Kate, the TDE
  Advanced Text Editor.  These plugins can be loaded through the plugin
  manager in Kate settings.
  .
@@ -99,8 +99,8 @@ Description: plugins for Kate, the KDE Advanced Text Editor
  and text snippets, opening of C/C++ headers, extraction of C/C++ symbols,
  a tab bar, a Python browser and even more.
  .
- This package is part of Trinity, as a component of the KDE addons module.
- See the 'kde-trinity' and 'tdeaddons-trinity' packages for more information.
+ This package is part of Trinity, as a component of the TDE addons module.
+ See the 'tde-trinity' and 'tdeaddons-trinity' packages for more information.
 
 Package: tdeaddons-tdefile-plugins-trinity
 Architecture: any
@@ -110,18 +110,18 @@ Breaks: kdeaddons-kfile-plugins-kde3 (<< 4:14.0.0~), kdeaddons-kfile-plugins-tri
 Depends: ${shlibs:Depends}
 Provides: renamedlg-plugins-trinity
 Description: Trinity file dialog plugins for text files and folders
- This is a collection of plugins for the KDE file dialog.  These plugins
+ This is a collection of plugins for the TDE file dialog.  These plugins
  extend the file dialog to offer advanced meta-information for text,
  HTML and desktop files, as well as for folders, Windows .lnk files,
  MIME archives and X.509 certificates.
  .
- This package also includes plugins for the KDE file rename dialog,
+ This package also includes plugins for the TDE file rename dialog,
  allowing a user to more easily decide what to do when faced with a
  decision regarding conflicting filenames.  Rename dialog plugins are
  provided for audio and image files.
  .
- This package is part of Trinity, as a component of the KDE addons module.
- See the 'kde-trinity' and 'tdeaddons-trinity' packages for more information.
+ This package is part of Trinity, as a component of the TDE addons module.
+ See the 'tde-trinity' and 'tdeaddons-trinity' packages for more information.
 
 Package: kicker-applets-trinity
 Architecture: any
@@ -133,7 +133,7 @@ Suggests: xmms-kde-trinity, khelpcenter-trinity, tdeaddons-trinity-doc-html
 Provides: ktimemon-trinity
 Enhances: kicker-trinity
 Description: applets for Kicker, the Trinity panel
- This package contains a variety of applets for Kicker, the KDE panel.
+ This package contains a variety of applets for Kicker, the TDE panel.
  These applets will appear in the panel's Add--Applet menu.
  .
  Included are a system monitor, a colour picker, a media player controller,
@@ -143,8 +143,8 @@ Description: applets for Kicker, the Trinity panel
  kicker-applets users to install XMMS. If you want a kicker applet that
  controls XMMS, install the xmms-kde-trinity package.
  .
- This package is part of Trinity, as a component of the KDE addons module.
- See the 'kde-trinity' and 'tdeaddons-trinity' packages for more information.
+ This package is part of Trinity, as a component of the TDE addons module.
+ See the 'tde-trinity' and 'tdeaddons-trinity' packages for more information.
 
 Package: knewsticker-scripts-trinity
 Architecture: all
@@ -156,14 +156,14 @@ Recommends: knewsticker-trinity
 Enhances: knewsticker-trinity
 Description: scripts for KNewsTicker, the Trinity news ticker
  This package contains a variety of scripts that provide additional news
- sources for KNewsTicker, the news ticker applet for the KDE panel.  See
+ sources for KNewsTicker, the news ticker applet for the TDE panel.  See
  /opt/trinity/share/doc/knewsticker-scripts/README.Debian for usage details.
  .
  Highlights include newsgroup handling, stock data retrieval, sports scores
  and various local news sources.
  .
- This package is part of Trinity, as a component of the KDE addons module.
- See the 'kde-trinity' and 'tdeaddons-trinity' packages for more information.
+ This package is part of Trinity, as a component of the TDE addons module.
+ See the 'tde-trinity' and 'tdeaddons-trinity' packages for more information.
 
 Package: konq-plugins-trinity
 Architecture: any
@@ -177,7 +177,7 @@ Enhances: konqueror-trinity, akregator-trinity
 Provides: akregator-konq-plugin-trinity
 Description: plugins for Konqueror, the Trinity file/web/doc browser
  This package contains a variety of useful plugins for Konqueror, the
- file manager, web browser and document viewer for KDE.  Many of these
+ file manager, web browser and document viewer for TDE.  Many of these
  plugins will appear in Konqueror's Tools menu.
  .
  Highlights for web browsing include web page translation, web page archiving,
@@ -191,8 +191,8 @@ Description: plugins for Konqueror, the Trinity file/web/doc browser
  media player, a file information metabar/sidebar, a media folder helper, a
  graphical disk usage viewer and image conversions and transformations.
  .
- This package is part of Trinity, as a component of the KDE addons module.
- See the 'kde-trinity' and 'tdeaddons-trinity' packages for more information.
+ This package is part of Trinity, as a component of the TDE addons module.
+ See the 'tde-trinity' and 'tdeaddons-trinity' packages for more information.
 
 Package: ksig-trinity
 Architecture: any
@@ -212,8 +212,8 @@ Description: graphical tool for managing multiple email signatures
  signatures in external mail clients such as KMail.  See
  /opt/trinity/share/doc/ksig/README.Debian for details on how this can be done.
  .
- This package is part of Trinity, as a component of the KDE addons module.
- See the 'kde-trinity' and 'tdeaddons-trinity' packages for more information.
+ This package is part of Trinity, as a component of the TDE addons module.
+ See the 'tde-trinity' and 'tdeaddons-trinity' packages for more information.
 
 Package: noatun-plugins-trinity
 Architecture: any
@@ -224,15 +224,15 @@ Depends: ${shlibs:Depends}
 Enhances: noatun-trinity
 Description: plugins for Noatun, the Trinity media player
  This package contains a variety of useful plugins for Noatun, the audio and
- video media player for KDE.  These plugins can be loaded through the plugin
+ video media player for TDE.  These plugins can be loaded through the plugin
  manager in Noatun settings.
  .
  Highlights include an alarm clock, guessing tags from filenames, adjustable
  playback speed, capture to wave file and displaying lyrics, plus a variety
  of user interfaces, playlists and visualisation plugins.
  .
- This package is part of Trinity, as a component of the KDE addons module.
- See the 'kde-trinity' and 'tdeaddons-trinity' packages for more information.
+ This package is part of Trinity, as a component of the TDE addons module.
+ See the 'tde-trinity' and 'tdeaddons-trinity' packages for more information.
 
 Package: tdeaddons-trinity-dbg
 Section: libdevel
diff --git a/ubuntu/maverick/tdeaddons/debian/control.in b/ubuntu/maverick/tdeaddons/debian/control.in
index e227d9b99..e63fa596b 100644
--- a/ubuntu/maverick/tdeaddons/debian/control.in
+++ b/ubuntu/maverick/tdeaddons/debian/control.in
@@ -12,32 +12,32 @@ Architecture: all
 Section: tde
 Depends: atlantikdesigner (>= ${Source-Version}), kaddressbook-plugins (>= ${Source-Version}), kate-plugins (>= ${Source-Version}), tdeaddons-tdefile-plugins (>= ${Source-Version}), kicker-applets (>= ${Source-Version}), knewsticker-scripts (>= ${Source-Version}), konq-plugins (>= ${Source-Version}), ksig (>= ${Source-Version}), noatun-plugins (>= ${Source-Version})
 Suggests: tdeaddons-doc-html
-Description: add-on plugins and applets provided with KDE
- KDE (the K Desktop Environment) is a powerful Open Source graphical
+Description: add-on plugins and applets provided with TDE
+ 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 add-on plugins and applets
- provided with the official release of KDE.
+ provided with the official release of TDE.
 
 Package: tdeaddons-doc-html
 Architecture: all
 Section: doc
 Suggests: konqueror | www-browser, tdeaddons
-Description: KDE add-ons 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 addons documentation
+Description: TDE add-ons 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 addons 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/kicker-applets/. Documentation is provided for
- most KDE addons packages.
+ most TDE addons packages.
  .
- This package is part of KDE, as a component of the KDE addons module.
- See the 'kde' and 'tdeaddons' packages for more information.
+ This package is part of TDE, as a component of the TDE addons module.
+ See the 'tde' and 'tdeaddons' packages for more information.
 
 Package: atlantikdesigner
 Architecture: any
@@ -47,14 +47,14 @@ Enhances: atlantik
 Description: game board designer for Atlantik
  Atlantik Designer is a game board designer for the game Atlantik.
  .
- Atlantik is a KDE client for playing Monopoly-like board games on the
+ Atlantik is a TDE client for playing Monopoly-like board games on the
  monopd network.  It can play any board supported by the network
  server, including the classic Monopoly game as well as the Atlantik
  game in which the properties include several major cities in North
  America and Europe.
  .
- This package is part of KDE, as a component of the KDE addons module.
- See the 'kde' and 'tdeaddons' packages for more information.
+ This package is part of TDE, as a component of the TDE addons module.
+ See the 'tde' and 'tdeaddons' packages for more information.
 
 Package: kaddressbook-plugins
 Architecture: any
@@ -62,16 +62,16 @@ Section: tde
 Depends: ${shlibs:Depends}
 Suggests: kworldclock, khelpcenter, tdeaddons-doc-html
 Enhances: kaddressbook
-Description: plugins for KAddressBook, the KDE address book
- This package contains a variety of useful plugins for the KDE address
- book.  These plugins can be loaded through the KDE address book settings.
+Description: plugins for KAddressBook, the TDE address book
+ This package contains a variety of useful plugins for the TDE address
+ book.  These plugins can be loaded through the TDE address book settings.
  .
  Highlights include exporting postal addresses as flags in KWorldClock,
  as well as importing and exporting contacts in the native format used
  by the German freemail provider GMX.
  .
- This package is part of KDE, as a component of the KDE addons module.
- See the 'kde' and 'tdeaddons' packages for more information.
+ This package is part of TDE, as a component of the TDE addons module.
+ See the 'tde' and 'tdeaddons' packages for more information.
 
 Package: kate-plugins
 Architecture: any
@@ -79,8 +79,8 @@ Section: editors
 Depends: ${shlibs:Depends}, tidy
 Suggests: khelpcenter, tdeaddons-doc-html, kaddressbook
 Enhances: kate
-Description: plugins for Kate, the KDE Advanced Text Editor
- This package contains a variety of useful plugins for Kate, the KDE
+Description: plugins for Kate, the TDE Advanced Text Editor
+ This package contains a variety of useful plugins for Kate, the TDE
  Advanced Text Editor.  These plugins can be loaded through the plugin
  manager in Kate settings.
  .
@@ -89,8 +89,8 @@ Description: plugins for Kate, the KDE Advanced Text Editor
  and text snippets, opening of C/C++ headers, extraction of C/C++ symbols,
  a tab bar, a Python browser and even more.
  .
- This package is part of KDE, as a component of the KDE addons module.
- See the 'kde' and 'tdeaddons' packages for more information.
+ This package is part of TDE, as a component of the TDE addons module.
+ See the 'tde' and 'tdeaddons' packages for more information.
 
 Package: tdeaddons-tdefile-plugins
 Architecture: any
@@ -99,19 +99,19 @@ Depends: ${shlibs:Depends}
 Conflicts: renamedlg-plugins (<= 4:3.2.0-1)
 Replaces: renamedlg-plugins (<= 4:3.2.0-1)
 Provides: renamedlg-plugins
-Description: KDE file dialog plugins for text files and folders
- This is a collection of plugins for the KDE file dialog.  These plugins
+Description: TDE file dialog plugins for text files and folders
+ This is a collection of plugins for the TDE file dialog.  These plugins
  extend the file dialog to offer advanced meta-information for text,
  HTML and desktop files, as well as for folders, Windows .lnk files,
  MIME archives and X.509 certificates.
  .
- This package also includes plugins for the KDE file rename dialog,
+ This package also includes plugins for the TDE file rename dialog,
  allowing a user to more easily decide what to do when faced with a
  decision regarding conflicting filenames.  Rename dialog plugins are
  provided for audio and image files.
  .
- This package is part of KDE, as a component of the KDE addons module.
- See the 'kde' and 'tdeaddons' packages for more information.
+ This package is part of TDE, as a component of the TDE addons module.
+ See the 'tde' and 'tdeaddons' packages for more information.
 
 Package: kicker-applets
 Architecture: any
@@ -122,8 +122,8 @@ Conflicts: ktimemon (<< 4:2.2-alpha1-0)
 Replaces: ktimemon (<< 4:2.2-alpha1-0)
 Provides: ktimemon
 Enhances: kicker
-Description: applets for Kicker, the KDE panel
- This package contains a variety of applets for Kicker, the KDE for panel.
+Description: applets for Kicker, the TDE panel
+ This package contains a variety of applets for Kicker, the TDE for panel.
  These applets will appear in the panel's Add--Applet menu.
  .
  Included are a system monitor, a colour picker, a media player controller,
@@ -133,8 +133,8 @@ Description: applets for Kicker, the KDE panel
  kicker-applets users to install XMMS. If you want a kicker applet that
  controls XMMS, install the xmms-kde package.
  .
- This package is part of KDE, as a component of the KDE addons module.
- See the 'kde' and 'tdeaddons' packages for more information.
+ This package is part of TDE, as a component of the TDE addons module.
+ See the 'tde' and 'tdeaddons' packages for more information.
 
 Package: knewsticker-scripts
 Architecture: all
@@ -142,16 +142,16 @@ Section: tde
 Depends: ${perl:Depends}, python, libfinance-quote-perl, libmime-perl, libnews-nntpclient-perl, libwww-perl
 Recommends: knewsticker
 Enhances: knewsticker
-Description: scripts for KNewsTicker, the KDE news ticker
+Description: scripts for KNewsTicker, the TDE news ticker
  This package contains a variety of scripts that provide additional news
- sources for KNewsTicker, the news ticker applet for the KDE panel.  See
+ sources for KNewsTicker, the news ticker applet for the TDE panel.  See
  /opt/trinity/share/doc/knewsticker-scripts/README.Debian for usage details.
  .
  Highlights include newsgroup handling, stock data retrieval, sports scores
  and various local news sources.
  .
- This package is part of KDE, as a component of the KDE addons module.
- See the 'kde' and 'tdeaddons' packages for more information.
+ This package is part of TDE, as a component of the TDE addons module.
+ See the 'tde' and 'tdeaddons' packages for more information.
 
 Package: konq-plugins
 Architecture: any
@@ -163,9 +163,9 @@ Enhances: konqueror, akregator
 Replaces: akregator (<< 1.1), akregator-konq-plugin (<< 1.1)
 Conflicts: akregator-konq-plugin (<< 1.1)
 Provides: akregator-konq-plugin
-Description: plugins for Konqueror, the KDE file/web/doc browser
+Description: plugins for Konqueror, the TDE file/web/doc browser
  This package contains a variety of useful plugins for Konqueror, the
- file manager, web browser and document viewer for KDE.  Many of these
+ file manager, web browser and document viewer for TDE.  Many of these
  plugins will appear in Konqueror's Tools menu.
  .
  Highlights for web browsing include web page translation, web page archiving,
@@ -179,8 +179,8 @@ Description: plugins for Konqueror, the KDE file/web/doc browser
  media player, a file information metabar/sidebar, a media folder helper, a
  graphical disk usage viewer and image conversions and transformations.
  .
- This package is part of KDE, as a component of the KDE addons module.
- See the 'kde' and 'tdeaddons' packages for more information.
+ This package is part of TDE, as a component of the TDE addons module.
+ See the 'tde' and 'tdeaddons' packages for more information.
 
 Package: ksig
 Architecture: any
@@ -198,25 +198,25 @@ Description: graphical tool for managing multiple email signatures
  signatures in external mail clients such as KMail.  See
  /opt/trinity/share/doc/ksig/README.Debian for details on how this can be done.
  .
- This package is part of KDE, as a component of the KDE addons module.
- See the 'kde' and 'tdeaddons' packages for more information.
+ This package is part of TDE, as a component of the TDE addons module.
+ See the 'tde' and 'tdeaddons' packages for more information.
 
 Package: noatun-plugins
 Architecture: any
 Section: sound
 Depends: ${shlibs:Depends}
 Enhances: noatun
-Description: plugins for Noatun, the KDE media player
+Description: plugins for Noatun, the TDE media player
  This package contains a variety of useful plugins for Noatun, the audio and
- video media player for KDE.  These plugins can be loaded through the plugin
+ video media player for TDE.  These plugins can be loaded through the plugin
  manager in Noatun settings.
  .
  Highlights include an alarm clock, guessing tags from filenames, adjustable
  playback speed, capture to wave file and displaying lyrics, plus a variety
  of user interfaces, playlists and visualisation plugins.
  .
- This package is part of KDE, as a component of the KDE addons module.
- See the 'kde' and 'tdeaddons' packages for more information.
+ This package is part of TDE, as a component of the TDE addons module.
+ See the 'tde' and 'tdeaddons' packages for more information.
 
 Package: tdeaddons-dbg
 Section: libdevel
diff --git a/ubuntu/maverick/tdeaddons/debian/kate-plugins-trinity.README.Debian b/ubuntu/maverick/tdeaddons/debian/kate-plugins-trinity.README.Debian
index fae96c9fe..abbab0eb6 100644
--- a/ubuntu/maverick/tdeaddons/debian/kate-plugins-trinity.README.Debian
+++ b/ubuntu/maverick/tdeaddons/debian/kate-plugins-trinity.README.Debian
@@ -1,7 +1,7 @@
 Kate Plugins for Debian
 -----------------------
 
-This package provides documentation in a docbook format that the KDE
+This package 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 tdeaddons-doc-html.
 
diff --git a/ubuntu/maverick/tdeaddons/debian/kicker-applets-trinity.README.Debian b/ubuntu/maverick/tdeaddons/debian/kicker-applets-trinity.README.Debian
index d095c4e14..931518168 100644
--- a/ubuntu/maverick/tdeaddons/debian/kicker-applets-trinity.README.Debian
+++ b/ubuntu/maverick/tdeaddons/debian/kicker-applets-trinity.README.Debian
@@ -1,7 +1,7 @@
 Kicker Applets for Debian
 -------------------------
 
-This package provides documentation in a docbook format that the KDE
+This package 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 tdeaddons-doc-html.
 
diff --git a/ubuntu/maverick/tdeaddons/debian/knewsticker-scripts-trinity.README.Debian b/ubuntu/maverick/tdeaddons/debian/knewsticker-scripts-trinity.README.Debian
index c6986aa86..f426321b6 100644
--- a/ubuntu/maverick/tdeaddons/debian/knewsticker-scripts-trinity.README.Debian
+++ b/ubuntu/maverick/tdeaddons/debian/knewsticker-scripts-trinity.README.Debian
@@ -2,7 +2,7 @@ knewsticker-scripts for Debian
 ------------------------------
 
 This package contains a variety of scripts that provide additional news
-sources for KNewsTicker, the KDE news ticker applet for the KDE panel.
+sources for KNewsTicker, the TDE news ticker applet for the TDE panel.
 
 Documentation for the individual scripts can be found in directory
 /opt/trinity/share/doc/knewsticker-scripts/.
diff --git a/ubuntu/maverick/tdeaddons/debian/konq-plugins-trinity.README.Debian b/ubuntu/maverick/tdeaddons/debian/konq-plugins-trinity.README.Debian
index 97fd38a7b..255e595ed 100644
--- a/ubuntu/maverick/tdeaddons/debian/konq-plugins-trinity.README.Debian
+++ b/ubuntu/maverick/tdeaddons/debian/konq-plugins-trinity.README.Debian
@@ -1,7 +1,7 @@
 Konqueror Plugins for Debian
 ----------------------------
 
-This package provides documentation in a docbook format that the KDE
+This package 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 tdeaddons-doc-html.
 
diff --git a/ubuntu/maverick/tdeaddons/debian/konq-plugins-trinity.menu b/ubuntu/maverick/tdeaddons/debian/konq-plugins-trinity.menu
index 835631c96..743016541 100644
--- a/ubuntu/maverick/tdeaddons/debian/konq-plugins-trinity.menu
+++ b/ubuntu/maverick/tdeaddons/debian/konq-plugins-trinity.menu
@@ -1,4 +1,4 @@
-?package(konq-plugins):needs="X11"\
+?package(konq-plugins-trinity):needs="X11"\
   section="Applications/System/Monitoring"\
   hints="TDE"\
   title="FSView"\
diff --git a/ubuntu/maverick/tdeaddons/debian/ksig-trinity.menu b/ubuntu/maverick/tdeaddons/debian/ksig-trinity.menu
index 3ff5213f4..84513c2d0 100644
--- a/ubuntu/maverick/tdeaddons/debian/ksig-trinity.menu
+++ b/ubuntu/maverick/tdeaddons/debian/ksig-trinity.menu
@@ -1,4 +1,4 @@
-?package(ksig):needs="X11"\
+?package(ksig-trinity):needs="X11"\
   section="Applications/Network/Communication"\
   hints="TDE"\
   title="KSig"\
diff --git a/ubuntu/maverick/tdeaddons/debian/man/atlantikdesigner-trinity.1 b/ubuntu/maverick/tdeaddons/debian/man/atlantikdesigner-trinity.1
index c345fcf5b..41a1aeb2b 100644
--- a/ubuntu/maverick/tdeaddons/debian/man/atlantikdesigner-trinity.1
+++ b/ubuntu/maverick/tdeaddons/debian/man/atlantikdesigner-trinity.1
@@ -23,13 +23,13 @@ atlantikdesigner \- game board designer for Atlantik
 .SH DESCRIPTION
 \fBAtlantik Designer\fP is a game board designer for Atlantik.
 .PP
-Atlantik is a KDE client for playing Monopoly-like board games on the
+Atlantik is a TDE client for playing Monopoly-like board games on the
 monopd network.  It can play any board supported by the network
 server, including the classic Monopoly game as well as the Atlantik
 game in which the properties include several major cities in North
 America and Europe.
 .PP
-This application is part of the official KDE add-ons module.
+This application is part of the official TDE add-ons module.
 .SH OPTIONS
 For a full summary of options, run \fIatlantikdesigner \-\-help\fP.
 .SH SEE ALSO
diff --git a/ubuntu/maverick/tdeaddons/debian/man/exif-trinity.py.1 b/ubuntu/maverick/tdeaddons/debian/man/exif-trinity.py.1
index c71467605..73179046f 100644
--- a/ubuntu/maverick/tdeaddons/debian/man/exif-trinity.py.1
+++ b/ubuntu/maverick/tdeaddons/debian/man/exif-trinity.py.1
@@ -30,7 +30,7 @@ This library is provided with the image conversion and transformation
 plugins for Konqueror.  The JPEG rotation/reflection tool \fBjpegorient\fP,
 part of the same set of plugins, makes use of this library.
 .PP
-This utility is part of the official KDE add-ons module.
+This utility is part of the official TDE add-ons module.
 .SH SEE ALSO
 .BR jpegorient (1),
 .BR konqueror (1),
diff --git a/ubuntu/maverick/tdeaddons/debian/man/fsview-trinity.1 b/ubuntu/maverick/tdeaddons/debian/man/fsview-trinity.1
index cbc9afc03..a1dd43b20 100644
--- a/ubuntu/maverick/tdeaddons/debian/man/fsview-trinity.1
+++ b/ubuntu/maverick/tdeaddons/debian/man/fsview-trinity.1
@@ -31,7 +31,7 @@ rectangles for its contents, and so on down.
 FSView is provided both as a Konqueror plugin for viewing directories,
 and as a standalone executable.
 .PP
-This application is part of the official KDE add-ons module.
+This application is part of the official TDE add-ons module.
 .SH OPTIONS
 Below are the fsview-specific options.
 For a full summary of options, run \fIfsview \-\-help\fP.
diff --git a/ubuntu/maverick/tdeaddons/debian/man/jpegorient-trinity.1 b/ubuntu/maverick/tdeaddons/debian/man/jpegorient-trinity.1
index 0b01d63f6..3317c868c 100644
--- a/ubuntu/maverick/tdeaddons/debian/man/jpegorient-trinity.1
+++ b/ubuntu/maverick/tdeaddons/debian/man/jpegorient-trinity.1
@@ -39,7 +39,7 @@ tags stored with the image to reflect the new orientation.  For this
 reason only images with the correct types of EXIF tags can be changed
 using this tool.
 .PP
-This utility is part of the official KDE add-ons module.
+This utility is part of the official TDE add-ons module.
 .SH OPTIONS
 .TP
 \fB\-90\fP
diff --git a/ubuntu/maverick/tdeaddons/debian/man/ksig-trinity.1 b/ubuntu/maverick/tdeaddons/debian/man/ksig-trinity.1
index d88a9907b..5c0ec94b5 100644
--- a/ubuntu/maverick/tdeaddons/debian/man/ksig-trinity.1
+++ b/ubuntu/maverick/tdeaddons/debian/man/ksig-trinity.1
@@ -38,7 +38,7 @@ signatures in external mail clients such as KMail.  See
 \fI/opt/trinity/share/doc/ksig/README.Debian\fP for details on how this can be
 done.
 .PP
-This application is part of the official KDE add-ons module.
+This application is part of the official TDE add-ons module.
 .SH OPTIONS
 Below are the ksig-specific options.
 For a full summary of options, run \fIksig \-\-help\fP.
diff --git a/ubuntu/maverick/tdeaddons/debian/man/lnkforward-trinity.1 b/ubuntu/maverick/tdeaddons/debian/man/lnkforward-trinity.1
index c3ebeb34d..692d6182a 100644
--- a/ubuntu/maverick/tdeaddons/debian/man/lnkforward-trinity.1
+++ b/ubuntu/maverick/tdeaddons/debian/man/lnkforward-trinity.1
@@ -16,7 +16,7 @@
 .\" .sp <n>    insert n+1 empty lines
 .\" for manpage-specific macros, see man(7)
 .SH NAME
-lnkforward \- open an URL in a Windows .lnk file under KDE
+lnkforward \- open an URL in a Windows .lnk file under TDE
 .SH SYNOPSIS
 .B lnkforward
 [ \fIgeneric-options\fP ]
@@ -25,7 +25,7 @@ lnkforward \- open an URL in a Windows .lnk file under KDE
 .SH DESCRIPTION
 \fBlnkforward\fP examines a Windows .lnk file, determines its target and
 then opens this target file.  In deciding how to open the target file,
-the usual KDE file associations will be used.
+the usual TDE file associations will be used.
 .PP
 The given URL must include a protocol.  Specifically, if it is simply a
 file on the local filesystem, it must be given in the form
@@ -35,7 +35,7 @@ Drive mappings must be supplied (via \-\-map) for any Windows drive
 referred to in the .lnk file.  See the OPTIONS section below for details.
 .PP
 This utility is used by the .lnk tdefile plugin, and is
-part of the official KDE add-ons module.
+part of the official TDE add-ons module.
 .SH OPTIONS
 Below are the lnkforward-specific options.
 For a full summary of options, run \fIlnkforward \-\-help\fP.
@@ -47,7 +47,7 @@ This option may be passed multiple times.
 .SH EXAMPLE
 Suppose that the Windows file \fIc:\\readme.txt.lnk\fP is a link to
 \fId:\\foo\\bar.txt\fP.  Then the following command will open the file
-\fI/mnt/data/foo/bar.txt\fP in the usual KDE text editor:
+\fI/mnt/data/foo/bar.txt\fP in the usual TDE text editor:
 .PP
 .RS
 \fIprompt$\fP
diff --git a/ubuntu/maverick/tdeaddons/debian/man/noatunsynaescope-trinity.bin.1 b/ubuntu/maverick/tdeaddons/debian/man/noatunsynaescope-trinity.bin.1
index 14d164ea1..fe860f1f8 100644
--- a/ubuntu/maverick/tdeaddons/debian/man/noatunsynaescope-trinity.bin.1
+++ b/ubuntu/maverick/tdeaddons/debian/man/noatunsynaescope-trinity.bin.1
@@ -21,13 +21,13 @@ noatunsynaescope.bin \- start the Synaescope visualisation plugin for Noatun
 .B noatunsynaescope.bin
 .SH DESCRIPTION
 This program starts the Synaescope visualisation plugin for Noatun, the audio
-and video media player for KDE.
+and video media player for TDE.
 .PP
 This program is for Noatun's internal use and should \fBnot\fP be run
 directly.  To start the plugin, run Noatun and select Plugins from the
 configuration dialog.
 .PP
-This plugin is part of the KDE addons module.
+This plugin is part of the TDE addons module.
 .SH SEE ALSO
 .BR noatun (1).
 .SH AUTHOR
diff --git a/ubuntu/maverick/tdeaddons/debian/man/noatuntippecanoe-trinity.bin.1 b/ubuntu/maverick/tdeaddons/debian/man/noatuntippecanoe-trinity.bin.1
index 7e128d0e1..b33eb3b16 100644
--- a/ubuntu/maverick/tdeaddons/debian/man/noatuntippecanoe-trinity.bin.1
+++ b/ubuntu/maverick/tdeaddons/debian/man/noatuntippecanoe-trinity.bin.1
@@ -21,13 +21,13 @@ noatuntippecanoe.bin \- start the Tippecanoe visualisation plugin for Noatun
 .B noatuntippecanoe.bin
 .SH DESCRIPTION
 This program starts the Tippecanoe visualisation plugin for Noatun, the audio
-and video media player for KDE.
+and video media player for TDE.
 .PP
 This program is for Noatun's internal use and should \fBnot\fP be run
 directly.  To start the plugin, run Noatun and select Plugins from the
 configuration dialog.
 .PP
-This plugin is part of the KDE addons module.
+This plugin is part of the TDE addons module.
 .SH SEE ALSO
 .BR noatun (1).
 .SH AUTHOR
diff --git a/ubuntu/maverick/tdeaddons/debian/man/noatuntyler-trinity.bin.1 b/ubuntu/maverick/tdeaddons/debian/man/noatuntyler-trinity.bin.1
index 4fd35e452..5a4001047 100644
--- a/ubuntu/maverick/tdeaddons/debian/man/noatuntyler-trinity.bin.1
+++ b/ubuntu/maverick/tdeaddons/debian/man/noatuntyler-trinity.bin.1
@@ -21,13 +21,13 @@ noatuntyler.bin \- start the Tyler visualisation plugin for Noatun
 .B noatuntyler.bin
 .SH DESCRIPTION
 This program starts the Tyler visualisation plugin for Noatun, the audio
-and video media player for KDE.
+and video media player for TDE.
 .PP
 This program is for Noatun's internal use and should \fBnot\fP be run
 directly.  To start the plugin, run Noatun and select Plugins from the
 configuration dialog.
 .PP
-This plugin is part of the KDE addons module.
+This plugin is part of the TDE addons module.
 .SH SEE ALSO
 .BR noatun (1).
 .SH AUTHOR
diff --git a/ubuntu/maverick/tdeaddons/debian/man/orient-trinity.py.1 b/ubuntu/maverick/tdeaddons/debian/man/orient-trinity.py.1
index cbdeab853..024ec11d7 100644
--- a/ubuntu/maverick/tdeaddons/debian/man/orient-trinity.py.1
+++ b/ubuntu/maverick/tdeaddons/debian/man/orient-trinity.py.1
@@ -46,7 +46,7 @@ tool, see
 .BR jpegorient (1)
 which is also a part of this same set of plugins.
 .PP
-This utility is part of the official KDE add-ons module.
+This utility is part of the official TDE add-ons module.
 .SH OPTIONS
 The possible orientations are represented by the numbers 1 to 8 as
 follows.
diff --git a/ubuntu/maverick/tdeaddons/debian/tdeaddons-doc-html.doc-base.kate-plugins b/ubuntu/maverick/tdeaddons/debian/tdeaddons-doc-html.doc-base.kate-plugins
index 7ac60d1c1..8bc014f43 100644
--- a/ubuntu/maverick/tdeaddons/debian/tdeaddons-doc-html.doc-base.kate-plugins
+++ b/ubuntu/maverick/tdeaddons/debian/tdeaddons-doc-html.doc-base.kate-plugins
@@ -1,7 +1,7 @@
 Document: tdeaddons-doc-html_kate-plugins
 Title: Kate Plugins Handbook
 Author: Various
-Abstract: This is the handbook for the plugins for Kate, KDE's Advanced Text
+Abstract: This is the handbook for the plugins for Kate, TDE's Advanced Text
  Editor.
 Section: Apps/Editors
 
diff --git a/ubuntu/maverick/tdeaddons/debian/tdeaddons-doc-html.doc-base.kicker-applets b/ubuntu/maverick/tdeaddons/debian/tdeaddons-doc-html.doc-base.kicker-applets
index ff75b2108..0ea037e4e 100644
--- a/ubuntu/maverick/tdeaddons/debian/tdeaddons-doc-html.doc-base.kicker-applets
+++ b/ubuntu/maverick/tdeaddons/debian/tdeaddons-doc-html.doc-base.kicker-applets
@@ -1,7 +1,7 @@
 Document: tdeaddons-doc-html_kicker-applets
 Title: Kicker Applets Handbook
 Author: Various
-Abstract: This is the handbook for the addon applets for Kicker, KDE's panel.
+Abstract: This is the handbook for the addon applets for Kicker, TDE's panel.
 Section: Apps/Tools
 
 Format: HTML
diff --git a/ubuntu/maverick/tdeaddons/debian/tdeaddons-doc-html.doc-base.konq-plugins b/ubuntu/maverick/tdeaddons/debian/tdeaddons-doc-html.doc-base.konq-plugins
index d4251adb6..784c55f67 100644
--- a/ubuntu/maverick/tdeaddons/debian/tdeaddons-doc-html.doc-base.konq-plugins
+++ b/ubuntu/maverick/tdeaddons/debian/tdeaddons-doc-html.doc-base.konq-plugins
@@ -2,7 +2,7 @@ Document: tdeaddons-doc-html_konq-plugins
 Title: Konqueror Plugins Handbook
 Author: Lauri Watts <lauri@kde.org> and others
 Abstract: This is the handbook for the additional plugins for Konqueror, the
- KDE file manager and web browser.
+ TDE file manager and web browser.
 Section: Apps/Tools
 
 Format: HTML
diff --git a/ubuntu/maverick/tdeaddons/debian/tdeaddons-trinity.README.Debian b/ubuntu/maverick/tdeaddons/debian/tdeaddons-trinity.README.Debian
index 889a705e6..7a9c3cc03 100644
--- a/ubuntu/maverick/tdeaddons/debian/tdeaddons-trinity.README.Debian
+++ b/ubuntu/maverick/tdeaddons/debian/tdeaddons-trinity.README.Debian
@@ -1,10 +1,10 @@
-KDE Add-On Plugins and Applets for Debian
+TDE Add-On Plugins and Applets for Debian
 -----------------------------------------
 
 Package tdeaddons is a metapackage that depends on the full set of add-on
-plugins and applets provided with the official release of KDE.
+plugins and applets provided with the official release of TDE.
 
-Some packages provide documentation in a docbook format that the KDE
+Some packages provide 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 tdeaddons-doc-html.