DEB kmplayer: Switch to cmake.

Enabled build of KOffice plugin.
Enabled support for GStreamer and NPP.
The man page has been moved to the main tree.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>

20 files changed, 98 insertions, 374 deletions

diff --git a/debian/_base/applications/kmplayer/debian/control b/debian/_base/applications/kmplayer/debian/control
index 8dd3c366b..5d9b52950 100644
--- a/debian/_base/applications/kmplayer/debian/control
+++ b/debian/_base/applications/kmplayer/debian/control
@@ -4,11 +4,11 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
 Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, tdelibs14-trinity-dev,
- libcairo2-dev, libdbus-1-dev, libdbus-glib-1-dev, libdbus-tqt-1-dev,
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, tdelibs14-trinity-dev,
+ libnspr4-dev, libcairo2-dev, libdbus-1-dev, libdbus-glib-1-dev, libdbus-tqt-1-dev,
  libgstreamer-plugins-base1.0-dev | libgstreamer-plugins-base0.10-dev,
- libgtk2.0-dev, libxine2-dev | libxine-dev, libxv-dev, docbook2x,
- automake, autoconf, libtool, libltdl-dev
+ libgtk2.0-dev, libxine2-dev | libxine-dev, libxv-dev, libxtst-dev,
+ koffice-trinity-dev
 Standards-Version: 3.8.4
 Homepage: http://kmplayer.kde.org
 
@@ -58,6 +58,16 @@ Description: KMPlayer plugin for TDEHTML/Konqueror [Trinity]
  tv or radio. It mimics QuickTime, MS Media Player and RealPlayer plugin
  browser plugins.
 
+Package: kmplayer-koffice-plugins-trinity
+Architecture: any
+Section: tde
+Depends: ${shlibs:Depends}, kmplayer-base-trinity (= ${binary:Version})
+Description: KMPlayer plugin for KOffice [Trinity]
+ This plugin enables audio/video playback inside KOffice, using Xine (with
+ *kxineplayer) or GStreamer (with *kgstplayer), such as movie trailers, web
+ tv or radio. It mimics QuickTime, MS Media Player and RealPlayer plugin
+ browser plugins.
+
 Package: kmplayer-trinity-doc
 Architecture: all
 Section: tde
diff --git a/debian/_base/applications/kmplayer/debian/kmplayer-base-trinity.install b/debian/_base/applications/kmplayer/debian/kmplayer-base-trinity.install
index 7e7f44aec..0bf23d0be 100644
--- a/debian/_base/applications/kmplayer/debian/kmplayer-base-trinity.install
+++ b/debian/_base/applications/kmplayer/debian/kmplayer-base-trinity.install
@@ -2,14 +2,14 @@ opt/trinity/lib/libkmplayercommon.so
 opt/trinity/lib/libkmplayercommon.la
 opt/trinity/bin/kxineplayer
 etc/trinity/kmplayerrc
