DEB tdemultimedia: switch to cmake

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

15 files changed, 477 insertions, 414 deletions

diff --git a/debian/lenny/tdemultimedia/debian/cdbs/debian-qt-kde.mk b/debian/lenny/tdemultimedia/debian/cdbs/debian-qt-kde.mk
index 61f3ab2dc..60ccb9eef 100644
--- a/debian/lenny/tdemultimedia/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/tdemultimedia/debian/cdbs/debian-qt-kde.mk
@@ -10,6 +10,7 @@ _cdbs_class_debian-qt-kde := 1
 # Note: This _must_ be included before autotools.mk, or it won't work.
 common-configure-arch common-configure-indep:: debian/stamp-cvs-make
 debian/stamp-cvs-make:
+ifndef _cdbs_class_cmake
 	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
 ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
 	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
@@ -18,10 +19,11 @@ ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
 	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
 endif
 	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
+endif
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-include debian/cdbs/uploaders.mk
+#include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
@@ -103,6 +105,7 @@ binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	done
 
 clean::
+ifndef _cdbs_class_cmake
 	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
 		cd $(DEB_SRCDIR); \
 		find . -name Makefile.in -print | \
@@ -111,6 +114,7 @@ clean::
 			configure configure.files configure.in stamp-h.in \
 			subdirs; \
 	fi
+endif
 	rm -f debian/stamp-cvs-make
 
 endif
diff --git a/debian/lenny/tdemultimedia/debian/cdbs/kde.mk b/debian/lenny/tdemultimedia/debian/cdbs/kde.mk
index 765560c89..023886fc8 100644
--- a/debian/lenny/tdemultimedia/debian/cdbs/kde.mk
+++ b/debian/lenny/tdemultimedia/debian/cdbs/kde.mk
@@ -35,7 +35,9 @@ else
 DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
 endif
 
+ifndef _cdbs_class_cmake
 include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
+endif
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
@@ -59,7 +61,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/lenny/tdemultimedia/debian/control b/debian/lenny/tdemultimedia/debian/control
index 8515176d9..01273e5d4 100644
--- a/debian/lenny/tdemultimedia/debian/control
+++ b/debian/lenny/tdemultimedia/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Fathi Boudra <fboudra@free.fr>, Sune Vuorela <debian@pusling.com>
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 7.0.50~), quilt, autotools-dev, cdparanoia, gawk, gettext, tdelibs14-trinity-dev, libcdparanoia0-dev, libesd0-dev, libflac-dev (>= 1.1.4-1), libgstreamer-plugins-base1.0-dev | libgstreamer-plugins-base0.10-dev, libsamplerate0-dev, libspeex-dev (>> 1.1.5), libtag1-dev (>> 1.3.1), libtheora-dev, libxine2-dev | libxine-dev, sharutils, texinfo, libxxf86dga-dev, libxv-dev, libxxf86vm-dev, libakode-dev, libogg-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 7.0.50~), quilt, cmake, autotools-dev, cdparanoia, gawk, gettext, tdelibs14-trinity-dev, libcdparanoia0-dev, libesd0-dev, libflac-dev (>= 1.1.4-1), libgstreamer-plugins-base1.0-dev | libgstreamer-plugins-base0.10-dev, libsamplerate0-dev, libspeex-dev (>> 1.1.5), libtag1-dev (>> 1.3.1), libtheora-dev, libxine2-dev | libxine-dev, sharutils, texinfo, libxxf86dga-dev, libxv-dev, libxxf86vm-dev, libakode-dev, libogg-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: tdemultimedia-trinity
diff --git a/debian/lenny/tdemultimedia/debian/rules b/debian/lenny/tdemultimedia/debian/rules
index 1a946ecfc..3fbdd268a 100755
--- a/debian/lenny/tdemultimedia/debian/rules
+++ b/debian/lenny/tdemultimedia/debian/rules
@@ -1,11 +1,12 @@
 #! /usr/bin/make -f
 
+include /usr/share/cdbs/1/class/cmake.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include debian/cdbs/debian-qt-kde.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include
 DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
 DEB_CONFIGURE_PREFIX := /opt/trinity
 DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
@@ -19,6 +20,20 @@ DEB_CONFIGURE_EXTRA_FLAGS := \
 	# The include/tde/arts one should be temporary. See
 	# "juk/Makefile.am: arts_includes vs ARTS_CFLAGS" in -talk.
 
+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" \
+ -DWITH_LAME="OFF"
+
+DEB_MAKE_CHECK_TARGET = check
+
 DOC_HTML_PRUNE := kcontrol-trinity
 
 DEB_DH_STRIP_ARGS  := --dbg-package=tdemultimedia-trinity-dbg
