DEB tdeaccessibility: Switch to cmake.

The man pages has been moved to the main tree.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit efa6341d0ffb3964e5dcd8e452ebdda9e4788e4a)

42 files changed, 83 insertions, 540 deletions

diff --git a/debian/_base/core/tdeaccessibility/debian/control b/debian/_base/core/tdeaccessibility/debian/control
index 16bc4ba7a..e0fa1f2ed 100644
--- a/debian/_base/core/tdeaccessibility/debian/control
+++ b/debian/_base/core/tdeaccessibility/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 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>, Josh Metzler <joshdeb@metzlers.org>, Sune Vuorela <debian@pusling.com>
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, gawk, groff-base, tdelibs14-trinity-dev, tdemultimedia-trinity-dev, libakode-dev, libxtst-dev, sharutils, libogg-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, tdelibs14-trinity-dev, tdemultimedia-trinity-dev, libakode-dev, libxtst-dev
 Standards-Version: 3.8.4
 
 Package: tdeaccessibility-trinity
diff --git a/debian/_base/core/tdeaccessibility/debian/kmag-trinity.install b/debian/_base/core/tdeaccessibility/debian/kmag-trinity.install
index 23013e6da..012fd8bab 100644
--- a/debian/_base/core/tdeaccessibility/debian/kmag-trinity.install
+++ b/debian/_base/core/tdeaccessibility/debian/kmag-trinity.install
@@ -13,6 +13,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kmag.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kmag.png
 debian/tmp/opt/trinity/share/icons/locolor/16x16/apps/kmag.png
 debian/tmp/opt/trinity/share/icons/locolor/32x32/apps/kmag.png
+debian/tmp/opt/trinity/share/man/man1/kmag.1
 
 debian/icons/kmag.xpm		/opt/trinity/share/pixmaps
 debian/icons/kmag-16.xpm	/opt/trinity/share/pixmaps
diff --git a/debian/_base/core/tdeaccessibility/debian/kmag-trinity.manpages b/debian/_base/core/tdeaccessibility/debian/kmag-trinity.manpages
deleted file mode 100644
index 6579ddb0f..000000000
--- a/debian/_base/core/tdeaccessibility/debian/kmag-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/out/kmag-trinity.1
diff --git a/debian/_base/core/tdeaccessibility/debian/kmousetool-trinity.install b/debian/_base/core/tdeaccessibility/debian/kmousetool-trinity.install
index cc13c6d89..249ea428a 100644
--- a/debian/_base/core/tdeaccessibility/debian/kmousetool-trinity.install
+++ b/debian/_base/core/tdeaccessibility/debian/kmousetool-trinity.install
@@ -13,6 +13,7 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmousetool/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmousetool/man-kmousetool.1.docbook
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kmousetool.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kmousetool.png
+debian/tmp/opt/trinity/share/man/man1/kmousetool.1
 
 debian/icons/kmousetool.xpm		/opt/trinity/share/pixmaps
 debian/icons/kmousetool-16.xpm		/opt/trinity/share/pixmaps
diff --git a/debian/_base/core/tdeaccessibility/debian/kmousetool-trinity.manpages b/debian/_base/core/tdeaccessibility/debian/kmousetool-trinity.manpages
deleted file mode 100644
index 4ebe07483..000000000
--- a/debian/_base/core/tdeaccessibility/debian/kmousetool-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/out/kmousetool-trinity.1
diff --git a/debian/_base/core/tdeaccessibility/debian/kmouth-trinity.install b/debian/_base/core/tdeaccessibility/debian/kmouth-trinity.install
index 546b65791..e80a73c32 100644
--- a/debian/_base/core/tdeaccessibility/debian/kmouth-trinity.install
+++ b/debian/_base/core/tdeaccessibility/debian/kmouth-trinity.install
@@ -11,6 +11,11 @@ debian/tmp/opt/trinity/share/apps/kmouth/books/en/en-greetings.phrasebook
 debian/tmp/opt/trinity/share/apps/kmouth/books/en/en-howareyou.phrasebook
 debian/tmp/opt/trinity/share/apps/kmouth/books/en/en-personal.phrasebook
 debian/tmp/opt/trinity/share/apps/kmouth/books/en/en.desktop
+debian/tmp/opt/trinity/share/apps/kmouth/books/nl/nl-courteousness.phrasebook
+debian/tmp/opt/trinity/share/apps/kmouth/books/nl/nl-greetings.phrasebook
+debian/tmp/opt/trinity/share/apps/kmouth/books/nl/nl-howareyou.phrasebook
+debian/tmp/opt/trinity/share/apps/kmouth/books/nl/nl-personal.phrasebook
+debian/tmp/opt/trinity/share/apps/kmouth/books/nl/nl.desktop
 debian/tmp/opt/trinity/share/apps/kmouth/books/sv/sv-courteousness.phrasebook
 debian/tmp/opt/trinity/share/apps/kmouth/books/sv/sv-greetings.phrasebook
 debian/tmp/opt/trinity/share/apps/kmouth/books/sv/sv-howareyou.phrasebook
@@ -92,6 +97,7 @@ debian/tmp/opt/trinity/share/icons/locolor/22x22/actions/speak.png
 debian/tmp/opt/trinity/share/icons/locolor/16x16/apps/kmouth.png
 debian/tmp/opt/trinity/share/icons/locolor/22x22/apps/kmouth.png
 debian/tmp/opt/trinity/share/icons/locolor/32x32/apps/kmouth.png
+debian/tmp/opt/trinity/share/man/man1/kmouth.1
 
 debian/icons/kmouth.xpm		/opt/trinity/share/pixmaps
 debian/icons/kmouth-16.xpm	/opt/trinity/share/pixmaps