-/opt/trinity/share/apps/kmplayer/bookmarks.xml
-/opt/trinity/share/apps/kmplayer/noise.gif
-/opt/trinity/share/mimelnk/application/x-kmplayer.desktop
-/opt/trinity/share/mimelnk/video/x-ms-wmp.desktop
-/opt/trinity/share/icons/hicolor/16x16/apps/kmplayer.png
-/opt/trinity/share/icons/hicolor/22x22/apps/kmplayer.png
-/opt/trinity/share/icons/hicolor/32x32/apps/kmplayer.png
-/opt/trinity/share/icons/hicolor/48x48/apps/kmplayer.png
-/opt/trinity/share/icons/hicolor/64x64/apps/kmplayer.png
-/opt/trinity/share/icons/hicolor/128x128/apps/kmplayer.png
-/opt/trinity/share/icons/hicolor/scalable/apps/kmplayer.svgz
+opt/trinity/share/apps/kmplayer/bookmarks.xml
+opt/trinity/share/apps/kmplayer/noise.gif
+opt/trinity/share/mimelnk/application/x-kmplayer.desktop
+opt/trinity/share/mimelnk/video/x-ms-wmp.desktop
+opt/trinity/share/icons/hicolor/16x16/apps/kmplayer.png
+opt/trinity/share/icons/hicolor/22x22/apps/kmplayer.png
+opt/trinity/share/icons/hicolor/32x32/apps/kmplayer.png
+opt/trinity/share/icons/hicolor/48x48/apps/kmplayer.png
+opt/trinity/share/icons/hicolor/64x64/apps/kmplayer.png
+opt/trinity/share/icons/hicolor/128x128/apps/kmplayer.png
+opt/trinity/share/icons/hicolor/scalable/apps/kmplayer.svgz
diff --git a/debian/_base/applications/kmplayer/debian/kmplayer-koffice-plugins-trinity.install b/debian/_base/applications/kmplayer/debian/kmplayer-koffice-plugins-trinity.install
new file mode 100644
index 000000000..67b3b3293
--- /dev/null
+++ b/debian/_base/applications/kmplayer/debian/kmplayer-koffice-plugins-trinity.install
@@ -0,0 +1,3 @@
+opt/trinity/lib/trinity/libkmplayerkofficepart.la
+opt/trinity/lib/trinity/libkmplayerkofficepart.so
+opt/trinity/share/services/kmplayer_koffice.desktop
diff --git a/debian/_base/applications/kmplayer/debian/kmplayer-konq-plugins-trinity.install b/debian/_base/applications/kmplayer/debian/kmplayer-konq-plugins-trinity.install
index 4590b56f4..25d58e803 100644
--- a/debian/_base/applications/kmplayer/debian/kmplayer-konq-plugins-trinity.install
+++ b/debian/_base/applications/kmplayer/debian/kmplayer-konq-plugins-trinity.install
@@ -1,5 +1,5 @@
 opt/trinity/lib/trinity/libkmplayerpart.so
 opt/trinity/lib/trinity/libkmplayerpart.la