diff --git a/debian/lenny/tdemultimedia/debian/tdemultimedia-trinity-dev.install b/debian/lenny/tdemultimedia/debian/tdemultimedia-trinity-dev.install
index 97d3eb309..17fd1301f 100644
--- a/debian/lenny/tdemultimedia/debian/tdemultimedia-trinity-dev.install
+++ b/debian/lenny/tdemultimedia/debian/tdemultimedia-trinity-dev.install
@@ -1,137 +1,137 @@
-debian/tmp/opt/trinity/include/tde/arts/artsbuilder.h
-debian/tmp/opt/trinity/include/tde/arts/artsbuilder.idl
-debian/tmp/opt/trinity/include/tde/arts/artsgui.h
-debian/tmp/opt/trinity/include/tde/arts/artsgui.idl
-debian/tmp/opt/trinity/include/tde/arts/artsmidi.h
-debian/tmp/opt/trinity/include/tde/arts/artsmidi.idl
-debian/tmp/opt/trinity/include/tde/arts/artsmodules.h
-debian/tmp/opt/trinity/include/tde/arts/artsmodules.idl
-debian/tmp/opt/trinity/include/tde/arts/artsmodulescommon.h
-debian/tmp/opt/trinity/include/tde/arts/artsmodulescommon.idl
-debian/tmp/opt/trinity/include/tde/arts/artsmoduleseffects.h
-debian/tmp/opt/trinity/include/tde/arts/artsmoduleseffects.idl
-debian/tmp/opt/trinity/include/tde/arts/artsmodulesmixers.h
-debian/tmp/opt/trinity/include/tde/arts/artsmodulesmixers.idl
-debian/tmp/opt/trinity/include/tde/arts/artsmodulessynth.h
-debian/tmp/opt/trinity/include/tde/arts/artsmodulessynth.idl
-debian/tmp/opt/trinity/include/tde/arts/kartswidget.h
-debian/tmp/opt/trinity/include/tde/arts/kframe_impl.h
-debian/tmp/opt/trinity/include/tde/arts/klayoutbox_impl.h
-debian/tmp/opt/trinity/include/tde/arts/kwidget_impl.h
-debian/tmp/opt/trinity/include/tde/arts/kwidgetrepo.h
-debian/tmp/opt/trinity/include/tde/audiocdencoder.h
-debian/tmp/opt/trinity/include/tde/cmodule.h
-debian/tmp/opt/trinity/include/tde/effectview.h
-debian/tmp/opt/trinity/include/tde/equalizerview.h
-debian/tmp/opt/trinity/include/tde/ksaver.h
-debian/tmp/opt/trinity/include/tde/libkcddb/cache.h
-debian/tmp/opt/trinity/include/tde/libkcddb/cddb.h
-debian/tmp/opt/trinity/include/tde/libkcddb/cdinfo.h
-debian/tmp/opt/trinity/include/tde/libkcddb/client.h
-debian/tmp/opt/trinity/include/tde/libkcddb/config.h
-debian/tmp/opt/trinity/include/tde/libkcddb/configbase.h
-debian/tmp/opt/trinity/include/tde/mimetypetree.h
-debian/tmp/opt/trinity/include/tde/mpeglib/decoder/cddaPlugin.h
-debian/tmp/opt/trinity/include/tde/mpeglib/decoder/command.h
-debian/tmp/opt/trinity/include/tde/mpeglib/decoder/commandPipe.h
-debian/tmp/opt/trinity/include/tde/mpeglib/decoder/decoderPlugin.h
-debian/tmp/opt/trinity/include/tde/mpeglib/decoder/mpegPlugin.h
-debian/tmp/opt/trinity/include/tde/mpeglib/decoder/mpgPlugin.h
-debian/tmp/opt/trinity/include/tde/mpeglib/decoder/nukePlugin.h
-debian/tmp/opt/trinity/include/tde/mpeglib/decoder/splayPlugin.h
-debian/tmp/opt/trinity/include/tde/mpeglib/decoder/tplayPlugin.h
-debian/tmp/opt/trinity/include/tde/mpeglib/decoder/vorbisPlugin.h
-debian/tmp/opt/trinity/include/tde/mpeglib/decoder/yuvPlugin.h
-debian/tmp/opt/trinity/include/tde/mpeglib/frame/IOFrameQueue.h
-debian/tmp/opt/trinity/include/tde/mpeglib/frame/audioFrame.h
-debian/tmp/opt/trinity/include/tde/mpeglib/frame/audioFrameQueue.h
-debian/tmp/opt/trinity/include/tde/mpeglib/frame/floatFrame.h
-debian/tmp/opt/trinity/include/tde/mpeglib/frame/frame.h
-debian/tmp/opt/trinity/include/tde/mpeglib/frame/frameQueue.h
-debian/tmp/opt/trinity/include/tde/mpeglib/frame/framer.h
-debian/tmp/opt/trinity/include/tde/mpeglib/frame/pcmFrame.h
-debian/tmp/opt/trinity/include/tde/mpeglib/frame/rawDataBuffer.h
-debian/tmp/opt/trinity/include/tde/mpeglib/frame/rawFrame.h
-debian/tmp/opt/trinity/include/tde/mpeglib/input/bufferInputStream.h
-debian/tmp/opt/trinity/include/tde/mpeglib/input/cddaInputStream.h
-debian/tmp/opt/trinity/include/tde/mpeglib/input/cdromInputStream.h
-debian/tmp/opt/trinity/include/tde/mpeglib/input/fileInputStream.h
-debian/tmp/opt/trinity/include/tde/mpeglib/input/httpInputStream.h
-debian/tmp/opt/trinity/include/tde/mpeglib/input/inputDetector.h
-debian/tmp/opt/trinity/include/tde/mpeglib/input/inputPlugin.h
-debian/tmp/opt/trinity/include/tde/mpeglib/input/inputStream.h
-debian/tmp/opt/trinity/include/tde/mpeglib/input/threadSafeInputStream.h
-debian/tmp/opt/trinity/include/tde/mpeglib/mpegutil/mpegStreamPlayer.h
-debian/tmp/opt/trinity/include/tde/mpeglib/mpegutil/mpegSystemHeader.h
-debian/tmp/opt/trinity/include/tde/mpeglib/mpegutil/mpegSystemStream.h
-debian/tmp/opt/trinity/include/tde/mpeglib/mpegutil/mpegVideoLength.h
-debian/tmp/opt/trinity/include/tde/mpeglib/mpegutil/pesSystemStream.h
-debian/tmp/opt/trinity/include/tde/mpeglib/mpegutil/psSystemStream.h
-debian/tmp/opt/trinity/include/tde/mpeglib/mpegutil/tsSystemStream.h
-debian/tmp/opt/trinity/include/tde/mpeglib/oggvorbis/oggFrame.h
-debian/tmp/opt/trinity/include/tde/mpeglib/oggvorbis/ovFramer.h
-debian/tmp/opt/trinity/include/tde/mpeglib/oggvorbis/vorbisDecoder.h
-debian/tmp/opt/trinity/include/tde/mpeglib/oggvorbis/vorbisInfo.h
-debian/tmp/opt/trinity/include/tde/mpeglib/output/artsOutputStream.h
-debian/tmp/opt/trinity/include/tde/mpeglib/output/audioTime.h
-debian/tmp/opt/trinity/include/tde/mpeglib/output/avSyncer.h
-debian/tmp/opt/trinity/include/tde/mpeglib/output/dspX11OutputStream.h
-debian/tmp/opt/trinity/include/tde/mpeglib/output/outPlugin.h
-debian/tmp/opt/trinity/include/tde/mpeglib/output/outputStream.h
-debian/tmp/opt/trinity/include/tde/mpeglib/output/pluginInfo.h
-debian/tmp/opt/trinity/include/tde/mpeglib/output/threadSafeOutputStream.h
-debian/tmp/opt/trinity/include/tde/mpeglib/splay/mpegAudioFrame.h
-debian/tmp/opt/trinity/include/tde/mpeglib/splay/mpegAudioInfo.h
-debian/tmp/opt/trinity/include/tde/mpeglib/splay/splayDecoder.h
-debian/tmp/opt/trinity/include/tde/mpeglib/util/abstract/abs_thread.h
-debian/tmp/opt/trinity/include/tde/mpeglib/util/abstract/threadQueue.h
-debian/tmp/opt/trinity/include/tde/mpeglib/util/dynBuffer.h
-debian/tmp/opt/trinity/include/tde/mpeglib/util/file/fileAccess.h
-debian/tmp/opt/trinity/include/tde/mpeglib/util/mmx/mm_accel.h
-debian/tmp/opt/trinity/include/tde/mpeglib/util/mmx/mmx.h
-debian/tmp/opt/trinity/include/tde/mpeglib/util/mmx/mmx_asm.h
-debian/tmp/opt/trinity/include/tde/mpeglib/util/render/pictureArray.h
-debian/tmp/opt/trinity/include/tde/mpeglib/util/render/yuvPicture.h
-debian/tmp/opt/trinity/include/tde/mpeglib/util/syncClock.h
-debian/tmp/opt/trinity/include/tde/mpeglib/util/timeStamp.h
-debian/tmp/opt/trinity/include/tde/mpeglib/util/timeStampArray.h
-debian/tmp/opt/trinity/include/tde/mpeglib/util/timeWrapper.h
-debian/tmp/opt/trinity/include/tde/mpeglib/util/yaf/yafcore/buffer.h
-debian/tmp/opt/trinity/include/tde/mpeglib/util/yaf/yafcore/inputDecoder.h
-debian/tmp/opt/trinity/include/tde/mpeglib/util/yaf/yafcore/inputInterface.h
-debian/tmp/opt/trinity/include/tde/mpeglib/util/yaf/yafcore/outputInterface.h
-debian/tmp/opt/trinity/include/tde/mpeglib/util/yaf/yafcore/yaf_control.h
-debian/tmp/opt/trinity/include/tde/mpeglib/util/yaf/yafxplayer/inputDecoderXPlayer.h
-debian/tmp/opt/trinity/include/tde/mpeglib/util/yaf/yafxplayer/inputDecoderYAF.h
-debian/tmp/opt/trinity/include/tde/mpeglib/util/yaf/yafxplayer/yafOutputStream.h
-debian/tmp/opt/trinity/include/tde/mpeglib_artsplug/decoderBaseObject.h
-debian/tmp/opt/trinity/include/tde/mpeglib_artsplug/decoderBaseObject.idl
-debian/tmp/opt/trinity/include/tde/mpeglib_artsplug/decoderBaseObject_impl.h
-debian/tmp/opt/trinity/include/tde/mpeglib_artsplug/splayPlayObject.h
-debian/tmp/opt/trinity/include/tde/mpeglib_artsplug/splayPlayObject.idl
-debian/tmp/opt/trinity/include/tde/mpeglib_artsplug/splayPlayObject_impl.h
-debian/tmp/opt/trinity/include/tde/noatun/app.h
-debian/tmp/opt/trinity/include/tde/noatun/controls.h
-debian/tmp/opt/trinity/include/tde/noatun/conversion.h
-debian/tmp/opt/trinity/include/tde/noatun/downloader.h
-debian/tmp/opt/trinity/include/tde/noatun/effects.h
-debian/tmp/opt/trinity/include/tde/noatun/engine.h
-debian/tmp/opt/trinity/include/tde/noatun/equalizer.h
-debian/tmp/opt/trinity/include/tde/noatun/noatunarts.h
-debian/tmp/opt/trinity/include/tde/noatun/player.h
-debian/tmp/opt/trinity/include/tde/noatun/playlist.h
-debian/tmp/opt/trinity/include/tde/noatun/playlistsaver.h
-debian/tmp/opt/trinity/include/tde/noatun/plugin.h
-debian/tmp/opt/trinity/include/tde/noatun/pluginloader.h
-debian/tmp/opt/trinity/include/tde/noatun/pref.h
-debian/tmp/opt/trinity/include/tde/noatun/scrollinglabel.h
-debian/tmp/opt/trinity/include/tde/noatun/stdaction.h
-debian/tmp/opt/trinity/include/tde/noatun/stereobuttonaction.h
-debian/tmp/opt/trinity/include/tde/noatun/tags.h
-debian/tmp/opt/trinity/include/tde/noatun/vequalizer.h
-debian/tmp/opt/trinity/include/tde/noatun/video.h
-debian/tmp/opt/trinity/include/tde/noatun/winskinvis.h
-debian/tmp/opt/trinity/include/tde/plugin_deps.h
+debian/tmp/opt/trinity/include/arts/artsbuilder.h
+debian/tmp/opt/trinity/include/arts/artsbuilder.idl
+debian/tmp/opt/trinity/include/arts/artsgui.h
+debian/tmp/opt/trinity/include/arts/artsgui.idl
+debian/tmp/opt/trinity/include/arts/artsmidi.h
+debian/tmp/opt/trinity/include/arts/artsmidi.idl
+debian/tmp/opt/trinity/include/arts/artsmodules.h
+debian/tmp/opt/trinity/include/arts/artsmodules.idl
+debian/tmp/opt/trinity/include/arts/artsmodulescommon.h
+debian/tmp/opt/trinity/include/arts/artsmodulescommon.idl
+debian/tmp/opt/trinity/include/arts/artsmoduleseffects.h
+debian/tmp/opt/trinity/include/arts/artsmoduleseffects.idl
+debian/tmp/opt/trinity/include/arts/artsmodulesmixers.h
+debian/tmp/opt/trinity/include/arts/artsmodulesmixers.idl
+debian/tmp/opt/trinity/include/arts/artsmodulessynth.h
+debian/tmp/opt/trinity/include/arts/artsmodulessynth.idl
+debian/tmp/opt/trinity/include/arts/kartswidget.h
+debian/tmp/opt/trinity/include/arts/kframe_impl.h
+debian/tmp/opt/trinity/include/arts/klayoutbox_impl.h
+debian/tmp/opt/trinity/include/arts/kwidget_impl.h
+debian/tmp/opt/trinity/include/arts/kwidgetrepo.h
+debian/tmp/opt/trinity/include/audiocdencoder.h
+debian/tmp/opt/trinity/include/cmodule.h
+debian/tmp/opt/trinity/include/effectview.h
+debian/tmp/opt/trinity/include/equalizerview.h
+debian/tmp/opt/trinity/include/ksaver.h
+debian/tmp/opt/trinity/include/libkcddb/cache.h
+debian/tmp/opt/trinity/include/libkcddb/cddb.h
+debian/tmp/opt/trinity/include/libkcddb/cdinfo.h
+debian/tmp/opt/trinity/include/libkcddb/client.h
+debian/tmp/opt/trinity/include/libkcddb/config.h
+debian/tmp/opt/trinity/include/libkcddb/configbase.h
+debian/tmp/opt/trinity/include/mimetypetree.h
+debian/tmp/opt/trinity/include/mpeglib/decoder/cddaPlugin.h
+debian/tmp/opt/trinity/include/mpeglib/decoder/command.h
+debian/tmp/opt/trinity/include/mpeglib/decoder/commandPipe.h
+debian/tmp/opt/trinity/include/mpeglib/decoder/decoderPlugin.h
+debian/tmp/opt/trinity/include/mpeglib/decoder/mpegPlugin.h
+debian/tmp/opt/trinity/include/mpeglib/decoder/mpgPlugin.h
+debian/tmp/opt/trinity/include/mpeglib/decoder/nukePlugin.h
+debian/tmp/opt/trinity/include/mpeglib/decoder/splayPlugin.h
+debian/tmp/opt/trinity/include/mpeglib/decoder/tplayPlugin.h
+debian/tmp/opt/trinity/include/mpeglib/decoder/vorbisPlugin.h
+debian/tmp/opt/trinity/include/mpeglib/decoder/yuvPlugin.h
+debian/tmp/opt/trinity/include/mpeglib/frame/IOFrameQueue.h
+debian/tmp/opt/trinity/include/mpeglib/frame/audioFrame.h
+debian/tmp/opt/trinity/include/mpeglib/frame/audioFrameQueue.h
+debian/tmp/opt/trinity/include/mpeglib/frame/floatFrame.h
+debian/tmp/opt/trinity/include/mpeglib/frame/frame.h
+debian/tmp/opt/trinity/include/mpeglib/frame/frameQueue.h
+debian/tmp/opt/trinity/include/mpeglib/frame/framer.h
+debian/tmp/opt/trinity/include/mpeglib/frame/pcmFrame.h
+debian/tmp/opt/trinity/include/mpeglib/frame/rawDataBuffer.h
+debian/tmp/opt/trinity/include/mpeglib/frame/rawFrame.h
+debian/tmp/opt/trinity/include/mpeglib/input/bufferInputStream.h
+debian/tmp/opt/trinity/include/mpeglib/input/cddaInputStream.h
+debian/tmp/opt/trinity/include/mpeglib/input/cdromInputStream.h
+debian/tmp/opt/trinity/include/mpeglib/input/fileInputStream.h
+debian/tmp/opt/trinity/include/mpeglib/input/httpInputStream.h
+debian/tmp/opt/trinity/include/mpeglib/input/inputDetector.h
+debian/tmp/opt/trinity/include/mpeglib/input/inputPlugin.h
+debian/tmp/opt/trinity/include/mpeglib/input/inputStream.h
+debian/tmp/opt/trinity/include/mpeglib/input/threadSafeInputStream.h
+debian/tmp/opt/trinity/include/mpeglib/mpegutil/mpegStreamPlayer.h
+debian/tmp/opt/trinity/include/mpeglib/mpegutil/mpegSystemHeader.h
+debian/tmp/opt/trinity/include/mpeglib/mpegutil/mpegSystemStream.h
+debian/tmp/opt/trinity/include/mpeglib/mpegutil/mpegVideoLength.h
+debian/tmp/opt/trinity/include/mpeglib/mpegutil/pesSystemStream.h
+debian/tmp/opt/trinity/include/mpeglib/mpegutil/psSystemStream.h
+debian/tmp/opt/trinity/include/mpeglib/mpegutil/tsSystemStream.h
+debian/tmp/opt/trinity/include/mpeglib/oggvorbis/oggFrame.h
+debian/tmp/opt/trinity/include/mpeglib/oggvorbis/ovFramer.h
+debian/tmp/opt/trinity/include/mpeglib/oggvorbis/vorbisDecoder.h
+debian/tmp/opt/trinity/include/mpeglib/oggvorbis/vorbisInfo.h
+debian/tmp/opt/trinity/include/mpeglib/output/artsOutputStream.h
+debian/tmp/opt/trinity/include/mpeglib/output/audioTime.h
+debian/tmp/opt/trinity/include/mpeglib/output/avSyncer.h
+debian/tmp/opt/trinity/include/mpeglib/output/dspX11OutputStream.h
+debian/tmp/opt/trinity/include/mpeglib/output/outPlugin.h
+debian/tmp/opt/trinity/include/mpeglib/output/outputStream.h
+debian/tmp/opt/trinity/include/mpeglib/output/pluginInfo.h
+debian/tmp/opt/trinity/include/mpeglib/output/threadSafeOutputStream.h
+debian/tmp/opt/trinity/include/mpeglib/splay/mpegAudioFrame.h
+debian/tmp/opt/trinity/include/mpeglib/splay/mpegAudioInfo.h
+debian/tmp/opt/trinity/include/mpeglib/splay/splayDecoder.h
+debian/tmp/opt/trinity/include/mpeglib/util/abstract/abs_thread.h
+debian/tmp/opt/trinity/include/mpeglib/util/abstract/threadQueue.h
+debian/tmp/opt/trinity/include/mpeglib/util/dynBuffer.h
+debian/tmp/opt/trinity/include/mpeglib/util/file/fileAccess.h
+debian/tmp/opt/trinity/include/mpeglib/util/mmx/mm_accel.h
+debian/tmp/opt/trinity/include/mpeglib/util/mmx/mmx.h
+debian/tmp/opt/trinity/include/mpeglib/util/mmx/mmx_asm.h
+debian/tmp/opt/trinity/include/mpeglib/util/render/pictureArray.h
+debian/tmp/opt/trinity/include/mpeglib/util/render/yuvPicture.h
+debian/tmp/opt/trinity/include/mpeglib/util/syncClock.h
+debian/tmp/opt/trinity/include/mpeglib/util/timeStamp.h
+debian/tmp/opt/trinity/include/mpeglib/util/timeStampArray.h
+debian/tmp/opt/trinity/include/mpeglib/util/timeWrapper.h
+debian/tmp/opt/trinity/include/mpeglib/util/yaf/yafcore/buffer.h
+debian/tmp/opt/trinity/include/mpeglib/util/yaf/yafcore/inputDecoder.h
+debian/tmp/opt/trinity/include/mpeglib/util/yaf/yafcore/inputInterface.h
+debian/tmp/opt/trinity/include/mpeglib/util/yaf/yafcore/outputInterface.h
+debian/tmp/opt/trinity/include/mpeglib/util/yaf/yafcore/yaf_control.h
+debian/tmp/opt/trinity/include/mpeglib/util/yaf/yafxplayer/inputDecoderXPlayer.h
+debian/tmp/opt/trinity/include/mpeglib/util/yaf/yafxplayer/inputDecoderYAF.h
+debian/tmp/opt/trinity/include/mpeglib/util/yaf/yafxplayer/yafOutputStream.h
+debian/tmp/opt/trinity/include/mpeglib_artsplug/decoderBaseObject.h
+debian/tmp/opt/trinity/include/mpeglib_artsplug/decoderBaseObject.idl
+debian/tmp/opt/trinity/include/mpeglib_artsplug/decoderBaseObject_impl.h
+debian/tmp/opt/trinity/include/mpeglib_artsplug/splayPlayObject.h
+debian/tmp/opt/trinity/include/mpeglib_artsplug/splayPlayObject.idl
+debian/tmp/opt/trinity/include/mpeglib_artsplug/splayPlayObject_impl.h
+debian/tmp/opt/trinity/include/noatun/app.h
+debian/tmp/opt/trinity/include/noatun/controls.h
+debian/tmp/opt/trinity/include/noatun/conversion.h
+debian/tmp/opt/trinity/include/noatun/downloader.h
+debian/tmp/opt/trinity/include/noatun/effects.h
+debian/tmp/opt/trinity/include/noatun/engine.h
+debian/tmp/opt/trinity/include/noatun/equalizer.h
+debian/tmp/opt/trinity/include/noatun/noatunarts.h
+debian/tmp/opt/trinity/include/noatun/player.h
+debian/tmp/opt/trinity/include/noatun/playlist.h
+debian/tmp/opt/trinity/include/noatun/playlistsaver.h
+debian/tmp/opt/trinity/include/noatun/plugin.h
+debian/tmp/opt/trinity/include/noatun/pluginloader.h
+debian/tmp/opt/trinity/include/noatun/pref.h
+debian/tmp/opt/trinity/include/noatun/scrollinglabel.h
+debian/tmp/opt/trinity/include/noatun/stdaction.h
+debian/tmp/opt/trinity/include/noatun/stereobuttonaction.h
+debian/tmp/opt/trinity/include/noatun/tags.h
+debian/tmp/opt/trinity/include/noatun/vequalizer.h
+debian/tmp/opt/trinity/include/noatun/video.h
+debian/tmp/opt/trinity/include/noatun/winskinvis.h
+debian/tmp/opt/trinity/include/plugin_deps.h
 debian/tmp/opt/trinity/lib/libarts_mpeglib.so
 debian/tmp/opt/trinity/lib/libarts_splay.so
 debian/tmp/opt/trinity/lib/libartsbuilder.so
