merge

3 files changed, 5 insertions, 5 deletions

diff --git a/debian/lenny/applications/knutclient/debian/control b/debian/lenny/applications/knutclient/debian/control
index bcdcab89d..1f9f0e574 100644
--- a/debian/lenny/applications/knutclient/debian/control
+++ b/debian/lenny/applications/knutclient/debian/control
@@ -12,7 +12,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Replaces: knutclient-trinity (<< 4:14.0.0~)
 Breaks: knutclient-trinity (<< 4:14.0.0~)
-Description: A KDE GUI that displays UPS statistics from NUT's upsd [Trinity]
+Description: A TDE GUI that displays UPS statistics from NUT's upsd [Trinity]
  KNutClient monitors UPS statistics through the NUT (Network UPS Tools,
  http://www.networkupstools.org/) framework on Linux and other systems. This
  information, presented in a nice visual format, can be invaluable on
diff --git a/debian/lenny/applications/knutclient/debian/knutclient.1x b/debian/lenny/applications/knutclient/debian/knutclient.1x
index 231658277..30ffffda2 100644
--- a/debian/lenny/applications/knutclient/debian/knutclient.1x
+++ b/debian/lenny/applications/knutclient/debian/knutclient.1x
@@ -1,6 +1,6 @@
 .TH KNUTCLIENT 1 "july 8, 2004"
 .SH NAME
-knutclient \- A KDE GUI that displays UPS statistics from NUT's upsd
+knutclient \- A TDE GUI that displays UPS statistics from NUT's upsd
 .SH SYNOPSIS
 .B knutclient [option]
 .br
@@ -10,7 +10,7 @@ This manual page documents briefly the
 program.
 This manual page was written for the Debian distribution
 because the original program does not have a manual page.
-Instead, it has documentation in the KDE Help format you
+Instead, it has documentation in the TDE Help format you
 should better refer to.
 .PP
 \fBknutclient\fP monitors UPS statistics through the NUT (Network UPS Tools,
@@ -22,7 +22,7 @@ using an UPS.
 This program follow the usual GNU command line syntax, with long
 options starting with two dashes (`-').
 A summary of options is included below.
-For a complete description, see the KDE Help.
+For a complete description, see the TDE Help.
 .TP
 .B \-\-help
 Show summary of options.
diff --git a/debian/lenny/applications/knutclient/debian/knutclient.menu b/debian/lenny/applications/knutclient/debian/knutclient.menu
index 411dd4bf1..c6844afcc 100644
--- a/debian/lenny/applications/knutclient/debian/knutclient.menu
+++ b/debian/lenny/applications/knutclient/debian/knutclient.menu
@@ -1,4 +1,4 @@
-?package(knutclient):\
+?package(knutclient-trinity):\
 	needs="X11"\
 	section="Applications/System/Monitoring"\
 	hints="TDE"\