-/opt/trinity/share/apps/kmplayer/kmplayerpartui.rc
-/opt/trinity/share/apps/kmplayer/pluginsinfo
-/opt/trinity/share/services/kmplayer_part.desktop
+opt/trinity/share/apps/kmplayer/kmplayerpartui.rc
+opt/trinity/share/apps/kmplayer/pluginsinfo
+opt/trinity/share/services/kmplayer_part.desktop
diff --git a/debian/_base/applications/kmplayer/debian/kmplayer-trinity-doc.install b/debian/_base/applications/kmplayer/debian/kmplayer-trinity-doc.install
index 9b26532f3..21ee04d88 100644
--- a/debian/_base/applications/kmplayer/debian/kmplayer-trinity-doc.install
+++ b/debian/_base/applications/kmplayer/debian/kmplayer-trinity-doc.install
@@ -1 +1 @@
-/opt/trinity/share/doc/*
+opt/trinity/share/doc/*
diff --git a/debian/_base/applications/kmplayer/debian/kmplayer-trinity.install b/debian/_base/applications/kmplayer/debian/kmplayer-trinity.install
index f27e64ad7..ac07b829a 100644
--- a/debian/_base/applications/kmplayer/debian/kmplayer-trinity.install
+++ b/debian/_base/applications/kmplayer/debian/kmplayer-trinity.install
@@ -1,7 +1,10 @@
 opt/trinity/lib/libtdeinit_kmplayer.so
 opt/trinity/lib/trinity/kmplayer.so
+opt/trinity/bin/kgstplayer
 opt/trinity/bin/kmplayer
+opt/trinity/bin/knpplayer
 opt/trinity/bin/kxvplayer
-/opt/trinity/share/apps/kmplayer/kmplayerui.rc
-/opt/trinity/share/applications/tde/kmplayer.desktop
-/opt/trinity/share/locale
+opt/trinity/share/apps/kmplayer/kmplayerui.rc
+opt/trinity/share/applications/tde/kmplayer.desktop
+opt/trinity/share/locale
+opt/trinity/share/man
diff --git a/debian/_base/applications/kmplayer/debian/menu b/debian/_base/applications/kmplayer/debian/kmplayer-trinity.menu
index 792ed1a5b..792ed1a5b 100644
--- a/debian/_base/applications/kmplayer/debian/menu
+++ b/debian/_base/applications/kmplayer/debian/kmplayer-trinity.menu
diff --git a/debian/_base/applications/kmplayer/debian/kmplayer.1.docbook b/debian/_base/applications/kmplayer/debian/kmplayer.1.docbook
deleted file mode 100644
index dabfff5f0..000000000
--- a/debian/_base/applications/kmplayer/debian/kmplayer.1.docbook
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-]>
-<refentry>
-  <refentryinfo>
-    <author>
-      <firstname>Jonathan Patrick</firstname>
-      <surname>Davies</surname>
-      <email>jpatrick@kubuntu.org</email>
-    </author>
-    <copyright>
-      <year>2006-2007</year>
-      <holder>Jonathan Patrick Davies</holder>
-    </copyright>
-    <!-- XXX IMPORTANT XXX -->
-    <!-- Keep this date up to date: -->
-    <date>2007-11-03</date>
-    <!--  ^^^^^^^^^^ -->
-  </refentryinfo>
-  <refmeta>
-    <refentrytitle>kmplayer</refentrytitle>
-    <manvolnum>1</manvolnum>
-  </refmeta>
-  <refnamediv>
-    <refname>kmplayer</refname>
-    <refpurpose>a media player for TDE</refpurpose>
-  </refnamediv>
-  <refsynopsisdiv>
-    <cmdsynopsis>
-      <command>kmplayer</command>
-      <arg choice="opt">
-        <option><replaceable>Qt-options</replaceable></option>
-      </arg>
-      <arg choice="opt">
-        <option><replaceable>TDE-options</replaceable></option>
-      </arg>
-    </cmdsynopsis>
-  </refsynopsisdiv>
-  <refsect1>
-    <title>DESCRIPTION</title>
-    <para>
-      KMPlayer is a basic audio/video viewer application for TDE.<br />
-      <br />
-      KMPlayer can:<br />
-      * play DVD (DVDNav only with the Xine player).<br />
-      * play VCD.<br />
-      * let the backend players play from a pipe (read from stdin).<br />
-      * play from a TV device (experimental).<br />
-      * 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 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 />
-    </para>
-  </refsect1>
-  <refsect1>
-    <title>OPTIONS</title>
-    <para>
-      All <productname>TDE</productname> and <productname>Qt</productname>
-      programs accept a some common command-line options.  KMPlayer has no
-      application-specific options.
-    </para>
-    <para>
-      <variablelist>
-        <title>Generic options:</title>
-        <varlistentry>
-          <term> <option>--help</option> </term>
-          <listitem> <para>Show help about options</para> </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term> <option>--help-qt</option> </term>
-          <listitem> <para>Show Qt specific options</para> </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term> <option>--help-tde</option> </term>
-          <listitem> <para>Show TDE specific options</para> </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term> <option>--help-all</option> </term>
-          <listitem> <para>Show all options</para> </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term> <option>--author</option> </term>
-          <listitem> <para>Show author information</para> </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term> <option>-v</option>, <option>--version</option> </term>
-          <listitem> <para>Show version information</para> </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term> <option>--license</option> </term>
-          <listitem> <para>Show license information</para> </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term> <option>--</option> </term>
-          <listitem> <para>Indicates end of options</para> </listitem>
-        </varlistentry>
-      </variablelist>
-      <!-- TODO * add all the rest of the options, but maybe find an automated
-      way to keep it up to date -->
-    </para>
-  </refsect1>
-  <refsect1>
-    <title>COPYRIGHT</title>
-    <para>
-      This manual page was written by Jonathan Patrick Davies
-      <email>jpatrick@kubuntu.org</email> for the
-      <productname>Ubuntu</productname> system (but may be used by others).
-      Permission is granted to copy, distribute and/or modify this document
-      under the terms of the <acronym>GNU</acronym> General Public License,
-      Version 2 or any later version published by the Free Software Foundation.
-    </para>
-    <para>
-      On Debian systems, the complete text of the GNU General Public
-      License can be found in
-      <filename>/usr/share/common-licenses/GPL</filename>.
-    </para>
-  </refsect1>
-</refentry>
diff --git a/debian/_base/applications/kmplayer/debian/rules b/debian/_base/applications/kmplayer/debian/rules
index a972956aa..18aa16b96 100755
--- a/debian/_base/applications/kmplayer/debian/rules
+++ b/debian/_base/applications/kmplayer/debian/rules
@@ -1,47 +1,19 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/cmake.mk
 include debian/cdbs/debian-tde.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
-DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
-DEB_CONFIGURE_PREFIX := /opt/trinity
-DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
-
-cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
-
-_P=)
-GCC_VERSION := $(shell gcc --version | sed -n "/^gcc/s/^[^$(_P)]*$(_P) \(.\..\).*/\1/p")
-ifeq ($(GCC_VERSION),4.3)
-  CXX = g++ -fpermissive
-endif
-
-DEB_CONFIGURE_EXTRA_FLAGS := --enable-maintainer-mode --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
-DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp
-DEB_INSTALL_MANPAGES_kmplayer = kmplayer.1
-
 DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
                                && echo xz || echo bzip2)
 