diff --git a/debian/_base/core/tdeaccessibility/debian/kmouth-trinity.manpages b/debian/_base/core/tdeaccessibility/debian/kmouth-trinity.manpages
deleted file mode 100644
index b459b0888..000000000
--- a/debian/_base/core/tdeaccessibility/debian/kmouth-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/out/kmouth-trinity.1
diff --git a/debian/_base/core/tdeaccessibility/debian/ksayit-trinity.install b/debian/_base/core/tdeaccessibility/debian/ksayit-trinity.install
index 010831729..87729d105 100644
--- a/debian/_base/core/tdeaccessibility/debian/ksayit-trinity.install
+++ b/debian/_base/core/tdeaccessibility/debian/ksayit-trinity.install
@@ -1,5 +1,5 @@
 debian/tmp/opt/trinity/bin/ksayit
-debian/tmp/opt/trinity/include/tde/ksayit_fxplugin.h
+debian/tmp/opt/trinity/include/ksayit_fxplugin.h
 debian/tmp/opt/trinity/lib/trinity/libFreeverb_plugin.la
 debian/tmp/opt/trinity/lib/trinity/libFreeverb_plugin.so
 debian/tmp/opt/trinity/lib/libKTTSD_Lib.la
@@ -15,6 +15,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/ksayit_clipempty.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/ksayit_talking.png
 debian/tmp/opt/trinity/share/services/ksayit_libFreeverb.desktop
 debian/tmp/opt/trinity/share/servicetypes/ksayit_libFreeverb_service.desktop
+debian/tmp/opt/trinity/share/man/man1/ksayit.1
 
 debian/icons/ksayit.xpm		/opt/trinity/share/pixmaps
 debian/icons/ksayit-16.xpm	/opt/trinity/share/pixmaps
diff --git a/debian/_base/core/tdeaccessibility/debian/kttsd-trinity.install b/debian/_base/core/tdeaccessibility/debian/kttsd-trinity.install
index 2ad412a7f..c1ade102d 100644
--- a/debian/_base/core/tdeaccessibility/debian/kttsd-trinity.install
+++ b/debian/_base/core/tdeaccessibility/debian/kttsd-trinity.install
@@ -89,3 +89,5 @@ debian/tmp/opt/trinity/share/services/kttsjobmgr.desktop
 debian/tmp/opt/trinity/share/servicetypes/kttsd_audioplugin.desktop
 debian/tmp/opt/trinity/share/servicetypes/kttsd_filterplugin.desktop
 debian/tmp/opt/trinity/share/servicetypes/kttsd_synthplugin.desktop