diff --git a/debian/squeeze/tdemultimedia/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/tdemultimedia/debian/cdbs/debian-qt-kde.mk
index 61f3ab2dc..60ccb9eef 100644
--- a/debian/squeeze/tdemultimedia/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/tdemultimedia/debian/cdbs/debian-qt-kde.mk
@@ -10,6 +10,7 @@ _cdbs_class_debian-qt-kde := 1
 # Note: This _must_ be included before autotools.mk, or it won't work.
 common-configure-arch common-configure-indep:: debian/stamp-cvs-make
 debian/stamp-cvs-make:
+ifndef _cdbs_class_cmake
 	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
 ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
 	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
@@ -18,10 +19,11 @@ ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
 	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
 endif
 	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
+endif
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-include debian/cdbs/uploaders.mk
+#include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
@@ -103,6 +105,7 @@ binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	done
 
 clean::
+ifndef _cdbs_class_cmake
 	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
 		cd $(DEB_SRCDIR); \
 		find . -name Makefile.in -print | \
@@ -111,6 +114,7 @@ clean::
 			configure configure.files configure.in stamp-h.in \
 			subdirs; \
 	fi
+endif
 	rm -f debian/stamp-cvs-make
 
 endif
diff --git a/debian/squeeze/tdemultimedia/debian/cdbs/kde.mk b/debian/squeeze/tdemultimedia/debian/cdbs/kde.mk
index 765560c89..023886fc8 100644
--- a/debian/squeeze/tdemultimedia/debian/cdbs/kde.mk
+++ b/debian/squeeze/tdemultimedia/debian/cdbs/kde.mk
@@ -35,7 +35,9 @@ else
 DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
 endif
 
+ifndef _cdbs_class_cmake
 include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
+endif
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
@@ -59,7 +61,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/squeeze/tdemultimedia/debian/control b/debian/squeeze/tdemultimedia/debian/control
index 8515176d9..01273e5d4 100644
--- a/debian/squeeze/tdemultimedia/debian/control
+++ b/debian/squeeze/tdemultimedia/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Fathi Boudra <fboudra@free.fr>, Sune Vuorela <debian@pusling.com>
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 7.0.50~), quilt, autotools-dev, cdparanoia, gawk, gettext, tdelibs14-trinity-dev, libcdparanoia0-dev, libesd0-dev, libflac-dev (>= 1.1.4-1), libgstreamer-plugins-base1.0-dev | libgstreamer-plugins-base0.10-dev, libsamplerate0-dev, libspeex-dev (>> 1.1.5), libtag1-dev (>> 1.3.1), libtheora-dev, libxine2-dev | libxine-dev, sharutils, texinfo, libxxf86dga-dev, libxv-dev, libxxf86vm-dev, libakode-dev, libogg-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 7.0.50~), quilt, cmake, autotools-dev, cdparanoia, gawk, gettext, tdelibs14-trinity-dev, libcdparanoia0-dev, libesd0-dev, libflac-dev (>= 1.1.4-1), libgstreamer-plugins-base1.0-dev | libgstreamer-plugins-base0.10-dev, libsamplerate0-dev, libspeex-dev (>> 1.1.5), libtag1-dev (>> 1.3.1), libtheora-dev, libxine2-dev | libxine-dev, sharutils, texinfo, libxxf86dga-dev, libxv-dev, libxxf86vm-dev, libakode-dev, libogg-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: tdemultimedia-trinity
diff --git a/debian/squeeze/tdemultimedia/debian/rules b/debian/squeeze/tdemultimedia/debian/rules
index 302028902..39ec27d1f 100755
--- a/debian/squeeze/tdemultimedia/debian/rules
+++ b/debian/squeeze/tdemultimedia/debian/rules
@@ -1,11 +1,12 @@
 #! /usr/bin/make -f
 