-post-patches:: debian/stamp-bootstrap
-
-debian/stamp-bootstrap:
-ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" ""
-	cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -f /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-	
-	make -f admin/Makefile.common cvs
-	touch debian/stamp-bootstrap
-
-build/kmplayer-trinity::
-	docbook2x-man debian/kmplayer.1.docbook
-
-clean::
-	rm -f kmplayer.1
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
+ -DCONFIG_INSTALL_DIR="/etc/trinity" \
+ -DSYSCONF_INSTALL_DIR="/etc/trinity" \
+ -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON"
diff --git a/debian/_base/applications/kmplayer/debian/watch b/debian/_base/applications/kmplayer/debian/watch
deleted file mode 100644
index d809e2ca1..000000000
--- a/debian/_base/applications/kmplayer/debian/watch
+++ /dev/null
@@ -1,4 +0,0 @@
-# debian/watch file for KMPlayer.
-version=3
-
-http://kmplayer.kde.org/pkgs/kmplayer-(.*)\.tar\.bz2
diff --git a/ubuntu/_base/applications/kmplayer/debian/control b/ubuntu/_base/applications/kmplayer/debian/control
index a896e20d9..aa262ac4e 100644
--- a/ubuntu/_base/applications/kmplayer/debian/control
+++ b/ubuntu/_base/applications/kmplayer/debian/control
@@ -4,11 +4,11 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
 Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, tdelibs14-trinity-dev,
- libcairo2-dev, libdbus-1-dev, libdbus-glib-1-dev, libdbus-tqt-1-dev,
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, tdelibs14-trinity-dev,
+ libnspr4-dev, libcairo2-dev, libdbus-1-dev, libdbus-glib-1-dev, libdbus-tqt-1-dev,
  libgstreamer-plugins-base1.0-dev | libgstreamer-plugins-base0.10-dev,
- libgtk2.0-dev, libxine2-dev | libxine-dev, libxv-dev, docbook2x,
- automake, autoconf, libtool, libltdl-dev
+ libgtk2.0-dev, libxine2-dev | libxine-dev, libxv-dev, libxtst-dev,
+ koffice-trinity-dev
 Standards-Version: 3.8.4
 Homepage: http://kmplayer.kde.org
 
@@ -58,6 +58,16 @@ Description: KMPlayer plugin for TDEHTML/Konqueror [Trinity]
  tv or radio. It mimics QuickTime, MS Media Player and RealPlayer plugin
  browser plugins.
 
+Package: kmplayer-koffice-plugins-trinity
+Architecture: any
+Section: tde
+Depends: ${shlibs:Depends}, kmplayer-base-trinity (= ${binary:Version})
+Description: KMPlayer plugin for KOffice [Trinity]
+ This plugin enables audio/video playback inside KOffice, using Xine (with
+ *kxineplayer) or GStreamer (with *kgstplayer), such as movie trailers, web
+ tv or radio. It mimics QuickTime, MS Media Player and RealPlayer plugin
+ browser plugins.
+
 Package: kmplayer-trinity-doc
 Architecture: all
 Section: tde
