Branding cleanup on Debian and Ubuntu

4 files changed, 15 insertions, 15 deletions

diff --git a/debian/squeeze/applications/kaffeine/debian/cdbs/versions.pl b/debian/squeeze/applications/kaffeine/debian/cdbs/versions.pl
index 75c9add4b..1b110f7af 100644
--- a/debian/squeeze/applications/kaffeine/debian/cdbs/versions.pl
+++ b/debian/squeeze/applications/kaffeine/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/debian/squeeze/applications/kaffeine/debian/control b/debian/squeeze/applications/kaffeine/debian/control
index 2c657ab4a..46f7f0d72 100644
--- a/debian/squeeze/applications/kaffeine/debian/control
+++ b/debian/squeeze/applications/kaffeine/debian/control
@@ -18,7 +18,7 @@ Depends: ${shlibs:Depends}, hdparm, libxine2-x | libxine1-x (<< 1.1.20) | libxin
 Replaces: kaffeine-trinity (<< 4:14.0.0~)
 Breaks: kaffeine-trinity (<< 4:14.0.0~)
 Description: versatile media player for TDE
- Kaffeine is a media player for KDE. While it supports multiple player
+ Kaffeine is a media player for TDE. While it supports multiple player
  engines, its default engine is Xine, giving Kaffeine a wide variety of
  supported media types and letting Kaffeine access CDs, DVDs, and
  network streams easily.
@@ -46,7 +46,7 @@ Depends: ${shlibs:Depends}, kaffeine-trinity
 Replaces: kaffeine-gstreamer-trinity (<< 4:14.0.0~)
 Breaks: kaffeine-gstreamer-trinity (<< 4:14.0.0~)
 Description: Gstreamer engine for kaffeine media player [Trinity]
- Kaffeine is a media player for KDE. While it supports multiple player
+ Kaffeine is a media player for TDE. While it supports multiple player
  engines, its default engine is Gstreamer, giving Kaffeine a wide variety of
  supported media types and letting Kaffeine access CDs, DVDs, and
  network streams easily.
diff --git a/debian/squeeze/applications/kaffeine/debian/kaffeine.1 b/debian/squeeze/applications/kaffeine/debian/kaffeine.1
index ca6de5bc7..0d66e29a8 100644
--- a/debian/squeeze/applications/kaffeine/debian/kaffeine.1
+++ b/debian/squeeze/applications/kaffeine/debian/kaffeine.1
@@ -1,12 +1,12 @@
 .\" This file was generated by kdemangen.pl
-.TH KAFFEINE 1 "Apr 2005" "K Desktop Environment" "A media player for KDE"
+.TH KAFFEINE 1 "Apr 2005" "Trinity Desktop Environment" "A media player for TDE"
 .SH NAME
 kaffeine
-- A media player for KDE that can use multiple backends for playback.
+- A media player for TDE that can use multiple backends for playback.
 .SH SYNOPSIS
-kaffeine [Qt-options] [KDE-options] [options] [file] 
+kaffeine [Qt-options] [TDE-options] [options] [file] 
 .SH DESCRIPTION
-Kaffeine is a media player for KDE. While it supports multiple player
+Kaffeine is a media player for TDE. While it supports multiple player
 engines, its default engine is Xine, giving Kaffeine a wide variety of
 supported media types and letting Kaffeine access CDs, DVDs, and
 network streams easily.
@@ -55,8 +55,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
@@ -73,7 +73,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
@@ -173,7 +173,7 @@ mirrors the whole layout of widgets
 .SS 
 
 .SH SEE ALSO
-Full user documentation is available through the KDE Help Center.  You can also enter the URL
+Full user documentation is available through the TDE Help Center.  You can also enter the URL
 .BR help:/kaffeine/
 directly into konqueror or you can run 
 .BR "`khelpcenter help:/kaffeine/'"
diff --git a/debian/squeeze/applications/kaffeine/debian/menu b/debian/squeeze/applications/kaffeine/debian/menu
index 50780b0a2..2a2ed2f01 100644
--- a/debian/squeeze/applications/kaffeine/debian/menu
+++ b/debian/squeeze/applications/kaffeine/debian/menu
@@ -1,4 +1,4 @@
-?package(kaffeine):\
+?package(kaffeine-trinity):\
 	needs="X11"\
 	section="Apps/Sound"\
 	hints="TDE"\