+include /usr/share/cdbs/1/class/cmake.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include debian/cdbs/debian-qt-kde.mk
 #include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include
 DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
 DEB_CONFIGURE_PREFIX := /opt/trinity
 DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
@@ -19,6 +20,20 @@ DEB_CONFIGURE_EXTRA_FLAGS := \
 	# The include/tde/arts one should be temporary. See
 	# "juk/Makefile.am: arts_includes vs ARTS_CFLAGS" in -talk.
 
+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" \
+ -DWITH_LAME="OFF"
+
+DEB_MAKE_CHECK_TARGET = check
+
 DOC_HTML_PRUNE := kcontrol-trinity
 
 DEB_DH_STRIP_ARGS  := --dbg-package=tdemultimedia-trinity-dbg
diff --git a/debian/squeeze/tdemultimedia/debian/tdemultimedia-trinity-dev.install b/debian/squeeze/tdemultimedia/debian/tdemultimedia-trinity-dev.install
index 97d3eb309..17fd1301f 100644
--- a/debian/squeeze/tdemultimedia/debian/tdemultimedia-trinity-dev.install
+++ b/debian/squeeze/tdemultimedia/debian/tdemultimedia-trinity-dev.install
@@ -1,137 +1,137 @@
-debian/tmp/opt/trinity/include/tde/arts/artsbuilder.h
-debian/tmp/opt/trinity/include/tde/arts/artsbuilder.idl
-debian/tmp/opt/trinity/include/tde/arts/artsgui.h
-debian/tmp/opt/trinity/include/tde/arts/artsgui.idl
-debian/tmp/opt/trinity/include/tde/arts/artsmidi.h
-debian/tmp/opt/trinity/include/tde/arts/artsmidi.idl
-debian/tmp/opt/trinity/include/tde/arts/artsmodules.h
-debian/tmp/opt/trinity/include/tde/arts/artsmodules.idl
-debian/tmp/opt/trinity/include/tde/arts/artsmodulescommon.h
-debian/tmp/opt/trinity/include/tde/arts/artsmodulescommon.idl
-debian/tmp/opt/trinity/include/tde/arts/artsmoduleseffects.h
-debian/tmp/opt/trinity/include/tde/arts/artsmoduleseffects.idl
-debian/tmp/opt/trinity/include/tde/arts/artsmodulesmixers.h
-debian/tmp/opt/trinity/include/tde/arts/artsmodulesmixers.idl
-debian/tmp/opt/trinity/include/tde/arts/artsmodulessynth.h
-debian/tmp/opt/trinity/include/tde/arts/artsmodulessynth.idl
-debian/tmp/opt/trinity/include/tde/arts/kartswidget.h
-debian/tmp/opt/trinity/include/tde/arts/kframe_impl.h
-debian/tmp/opt/trinity/include/tde/arts/klayoutbox_impl.h
-debian/tmp/opt/trinity/include/tde/arts/kwidget_impl.h
-debian/tmp/opt/trinity/include/tde/arts/kwidgetrepo.h
-debian/tmp/opt/trinity/include/tde/audiocdencoder.h
-debian/tmp/opt/trinity/include/tde/cmodule.h
-debian/tmp/opt/trinity/include/tde/effectview.h
-debian/tmp/opt/trinity/include/tde/equalizerview.h
-debian/tmp/opt/trinity/include/tde/ksaver.h
-debian/tmp/opt/trinity/include/tde/libkcddb/cache.h
-debian/tmp/opt/trinity/include/tde/libkcddb/cddb.h
-debian/tmp/opt/trinity/include/tde/libkcddb/cdinfo.h
-debian/tmp/opt/trinity/include/tde/libkcddb/client.h
-debian/tmp/opt/trinity/include/tde/libkcddb/config.h
-debian/tmp/opt/trinity/include/tde/libkcddb/configbase.h
-debian/tmp/opt/trinity/include/tde/mimetypetree.h
-debian/tmp/opt/trinity/include/tde/mpeglib/decoder/cddaPlugin.h
-debian/tmp/opt/trinity/include/tde/mpeglib/decoder/command.h
-debian/tmp/opt/trinity/include/tde/mpeglib/decoder/commandPipe.h
-debian/tmp/opt/trinity/include/tde/mpeglib/decoder/decoderPlugin.h
-debian/tmp/opt/trinity/include/tde/mpeglib/decoder/mpegPlugin.h
-debian/tmp/opt/trinity/include/tde/mpeglib/decoder/mpgPlugin.h
-debian/tmp/opt/trinity/include/tde/mpeglib/decoder/nukePlugin.h
-debian/tmp/opt/trinity/include/tde/mpeglib/decoder/splayPlugin.h
-debian/tmp/opt/trinity/include/tde/mpeglib/decoder/tplayPlugin.h
-debian/tmp/opt/trinity/include/tde/mpeglib/decoder/vorbisPlugin.h
-debian/tmp/opt/trinity/include/tde/mpeglib/decoder/yuvPlugin.h
-debian/tmp/opt/trinity/include/tde/mpeglib/frame/IOFrameQueue.h
-debian/tmp/opt/trinity/include/tde/mpeglib/frame/audioFrame.h
-debian/tmp/opt/trinity/include/tde/mpeglib/frame/audioFrameQueue.h
-debian/tmp/opt/trinity/include/tde/mpeglib/frame/floatFrame.h
-debian/tmp/opt/trinity/include/tde/mpeglib/frame/frame.h
-debian/tmp/opt/trinity/include/tde/mpeglib/frame/frameQueue.h
-debian/tmp/opt/trinity/include/tde/mpeglib/frame/framer.h
-debian/tmp/opt/trinity/include/tde/mpeglib/frame/pcmFrame.h
-debian/tmp/opt/trinity/include/tde/mpeglib/frame/rawDataBuffer.h
-debian/tmp/opt/trinity/include/tde/mpeglib/frame/rawFrame.h
-debian/tmp/opt/trinity/include/tde/mpeglib/input/bufferInputStream.h
-debian/tmp/opt/trinity/include/tde/mpeglib/input/cddaInputStream.h
-debian/tmp/opt/trinity/include/tde/mpeglib/input/cdromInputStream.h
-debian/tmp/opt/trinity/include/tde/mpeglib/input/fileInputStream.h
-debian/tmp/opt/trinity/include/tde/mpeglib/input/httpInputStream.h
-debian/tmp/opt/trinity/include/tde/mpeglib/input/inputDetector.h
-debian/tmp/opt/trinity/include/tde/mpeglib/input/inputPlugin.h
-debian/tmp/opt/trinity/include/tde/mpeglib/input/inputStream.h
-debian/tmp/opt/trinity/include/tde/mpeglib/input/threadSafeInputStream.h
-debian/tmp/opt/trinity/include/tde/mpeglib/mpegutil/mpegStreamPlayer.h
-debian/tmp/opt/trinity/include/tde/mpeglib/mpegutil/mpegSystemHeader.h
-debian/tmp/opt/trinity/include/tde/mpeglib/mpegutil/mpegSystemStream.h
-debian/tmp/opt/trinity/include/tde/mpeglib/mpegutil/mpegVideoLength.h
-debian/tmp/opt/trinity/include/tde/mpeglib/mpegutil/pesSystemStream.h
-debian/tmp/opt/trinity/include/tde/mpeglib/mpegutil/psSystemStream.h
-debian/tmp/opt/trinity/include/tde/mpeglib/mpegutil/tsSystemStream.h
-debian/tmp/opt/trinity/include/tde/mpeglib/oggvorbis/oggFrame.h
-debian/tmp/opt/trinity/include/tde/mpeglib/oggvorbis/ovFramer.h
-debian/tmp/opt/trinity/include/tde/mpeglib/oggvorbis/vorbisDecoder.h
-debian/tmp/opt/trinity/include/tde/mpeglib/oggvorbis/vorbisInfo.h
-debian/tmp/opt/trinity/include/tde/mpeglib/output/artsOutputStream.h
-debian/tmp/opt/trinity/include/tde/mpeglib/output/audioTime.h
-debian/tmp/opt/trinity/include/tde/mpeglib/output/avSyncer.h
-debian/tmp/opt/trinity/include/tde/mpeglib/output/dspX11OutputStream.h
-debian/tmp/opt/trinity/include/tde/mpeglib/output/outPlugin.h
-debian/tmp/opt/trinity/include/tde/mpeglib/output/outputStream.h
-debian/tmp/opt/trinity/include/tde/mpeglib/output/pluginInfo.h
-debian/tmp/opt/trinity/include/tde/mpeglib/output/threadSafeOutputStream.h
-debian/tmp/opt/trinity/include/tde/mpeglib/splay/mpegAudioFrame.h
-debian/tmp/opt/trinity/include/tde/mpeglib/splay/mpegAudioInfo.h
-debian/tmp/opt/trinity/include/tde/mpeglib/splay/splayDecoder.h
-debian/tmp/opt/trinity/include/tde/mpeglib/util/abstract/abs_thread.h
-debian/tmp/opt/trinity/include/tde/mpeglib/util/abstract/threadQueue.h
-debian/tmp/opt/trinity/include/tde/mpeglib/util/dynBuffer.h
-debian/tmp/opt/trinity/include/tde/mpeglib/util/file/fileAccess.h
-debian/tmp/opt/trinity/include/tde/mpeglib/util/mmx/mm_accel.h
-debian/tmp/opt/trinity/include/tde/mpeglib/util/mmx/mmx.h
-debian/tmp/opt/trinity/include/tde/mpeglib/util/mmx/mmx_asm.h
-debian/tmp/opt/trinity/include/tde/mpeglib/util/render/pictureArray.h
-debian/tmp/opt/trinity/include/tde/mpeglib/util/render/yuvPicture.h
-debian/tmp/opt/trinity/include/tde/mpeglib/util/syncClock.h
-debian/tmp/opt/trinity/include/tde/mpeglib/util/timeStamp.h
-debian/tmp/opt/trinity/include/tde/mpeglib/util/timeStampArray.h
-debian/tmp/opt/trinity/include/tde/mpeglib/util/timeWrapper.h
-debian/tmp/opt/trinity/include/tde/mpeglib/util/yaf/yafcore/buffer.h
-debian/tmp/opt/trinity/include/tde/mpeglib/util/yaf/yafcore/inputDecoder.h
-debian/tmp/opt/trinity/include/tde/mpeglib/util/yaf/yafcore/inputInterface.h
-debian/tmp/opt/trinity/include/tde/mpeglib/util/yaf/yafcore/outputInterface.h
-debian/tmp/opt/trinity/include/tde/mpeglib/util/yaf/yafcore/yaf_control.h
-debian/tmp/opt/trinity/include/tde/mpeglib/util/yaf/yafxplayer/inputDecoderXPlayer.h
-debian/tmp/opt/trinity/include/tde/mpeglib/util/yaf/yafxplayer/inputDecoderYAF.h
-debian/tmp/opt/trinity/include/tde/mpeglib/util/yaf/yafxplayer/yafOutputStream.h
-debian/tmp/opt/trinity/include/tde/mpeglib_artsplug/decoderBaseObject.h
-debian/tmp/opt/trinity/include/tde/mpeglib_artsplug/decoderBaseObject.idl
-debian/tmp/opt/trinity/include/tde/mpeglib_artsplug/decoderBaseObject_impl.h
-debian/tmp/opt/trinity/include/tde/mpeglib_artsplug/splayPlayObject.h
-debian/tmp/opt/trinity/include/tde/mpeglib_artsplug/splayPlayObject.idl
-debian/tmp/opt/trinity/include/tde/mpeglib_artsplug/splayPlayObject_impl.h
-debian/tmp/opt/trinity/include/tde/noatun/app.h
-debian/tmp/opt/trinity/include/tde/noatun/controls.h
-debian/tmp/opt/trinity/include/tde/noatun/conversion.h
-debian/tmp/opt/trinity/include/tde/noatun/downloader.h
-debian/tmp/opt/trinity/include/tde/noatun/effects.h
-debian/tmp/opt/trinity/include/tde/noatun/engine.h
-debian/tmp/opt/trinity/include/tde/noatun/equalizer.h
-debian/tmp/opt/trinity/include/tde/noatun/noatunarts.h
-debian/tmp/opt/trinity/include/tde/noatun/player.h
-debian/tmp/opt/trinity/include/tde/noatun/playlist.h
-debian/tmp/opt/trinity/include/tde/noatun/playlistsaver.h
-debian/tmp/opt/trinity/include/tde/noatun/plugin.h
-debian/tmp/opt/trinity/include/tde/noatun/pluginloader.h
-debian/tmp/opt/trinity/include/tde/noatun/pref.h
-debian/tmp/opt/trinity/include/tde/noatun/scrollinglabel.h
-debian/tmp/opt/trinity/include/tde/noatun/stdaction.h
-debian/tmp/opt/trinity/include/tde/noatun/stereobuttonaction.h
-debian/tmp/opt/trinity/include/tde/noatun/tags.h
-debian/tmp/opt/trinity/include/tde/noatun/vequalizer.h
-debian/tmp/opt/trinity/include/tde/noatun/video.h
-debian/tmp/opt/trinity/include/tde/noatun/winskinvis.h
-debian/tmp/opt/trinity/include/tde/plugin_deps.h
+debian/tmp/opt/trinity/include/arts/artsbuilder.h
+debian/tmp/opt/trinity/include/arts/artsbuilder.idl
+debian/tmp/opt/trinity/include/arts/artsgui.h
+debian/tmp/opt/trinity/include/arts/artsgui.idl
+debian/tmp/opt/trinity/include/arts/artsmidi.h
+debian/tmp/opt/trinity/include/arts/artsmidi.idl
+debian/tmp/opt/trinity/include/arts/artsmodules.h
+debian/tmp/opt/trinity/include/arts/artsmodules.idl
+debian/tmp/opt/trinity/include/arts/artsmodulescommon.h
+debian/tmp/opt/trinity/include/arts/artsmodulescommon.idl
+debian/tmp/opt/trinity/include/arts/artsmoduleseffects.h
+debian/tmp/opt/trinity/include/arts/artsmoduleseffects.idl
+debian/tmp/opt/trinity/include/arts/artsmodulesmixers.h
+debian/tmp/opt/trinity/include/arts/artsmodulesmixers.idl
+debian/tmp/opt/trinity/include/arts/artsmodulessynth.h
+debian/tmp/opt/trinity/include/arts/artsmodulessynth.idl
+debian/tmp/opt/trinity/include/arts/kartswidget.h
+debian/tmp/opt/trinity/include/arts/kframe_impl.h
+debian/tmp/opt/trinity/include/arts/klayoutbox_impl.h
+debian/tmp/opt/trinity/include/arts/kwidget_impl.h
+debian/tmp/opt/trinity/include/arts/kwidgetrepo.h
+debian/tmp/opt/trinity/include/audiocdencoder.h
+debian/tmp/opt/trinity/include/cmodule.h
+debian/tmp/opt/trinity/include/effectview.h
+debian/tmp/opt/trinity/include/equalizerview.h
+debian/tmp/opt/trinity/include/ksaver.h
+debian/tmp/opt/trinity/include/libkcddb/cache.h
+debian/tmp/opt/trinity/include/libkcddb/cddb.h
+debian/tmp/opt/trinity/include/libkcddb/cdinfo.h
+debian/tmp/opt/trinity/include/libkcddb/client.h
+debian/tmp/opt/trinity/include/libkcddb/config.h
+debian/tmp/opt/trinity/include/libkcddb/configbase.h
+debian/tmp/opt/trinity/include/mimetypetree.h
+debian/tmp/opt/trinity/include/mpeglib/decoder/cddaPlugin.h
+debian/tmp/opt/trinity/include/mpeglib/decoder/command.h
+debian/tmp/opt/trinity/include/mpeglib/decoder/commandPipe.h
+debian/tmp/opt/trinity/include/mpeglib/decoder/decoderPlugin.h
+debian/tmp/opt/trinity/include/mpeglib/decoder/mpegPlugin.h
+debian/tmp/opt/trinity/include/mpeglib/decoder/mpgPlugin.h
+debian/tmp/opt/trinity/include/mpeglib/decoder/nukePlugin.h
+debian/tmp/opt/trinity/include/mpeglib/decoder/splayPlugin.h
+debian/tmp/opt/trinity/include/mpeglib/decoder/tplayPlugin.h
+debian/tmp/opt/trinity/include/mpeglib/decoder/vorbisPlugin.h
+debian/tmp/opt/trinity/include/mpeglib/decoder/yuvPlugin.h
+debian/tmp/opt/trinity/include/mpeglib/frame/IOFrameQueue.h
+debian/tmp/opt/trinity/include/mpeglib/frame/audioFrame.h
+debian/tmp/opt/trinity/include/mpeglib/frame/audioFrameQueue.h
+debian/tmp/opt/trinity/include/mpeglib/frame/floatFrame.h
+debian/tmp/opt/trinity/include/mpeglib/frame/frame.h
+debian/tmp/opt/trinity/include/mpeglib/frame/frameQueue.h
+debian/tmp/opt/trinity/include/mpeglib/frame/framer.h
+debian/tmp/opt/trinity/include/mpeglib/frame/pcmFrame.h
+debian/tmp/opt/trinity/include/mpeglib/frame/rawDataBuffer.h
+debian/tmp/opt/trinity/include/mpeglib/frame/rawFrame.h
+debian/tmp/opt/trinity/include/mpeglib/input/bufferInputStream.h
+debian/tmp/opt/trinity/include/mpeglib/input/cddaInputStream.h
+debian/tmp/opt/trinity/include/mpeglib/input/cdromInputStream.h
+debian/tmp/opt/trinity/include/mpeglib/input/fileInputStream.h
+debian/tmp/opt/trinity/include/mpeglib/input/httpInputStream.h
+debian/tmp/opt/trinity/include/mpeglib/input/inputDetector.h
+debian/tmp/opt/trinity/include/mpeglib/input/inputPlugin.h
+debian/tmp/opt/trinity/include/mpeglib/input/inputStream.h
+debian/tmp/opt/trinity/include/mpeglib/input/threadSafeInputStream.h
+debian/tmp/opt/trinity/include/mpeglib/mpegutil/mpegStreamPlayer.h
+debian/tmp/opt/trinity/include/mpeglib/mpegutil/mpegSystemHeader.h
+debian/tmp/opt/trinity/include/mpeglib/mpegutil/mpegSystemStream.h
+debian/tmp/opt/trinity/include/mpeglib/mpegutil/mpegVideoLength.h
+debian/tmp/opt/trinity/include/mpeglib/mpegutil/pesSystemStream.h
+debian/tmp/opt/trinity/include/mpeglib/mpegutil/psSystemStream.h
+debian/tmp/opt/trinity/include/mpeglib/mpegutil/tsSystemStream.h
+debian/tmp/opt/trinity/include/mpeglib/oggvorbis/oggFrame.h
+debian/tmp/opt/trinity/include/mpeglib/oggvorbis/ovFramer.h
+debian/tmp/opt/trinity/include/mpeglib/oggvorbis/vorbisDecoder.h
+debian/tmp/opt/trinity/include/mpeglib/oggvorbis/vorbisInfo.h
+debian/tmp/opt/trinity/include/mpeglib/output/artsOutputStream.h
+debian/tmp/opt/trinity/include/mpeglib/output/audioTime.h
+debian/tmp/opt/trinity/include/mpeglib/output/avSyncer.h
+debian/tmp/opt/trinity/include/mpeglib/output/dspX11OutputStream.h
+debian/tmp/opt/trinity/include/mpeglib/output/outPlugin.h
+debian/tmp/opt/trinity/include/mpeglib/output/outputStream.h
+debian/tmp/opt/trinity/include/mpeglib/output/pluginInfo.h
+debian/tmp/opt/trinity/include/mpeglib/output/threadSafeOutputStream.h
+debian/tmp/opt/trinity/include/mpeglib/splay/mpegAudioFrame.h
+debian/tmp/opt/trinity/include/mpeglib/splay/mpegAudioInfo.h
+debian/tmp/opt/trinity/include/mpeglib/splay/splayDecoder.h
+debian/tmp/opt/trinity/include/mpeglib/util/abstract/abs_thread.h
+debian/tmp/opt/trinity/include/mpeglib/util/abstract/threadQueue.h
+debian/tmp/opt/trinity/include/mpeglib/util/dynBuffer.h
+debian/tmp/opt/trinity/include/mpeglib/util/file/fileAccess.h
+debian/tmp/opt/trinity/include/mpeglib/util/mmx/mm_accel.h
+debian/tmp/opt/trinity/include/mpeglib/util/mmx/mmx.h
+debian/tmp/opt/trinity/include/mpeglib/util/mmx/mmx_asm.h
+debian/tmp/opt/trinity/include/mpeglib/util/render/pictureArray.h
+debian/tmp/opt/trinity/include/mpeglib/util/render/yuvPicture.h
+debian/tmp/opt/trinity/include/mpeglib/util/syncClock.h
+debian/tmp/opt/trinity/include/mpeglib/util/timeStamp.h
+debian/tmp/opt/trinity/include/mpeglib/util/timeStampArray.h
+debian/tmp/opt/trinity/include/mpeglib/util/timeWrapper.h
+debian/tmp/opt/trinity/include/mpeglib/util/yaf/yafcore/buffer.h
+debian/tmp/opt/trinity/include/mpeglib/util/yaf/yafcore/inputDecoder.h
+debian/tmp/opt/trinity/include/mpeglib/util/yaf/yafcore/inputInterface.h
+debian/tmp/opt/trinity/include/mpeglib/util/yaf/yafcore/outputInterface.h
+debian/tmp/opt/trinity/include/mpeglib/util/yaf/yafcore/yaf_control.h
+debian/tmp/opt/trinity/include/mpeglib/util/yaf/yafxplayer/inputDecoderXPlayer.h
+debian/tmp/opt/trinity/include/mpeglib/util/yaf/yafxplayer/inputDecoderYAF.h
+debian/tmp/opt/trinity/include/mpeglib/util/yaf/yafxplayer/yafOutputStream.h
+debian/tmp/opt/trinity/include/mpeglib_artsplug/decoderBaseObject.h
+debian/tmp/opt/trinity/include/mpeglib_artsplug/decoderBaseObject.idl
+debian/tmp/opt/trinity/include/mpeglib_artsplug/decoderBaseObject_impl.h
+debian/tmp/opt/trinity/include/mpeglib_artsplug/splayPlayObject.h
+debian/tmp/opt/trinity/include/mpeglib_artsplug/splayPlayObject.idl
+debian/tmp/opt/trinity/include/mpeglib_artsplug/splayPlayObject_impl.h
+debian/tmp/opt/trinity/include/noatun/app.h
+debian/tmp/opt/trinity/include/noatun/controls.h
+debian/tmp/opt/trinity/include/noatun/conversion.h
+debian/tmp/opt/trinity/include/noatun/downloader.h
+debian/tmp/opt/trinity/include/noatun/effects.h
+debian/tmp/opt/trinity/include/noatun/engine.h
+debian/tmp/opt/trinity/include/noatun/equalizer.h
+debian/tmp/opt/trinity/include/noatun/noatunarts.h
+debian/tmp/opt/trinity/include/noatun/player.h
+debian/tmp/opt/trinity/include/noatun/playlist.h
+debian/tmp/opt/trinity/include/noatun/playlistsaver.h
+debian/tmp/opt/trinity/include/noatun/plugin.h
+debian/tmp/opt/trinity/include/noatun/pluginloader.h
+debian/tmp/opt/trinity/include/noatun/pref.h
+debian/tmp/opt/trinity/include/noatun/scrollinglabel.h
+debian/tmp/opt/trinity/include/noatun/stdaction.h
+debian/tmp/opt/trinity/include/noatun/stereobuttonaction.h
+debian/tmp/opt/trinity/include/noatun/tags.h
+debian/tmp/opt/trinity/include/noatun/vequalizer.h
+debian/tmp/opt/trinity/include/noatun/video.h
+debian/tmp/opt/trinity/include/noatun/winskinvis.h
+debian/tmp/opt/trinity/include/plugin_deps.h
 debian/tmp/opt/trinity/lib/libarts_mpeglib.so
 debian/tmp/opt/trinity/lib/libarts_splay.so
 debian/tmp/opt/trinity/lib/libartsbuilder.so