+debian/tmp/opt/trinity/share/man/man1/kttsd.1
+debian/tmp/opt/trinity/share/man/man1/kttsmgr.1
diff --git a/debian/_base/core/tdeaccessibility/debian/man/kdeopt-trinity.part b/debian/_base/core/tdeaccessibility/debian/man/kdeopt-trinity.part
deleted file mode 100644
index 37fdfded7..000000000
--- a/debian/_base/core/tdeaccessibility/debian/man/kdeopt-trinity.part
+++ /dev/null
@@ -1,110 +0,0 @@
-.\" This portion of the manual page is from kdeopt.man, from the
-.\" tdeaccessibility Debian package.
-.SH GENERIC OPTIONS
-.TP
-.B \-\-help
-Show help about options.
-.TP
-.B \-\-help-qt
-Show Qt specific options.
-.TP
-.B \-\-help-tde
-Show TDE specific options.
-.TP
-.B \-\-help-all
-Show all options.
-.TP
-.B \-\-author
-Show author information.
-.TP
-.B \-v, \-\-version
-Show version information.
-.TP
-.B \-\-license
-Show license information.
-.TP
-.B \-\-
-End of options.
-.SH QT OPTIONS
-.TP
-.B \-\-display \fI<displayname>\fB
-Use the X-server display `displayname'.
-.TP
-.B \-\-session \fI<sessionId>\fB
-Restore the application for the given `sessionId'.
-.TP
-.B \-\-cmap
-Causes the application to install a private color map on an 8\-bit
-display.
-.TP
-.B \-\-ncols \fI<count>\fB
-Limits the number of colors allocated in the color cube on an 8\-bit
-display, if the application is using the QApplication::ManyColor color
-specification.
-.TP
-.B \-\-nograb
-Tells Qt to never grab the mouse or the keyboard.
-.TP
-.B \-\-dograb
-Running under a debugger can cause an implicit \-nograb, use \-dograb
-to override.
-.TP
-.B \-\-sync
-Switches to synchronous mode for debugging.
-.TP
-.B \-\-fn, \-\-font \fI<fontname>\fB
-Defines the application font.
-.TP
-.B \-\-bg, \-\-background \fI<color>\fB
-Sets the default background color and an application palette (light
-and dark shades are calculated).
-.TP
-.B \-\-fg, \-\-foreground \fI<color>\fB
-Sets the default foreground color.
-.TP
-.B \-\-btn, \-\-button \fI<color>\fB
-Sets the default button color.
-.TP
-.B \-\-name \fI<name>\fB
-Sets the application name.
-.TP
-.B \-\-title \fI<title>\fB
-Sets the application title (caption).
-.TP
-.B \-\-visual TrueColor
-Forces the application to use a TrueColor visual on an 8-bit display.
-.TP
-.B \-\-inputstyle \fI<inputstyle>\fB
-Sets XIM (X Input Method) input style. Possible values are
-\fIonthespot\fP, \fIoverthespot\fP, \fIoffthespot\fP and \fIroot\fP.
-.TP
-.B \-\-im \fI<XIM server>\fB
-Set XIM server.
-.TP
-.B \-\-noxim
-Disable XIM.
-.SH TDE OPTIONS
-.TP
-.B \-\-caption \fI<caption>\fB
-Use `caption' as name in the titlebar.
-.TP
-.B \-\-icon \fI<icon>\fB
-Use `icon' as the application icon.
-.TP
-.B \-\-miniicon \fI<icon>\fB
-Use `icon' as the icon in the titlebar.
-.TP
-.B \-\-dcopserver \fI<server>\fB
-Use the DCOP Server specified by `server'.
-.TP
-.B \-\-nocrashhandler
-Disable crash handler, to get core dumps.
-.TP
-.B \-\-waitforwm
-Waits for a WM_NET compatible windowmanager.
-.TP
-.B \-\-style \fI<style>\fB
-Sets the application GUI style.
-.TP
-.B \-\-geometry \fI<geometry>\fB
-Sets the client geometry of the main widget.
diff --git a/debian/_base/core/tdeaccessibility/debian/man/kmag-trinity.man b/debian/_base/core/tdeaccessibility/debian/man/kmag-trinity.man
deleted file mode 100644
index 1f7debb82..000000000
--- a/debian/_base/core/tdeaccessibility/debian/man/kmag-trinity.man
+++ /dev/null
@@ -1,15 +0,0 @@
-.TH KMAG 1
-.SH NAME
-kmag \- A screen magnifier for TDE
-.SH SYNOPSIS
-.B kmag [file]
-.I [Qt-options] [TDE-options]
-.SH DESCRIPTION
-.B kmag
-Kmag is a TDE screen magnifier for the visually impaired.
-.so kdeopt.part
-.SH SEE ALSO
-More detailed user documentation is available from
-.BR help:/kmag
-(either enter this URL into \fBkonqueror\fP, or run `khelpcenter
-help:/kmag').
diff --git a/debian/_base/core/tdeaccessibility/debian/man/kmousetool-trinity.man b/debian/_base/core/tdeaccessibility/debian/man/kmousetool-trinity.man
deleted file mode 100644
index 4a4d6b411..000000000
--- a/debian/_base/core/tdeaccessibility/debian/man/kmousetool-trinity.man
+++ /dev/null
@@ -1,18 +0,0 @@
-.TH KMOUSETOOL 1
-.SH NAME
-kmousetool \- TDE mouse manipulation tool
-.SH SYNOPSIS
-.B kmousetool
-.I [Qt-options] [TDE-options]
-.SH DESCRIPTION
-.B kmousetool
-Kmousetool is a TDE mouse manipulation tool aimed to help aid
-disabled people but useful for many.  It includes features
-and options that provide artificial intelligence on common
-mouse gestures to perform actions.
-.so kdeopt.part
-.SH SEE ALSO
-More detailed user documentation is available from
-.BR help:/kmousetool
-(either enter this URL into \fBkonqueror\fP, or run `khelpcenter
-help:/kmousetool').
diff --git a/debian/_base/core/tdeaccessibility/debian/man/kmouth-trinity.man b/debian/_base/core/tdeaccessibility/debian/man/kmouth-trinity.man
deleted file mode 100644
index ce2a38b5d..000000000
--- a/debian/_base/core/tdeaccessibility/debian/man/kmouth-trinity.man
+++ /dev/null
@@ -1,15 +0,0 @@
-.TH KMOUTH 1
-.SH NAME
-kmouth \- A type and say TDE front end for speech synthesizers
-.SH SYNOPSIS
-.B kmouth [file]
-.I [Qt-options] [TDE-options]
-.SH DESCRIPTION
-.B kmouth
-Kmouth is a type and say TDE front end for speech synthesizers.
-.so kdeopt.part
-.SH SEE ALSO
-More detailed user documentation is available from
-.BR help:/kmouth
-(either enter this URL into \fBkonqueror\fP, or run `khelpcenter
-help:/kmouth').
diff --git a/debian/_base/core/tdeaccessibility/debian/rules b/debian/_base/core/tdeaccessibility/debian/rules
index 9e4e2c943..1b0ed7032 100755
--- a/debian/_base/core/tdeaccessibility/debian/rules
+++ b/debian/_base/core/tdeaccessibility/debian/rules
@@ -1,25 +1,22 @@
 #! /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)
-
-DEB_CONFIGURE_EXTRA_FLAGS := \
-	--enable-ksayit-audio-plugins --with-akode --prefix=/opt/trinity \
-	--with-extra-libs=/opt/trinity/lib
-
-DEB_DH_STRIP_ARGS  := --dbg-package=tdeaccessibility-trinity-dbg
-
 DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
                                && echo xz || echo bzip2)
 
-PACKAGES_WITH_LIBS := kttsd-trinity ksayit-trinity
-
-#shlibs_ver = 4:3.5.0
-#$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))
+#DEB_MAKE_CHECK_TARGET = check
+
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
+ -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/dilos/core/tdeaccessibility/debian/control b/dilos/core/tdeaccessibility/debian/control
index fa4008b8c..7072c5df9 100644
--- a/dilos/core/tdeaccessibility/debian/control
+++ b/dilos/core/tdeaccessibility/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 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>, Josh Metzler <joshdeb@metzlers.org>, Sune Vuorela <debian@pusling.com>
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, gawk, groff-base, tdelibs14-trinity-dev, tdemultimedia-trinity-dev, libakode-dev, libxtst-dev, sharutils, libogg-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, tdelibs14-trinity-dev, tdemultimedia-trinity-dev, libakode-dev, libxtst-dev
 Standards-Version: 3.8.4
 
 Package: tdeaccessibility-trinity
diff --git a/dilos/core/tdeaccessibility/debian/kmag-trinity.install b/dilos/core/tdeaccessibility/debian/kmag-trinity.install
index 051d7597c..596a7f7d6 100644
--- a/dilos/core/tdeaccessibility/debian/kmag-trinity.install
+++ b/dilos/core/tdeaccessibility/debian/kmag-trinity.install
@@ -13,6 +13,7 @@ debian/tmp/usr/share/icons/hicolor/16x16/apps/kmag.png
 debian/tmp/usr/share/icons/hicolor/32x32/apps/kmag.png
 debian/tmp/usr/share/icons/locolor/16x16/apps/kmag.png
 debian/tmp/usr/share/icons/locolor/32x32/apps/kmag.png
+debian/tmp/usr/share/man/man1/kmag.1
 
 debian/icons/kmag.xpm		/usr/share/pixmaps
 debian/icons/kmag-16.xpm	/usr/share/pixmaps
diff --git a/dilos/core/tdeaccessibility/debian/kmag-trinity.manpages b/dilos/core/tdeaccessibility/debian/kmag-trinity.manpages
deleted file mode 100644
index 6579ddb0f..000000000
--- a/dilos/core/tdeaccessibility/debian/kmag-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/out/kmag-trinity.1
diff --git a/dilos/core/tdeaccessibility/debian/kmousetool-trinity.install b/dilos/core/tdeaccessibility/debian/kmousetool-trinity.install
index 331e4db7f..428301ef2 100644
--- a/dilos/core/tdeaccessibility/debian/kmousetool-trinity.install
+++ b/dilos/core/tdeaccessibility/debian/kmousetool-trinity.install
@@ -13,6 +13,7 @@ debian/tmp/usr/share/doc/tde/HTML/en/kmousetool/index.docbook
 debian/tmp/usr/share/doc/tde/HTML/en/kmousetool/man-kmousetool.1.docbook
 debian/tmp/usr/share/icons/hicolor/16x16/apps/kmousetool.png
 debian/tmp/usr/share/icons/hicolor/32x32/apps/kmousetool.png
+debian/tmp/usr/share/man/man1/kmousetool.1
 
 debian/icons/kmousetool.xpm		/usr/share/pixmaps
 debian/icons/kmousetool-16.xpm		/usr/share/pixmaps
diff --git a/dilos/core/tdeaccessibility/debian/kmousetool-trinity.manpages b/dilos/core/tdeaccessibility/debian/kmousetool-trinity.manpages
deleted file mode 100644
index 4ebe07483..000000000
--- a/dilos/core/tdeaccessibility/debian/kmousetool-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/out/kmousetool-trinity.1
diff --git a/dilos/core/tdeaccessibility/debian/kmouth-trinity.install b/dilos/core/tdeaccessibility/debian/kmouth-trinity.install
index 667286790..c7143bf04 100644
--- a/dilos/core/tdeaccessibility/debian/kmouth-trinity.install
+++ b/dilos/core/tdeaccessibility/debian/kmouth-trinity.install
@@ -11,6 +11,11 @@ debian/tmp/usr/share/apps/kmouth/books/en/en-greetings.phrasebook
 debian/tmp/usr/share/apps/kmouth/books/en/en-howareyou.phrasebook
 debian/tmp/usr/share/apps/kmouth/books/en/en-personal.phrasebook
 debian/tmp/usr/share/apps/kmouth/books/en/en.desktop
+debian/tmp/usr/share/apps/kmouth/books/nl/nl-courteousness.phrasebook
+debian/tmp/usr/share/apps/kmouth/books/nl/nl-greetings.phrasebook
+debian/tmp/usr/share/apps/kmouth/books/nl/nl-howareyou.phrasebook
+debian/tmp/usr/share/apps/kmouth/books/nl/nl-personal.phrasebook
+debian/tmp/usr/share/apps/kmouth/books/nl/nl.desktop
 debian/tmp/usr/share/apps/kmouth/books/sv/sv-courteousness.phrasebook
 debian/tmp/usr/share/apps/kmouth/books/sv/sv-greetings.phrasebook
 debian/tmp/usr/share/apps/kmouth/books/sv/sv-howareyou.phrasebook
@@ -92,6 +97,7 @@ debian/tmp/usr/share/icons/locolor/22x22/actions/speak.png
 debian/tmp/usr/share/icons/locolor/16x16/apps/kmouth.png
 debian/tmp/usr/share/icons/locolor/22x22/apps/kmouth.png
 debian/tmp/usr/share/icons/locolor/32x32/apps/kmouth.png
+debian/tmp/usr/share/man/man1/kmouth.1
 
 debian/icons/kmouth.xpm		/usr/share/pixmaps
 debian/icons/kmouth-16.xpm	/usr/share/pixmaps
diff --git a/dilos/core/tdeaccessibility/debian/kmouth-trinity.manpages b/dilos/core/tdeaccessibility/debian/kmouth-trinity.manpages
deleted file mode 100644
index b459b0888..000000000
--- a/dilos/core/tdeaccessibility/debian/kmouth-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/out/kmouth-trinity.1
diff --git a/dilos/core/tdeaccessibility/debian/ksayit-trinity.install b/dilos/core/tdeaccessibility/debian/ksayit-trinity.install
index ee8ac6ec6..8496d380f 100644
--- a/dilos/core/tdeaccessibility/debian/ksayit-trinity.install
+++ b/dilos/core/tdeaccessibility/debian/ksayit-trinity.install
@@ -1,5 +1,5 @@
 debian/tmp/usr/bin/ksayit
-debian/tmp/usr/include/tde/ksayit_fxplugin.h
+debian/tmp/usr/include/ksayit_fxplugin.h
 debian/tmp/usr/lib/*/trinity/libFreeverb_plugin.la
 debian/tmp/usr/lib/*/trinity/libFreeverb_plugin.so
 debian/tmp/usr/lib/*/libKTTSD_Lib.la
@@ -15,6 +15,7 @@ debian/tmp/usr/share/icons/hicolor/32x32/apps/ksayit_clipempty.png
 debian/tmp/usr/share/icons/hicolor/32x32/apps/ksayit_talking.png
 debian/tmp/usr/share/services/ksayit_libFreeverb.desktop
 debian/tmp/usr/share/servicetypes/ksayit_libFreeverb_service.desktop
+debian/tmp/usr/share/man/man1/ksayit.1
 
 debian/icons/ksayit.xpm		/usr/share/pixmaps
 debian/icons/ksayit-16.xpm	/usr/share/pixmaps
diff --git a/dilos/core/tdeaccessibility/debian/kttsd-trinity.install b/dilos/core/tdeaccessibility/debian/kttsd-trinity.install
index e83c98532..23c370137 100644
--- a/dilos/core/tdeaccessibility/debian/kttsd-trinity.install
+++ b/dilos/core/tdeaccessibility/debian/kttsd-trinity.install
@@ -89,3 +89,5 @@ debian/tmp/usr/share/services/kttsjobmgr.desktop
 debian/tmp/usr/share/servicetypes/kttsd_audioplugin.desktop
 debian/tmp/usr/share/servicetypes/kttsd_filterplugin.desktop
 debian/tmp/usr/share/servicetypes/kttsd_synthplugin.desktop
+debian/tmp/usr/share/man/man1/kttsd.1
+debian/tmp/usr/share/man/man1/kttsmgr.1
diff --git a/dilos/core/tdeaccessibility/debian/man/kdeopt-trinity.part b/dilos/core/tdeaccessibility/debian/man/kdeopt-trinity.part
deleted file mode 100644
index 37fdfded7..000000000
--- a/dilos/core/tdeaccessibility/debian/man/kdeopt-trinity.part
+++ /dev/null
@@ -1,110 +0,0 @@
-.\" This portion of the manual page is from kdeopt.man, from the
-.\" tdeaccessibility Debian package.
-.SH GENERIC OPTIONS
-.TP
-.B \-\-help
-Show help about options.
-.TP
-.B \-\-help-qt
-Show Qt specific options.
-.TP
-.B \-\-help-tde
-Show TDE specific options.
-.TP
-.B \-\-help-all
-Show all options.
-.TP
-.B \-\-author
-Show author information.
-.TP
-.B \-v, \-\-version
-Show version information.
-.TP
-.B \-\-license
-Show license information.
-.TP
-.B \-\-
-End of options.
-.SH QT OPTIONS
-.TP
-.B \-\-display \fI<displayname>\fB
-Use the X-server display `displayname'.
-.TP
-.B \-\-session \fI<sessionId>\fB
-Restore the application for the given `sessionId'.
-.TP
-.B \-\-cmap
-Causes the application to install a private color map on an 8\-bit
-display.
-.TP
-.B \-\-ncols \fI<count>\fB
-Limits the number of colors allocated in the color cube on an 8\-bit
-display, if the application is using the QApplication::ManyColor color
-specification.
-.TP
-.B \-\-nograb
-Tells Qt to never grab the mouse or the keyboard.
-.TP
-.B \-\-dograb
-Running under a debugger can cause an implicit \-nograb, use \-dograb
-to override.
-.TP
-.B \-\-sync
-Switches to synchronous mode for debugging.
-.TP
-.B \-\-fn, \-\-font \fI<fontname>\fB
-Defines the application font.
-.TP
-.B \-\-bg, \-\-background \fI<color>\fB
-Sets the default background color and an application palette (light
-and dark shades are calculated).
-.TP
-.B \-\-fg, \-\-foreground \fI<color>\fB
-Sets the default foreground color.
-.TP
-.B \-\-btn, \-\-button \fI<color>\fB
-Sets the default button color.
-.TP
-.B \-\-name \fI<name>\fB
-Sets the application name.
-.TP
-.B \-\-title \fI<title>\fB
-Sets the application title (caption).
-.TP
-.B \-\-visual TrueColor
-Forces the application to use a TrueColor visual on an 8-bit display.
-.TP
-.B \-\-inputstyle \fI<inputstyle>\fB
-Sets XIM (X Input Method) input style. Possible values are
-\fIonthespot\fP, \fIoverthespot\fP, \fIoffthespot\fP and \fIroot\fP.
-.TP
-.B \-\-im \fI<XIM server>\fB
-Set XIM server.
-.TP
-.B \-\-noxim
-Disable XIM.
-.SH TDE OPTIONS
-.TP
-.B \-\-caption \fI<caption>\fB
-Use `caption' as name in the titlebar.
-.TP
-.B \-\-icon \fI<icon>\fB
-Use `icon' as the application icon.
-.TP
-.B \-\-miniicon \fI<icon>\fB
-Use `icon' as the icon in the titlebar.
-.TP
-.B \-\-dcopserver \fI<server>\fB
-Use the DCOP Server specified by `server'.
-.TP
-.B \-\-nocrashhandler
-Disable crash handler, to get core dumps.
-.TP
-.B \-\-waitforwm
-Waits for a WM_NET compatible windowmanager.
-.TP
-.B \-\-style \fI<style>\fB
-Sets the application GUI style.
-.TP
-.B \-\-geometry \fI<geometry>\fB
-Sets the client geometry of the main widget.
diff --git a/dilos/core/tdeaccessibility/debian/man/kmag-trinity.man b/dilos/core/tdeaccessibility/debian/man/kmag-trinity.man
deleted file mode 100644
index 1f7debb82..000000000
--- a/dilos/core/tdeaccessibility/debian/man/kmag-trinity.man
+++ /dev/null
@@ -1,15 +0,0 @@
-.TH KMAG 1
-.SH NAME
-kmag \- A screen magnifier for TDE
-.SH SYNOPSIS
-.B kmag [file]
-.I [Qt-options] [TDE-options]
-.SH DESCRIPTION
-.B kmag
-Kmag is a TDE screen magnifier for the visually impaired.
-.so kdeopt.part
-.SH SEE ALSO
-More detailed user documentation is available from
-.BR help:/kmag
-(either enter this URL into \fBkonqueror\fP, or run `khelpcenter
-help:/kmag').
diff --git a/dilos/core/tdeaccessibility/debian/man/kmousetool-trinity.man b/dilos/core/tdeaccessibility/debian/man/kmousetool-trinity.man
deleted file mode 100644
index 4a4d6b411..000000000
--- a/dilos/core/tdeaccessibility/debian/man/kmousetool-trinity.man
+++ /dev/null
@@ -1,18 +0,0 @@
-.TH KMOUSETOOL 1
-.SH NAME
-kmousetool \- TDE mouse manipulation tool
-.SH SYNOPSIS
-.B kmousetool
-.I [Qt-options] [TDE-options]
-.SH DESCRIPTION
-.B kmousetool
-Kmousetool is a TDE mouse manipulation tool aimed to help aid
-disabled people but useful for many.  It includes features
-and options that provide artificial intelligence on common
-mouse gestures to perform actions.
-.so kdeopt.part
-.SH SEE ALSO
-More detailed user documentation is available from
-.BR help:/kmousetool
-(either enter this URL into \fBkonqueror\fP, or run `khelpcenter
-help:/kmousetool').
diff --git a/dilos/core/tdeaccessibility/debian/man/kmouth-trinity.man b/dilos/core/tdeaccessibility/debian/man/kmouth-trinity.man
deleted file mode 100644
index ce2a38b5d..000000000
--- a/dilos/core/tdeaccessibility/debian/man/kmouth-trinity.man
+++ /dev/null
@@ -1,15 +0,0 @@
-.TH KMOUTH 1
-.SH NAME
-kmouth \- A type and say TDE front end for speech synthesizers
-.SH SYNOPSIS
-.B kmouth [file]
-.I [Qt-options] [TDE-options]
-.SH DESCRIPTION
-.B kmouth
-Kmouth is a type and say TDE front end for speech synthesizers.
-.so kdeopt.part
-.SH SEE ALSO
-More detailed user documentation is available from
-.BR help:/kmouth
-(either enter this URL into \fBkonqueror\fP, or run `khelpcenter
-help:/kmouth').
diff --git a/dilos/core/tdeaccessibility/debian/rules b/dilos/core/tdeaccessibility/debian/rules
index da5684916..bc84894ea 100755
--- a/dilos/core/tdeaccessibility/debian/rules
+++ b/dilos/core/tdeaccessibility/debian/rules
@@ -1,27 +1,26 @@
 #! /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 := /usr/include/tde
-DEB_CONFIGURE_MANDIR := /usr/share/man
-DEB_CONFIGURE_PREFIX := /usr
-DEB_CONFIGURE_INFODIR := /usr/share/info
-
-cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
-
-DEB_CONFIGURE_EXTRA_FLAGS := \
-	--enable-ksayit-audio-plugins --with-akode --prefix=/usr \
-	--with-extra-libs=/usr/lib/$(DEB_HOST_MULTIARCH) \
-	--enable-libsuffix=/$(DEB_HOST_MULTIARCH)
-
-DEB_DH_STRIP_ARGS  := --dbg-package=tdeaccessibility-trinity-dbg
-
 DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
                                && echo xz || echo bzip2)
 
-PACKAGES_WITH_LIBS := kttsd-trinity ksayit-trinity
 DEB_DH_SHLIBDEPS_ARGS += --dpkg-shlibdeps-params=--ignore-missing-info
 
-#shlibs_ver = 4:3.5.0
-#$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))
+#DEB_MAKE_CHECK_TARGET = check
+
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
+ -DCMAKE_INSTALL_PREFIX="/usr" \
+ -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" \
+ -DCMAKE_C_COMPILER=gcc \
+ -DLIB_SUFFIX="/$(DEB_HOST_MULTIARCH)"
diff --git a/ubuntu/_base/core/tdeaccessibility/debian/control b/ubuntu/_base/core/tdeaccessibility/debian/control
index 7e06d9085..df320c4f1 100644
--- a/ubuntu/_base/core/tdeaccessibility/debian/control
+++ b/ubuntu/_base/core/tdeaccessibility/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 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>, Josh Metzler <joshdeb@metzlers.org>, Sune Vuorela <debian@pusling.com>
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, gawk, groff-base, tdelibs14-trinity-dev, tdemultimedia-trinity-dev, libakode-dev, libxtst-dev, sharutils, libogg-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, tdelibs14-trinity-dev, tdemultimedia-trinity-dev, libakode-dev, libxtst-dev
 Standards-Version: 3.8.4
 
 Package: tdeaccessibility-trinity
diff --git a/ubuntu/_base/core/tdeaccessibility/debian/kmag-trinity.install b/ubuntu/_base/core/tdeaccessibility/debian/kmag-trinity.install
index 23013e6da..012fd8bab 100644
--- a/ubuntu/_base/core/tdeaccessibility/debian/kmag-trinity.install
+++ b/ubuntu/_base/core/tdeaccessibility/debian/kmag-trinity.install
@@ -13,6 +13,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kmag.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kmag.png
 debian/tmp/opt/trinity/share/icons/locolor/16x16/apps/kmag.png
 debian/tmp/opt/trinity/share/icons/locolor/32x32/apps/kmag.png
+debian/tmp/opt/trinity/share/man/man1/kmag.1
 
 debian/icons/kmag.xpm		/opt/trinity/share/pixmaps
 debian/icons/kmag-16.xpm	/opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/core/tdeaccessibility/debian/kmag-trinity.manpages b/ubuntu/_base/core/tdeaccessibility/debian/kmag-trinity.manpages
deleted file mode 100644
index 6579ddb0f..000000000
--- a/ubuntu/_base/core/tdeaccessibility/debian/kmag-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/out/kmag-trinity.1
diff --git a/ubuntu/_base/core/tdeaccessibility/debian/kmousetool-trinity.install b/ubuntu/_base/core/tdeaccessibility/debian/kmousetool-trinity.install
index cc13c6d89..249ea428a 100644
--- a/ubuntu/_base/core/tdeaccessibility/debian/kmousetool-trinity.install
+++ b/ubuntu/_base/core/tdeaccessibility/debian/kmousetool-trinity.install
@@ -13,6 +13,7 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmousetool/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmousetool/man-kmousetool.1.docbook
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kmousetool.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kmousetool.png
+debian/tmp/opt/trinity/share/man/man1/kmousetool.1
 
 debian/icons/kmousetool.xpm		/opt/trinity/share/pixmaps
 debian/icons/kmousetool-16.xpm		/opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/core/tdeaccessibility/debian/kmousetool-trinity.manpages b/ubuntu/_base/core/tdeaccessibility/debian/kmousetool-trinity.manpages
deleted file mode 100644
index 4ebe07483..000000000
--- a/ubuntu/_base/core/tdeaccessibility/debian/kmousetool-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/out/kmousetool-trinity.1
diff --git a/ubuntu/_base/core/tdeaccessibility/debian/kmouth-trinity.install b/ubuntu/_base/core/tdeaccessibility/debian/kmouth-trinity.install
index 546b65791..e80a73c32 100644
--- a/ubuntu/_base/core/tdeaccessibility/debian/kmouth-trinity.install
+++ b/ubuntu/_base/core/tdeaccessibility/debian/kmouth-trinity.install
@@ -11,6 +11,11 @@ debian/tmp/opt/trinity/share/apps/kmouth/books/en/en-greetings.phrasebook
 debian/tmp/opt/trinity/share/apps/kmouth/books/en/en-howareyou.phrasebook
 debian/tmp/opt/trinity/share/apps/kmouth/books/en/en-personal.phrasebook
 debian/tmp/opt/trinity/share/apps/kmouth/books/en/en.desktop
+debian/tmp/opt/trinity/share/apps/kmouth/books/nl/nl-courteousness.phrasebook
+debian/tmp/opt/trinity/share/apps/kmouth/books/nl/nl-greetings.phrasebook
+debian/tmp/opt/trinity/share/apps/kmouth/books/nl/nl-howareyou.phrasebook
+debian/tmp/opt/trinity/share/apps/kmouth/books/nl/nl-personal.phrasebook
+debian/tmp/opt/trinity/share/apps/kmouth/books/nl/nl.desktop
 debian/tmp/opt/trinity/share/apps/kmouth/books/sv/sv-courteousness.phrasebook
 debian/tmp/opt/trinity/share/apps/kmouth/books/sv/sv-greetings.phrasebook
 debian/tmp/opt/trinity/share/apps/kmouth/books/sv/sv-howareyou.phrasebook
@@ -92,6 +97,7 @@ debian/tmp/opt/trinity/share/icons/locolor/22x22/actions/speak.png
 debian/tmp/opt/trinity/share/icons/locolor/16x16/apps/kmouth.png
 debian/tmp/opt/trinity/share/icons/locolor/22x22/apps/kmouth.png
 debian/tmp/opt/trinity/share/icons/locolor/32x32/apps/kmouth.png
+debian/tmp/opt/trinity/share/man/man1/kmouth.1
 
 debian/icons/kmouth.xpm		/opt/trinity/share/pixmaps
 debian/icons/kmouth-16.xpm	/opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/core/tdeaccessibility/debian/kmouth-trinity.manpages b/ubuntu/_base/core/tdeaccessibility/debian/kmouth-trinity.manpages
deleted file mode 100644
index b459b0888..000000000
--- a/ubuntu/_base/core/tdeaccessibility/debian/kmouth-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/out/kmouth-trinity.1
diff --git a/ubuntu/_base/core/tdeaccessibility/debian/ksayit-trinity.install b/ubuntu/_base/core/tdeaccessibility/debian/ksayit-trinity.install
index 010831729..87729d105 100644
--- a/ubuntu/_base/core/tdeaccessibility/debian/ksayit-trinity.install
+++ b/ubuntu/_base/core/tdeaccessibility/debian/ksayit-trinity.install
@@ -1,5 +1,5 @@
 debian/tmp/opt/trinity/bin/ksayit
-debian/tmp/opt/trinity/include/tde/ksayit_fxplugin.h
+debian/tmp/opt/trinity/include/ksayit_fxplugin.h
 debian/tmp/opt/trinity/lib/trinity/libFreeverb_plugin.la
 debian/tmp/opt/trinity/lib/trinity/libFreeverb_plugin.so
 debian/tmp/opt/trinity/lib/libKTTSD_Lib.la
@@ -15,6 +15,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/ksayit_clipempty.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/ksayit_talking.png
 debian/tmp/opt/trinity/share/services/ksayit_libFreeverb.desktop
 debian/tmp/opt/trinity/share/servicetypes/ksayit_libFreeverb_service.desktop
+debian/tmp/opt/trinity/share/man/man1/ksayit.1
 
 debian/icons/ksayit.xpm		/opt/trinity/share/pixmaps
 debian/icons/ksayit-16.xpm	/opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/core/tdeaccessibility/debian/kttsd-trinity.install b/ubuntu/_base/core/tdeaccessibility/debian/kttsd-trinity.install
index 2ad412a7f..c1ade102d 100644
--- a/ubuntu/_base/core/tdeaccessibility/debian/kttsd-trinity.install
+++ b/ubuntu/_base/core/tdeaccessibility/debian/kttsd-trinity.install
@@ -89,3 +89,5 @@ debian/tmp/opt/trinity/share/services/kttsjobmgr.desktop
 debian/tmp/opt/trinity/share/servicetypes/kttsd_audioplugin.desktop
 debian/tmp/opt/trinity/share/servicetypes/kttsd_filterplugin.desktop
 debian/tmp/opt/trinity/share/servicetypes/kttsd_synthplugin.desktop
+debian/tmp/opt/trinity/share/man/man1/kttsd.1
+debian/tmp/opt/trinity/share/man/man1/kttsmgr.1
diff --git a/ubuntu/_base/core/tdeaccessibility/debian/man/kdeopt-trinity.part b/ubuntu/_base/core/tdeaccessibility/debian/man/kdeopt-trinity.part
deleted file mode 100644
index 37fdfded7..000000000
--- a/ubuntu/_base/core/tdeaccessibility/debian/man/kdeopt-trinity.part
+++ /dev/null
@@ -1,110 +0,0 @@
-.\" This portion of the manual page is from kdeopt.man, from the
-.\" tdeaccessibility Debian package.
-.SH GENERIC OPTIONS
-.TP
-.B \-\-help
-Show help about options.
-.TP
-.B \-\-help-qt
-Show Qt specific options.
-.TP
-.B \-\-help-tde
-Show TDE specific options.
-.TP
-.B \-\-help-all
-Show all options.
-.TP
-.B \-\-author
-Show author information.
-.TP
-.B \-v, \-\-version
-Show version information.
-.TP
-.B \-\-license
-Show license information.
-.TP
-.B \-\-
-End of options.
-.SH QT OPTIONS
-.TP
-.B \-\-display \fI<displayname>\fB
-Use the X-server display `displayname'.
-.TP
-.B \-\-session \fI<sessionId>\fB
-Restore the application for the given `sessionId'.
-.TP
-.B \-\-cmap
-Causes the application to install a private color map on an 8\-bit
-display.
-.TP
-.B \-\-ncols \fI<count>\fB
-Limits the number of colors allocated in the color cube on an 8\-bit
-display, if the application is using the QApplication::ManyColor color
-specification.
-.TP
-.B \-\-nograb
-Tells Qt to never grab the mouse or the keyboard.
-.TP
-.B \-\-dograb
-Running under a debugger can cause an implicit \-nograb, use \-dograb
-to override.
-.TP
-.B \-\-sync
-Switches to synchronous mode for debugging.
-.TP
-.B \-\-fn, \-\-font \fI<fontname>\fB
-Defines the application font.
-.TP
-.B \-\-bg, \-\-background \fI<color>\fB
-Sets the default background color and an application palette (light
-and dark shades are calculated).
-.TP
-.B \-\-fg, \-\-foreground \fI<color>\fB
-Sets the default foreground color.
-.TP
-.B \-\-btn, \-\-button \fI<color>\fB
-Sets the default button color.
-.TP
-.B \-\-name \fI<name>\fB
-Sets the application name.
-.TP
-.B \-\-title \fI<title>\fB
-Sets the application title (caption).
-.TP
-.B \-\-visual TrueColor
-Forces the application to use a TrueColor visual on an 8-bit display.
-.TP
-.B \-\-inputstyle \fI<inputstyle>\fB
-Sets XIM (X Input Method) input style. Possible values are
-\fIonthespot\fP, \fIoverthespot\fP, \fIoffthespot\fP and \fIroot\fP.
-.TP
-.B \-\-im \fI<XIM server>\fB
-Set XIM server.
-.TP
-.B \-\-noxim
-Disable XIM.
-.SH TDE OPTIONS
-.TP
-.B \-\-caption \fI<caption>\fB
-Use `caption' as name in the titlebar.
-.TP
-.B \-\-icon \fI<icon>\fB
-Use `icon' as the application icon.
-.TP
-.B \-\-miniicon \fI<icon>\fB
-Use `icon' as the icon in the titlebar.
-.TP
-.B \-\-dcopserver \fI<server>\fB
-Use the DCOP Server specified by `server'.
-.TP
-.B \-\-nocrashhandler
-Disable crash handler, to get core dumps.
-.TP
-.B \-\-waitforwm
-Waits for a WM_NET compatible windowmanager.
-.TP
-.B \-\-style \fI<style>\fB
-Sets the application GUI style.
-.TP
-.B \-\-geometry \fI<geometry>\fB
-Sets the client geometry of the main widget.
diff --git a/ubuntu/_base/core/tdeaccessibility/debian/man/kmag-trinity.man b/ubuntu/_base/core/tdeaccessibility/debian/man/kmag-trinity.man
deleted file mode 100644
index 1f7debb82..000000000
--- a/ubuntu/_base/core/tdeaccessibility/debian/man/kmag-trinity.man
+++ /dev/null
@@ -1,15 +0,0 @@
-.TH KMAG 1
-.SH NAME
-kmag \- A screen magnifier for TDE
-.SH SYNOPSIS
-.B kmag [file]
-.I [Qt-options] [TDE-options]
-.SH DESCRIPTION
-.B kmag
-Kmag is a TDE screen magnifier for the visually impaired.
-.so kdeopt.part
-.SH SEE ALSO
-More detailed user documentation is available from
-.BR help:/kmag
-(either enter this URL into \fBkonqueror\fP, or run `khelpcenter
-help:/kmag').
diff --git a/ubuntu/_base/core/tdeaccessibility/debian/man/kmousetool-trinity.man b/ubuntu/_base/core/tdeaccessibility/debian/man/kmousetool-trinity.man
deleted file mode 100644
index 4a4d6b411..000000000
--- a/ubuntu/_base/core/tdeaccessibility/debian/man/kmousetool-trinity.man
+++ /dev/null
@@ -1,18 +0,0 @@
-.TH KMOUSETOOL 1
-.SH NAME
-kmousetool \- TDE mouse manipulation tool
-.SH SYNOPSIS
-.B kmousetool
-.I [Qt-options] [TDE-options]
-.SH DESCRIPTION
-.B kmousetool
-Kmousetool is a TDE mouse manipulation tool aimed to help aid
-disabled people but useful for many.  It includes features
-and options that provide artificial intelligence on common
-mouse gestures to perform actions.
-.so kdeopt.part
-.SH SEE ALSO
-More detailed user documentation is available from
-.BR help:/kmousetool
-(either enter this URL into \fBkonqueror\fP, or run `khelpcenter
-help:/kmousetool').
diff --git a/ubuntu/_base/core/tdeaccessibility/debian/man/kmouth-trinity.man b/ubuntu/_base/core/tdeaccessibility/debian/man/kmouth-trinity.man
deleted file mode 100644
index ce2a38b5d..000000000
--- a/ubuntu/_base/core/tdeaccessibility/debian/man/kmouth-trinity.man
+++ /dev/null
@@ -1,15 +0,0 @@
-.TH KMOUTH 1
-.SH NAME
-kmouth \- A type and say TDE front end for speech synthesizers
-.SH SYNOPSIS
-.B kmouth [file]
-.I [Qt-options] [TDE-options]
-.SH DESCRIPTION
-.B kmouth
-Kmouth is a type and say TDE front end for speech synthesizers.
-.so kdeopt.part
-.SH SEE ALSO
-More detailed user documentation is available from
-.BR help:/kmouth
-(either enter this URL into \fBkonqueror\fP, or run `khelpcenter
-help:/kmouth').
diff --git a/ubuntu/_base/core/tdeaccessibility/debian/rules b/ubuntu/_base/core/tdeaccessibility/debian/rules
index 9e4e2c943..1b0ed7032 100755
--- a/ubuntu/_base/core/tdeaccessibility/debian/rules
+++ b/ubuntu/_base/core/tdeaccessibility/debian/rules
@@ -1,25 +1,22 @@
 #! /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)
-
-DEB_CONFIGURE_EXTRA_FLAGS := \
-	--enable-ksayit-audio-plugins --with-akode --prefix=/opt/trinity \
-	--with-extra-libs=/opt/trinity/lib
-
-DEB_DH_STRIP_ARGS  := --dbg-package=tdeaccessibility-trinity-dbg
-
 DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
                                && echo xz || echo bzip2)
 
-PACKAGES_WITH_LIBS := kttsd-trinity ksayit-trinity
-
-#shlibs_ver = 4:3.5.0
-#$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))
+#DEB_MAKE_CHECK_TARGET = check
+
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
+ -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"