merge

4 files changed, 14 insertions, 14 deletions

diff --git a/ubuntu/maverick/applications/kmplayer/debian/cdbs/versions.pl b/ubuntu/maverick/applications/kmplayer/debian/cdbs/versions.pl
index 75c9add4b..1b110f7af 100644
--- a/ubuntu/maverick/applications/kmplayer/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/applications/kmplayer/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/kmplayer/debian/control b/ubuntu/maverick/applications/kmplayer/debian/control
index f09dd1f1e..fd10c8214 100644
--- a/ubuntu/maverick/applications/kmplayer/debian/control
+++ b/ubuntu/maverick/applications/kmplayer/debian/control
@@ -29,7 +29,7 @@ Description: media player for Trinity
  * show backend player's console output
  * launch ffserver (only 0.4.8 works) when viewing from a v4l device
  * DCOP KMediaPlayer interface support
- * VDR viewer frontend (with *kxvplayer), configure VDR keys with standard KDE
+ * VDR viewer frontend (with *kxvplayer), configure VDR keys with standard TDE
    shortcut configure window
  * Lots of configurable shortcuts. Highly recommended for the VDR keys
    (if you have VDR) and volume increase/decrease
@@ -64,4 +64,4 @@ Replaces: kmplayer-kde3-doc (<< 4:14.0.0~), kmplayer-trinity-doc (<< 4:14.0.0~)
 Breaks: kmplayer-kde3-doc (<< 4:14.0.0~), kmplayer-trinity-doc (<< 4:14.0.0~)
 Depends: ${shlibs:Depends}, kmplayer-trinity
 Description: Handbook for KMPlayer [Trinity]
- Documention for KMPlayer, a basic audio/video viewer application for KDE.
+ Documention for KMPlayer, a basic audio/video viewer application for TDE.
diff --git a/ubuntu/maverick/applications/kmplayer/debian/kmplayer.1.docbook b/ubuntu/maverick/applications/kmplayer/debian/kmplayer.1.docbook
index eda152760..dabfff5f0 100644
--- a/ubuntu/maverick/applications/kmplayer/debian/kmplayer.1.docbook
+++ b/ubuntu/maverick/applications/kmplayer/debian/kmplayer.1.docbook
@@ -24,7 +24,7 @@
   </refmeta>
   <refnamediv>
     <refname>kmplayer</refname>
-    <refpurpose>a media player for KDE</refpurpose>
+    <refpurpose>a media player for TDE</refpurpose>
   </refnamediv>
   <refsynopsisdiv>
     <cmdsynopsis>
@@ -33,14 +33,14 @@
         <option><replaceable>Qt-options</replaceable></option>
       </arg>
       <arg choice="opt">
-        <option><replaceable>KDE-options</replaceable></option>
+        <option><replaceable>TDE-options</replaceable></option>
       </arg>
     </cmdsynopsis>
   </refsynopsisdiv>
   <refsect1>
     <title>DESCRIPTION</title>
     <para>
-      KMPlayer is a basic audio/video viewer application for KDE.<br />
+      KMPlayer is a basic audio/video viewer application for TDE.<br />
       <br />
       KMPlayer can:<br />
       * play DVD (DVDNav only with the Xine player).<br />
@@ -50,7 +50,7 @@
       * show backend player's console output.<br />
       * launch ffserver (only 0.4.8 works) when viewing from a v4l device.<br />
       * DCOP KMediaPlayer interface support.<br />
-      * VDR viewer frontend (with *kxvplayer), configure VDR keys with standard KDE<br />
+      * VDR viewer frontend (with *kxvplayer), configure VDR keys with standard TDE<br />
         shortcut configure window.<br />
       * Lots of configurable shortcuts. Highly recommended for the VDR keys<br />
         (if you have VDR) and volume increase/decrease.<br />
@@ -59,7 +59,7 @@
   <refsect1>
     <title>OPTIONS</title>
     <para>
-      All <productname>KDE</productname> and <productname>Qt</productname>
+      All <productname>TDE</productname> and <productname>Qt</productname>
       programs accept a some common command-line options.  KMPlayer has no
       application-specific options.
     </para>
@@ -75,8 +75,8 @@
           <listitem> <para>Show Qt specific options</para> </listitem>
         </varlistentry>
         <varlistentry>
-          <term> <option>--help-kde</option> </term>
-          <listitem> <para>Show KDE specific options</para> </listitem>
+          <term> <option>--help-tde</option> </term>
+          <listitem> <para>Show TDE specific options</para> </listitem>
         </varlistentry>
         <varlistentry>
           <term> <option>--help-all</option> </term>
diff --git a/ubuntu/maverick/applications/kmplayer/debian/menu b/ubuntu/maverick/applications/kmplayer/debian/menu
index 879939d6e..792ed1a5b 100644
--- a/ubuntu/maverick/applications/kmplayer/debian/menu
+++ b/ubuntu/maverick/applications/kmplayer/debian/menu
@@ -1,4 +1,4 @@
-?package(kmplayer):\
+?package(kmplayer-trinity):\
 	needs="X11"\
 	section="Applications/Video"\
 	hints="TDE"\