merge

5 files changed, 14 insertions, 14 deletions

diff --git a/ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/versions.pl b/ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/versions.pl
index 75c9add4b..1b110f7af 100644
--- a/ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/applications/knetworkmanager8/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/knetworkmanager8/debian/control b/ubuntu/maverick/applications/knetworkmanager8/debian/control
index f1087800d..26e666376 100644
--- a/ubuntu/maverick/applications/knetworkmanager8/debian/control
+++ b/ubuntu/maverick/applications/knetworkmanager8/debian/control
@@ -31,7 +31,7 @@ Breaks: network-manager-kde-kde3 (<< 4:14.0.0~), network-manager-kde-trinity (<<
 Recommends: tdewalletmanager-trinity, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp
 Provides: knetworkmanager-trinity
 Conflicts: network-manager-kde
-Description: KDE systray applet for controlling NetworkManager [Trinity]
+Description: TDE systray applet for controlling NetworkManager [Trinity]
  Systray applet for controlling network connections managed by 
  NetworkManager. It is mainly written for Trinity but also works for 
  other desktop environments like GNOME or Xfce.
diff --git a/ubuntu/maverick/applications/knetworkmanager8/debian/control.in b/ubuntu/maverick/applications/knetworkmanager8/debian/control.in
index a1ff67bc6..4891ff225 100644
--- a/ubuntu/maverick/applications/knetworkmanager8/debian/control.in
+++ b/ubuntu/maverick/applications/knetworkmanager8/debian/control.in
@@ -30,7 +30,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.7.0)
 Recommends: tdewalletmanager-trinity, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp
 Provides: knetworkmanager-trinity
 Conflicts: network-manager-kde
-Description: KDE systray applet for controlling NetworkManager [Trinity]
+Description: TDE systray applet for controlling NetworkManager [Trinity]
  Systray applet for controlling network connections managed by 
  NetworkManager. It is mainly written for Trinity but also works for 
  other desktop environments like GNOME or Xfce.
diff --git a/ubuntu/maverick/applications/knetworkmanager8/debian/knetworkmanager.1 b/ubuntu/maverick/applications/knetworkmanager8/debian/knetworkmanager.1
index 3cd261c89..e4f5073db 100644
--- a/ubuntu/maverick/applications/knetworkmanager8/debian/knetworkmanager.1
+++ b/ubuntu/maverick/applications/knetworkmanager8/debian/knetworkmanager.1
@@ -1,12 +1,12 @@
 .\" This file was generated by kdemangen.pl
-.TH KNETWORKMANAGER 1 "Feb 2006" "K Desktop Environment" "A NetworkManager front-end for KDE"
+.TH KNETWORKMANAGER 1 "Feb 2006" "Trinity Desktop Environment" "A NetworkManager front-end for TDE"
 .SH NAME
 knetworkmanager
-\- A NetworkManager front-end for KDE
+\- A NetworkManager front-end for TDE
 .SH SYNOPSIS
-knetworkmanager [Qt\-options] [KDE\-options] 
+knetworkmanager [Qt\-options] [TDE\-options] 
 .SH DESCRIPTION
-A NetworkManager front-end for KDE
+A NetworkManager front-end for TDE
 .SH OPTIONS
 .SS Generic options:
 .TP
@@ -16,8 +16,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
@@ -34,7 +34,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
diff --git a/ubuntu/maverick/applications/knetworkmanager8/debian/menu b/ubuntu/maverick/applications/knetworkmanager8/debian/menu
index 3853fafff..cc47df4d0 100644
--- a/ubuntu/maverick/applications/knetworkmanager8/debian/menu
+++ b/ubuntu/maverick/applications/knetworkmanager8/debian/menu
@@ -1,4 +1,4 @@
-?package(network-manager-tde): \
+?package(network-manager-kde-trinity): \
 	needs="X11" \
 	section="Applications/Network/Monitoring" \
   	title="KNetworkManager" \