merge

5 files changed, 10 insertions, 10 deletions

diff --git a/ubuntu/maverick/applications/wlassistant/debian/cdbs/versions.pl b/ubuntu/maverick/applications/wlassistant/debian/cdbs/versions.pl
index 75c9add4b..1b110f7af 100644
--- a/ubuntu/maverick/applications/wlassistant/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/applications/wlassistant/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/wlassistant/debian/control b/ubuntu/maverick/applications/wlassistant/debian/control
index 67aee9c3c..7983de269 100644
--- a/ubuntu/maverick/applications/wlassistant/debian/control
+++ b/ubuntu/maverick/applications/wlassistant/debian/control
@@ -12,7 +12,7 @@ Depends: kicker-trinity, net-tools, wireless-tools, menu, ${shlibs:Depends}
 Replaces: wlassistant-kde3 (<< 4:14.0.0~), wlassistant-trinity (<< 4:14.0.0~)
 Breaks: wlassistant-kde3 (<< 4:14.0.0~), wlassistant-trinity (<< 4:14.0.0~)
 Recommends: dhcp3-client | dhcp-client | dhcpcd
-Description: User friendly KDE frontend for wireless network connection [Trinity]
+Description: User friendly TDE frontend for wireless network connection [Trinity]
  Wireless Assistant scans for wireless access points and displays link quality,
  encryption and other useful information. When user wants to connect to a
  network, Wireless Assistant opens up its wizards and guides the user through
diff --git a/ubuntu/maverick/applications/wlassistant/debian/control.in b/ubuntu/maverick/applications/wlassistant/debian/control.in
index ca673aa4b..ab3e7e5a6 100644
--- a/ubuntu/maverick/applications/wlassistant/debian/control.in
+++ b/ubuntu/maverick/applications/wlassistant/debian/control.in
@@ -13,7 +13,7 @@ Depends: kicker-trinity, net-tools, wireless-tools, menu, ${shlibs:Depends}
 Replaces: wlassistant-kde3 (<< 4:3.5.13)
 Breaks: wlassistant-kde3 (<< 4:3.5.13)
 Recommends: dhcp3-client | dhcp-client | dhcpcd
-Description: User friendly KDE frontend for wireless network connection [Trinity]
+Description: User friendly TDE frontend for wireless network connection [Trinity]
  Wireless Assistant scans for wireless access points and displays link quality,
  encryption and other useful information. When user wants to connect to a
  network, Wireless Assistant opens up its wizards and guides the user through
diff --git a/ubuntu/maverick/applications/wlassistant/debian/wlassistant-trinity.manpage b/ubuntu/maverick/applications/wlassistant/debian/wlassistant-trinity.manpage
index fb021a15b..28b6283c0 100644
--- a/ubuntu/maverick/applications/wlassistant/debian/wlassistant-trinity.manpage
+++ b/ubuntu/maverick/applications/wlassistant/debian/wlassistant-trinity.manpage
@@ -4,12 +4,12 @@
 Wireless Assistant
 .SH "SYNTAX"
 .LP 
-wlassistant [Qt\-options] [KDE\-options]
+wlassistant [Qt\-options] [TDE\-options]
 
 Generic options:
   \-\-help                    Show help about options
   \-\-help\-qt                 Show Qt specific options
-  \-\-help\-kde                Show KDE specific options
+  \-\-help\-tde                Show TDE specific options
   \-\-help\-all                Show all options
   \-\-author                  Show author information
   \-v, \-\-version             Show version information
@@ -17,7 +17,7 @@ Generic options:
   \-\-                        End of options
 .SH "DESCRIPTION"
 .LP 
-Wireless Assistant is a full\-featured KDE application with an intuitive interface. It scans for wireless access points and displays link quality, encryption and other useful information. When user wants to connect to a  network, Wireless Assistant opens up its wizards and guides the user through Wi\-Fi settings. After a successful connection is made the settings are remembered so next time the user won't have to enter them again. 
+Wireless Assistant is a full\-featured TDE application with an intuitive interface. It scans for wireless access points and displays link quality, encryption and other useful information. When user wants to connect to a  network, Wireless Assistant opens up its wizards and guides the user through Wi\-Fi settings. After a successful connection is made the settings are remembered so next time the user won't have to enter them again. 
 
 Unlike other similar applications, Wireless Assistant requires virtually no  configuration, it is ready to use right after installation. Features include WEP  encryption, automatic (DHCP) and manual configuration, hidden ESSIDs and more.
 
diff --git a/ubuntu/maverick/applications/wlassistant/debian/wlassistant-trinity.menu b/ubuntu/maverick/applications/wlassistant/debian/wlassistant-trinity.menu
index 8b3f1d669..9e7286512 100644
--- a/ubuntu/maverick/applications/wlassistant/debian/wlassistant-trinity.menu
+++ b/ubuntu/maverick/applications/wlassistant/debian/wlassistant-trinity.menu
@@ -1,4 +1,4 @@
-?package(wlassistant):\
+?package(wlassistant-trinity):\
         needs="X11"\
         section="Applications/Network/Monitoring"\
         hints="TDE"\