Branding cleanup on Debian and Ubuntu

6 files changed, 20 insertions, 20 deletions

diff --git a/ubuntu/maverick/applications/amarok/debian/README.Debian b/ubuntu/maverick/applications/amarok/debian/README.Debian
index 185627147..8a407f9c1 100644
--- a/ubuntu/maverick/applications/amarok/debian/README.Debian
+++ b/ubuntu/maverick/applications/amarok/debian/README.Debian
@@ -16,9 +16,9 @@ Amarok packages for Debian
       some other packages for them to work. Those packages are listed in
       the Suggests: field of the amarok package.
 
-  Also, users not using the full KDE environment may get the following
+  Also, users not using the full TDE environment may get the following
   error when executing amarok for the first time: "Socket-path is not a
-  link or a directory: /home/$USER/.kde/socket-$HOSTNAME". Just execute:
+  link or a directory: /home/$USER/.trinity/socket-$HOSTNAME". Just execute:
 
     $ lnusertemp socket
 
diff --git a/ubuntu/maverick/applications/amarok/debian/amarok-trinity.menu b/ubuntu/maverick/applications/amarok/debian/amarok-trinity.menu
index 51d4e1f8b..2e66f42b2 100644
--- a/ubuntu/maverick/applications/amarok/debian/amarok-trinity.menu
+++ b/ubuntu/maverick/applications/amarok/debian/amarok-trinity.menu
@@ -1,4 +1,4 @@
-?package(amarok):\
+?package(amarok-trinity):\
 	needs="X11"\
 	section="Applications/Sound"\
 	hints="TDE"\
diff --git a/ubuntu/maverick/applications/amarok/debian/cdbs/versions.pl b/ubuntu/maverick/applications/amarok/debian/cdbs/versions.pl
index 75c9add4b..1b110f7af 100644
--- a/ubuntu/maverick/applications/amarok/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/applications/amarok/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/amarok/debian/man/amarok-trinity.1 b/ubuntu/maverick/applications/amarok/debian/man/amarok-trinity.1
index dac3bb8aa..821ec48c7 100644
--- a/ubuntu/maverick/applications/amarok/debian/man/amarok-trinity.1
+++ b/ubuntu/maverick/applications/amarok/debian/man/amarok-trinity.1
@@ -1,10 +1,10 @@
 .\" Generated by kdemangen.pl and edited by hand
-.TH AMAROK 1 "Mar 2004" "K Desktop Environment" "An audio player for KDE"
+.TH AMAROK 1 "Mar 2004" "Trinity Desktop Environment" "An audio player for TDE"
 .SH NAME
 amarok
-\- An audio player for KDE
+\- An audio player for TDE
 .SH SYNOPSIS
-amarok [Qt-options] [KDE-options] [URL(s)] 
+amarok [Qt-options] [TDE-options] [URL(s)] 
 .SH DESCRIPTION
 amaroK is a multimedia player based on the soundserver-independent framework.
 There are many media players around these days, true. What's missing from most
@@ -18,8 +18,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
@@ -102,7 +102,7 @@ disable XIM.
 .B  \-\-reverse  
 mirrors the whole layout of widgets.
 .SS 
-.SS KDE options:
+.SS TDE options:
 .TP
 .B  \-\-caption  <caption>
 Use 'caption' as name in the titlebar.
@@ -157,7 +157,7 @@ Skip forwards in playlist
 Enqueue Files/URLs
 
 .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:/amarok/
 directly into konqueror or you can run 
 .BR "`khelpcenter help:/amarok/'"
@@ -173,7 +173,7 @@ Max Howell <max.howell@methylblue.com>
 .BR
 Stanislav Karchebny <berk@upnet.ru>
 .BR
-Please use http://bugs.kde.org to report bugs, do not mail the authors directly.
+Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
 .BR
 .SH OTHER
 This manual page was written by Alejandro Exojo <suy@badopi.org> for the Debian
diff --git a/ubuntu/maverick/applications/amarok/debian/man/amarokapp-trinity.1 b/ubuntu/maverick/applications/amarok/debian/man/amarokapp-trinity.1
index 0850440dd..91ff8b6aa 100644
--- a/ubuntu/maverick/applications/amarok/debian/man/amarokapp-trinity.1
+++ b/ubuntu/maverick/applications/amarok/debian/man/amarokapp-trinity.1
@@ -1,10 +1,10 @@
 .\" Generated by kdemangen.pl and edited by hand
-.TH AMAROK 1 "Feb 2008" "Amarok" "An audio player for KDE"
+.TH AMAROK 1 "Feb 2008" "Amarok" "An audio player for TDE"
 .SH NAME
 amarokapp
 \- A direct executable for Amarok.
 .SH SYNOPSIS
-amarokapp [Qt-options] [KDE-options] [URL(s)] 
+amarokapp [Qt-options] [TDE-options] [URL(s)] 
 .SH DESCRIPTION
 Amarok is a multimedia player based on the soundserver-independent framework.
 There are many media players around these days, true. What's missing from most
diff --git a/ubuntu/maverick/applications/amarok/debian/man/amarokcollectionscanner-trinity.1 b/ubuntu/maverick/applications/amarok/debian/man/amarokcollectionscanner-trinity.1
index f4abfd1b2..c67cd917f 100644
--- a/ubuntu/maverick/applications/amarok/debian/man/amarokcollectionscanner-trinity.1
+++ b/ubuntu/maverick/applications/amarok/debian/man/amarokcollectionscanner-trinity.1
@@ -3,7 +3,7 @@
 .SH NAME
 amarokcollectionscanner \- Collection Scanner for Amarok
 .SH SYNOPSIS
-amarokcollectionscanner [Qt\-options] [KDE\-options] Folder(s) 
+amarokcollectionscanner [Qt\-options] [TDE\-options] Folder(s) 
 .SH DESCRIPTION
 This Amarok helper utility scans folder(s) given on the command line or
 restarts previous scan if \fB\-\-restart\fP option was given and writes a
@@ -39,8 +39,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