merge

3 files changed, 7 insertions, 7 deletions

diff --git a/ubuntu/maverick/applications/kvpnc/debian/README.Debian b/ubuntu/maverick/applications/kvpnc/debian/README.Debian
index b6bc07ea6..c34f0fa8b 100644
--- a/ubuntu/maverick/applications/kvpnc/debian/README.Debian
+++ b/ubuntu/maverick/applications/kvpnc/debian/README.Debian
@@ -1,7 +1,7 @@
 kvpnc for Debian
 ----------------
 
-kvpnc for Debian uses su-to-root from menu package instead kdesu.
+kvpnc for Debian uses su-to-root from menu package instead tdesu.
 
 Howto setup kvpnc for use without root password using sudo:
 
diff --git a/ubuntu/maverick/applications/kvpnc/debian/kvpnc-trinity.1 b/ubuntu/maverick/applications/kvpnc/debian/kvpnc-trinity.1
index 4111d5ff4..48c475084 100644
--- a/ubuntu/maverick/applications/kvpnc/debian/kvpnc-trinity.1
+++ b/ubuntu/maverick/applications/kvpnc/debian/kvpnc-trinity.1
@@ -16,7 +16,7 @@
 .\" .sp <n>    insert n+1 empty lines
 .\" for manpage-specific macros, see man(7)
 .SH NAME
-kvpnc \- vpn clients frontend for KDE
+kvpnc \- vpn clients frontend for TDE
 .SH SYNOPSIS
 .B kvpnc
 .RI [ options ]
@@ -25,7 +25,7 @@ kvpnc \- vpn clients frontend for KDE
 .\" TeX users may be more comfortable with the \fB<whatever>\fP and
 .\" \fI<whatever>\fP escape sequences to invode bold face and italics,
 .\" respectively.
-\fBkvpnc\fP is a KDE frontend for various vpn clients.
+\fBkvpnc\fP is a TDE frontend for various vpn clients.
 .br
 It supports :
 .br
@@ -37,7 +37,7 @@ It supports :
 .br
  * Virtual Private Network daemon (openvpn)
 .SH OPTIONS
-All KDE and Qt programs accept some common command\-line options.
+All TDE and Qt programs accept some common command\-line options.
 .br
 Kvpnc has no application\-specific options.
 .PP
@@ -48,8 +48,8 @@ Show help about options
 \fB\-\-help\-qt\fR
 Show Qt specific options
 .TP
-\fB\-\-help\-kde\fR
-Show KDE specific options
+\fB\-\-help\-tde\fR
+Show TDE specific options
 .TP
 \fB\-\-help\-all\fR
 Show all options
diff --git a/ubuntu/maverick/applications/kvpnc/debian/menu b/ubuntu/maverick/applications/kvpnc/debian/menu
index 909adb58a..2309453a4 100644
--- a/ubuntu/maverick/applications/kvpnc/debian/menu
+++ b/ubuntu/maverick/applications/kvpnc/debian/menu
@@ -1,4 +1,4 @@
-?package(kvpnc):\
+?package(kvpnc-trinity):\
   needs="X11"\
   section="Applications/Network/Communication"\
   title="kvpnc"\