diff --git a/ubuntu/maverick/tdemultimedia/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/tdemultimedia/debian/cdbs/debian-qt-kde.mk
index 61f3ab2dc..60ccb9eef 100644
--- a/ubuntu/maverick/tdemultimedia/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/tdemultimedia/debian/cdbs/debian-qt-kde.mk
@@ -10,6 +10,7 @@ _cdbs_class_debian-qt-kde := 1
 # Note: This _must_ be included before autotools.mk, or it won't work.
 common-configure-arch common-configure-indep:: debian/stamp-cvs-make
 debian/stamp-cvs-make:
+ifndef _cdbs_class_cmake
 	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
 ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
 	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
@@ -18,10 +19,11 @@ ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
 	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
 endif
 	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
+endif
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-include debian/cdbs/uploaders.mk
+#include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
@@ -103,6 +105,7 @@ binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	done
 
 clean::
+ifndef _cdbs_class_cmake
 	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
 		cd $(DEB_SRCDIR); \
 		find . -name Makefile.in -print | \
@@ -111,6 +114,7 @@ clean::
 			configure configure.files configure.in stamp-h.in \
 			subdirs; \
 	fi
+endif
 	rm -f debian/stamp-cvs-make
 
 endif
diff --git a/ubuntu/maverick/tdemultimedia/debian/cdbs/kde.mk b/ubuntu/maverick/tdemultimedia/debian/cdbs/kde.mk
index 765560c89..023886fc8 100644
--- a/ubuntu/maverick/tdemultimedia/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/tdemultimedia/debian/cdbs/kde.mk
@@ -35,7 +35,9 @@ else
 DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
 endif
 
