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

5 files changed, 10 insertions, 10 deletions

diff --git a/ubuntu/maverick/applications/kcpuload/debian/cdbs/versions.pl b/ubuntu/maverick/applications/kcpuload/debian/cdbs/versions.pl
index 75c9add4b..1b110f7af 100644
--- a/ubuntu/maverick/applications/kcpuload/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/applications/kcpuload/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/applications/kcpuload/debian/control b/ubuntu/maverick/applications/kcpuload/debian/control
index 87edbd944..fd1fe9737 100644
--- a/ubuntu/maverick/applications/kcpuload/debian/control
+++ b/ubuntu/maverick/applications/kcpuload/debian/control
@@ -14,7 +14,7 @@ Breaks: kcpuload-kde3 (<< 4:14.0.0~), kcpuload-trinity (<< 4:14.0.0~)
 Depends: ${shlibs:Depends}
 Suggests: knetload-trinity
 Description: a CPU meter for Kicker [Trinity]
- KCPULoad is a small program for Kicker (the KDE panel).  It shows a
+ KCPULoad is a small program for Kicker (the TDE panel).  It shows a
  recent history of CPU usage in the form of one or two configurable
  diagrams in the system tray.  These diagrams have settings for colours
  and various different styles.
diff --git a/ubuntu/maverick/applications/kcpuload/debian/kcpuload.1 b/ubuntu/maverick/applications/kcpuload/debian/kcpuload.1
index 0eb630559..513cd2a70 100644
--- a/ubuntu/maverick/applications/kcpuload/debian/kcpuload.1
+++ b/ubuntu/maverick/applications/kcpuload/debian/kcpuload.1
@@ -21,7 +21,7 @@ kcpuload \- a CPU meter for Kicker
 .B kcpuload
 .RI "[ " generic-options " ]"
 .SH DESCRIPTION
-\fBKCPULoad\fP is a small program for Kicker (the KDE panel).  It
+\fBKCPULoad\fP is a small program for Kicker (the TDE panel).  It
 shows a recent history of CPU usage in the form of one or two
 configurable diagrams in the system tray.
 These diagrams have settings for colors and various different styles.
@@ -42,14 +42,14 @@ and accurate diagram without flicker.
 .SH OPTIONS
 For a full summary of options, run \fIkcpuload \-\-help\fP.
 .SH SEE ALSO
-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:/kcpuload/\fP
 directly into konqueror or you can run
 `\fIkhelpcenter help:/kcpuload/\fP'
 from the command-line.
 .PP
-If the KDE Help Centre is not installed then you can
+If the TDE Help Centre is not installed then you can
 read this documentation in HTML format from
 \fI/usr/share/doc/tde/HTML/en/kcpuload/\fP.
 .SH AUTHOR
diff --git a/ubuntu/maverick/applications/kcpuload/debian/menu b/ubuntu/maverick/applications/kcpuload/debian/menu
index 1ae39c62a..88ff824b6 100644
--- a/ubuntu/maverick/applications/kcpuload/debian/menu
+++ b/ubuntu/maverick/applications/kcpuload/debian/menu
@@ -1,4 +1,4 @@
-?package(kcpuload):needs="X11"\
+?package(kcpuload-trinity):needs="X11"\
   section="Applications/System/Monitoring"\
   hints="TDE"\
   kderemove="1"\
diff --git a/ubuntu/maverick/applications/kcpuload/debian/override b/ubuntu/maverick/applications/kcpuload/debian/override
index e3c6bcea4..636623749 100644
--- a/ubuntu/maverick/applications/kcpuload/debian/override
+++ b/ubuntu/maverick/applications/kcpuload/debian/override
@@ -1,2 +1,2 @@
-# This tag is required for apps already in the KDE menu.
+# This tag is required for apps already in the TDE menu.
 kcpuload-trinity: menu-item-contains-unknown-tag kderemove /usr/share/menu/kcpuload:7