diff --git a/ubuntu/_base/applications/kmplayer/debian/kmplayer-base-trinity.install b/ubuntu/_base/applications/kmplayer/debian/kmplayer-base-trinity.install
index 7e7f44aec..0bf23d0be 100644
--- a/ubuntu/_base/applications/kmplayer/debian/kmplayer-base-trinity.install
+++ b/ubuntu/_base/applications/kmplayer/debian/kmplayer-base-trinity.install
@@ -2,14 +2,14 @@ opt/trinity/lib/libkmplayercommon.so
 opt/trinity/lib/libkmplayercommon.la
 opt/trinity/bin/kxineplayer
 etc/trinity/kmplayerrc
-/opt/trinity/share/apps/kmplayer/bookmarks.xml
-/opt/trinity/share/apps/kmplayer/noise.gif
-/opt/trinity/share/mimelnk/application/x-kmplayer.desktop
-/opt/trinity/share/mimelnk/video/x-ms-wmp.desktop
-/opt/trinity/share/icons/hicolor/16x16/apps/kmplayer.png
-/opt/trinity/share/icons/hicolor/22x22/apps/kmplayer.png
-/opt/trinity/share/icons/hicolor/32x32/apps/kmplayer.png
-/opt/trinity/share/icons/hicolor/48x48/apps/kmplayer.png
-/opt/trinity/share/icons/hicolor/64x64/apps/kmplayer.png
-/opt/trinity/share/icons/hicolor/128x128/apps/kmplayer.png
-/opt/trinity/share/icons/hicolor/scalable/apps/kmplayer.svgz
+opt/trinity/share/apps/kmplayer/bookmarks.xml
+opt/trinity/share/apps/kmplayer/noise.gif
+opt/trinity/share/mimelnk/application/x-kmplayer.desktop
+opt/trinity/share/mimelnk/video/x-ms-wmp.desktop
+opt/trinity/share/icons/hicolor/16x16/apps/kmplayer.png
+opt/trinity/share/icons/hicolor/22x22/apps/kmplayer.png
+opt/trinity/share/icons/hicolor/32x32/apps/kmplayer.png
+opt/trinity/share/icons/hicolor/48x48/apps/kmplayer.png
+opt/trinity/share/icons/hicolor/64x64/apps/kmplayer.png
+opt/trinity/share/icons/hicolor/128x128/apps/kmplayer.png
+opt/trinity/share/icons/hicolor/scalable/apps/kmplayer.svgz
diff --git a/ubuntu/_base/applications/kmplayer/debian/kmplayer-koffice-plugins-trinity.install b/ubuntu/_base/applications/kmplayer/debian/kmplayer-koffice-plugins-trinity.install
new file mode 100644
index 000000000..67b3b3293
--- /dev/null
+++ b/ubuntu/_base/applications/kmplayer/debian/kmplayer-koffice-plugins-trinity.install
@@ -0,0 +1,3 @@
+opt/trinity/lib/trinity/libkmplayerkofficepart.la
+opt/trinity/lib/trinity/libkmplayerkofficepart.so
+opt/trinity/share/services/kmplayer_koffice.desktop
diff --git a/ubuntu/_base/applications/kmplayer/debian/kmplayer-konq-plugins-trinity.install b/ubuntu/_base/applications/kmplayer/debian/kmplayer-konq-plugins-trinity.install
index 4590b56f4..25d58e803 100644
--- a/ubuntu/_base/applications/kmplayer/debian/kmplayer-konq-plugins-trinity.install
+++ b/ubuntu/_base/applications/kmplayer/debian/kmplayer-konq-plugins-trinity.install
@@ -1,5 +1,5 @@
 opt/trinity/lib/trinity/libkmplayerpart.so
 opt/trinity/lib/trinity/libkmplayerpart.la