+ifndef _cdbs_class_cmake
 include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
+endif
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
@@ -59,7 +61,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/ubuntu/maverick/tdemultimedia/debian/control b/ubuntu/maverick/tdemultimedia/debian/control
index fae04903e..faeea6d02 100644
--- a/ubuntu/maverick/tdemultimedia/debian/control
+++ b/ubuntu/maverick/tdemultimedia/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Fathi Boudra <fboudra@free.fr>, Sune Vuorela <debian@pusling.com>
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 7.0.50~), quilt, autotools-dev, cdparanoia, gawk, gettext, tdelibs14-trinity-dev, libcdparanoia0-dev, libesd0-dev, libflac-dev (>= 1.1.4-1), libgstreamer-plugins-base1.0-dev | libgstreamer-plugins-base0.10-dev, libsamplerate0-dev, libspeex-dev (>> 1.1.5), libtag1-dev (>> 1.3.1), libtheora-dev, libxine2-dev | libxine-dev, sharutils, texinfo, libxxf86dga-dev, libxv-dev, libxxf86vm-dev, libakode-dev, libogg-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 7.0.50~), quilt, cmake, autotools-dev, cdparanoia, gawk, gettext, tdelibs14-trinity-dev, libcdparanoia0-dev, libesd0-dev, libflac-dev (>= 1.1.4-1), libgstreamer-plugins-base1.0-dev | libgstreamer-plugins-base0.10-dev, libsamplerate0-dev, libspeex-dev (>> 1.1.5), libtag1-dev (>> 1.3.1), libtheora-dev, libxine2-dev | libxine-dev, sharutils, texinfo, libxxf86dga-dev, libxv-dev, libxxf86vm-dev, libakode-dev, libogg-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: tdemultimedia-trinity
diff --git a/ubuntu/maverick/tdemultimedia/debian/rules b/ubuntu/maverick/tdemultimedia/debian/rules
index 302028902..39ec27d1f 100755
--- a/ubuntu/maverick/tdemultimedia/debian/rules
+++ b/ubuntu/maverick/tdemultimedia/debian/rules
@@ -1,11 +1,12 @@
 #! /usr/bin/make -f
 
+include /usr/share/cdbs/1/class/cmake.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include debian/cdbs/debian-qt-kde.mk
 #include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include
 DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
 DEB_CONFIGURE_PREFIX := /opt/trinity
 DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
@@ -19,6 +20,20 @@ DEB_CONFIGURE_EXTRA_FLAGS := \
 	# The include/tde/arts one should be temporary. See
 	# "juk/Makefile.am: arts_includes vs ARTS_CFLAGS" in -talk.
 
+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" \
+ -DWITH_LAME="OFF"
+
+DEB_MAKE_CHECK_TARGET = check
+
 DOC_HTML_PRUNE := kcontrol-trinity
 
 DEB_DH_STRIP_ARGS  := --dbg-package=tdemultimedia-trinity-dbg
diff --git a/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-trinity-dev.install b/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-trinity-dev.install
index 97d3eb309..17fd1301f 100644
--- a/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-trinity-dev.install
+++ b/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-trinity-dev.install
@@ -1,137 +1,137 @@
-debian/tmp/opt/trinity/include/tde/arts/artsbuilder.h
-debian/tmp/opt/trinity/include/tde/arts/artsbuilder.idl
-debian/tmp/opt/trinity/include/tde/arts/artsgui.h
-debian/tmp/opt/trinity/include/tde/arts/artsgui.idl
-debian/tmp/opt/trinity/include/tde/arts/artsmidi.h
-debian/tmp/opt/trinity/include/tde/arts/artsmidi.idl
-debian/tmp/opt/trinity/include/tde/arts/artsmodules.h
-debian/tmp/opt/trinity/include/tde/arts/artsmodules.idl
-debian/tmp/opt/trinity/include/tde/arts/artsmodulescommon.h
-debian/tmp/opt/trinity/include/tde/arts/artsmodulescommon.idl
-debian/tmp/opt/trinity/include/tde/arts/artsmoduleseffects.h
-debian/tmp/opt/trinity/include/tde/arts/artsmoduleseffects.idl
-debian/tmp/opt/trinity/include/tde/arts/artsmodulesmixers.h
-debian/tmp/opt/trinity/include/tde/arts/artsmodulesmixers.idl
-debian/tmp/opt/trinity/include/tde/arts/artsmodulessynth.h
-debian/tmp/opt/trinity/include/tde/arts/artsmodulessynth.idl
-debian/tmp/opt/trinity/include/tde/arts/kartswidget.h
-debian/tmp/opt/trinity/include/tde/arts/kframe_impl.h
-debian/tmp/opt/trinity/include/tde/arts/klayoutbox_impl.h
-debian/tmp/opt/trinity/include/tde/arts/kwidget_impl.h
-debian/tmp/opt/trinity/include/tde/arts/kwidgetrepo.h
-debian/tmp/opt/trinity/include/tde/audiocdencoder.h
-debian/tmp/opt/trinity/include/tde/cmodule.h
-debian/tmp/opt/trinity/include/tde/effectview.h
-debian/tmp/opt/trinity/include/tde/equalizerview.h
-debian/tmp/opt/trinity/include/tde/ksaver.h
-debian/tmp/opt/trinity/include/tde/libkcddb/cache.h
-debian/tmp/opt/trinity/include/tde/libkcddb/cddb.h
-debian/tmp/opt/trinity/include/tde/libkcddb/cdinfo.h
-debian/tmp/opt/trinity/include/tde/libkcddb/client.h
-debian/tmp/opt/trinity/include/tde/libkcddb/config.h
-debian/tmp/opt/trinity/include/tde/libkcddb/configbase.h
-debian/tmp/opt/trinity/include/tde/mimetypetree.h
-debian/tmp/opt/trinity/include/tde/mpeglib/decoder/cddaPlugin.h
-debian/tmp/opt/trinity/include/tde/mpeglib/decoder/command.h
-debian/tmp/opt/trinity/include/tde/mpeglib/decoder/commandPipe.h
-debian/tmp/opt/trinity/include/tde/mpeglib/decoder/decoderPlugin.h
-debian/tmp/opt/trinity/include/tde/mpeglib/decoder/mpegPlugin.h
-debian/tmp/opt/trinity/include/tde/mpeglib/decoder/mpgPlugin.h
-debian/tmp/opt/trinity/include/tde/mpeglib/decoder/nukePlugin.h
-debian/tmp/opt/trinity/include/tde/mpeglib/decoder/splayPlugin.h
-debian/tmp/opt/trinity/include/tde/mpeglib/decoder/tplayPlugin.h
-debian/tmp/opt/trinity/include/tde/mpeglib/decoder/vorbisPlugin.h
-debian/tmp/opt/trinity/include/tde/mpeglib/decoder/yuvPlugin.h
-debian/tmp/opt/trinity/include/tde/mpeglib/frame/IOFrameQueue.h
-debian/tmp/opt/trinity/include/tde/mpeglib/frame/audioFrame.h
-debian/tmp/opt/trinity/include/tde/mpeglib/frame/audioFrameQueue.h
-debian/tmp/opt/trinity/include/tde/mpeglib/frame/floatFrame.h
-debian/tmp/opt/trinity/include/tde/mpeglib/frame/frame.h
-debian/tmp/opt/trinity/include/tde/mpeglib/frame/frameQueue.h
-debian/tmp/opt/trinity/include/tde/mpeglib/frame/framer.h
-debian/tmp/opt/trinity/include/tde/mpeglib/frame/pcmFrame.h
-debian/tmp/opt/trinity/include/tde/mpeglib/frame/rawDataBuffer.h
-debian/tmp/opt/trinity/include/tde/mpeglib/frame/rawFrame.h
-debian/tmp/opt/trinity/include/tde/mpeglib/input/bufferInputStream.h
-debian/tmp/opt/trinity/include/tde/mpeglib/input/cddaInputStream.h
-debian/tmp/opt/trinity/include/tde/mpeglib/input/cdromInputStream.h
-debian/tmp/opt/trinity/include/tde/mpeglib/input/fileInputStream.h
-debian/tmp/opt/trinity/include/tde/mpeglib/input/httpInputStream.h
-debian/tmp/opt/trinity/include/tde/mpeglib/input/inputDetector.h
-debian/tmp/opt/trinity/include/tde/mpeglib/input/inputPlugin.h
-debian/tmp/opt/trinity/include/tde/mpeglib/input/inputStream.h
-debian/tmp/opt/trinity/include/tde/mpeglib/input/threadSafeInputStream.h
-debian/tmp/opt/trinity/include/tde/mpeglib/mpegutil/mpegStreamPlayer.h
-debian/tmp/opt/trinity/include/tde/mpeglib/mpegutil/mpegSystemHeader.h
-debian/tmp/opt/trinity/include/tde/mpeglib/mpegutil/mpegSystemStream.h
-debian/tmp/opt/trinity/include/tde/mpeglib/mpegutil/mpegVideoLength.h
-debian/tmp/opt/trinity/include/tde/mpeglib/mpegutil/pesSystemStream.h
-debian/tmp/opt/trinity/include/tde/mpeglib/mpegutil/psSystemStream.h
-debian/tmp/opt/trinity/include/tde/mpeglib/mpegutil/tsSystemStream.h
-debian/tmp/opt/trinity/include/tde/mpeglib/oggvorbis/oggFrame.h
-debian/tmp/opt/trinity/include/tde/mpeglib/oggvorbis/ovFramer.h
-debian/tmp/opt/trinity/include/tde/mpeglib/oggvorbis/vorbisDecoder.h
-debian/tmp/opt/trinity/include/tde/mpeglib/oggvorbis/vorbisInfo.h
-debian/tmp/opt/trinity/include/tde/mpeglib/output/artsOutputStream.h
-debian/tmp/opt/trinity/include/tde/mpeglib/output/audioTime.h
-debian/tmp/opt/trinity/include/tde/mpeglib/output/avSyncer.h
-debian/tmp/opt/trinity/include/tde/mpeglib/output/dspX11OutputStream.h
-debian/tmp/opt/trinity/include/tde/mpeglib/output/outPlugin.h
-debian/tmp/opt/trinity/include/tde/mpeglib/output/outputStream.h
-debian/tmp/opt/trinity/include/tde/mpeglib/output/pluginInfo.h
-debian/tmp/opt/trinity/include/tde/mpeglib/output/threadSafeOutputStream.h
-debian/tmp/opt/trinity/include/tde/mpeglib/splay/mpegAudioFrame.h
-debian/tmp/opt/trinity/include/tde/mpeglib/splay/mpegAudioInfo.h
-debian/tmp/opt/trinity/include/tde/mpeglib/splay/splayDecoder.h
-debian/tmp/opt/trinity/include/tde/mpeglib/util/abstract/abs_thread.h
-debian/tmp/opt/trinity/include/tde/mpeglib/util/abstract/threadQueue.h
-debian/tmp/opt/trinity/include/tde/mpeglib/util/dynBuffer.h
-debian/tmp/opt/trinity/include/tde/mpeglib/util/file/fileAccess.h
-debian/tmp/opt/trinity/include/tde/mpeglib/util/mmx/mm_accel.h
-debian/tmp/opt/trinity/include/tde/mpeglib/util/mmx/mmx.h
-debian/tmp/opt/trinity/include/tde/mpeglib/util/mmx/mmx_asm.h
-debian/tmp/opt/trinity/include/tde/mpeglib/util/render/pictureArray.h
-debian/tmp/opt/trinity/include/tde/mpeglib/util/render/yuvPicture.h
-debian/tmp/opt/trinity/include/tde/mpeglib/util/syncClock.h
-debian/tmp/opt/trinity/include/tde/mpeglib/util/timeStamp.h
-debian/tmp/opt/trinity/include/tde/mpeglib/util/timeStampArray.h
-debian/tmp/opt/trinity/include/tde/mpeglib/util/timeWrapper.h
-debian/tmp/opt/trinity/include/tde/mpeglib/util/yaf/yafcore/buffer.h
-debian/tmp/opt/trinity/include/tde/mpeglib/util/yaf/yafcore/inputDecoder.h
-debian/tmp/opt/trinity/include/tde/mpeglib/util/yaf/yafcore/inputInterface.h
-debian/tmp/opt/trinity/include/tde/mpeglib/util/yaf/yafcore/outputInterface.h
-debian/tmp/opt/trinity/include/tde/mpeglib/util/yaf/yafcore/yaf_control.h
-debian/tmp/opt/trinity/include/tde/mpeglib/util/yaf/yafxplayer/inputDecoderXPlayer.h
-debian/tmp/opt/trinity/include/tde/mpeglib/util/yaf/yafxplayer/inputDecoderYAF.h
-debian/tmp/opt/trinity/include/tde/mpeglib/util/yaf/yafxplayer/yafOutputStream.h
-debian/tmp/opt/trinity/include/tde/mpeglib_artsplug/decoderBaseObject.h
-debian/tmp/opt/trinity/include/tde/mpeglib_artsplug/decoderBaseObject.idl
-debian/tmp/opt/trinity/include/tde/mpeglib_artsplug/decoderBaseObject_impl.h
-debian/tmp/opt/trinity/include/tde/mpeglib_artsplug/splayPlayObject.h
-debian/tmp/opt/trinity/include/tde/mpeglib_artsplug/splayPlayObject.idl
-debian/tmp/opt/trinity/include/tde/mpeglib_artsplug/splayPlayObject_impl.h
-debian/tmp/opt/trinity/include/tde/noatun/app.h
-debian/tmp/opt/trinity/include/tde/noatun/controls.h
-debian/tmp/opt/trinity/include/tde/noatun/conversion.h
-debian/tmp/opt/trinity/include/tde/noatun/downloader.h
-debian/tmp/opt/trinity/include/tde/noatun/effects.h
-debian/tmp/opt/trinity/include/tde/noatun/engine.h
-debian/tmp/opt/trinity/include/tde/noatun/equalizer.h
-debian/tmp/opt/trinity/include/tde/noatun/noatunarts.h
-debian/tmp/opt/trinity/include/tde/noatun/player.h
-debian/tmp/opt/trinity/include/tde/noatun/playlist.h
-debian/tmp/opt/trinity/include/tde/noatun/playlistsaver.h
-debian/tmp/opt/trinity/include/tde/noatun/plugin.h
-debian/tmp/opt/trinity/include/tde/noatun/pluginloader.h
-debian/tmp/opt/trinity/include/tde/noatun/pref.h
-debian/tmp/opt/trinity/include/tde/noatun/scrollinglabel.h
-debian/tmp/opt/trinity/include/tde/noatun/stdaction.h
-debian/tmp/opt/trinity/include/tde/noatun/stereobuttonaction.h
-debian/tmp/opt/trinity/include/tde/noatun/tags.h
-debian/tmp/opt/trinity/include/tde/noatun/vequalizer.h
-debian/tmp/opt/trinity/include/tde/noatun/video.h
-debian/tmp/opt/trinity/include/tde/noatun/winskinvis.h
-debian/tmp/opt/trinity/include/tde/plugin_deps.h
+debian/tmp/opt/trinity/include/arts/artsbuilder.h
+debian/tmp/opt/trinity/include/arts/artsbuilder.idl
+debian/tmp/opt/trinity/include/arts/artsgui.h
+debian/tmp/opt/trinity/include/arts/artsgui.idl
+debian/tmp/opt/trinity/include/arts/artsmidi.h
+debian/tmp/opt/trinity/include/arts/artsmidi.idl
+debian/tmp/opt/trinity/include/arts/artsmodules.h
+debian/tmp/opt/trinity/include/arts/artsmodules.idl
+debian/tmp/opt/trinity/include/arts/artsmodulescommon.h
+debian/tmp/opt/trinity/include/arts/artsmodulescommon.idl
+debian/tmp/opt/trinity/include/arts/artsmoduleseffects.h
+debian/tmp/opt/trinity/include/arts/artsmoduleseffects.idl
+debian/tmp/opt/trinity/include/arts/artsmodulesmixers.h
+debian/tmp/opt/trinity/include/arts/artsmodulesmixers.idl
+debian/tmp/opt/trinity/include/arts/artsmodulessynth.h
+debian/tmp/opt/trinity/include/arts/artsmodulessynth.idl
+debian/tmp/opt/trinity/include/arts/kartswidget.h
+debian/tmp/opt/trinity/include/arts/kframe_impl.h
+debian/tmp/opt/trinity/include/arts/klayoutbox_impl.h
+debian/tmp/opt/trinity/include/arts/kwidget_impl.h
+debian/tmp/opt/trinity/include/arts/kwidgetrepo.h
+debian/tmp/opt/trinity/include/audiocdencoder.h
+debian/tmp/opt/trinity/include/cmodule.h
+debian/tmp/opt/trinity/include/effectview.h
+debian/tmp/opt/trinity/include/equalizerview.h
+debian/tmp/opt/trinity/include/ksaver.h
+debian/tmp/opt/trinity/include/libkcddb/cache.h
+debian/tmp/opt/trinity/include/libkcddb/cddb.h
+debian/tmp/opt/trinity/include/libkcddb/cdinfo.h
+debian/tmp/opt/trinity/include/libkcddb/client.h
+debian/tmp/opt/trinity/include/libkcddb/config.h
+debian/tmp/opt/trinity/include/libkcddb/configbase.h
+debian/tmp/opt/trinity/include/mimetypetree.h
+debian/tmp/opt/trinity/include/mpeglib/decoder/cddaPlugin.h
+debian/tmp/opt/trinity/include/mpeglib/decoder/command.h
+debian/tmp/opt/trinity/include/mpeglib/decoder/commandPipe.h
+debian/tmp/opt/trinity/include/mpeglib/decoder/decoderPlugin.h
+debian/tmp/opt/trinity/include/mpeglib/decoder/mpegPlugin.h
+debian/tmp/opt/trinity/include/mpeglib/decoder/mpgPlugin.h
+debian/tmp/opt/trinity/include/mpeglib/decoder/nukePlugin.h
+debian/tmp/opt/trinity/include/mpeglib/decoder/splayPlugin.h
+debian/tmp/opt/trinity/include/mpeglib/decoder/tplayPlugin.h
+debian/tmp/opt/trinity/include/mpeglib/decoder/vorbisPlugin.h
+debian/tmp/opt/trinity/include/mpeglib/decoder/yuvPlugin.h
+debian/tmp/opt/trinity/include/mpeglib/frame/IOFrameQueue.h
+debian/tmp/opt/trinity/include/mpeglib/frame/audioFrame.h
+debian/tmp/opt/trinity/include/mpeglib/frame/audioFrameQueue.h
+debian/tmp/opt/trinity/include/mpeglib/frame/floatFrame.h
+debian/tmp/opt/trinity/include/mpeglib/frame/frame.h
+debian/tmp/opt/trinity/include/mpeglib/frame/frameQueue.h
+debian/tmp/opt/trinity/include/mpeglib/frame/framer.h
+debian/tmp/opt/trinity/include/mpeglib/frame/pcmFrame.h
+debian/tmp/opt/trinity/include/mpeglib/frame/rawDataBuffer.h
+debian/tmp/opt/trinity/include/mpeglib/frame/rawFrame.h
+debian/tmp/opt/trinity/include/mpeglib/input/bufferInputStream.h
+debian/tmp/opt/trinity/include/mpeglib/input/cddaInputStream.h
+debian/tmp/opt/trinity/include/mpeglib/input/cdromInputStream.h
+debian/tmp/opt/trinity/include/mpeglib/input/fileInputStream.h
+debian/tmp/opt/trinity/include/mpeglib/input/httpInputStream.h
+debian/tmp/opt/trinity/include/mpeglib/input/inputDetector.h
+debian/tmp/opt/trinity/include/mpeglib/input/inputPlugin.h
+debian/tmp/opt/trinity/include/mpeglib/input/inputStream.h
+debian/tmp/opt/trinity/include/mpeglib/input/threadSafeInputStream.h
+debian/tmp/opt/trinity/include/mpeglib/mpegutil/mpegStreamPlayer.h
+debian/tmp/opt/trinity/include/mpeglib/mpegutil/mpegSystemHeader.h
+debian/tmp/opt/trinity/include/mpeglib/mpegutil/mpegSystemStream.h
+debian/tmp/opt/trinity/include/mpeglib/mpegutil/mpegVideoLength.h
+debian/tmp/opt/trinity/include/mpeglib/mpegutil/pesSystemStream.h
+debian/tmp/opt/trinity/include/mpeglib/mpegutil/psSystemStream.h
+debian/tmp/opt/trinity/include/mpeglib/mpegutil/tsSystemStream.h
+debian/tmp/opt/trinity/include/mpeglib/oggvorbis/oggFrame.h
+debian/tmp/opt/trinity/include/mpeglib/oggvorbis/ovFramer.h
+debian/tmp/opt/trinity/include/mpeglib/oggvorbis/vorbisDecoder.h
+debian/tmp/opt/trinity/include/mpeglib/oggvorbis/vorbisInfo.h
+debian/tmp/opt/trinity/include/mpeglib/output/artsOutputStream.h
+debian/tmp/opt/trinity/include/mpeglib/output/audioTime.h
+debian/tmp/opt/trinity/include/mpeglib/output/avSyncer.h
+debian/tmp/opt/trinity/include/mpeglib/output/dspX11OutputStream.h
+debian/tmp/opt/trinity/include/mpeglib/output/outPlugin.h
+debian/tmp/opt/trinity/include/mpeglib/output/outputStream.h
+debian/tmp/opt/trinity/include/mpeglib/output/pluginInfo.h
+debian/tmp/opt/trinity/include/mpeglib/output/threadSafeOutputStream.h
+debian/tmp/opt/trinity/include/mpeglib/splay/mpegAudioFrame.h
+debian/tmp/opt/trinity/include/mpeglib/splay/mpegAudioInfo.h
+debian/tmp/opt/trinity/include/mpeglib/splay/splayDecoder.h
+debian/tmp/opt/trinity/include/mpeglib/util/abstract/abs_thread.h
+debian/tmp/opt/trinity/include/mpeglib/util/abstract/threadQueue.h
+debian/tmp/opt/trinity/include/mpeglib/util/dynBuffer.h
+debian/tmp/opt/trinity/include/mpeglib/util/file/fileAccess.h
+debian/tmp/opt/trinity/include/mpeglib/util/mmx/mm_accel.h
+debian/tmp/opt/trinity/include/mpeglib/util/mmx/mmx.h
+debian/tmp/opt/trinity/include/mpeglib/util/mmx/mmx_asm.h
+debian/tmp/opt/trinity/include/mpeglib/util/render/pictureArray.h
+debian/tmp/opt/trinity/include/mpeglib/util/render/yuvPicture.h
+debian/tmp/opt/trinity/include/mpeglib/util/syncClock.h
+debian/tmp/opt/trinity/include/mpeglib/util/timeStamp.h
+debian/tmp/opt/trinity/include/mpeglib/util/timeStampArray.h
+debian/tmp/opt/trinity/include/mpeglib/util/timeWrapper.h
+debian/tmp/opt/trinity/include/mpeglib/util/yaf/yafcore/buffer.h
+debian/tmp/opt/trinity/include/mpeglib/util/yaf/yafcore/inputDecoder.h
+debian/tmp/opt/trinity/include/mpeglib/util/yaf/yafcore/inputInterface.h
+debian/tmp/opt/trinity/include/mpeglib/util/yaf/yafcore/outputInterface.h
+debian/tmp/opt/trinity/include/mpeglib/util/yaf/yafcore/yaf_control.h
+debian/tmp/opt/trinity/include/mpeglib/util/yaf/yafxplayer/inputDecoderXPlayer.h
+debian/tmp/opt/trinity/include/mpeglib/util/yaf/yafxplayer/inputDecoderYAF.h
+debian/tmp/opt/trinity/include/mpeglib/util/yaf/yafxplayer/yafOutputStream.h
+debian/tmp/opt/trinity/include/mpeglib_artsplug/decoderBaseObject.h
+debian/tmp/opt/trinity/include/mpeglib_artsplug/decoderBaseObject.idl
+debian/tmp/opt/trinity/include/mpeglib_artsplug/decoderBaseObject_impl.h
+debian/tmp/opt/trinity/include/mpeglib_artsplug/splayPlayObject.h
+debian/tmp/opt/trinity/include/mpeglib_artsplug/splayPlayObject.idl
+debian/tmp/opt/trinity/include/mpeglib_artsplug/splayPlayObject_impl.h
+debian/tmp/opt/trinity/include/noatun/app.h
+debian/tmp/opt/trinity/include/noatun/controls.h
+debian/tmp/opt/trinity/include/noatun/conversion.h
+debian/tmp/opt/trinity/include/noatun/downloader.h
+debian/tmp/opt/trinity/include/noatun/effects.h
+debian/tmp/opt/trinity/include/noatun/engine.h
+debian/tmp/opt/trinity/include/noatun/equalizer.h
+debian/tmp/opt/trinity/include/noatun/noatunarts.h
+debian/tmp/opt/trinity/include/noatun/player.h
+debian/tmp/opt/trinity/include/noatun/playlist.h
+debian/tmp/opt/trinity/include/noatun/playlistsaver.h
+debian/tmp/opt/trinity/include/noatun/plugin.h
+debian/tmp/opt/trinity/include/noatun/pluginloader.h
+debian/tmp/opt/trinity/include/noatun/pref.h
+debian/tmp/opt/trinity/include/noatun/scrollinglabel.h
+debian/tmp/opt/trinity/include/noatun/stdaction.h
+debian/tmp/opt/trinity/include/noatun/stereobuttonaction.h
+debian/tmp/opt/trinity/include/noatun/tags.h
+debian/tmp/opt/trinity/include/noatun/vequalizer.h
+debian/tmp/opt/trinity/include/noatun/video.h
+debian/tmp/opt/trinity/include/noatun/winskinvis.h
+debian/tmp/opt/trinity/include/plugin_deps.h
 debian/tmp/opt/trinity/lib/libarts_mpeglib.so
 debian/tmp/opt/trinity/lib/libarts_splay.so
 debian/tmp/opt/trinity/lib/libartsbuilder.so