-/opt/trinity/share/apps/kmplayer/kmplayerpartui.rc
-/opt/trinity/share/apps/kmplayer/pluginsinfo
-/opt/trinity/share/services/kmplayer_part.desktop
+opt/trinity/share/apps/kmplayer/kmplayerpartui.rc
+opt/trinity/share/apps/kmplayer/pluginsinfo
+opt/trinity/share/services/kmplayer_part.desktop
diff --git a/ubuntu/_base/applications/kmplayer/debian/kmplayer-trinity-doc.install b/ubuntu/_base/applications/kmplayer/debian/kmplayer-trinity-doc.install
index 9b26532f3..21ee04d88 100644
--- a/ubuntu/_base/applications/kmplayer/debian/kmplayer-trinity-doc.install
+++ b/ubuntu/_base/applications/kmplayer/debian/kmplayer-trinity-doc.install
@@ -1 +1 @@
-/opt/trinity/share/doc/*
+opt/trinity/share/doc/*
diff --git a/ubuntu/_base/applications/kmplayer/debian/kmplayer-trinity.install b/ubuntu/_base/applications/kmplayer/debian/kmplayer-trinity.install
index f27e64ad7..ac07b829a 100644
--- a/ubuntu/_base/applications/kmplayer/debian/kmplayer-trinity.install
+++ b/ubuntu/_base/applications/kmplayer/debian/kmplayer-trinity.install
@@ -1,7 +1,10 @@
 opt/trinity/lib/libtdeinit_kmplayer.so
 opt/trinity/lib/trinity/kmplayer.so
+opt/trinity/bin/kgstplayer
 opt/trinity/bin/kmplayer
+opt/trinity/bin/knpplayer
 opt/trinity/bin/kxvplayer
-/opt/trinity/share/apps/kmplayer/kmplayerui.rc
-/opt/trinity/share/applications/tde/kmplayer.desktop
-/opt/trinity/share/locale
+opt/trinity/share/apps/kmplayer/kmplayerui.rc
+opt/trinity/share/applications/tde/kmplayer.desktop
+opt/trinity/share/locale
+opt/trinity/share/man
diff --git a/ubuntu/_base/applications/kmplayer/debian/menu b/ubuntu/_base/applications/kmplayer/debian/kmplayer-trinity.menu
index 792ed1a5b..792ed1a5b 100644
--- a/ubuntu/_base/applications/kmplayer/debian/menu
+++ b/ubuntu/_base/applications/kmplayer/debian/kmplayer-trinity.menu
diff --git a/ubuntu/_base/applications/kmplayer/debian/kmplayer.1.docbook b/ubuntu/_base/applications/kmplayer/debian/kmplayer.1.docbook
deleted file mode 100644
index dabfff5f0..000000000
--- a/ubuntu/_base/applications/kmplayer/debian/kmplayer.1.docbook
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-]>
-<refentry>
-  <refentryinfo>
-    <author>
-      <firstname>Jonathan Patrick</firstname>
-      <surname>Davies</surname>
-      <email>jpatrick@kubuntu.org</email>
-    </author>
-    <copyright>
-      <year>2006-2007</year>
-      <holder>Jonathan Patrick Davies</holder>
-    </copyright>
-    <!-- XXX IMPORTANT XXX -->
-    <!-- Keep this date up to date: -->
-    <date>2007-11-03</date>
-    <!--  ^^^^^^^^^^ -->
-  </refentryinfo>
-  <refmeta>
-    <refentrytitle>kmplayer</refentrytitle>
-    <manvolnum>1</manvolnum>
-  </refmeta>
-  <refnamediv>
-    <refname>kmplayer</refname>
-    <refpurpose>a media player for TDE</refpurpose>
-  </refnamediv>
-  <refsynopsisdiv>
-    <cmdsynopsis>
-      <command>kmplayer</command>
-      <arg choice="opt">
-        <option><replaceable>Qt-options</replaceable></option>
-      </arg>
-      <arg choice="opt">
-        <option><replaceable>TDE-options</replaceable></option>
-      </arg>
-    </cmdsynopsis>
-  </refsynopsisdiv>
-  <refsect1>
-    <title>DESCRIPTION</title>
-    <para>
-      KMPlayer is a basic audio/video viewer application for TDE.<br />
-      <br />
-      KMPlayer can:<br />
-      * play DVD (DVDNav only with the Xine player).<br />
-      * play VCD.<br />
-      * let the backend players play from a pipe (read from stdin).<br />
-      * play from a TV device (experimental).<br />
-      * 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 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 />
-    </para>
-  </refsect1>
-  <refsect1>
-    <title>OPTIONS</title>
-    <para>
-      All <productname>TDE</productname> and <productname>Qt</productname>
-      programs accept a some common command-line options.  KMPlayer has no
-      application-specific options.
-    </para>
-    <para>
-      <variablelist>
-        <title>Generic options:</title>
-        <varlistentry>
-          <term> <option>--help</option> </term>
-          <listitem> <para>Show help about options</para> </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term> <option>--help-qt</option> </term>
-          <listitem> <para>Show Qt specific options</para> </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term> <option>--help-tde</option> </term>
-          <listitem> <para>Show TDE specific options</para> </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term> <option>--help-all</option> </term>
-          <listitem> <para>Show all options</para> </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term> <option>--author</option> </term>
-          <listitem> <para>Show author information</para> </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term> <option>-v</option>, <option>--version</option> </term>
-          <listitem> <para>Show version information</para> </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term> <option>--license</option> </term>
-          <listitem> <para>Show license information</para> </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term> <option>--</option> </term>
-          <listitem> <para>Indicates end of options</para> </listitem>
-        </varlistentry>
-      </variablelist>
-      <!-- TODO * add all the rest of the options, but maybe find an automated
-      way to keep it up to date -->
-    </para>
-  </refsect1>
-  <refsect1>
-    <title>COPYRIGHT</title>
-    <para>
-      This manual page was written by Jonathan Patrick Davies
-      <email>jpatrick@kubuntu.org</email> for the
-      <productname>Ubuntu</productname> system (but may be used by others).
-      Permission is granted to copy, distribute and/or modify this document
-      under the terms of the <acronym>GNU</acronym> General Public License,
-      Version 2 or any later version published by the Free Software Foundation.
-    </para>
-    <para>
-      On Debian systems, the complete text of the GNU General Public
-      License can be found in
-      <filename>/usr/share/common-licenses/GPL</filename>.
-    </para>
-  </refsect1>
-</refentry>
diff --git a/ubuntu/_base/applications/kmplayer/debian/rules b/ubuntu/_base/applications/kmplayer/debian/rules
index a972956aa..18aa16b96 100755
--- a/ubuntu/_base/applications/kmplayer/debian/rules
+++ b/ubuntu/_base/applications/kmplayer/debian/rules
@@ -1,47 +1,19 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/cmake.mk
 include debian/cdbs/debian-tde.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
-DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
-DEB_CONFIGURE_PREFIX := /opt/trinity
-DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
-
-cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
-
-_P=)
-GCC_VERSION := $(shell gcc --version | sed -n "/^gcc/s/^[^$(_P)]*$(_P) \(.\..\).*/\1/p")
-ifeq ($(GCC_VERSION),4.3)
-  CXX = g++ -fpermissive
-endif
-
-DEB_CONFIGURE_EXTRA_FLAGS := --enable-maintainer-mode --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
-DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp
-DEB_INSTALL_MANPAGES_kmplayer = kmplayer.1
-
 DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
                                && echo xz || echo bzip2)
 
-post-patches:: debian/stamp-bootstrap
-
-debian/stamp-bootstrap:
-ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" ""
-	cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -f /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-	
-	make -f admin/Makefile.common cvs
-	touch debian/stamp-bootstrap
-
-build/kmplayer-trinity::
-	docbook2x-man debian/kmplayer.1.docbook
-
-clean::
-	rm -f kmplayer.1
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
+ -DCONFIG_INSTALL_DIR="/etc/trinity" \
+ -DSYSCONF_INSTALL_DIR="/etc/trinity" \
+ -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON"
diff --git a/ubuntu/_base/applications/kmplayer/debian/watch b/ubuntu/_base/applications/kmplayer/debian/watch
deleted file mode 100644
index d809e2ca1..000000000
--- a/ubuntu/_base/applications/kmplayer/debian/watch
+++ /dev/null
@@ -1,4 +0,0 @@
-# debian/watch file for KMPlayer.
-version=3
-
-http://kmplayer.kde.org/pkgs/kmplayer-(.*)\.tar\.bz2