From 498c9b0a1b8df20399b359e328c07a342e94c8e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= <slavek.banko@axis.cz>
Date: Fri, 12 Mar 2021 00:45:32 +0100
Subject: [PATCH] DEB tdewebdev: Switch to cmake. The man pages has been moved
 to the main tree.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit d46225bdd8a8e8e4a8a339cd892529647847486b)
---
 .../debian/KUBUNTU-DEBIAN-DIFFERENCES         |   2 -
 debian/_base/core/tdewebdev/debian/control    |   2 +-
 .../debian/kimagemapeditor-trinity.install    |   1 +
 .../debian/kimagemapeditor-trinity.manpages   |   1 -
 .../debian/klinkstatus-trinity.install        |   1 +
 .../debian/klinkstatus-trinity.manpages       |   1 -
 .../debian/kommander-trinity-dev.install      |   4 +-
 .../debian/kommander-trinity.install          |   5 +
 .../debian/kommander-trinity.manpages         |   5 -
 .../tdewebdev/debian/kxsldbg-trinity.install  |   1 +
 .../tdewebdev/debian/kxsldbg-trinity.manpages |   1 -
 .../debian/man/extractkmdr-trinity.1          |  53 ------
 .../debian/man/kimagemapeditor-trinity.1      |  47 -----
 .../debian/man/klinkstatus-trinity.1          |  52 ------
 .../debian/man/kmdr-editor-trinity.1          |  70 --------
 .../debian/man/kmdr-executor-trinity.1        |  87 ----------
 .../debian/man/kmdr-plugins-trinity.1         |  71 --------
 .../tdewebdev/debian/man/kmdr2po-trinity.1    |  47 -----
 .../tdewebdev/debian/man/kxsldbg-trinity.1    |  54 ------
 .../tdewebdev/debian/man/quanta-trinity.1     |  71 --------
 .../debian/man/tdefilereplace-trinity.1       | 160 ------------------
 .../tdewebdev/debian/quanta-trinity.install   |   1 +
 .../tdewebdev/debian/quanta-trinity.manpages  |   1 -
 debian/_base/core/tdewebdev/debian/rules      |  30 ++--
 .../debian/tdefilereplace-trinity.install     |   1 +
 .../debian/tdefilereplace-trinity.manpages    |   1 -
 .../debian/KUBUNTU-DEBIAN-DIFFERENCES         |   2 -
 ubuntu/_base/core/tdewebdev/debian/control    |   2 +-
 .../debian/kimagemapeditor-trinity.install    |   1 +
 .../debian/kimagemapeditor-trinity.manpages   |   1 -
 .../debian/klinkstatus-trinity.install        |   1 +
 .../debian/klinkstatus-trinity.manpages       |   1 -
 .../debian/kommander-trinity-dev.install      |   4 +-
 .../debian/kommander-trinity.install          |   5 +
 .../debian/kommander-trinity.manpages         |   5 -
 .../tdewebdev/debian/kxsldbg-trinity.install  |   1 +
 .../tdewebdev/debian/kxsldbg-trinity.manpages |   1 -
 .../debian/man/extractkmdr-trinity.1          |  53 ------
 .../debian/man/kimagemapeditor-trinity.1      |  47 -----
 .../debian/man/klinkstatus-trinity.1          |  52 ------
 .../debian/man/kmdr-editor-trinity.1          |  70 --------
 .../debian/man/kmdr-executor-trinity.1        |  87 ----------
 .../debian/man/kmdr-plugins-trinity.1         |  71 --------
 .../tdewebdev/debian/man/kmdr2po-trinity.1    |  47 -----
 .../tdewebdev/debian/man/kxsldbg-trinity.1    |  54 ------
 .../tdewebdev/debian/man/quanta-trinity.1     |  71 --------
 .../debian/man/tdefilereplace-trinity.1       | 160 ------------------
 .../tdewebdev/debian/quanta-trinity.install   |   1 +
 .../tdewebdev/debian/quanta-trinity.manpages  |   1 -
 ubuntu/_base/core/tdewebdev/debian/rules      |  30 ++--
 .../debian/tdefilereplace-trinity.install     |   1 +
 .../debian/tdefilereplace-trinity.manpages    |   1 -
 52 files changed, 54 insertions(+), 1486 deletions(-)
 delete mode 100644 debian/_base/core/tdewebdev/debian/KUBUNTU-DEBIAN-DIFFERENCES
 delete mode 100644 debian/_base/core/tdewebdev/debian/kimagemapeditor-trinity.manpages
 delete mode 100644 debian/_base/core/tdewebdev/debian/klinkstatus-trinity.manpages
 delete mode 100644 debian/_base/core/tdewebdev/debian/kommander-trinity.manpages
 delete mode 100644 debian/_base/core/tdewebdev/debian/kxsldbg-trinity.manpages
 delete mode 100644 debian/_base/core/tdewebdev/debian/man/extractkmdr-trinity.1
 delete mode 100644 debian/_base/core/tdewebdev/debian/man/kimagemapeditor-trinity.1
 delete mode 100644 debian/_base/core/tdewebdev/debian/man/klinkstatus-trinity.1
 delete mode 100644 debian/_base/core/tdewebdev/debian/man/kmdr-editor-trinity.1
 delete mode 100644 debian/_base/core/tdewebdev/debian/man/kmdr-executor-trinity.1
 delete mode 100644 debian/_base/core/tdewebdev/debian/man/kmdr-plugins-trinity.1
 delete mode 100644 debian/_base/core/tdewebdev/debian/man/kmdr2po-trinity.1
 delete mode 100644 debian/_base/core/tdewebdev/debian/man/kxsldbg-trinity.1
 delete mode 100644 debian/_base/core/tdewebdev/debian/man/quanta-trinity.1
 delete mode 100644 debian/_base/core/tdewebdev/debian/man/tdefilereplace-trinity.1
 delete mode 100644 debian/_base/core/tdewebdev/debian/quanta-trinity.manpages
 delete mode 100644 debian/_base/core/tdewebdev/debian/tdefilereplace-trinity.manpages
 delete mode 100644 ubuntu/_base/core/tdewebdev/debian/KUBUNTU-DEBIAN-DIFFERENCES
 delete mode 100644 ubuntu/_base/core/tdewebdev/debian/kimagemapeditor-trinity.manpages
 delete mode 100644 ubuntu/_base/core/tdewebdev/debian/klinkstatus-trinity.manpages
 delete mode 100644 ubuntu/_base/core/tdewebdev/debian/kommander-trinity.manpages
 delete mode 100644 ubuntu/_base/core/tdewebdev/debian/kxsldbg-trinity.manpages
 delete mode 100644 ubuntu/_base/core/tdewebdev/debian/man/extractkmdr-trinity.1
 delete mode 100644 ubuntu/_base/core/tdewebdev/debian/man/kimagemapeditor-trinity.1
 delete mode 100644 ubuntu/_base/core/tdewebdev/debian/man/klinkstatus-trinity.1
 delete mode 100644 ubuntu/_base/core/tdewebdev/debian/man/kmdr-editor-trinity.1
 delete mode 100644 ubuntu/_base/core/tdewebdev/debian/man/kmdr-executor-trinity.1
 delete mode 100644 ubuntu/_base/core/tdewebdev/debian/man/kmdr-plugins-trinity.1
 delete mode 100644 ubuntu/_base/core/tdewebdev/debian/man/kmdr2po-trinity.1
 delete mode 100644 ubuntu/_base/core/tdewebdev/debian/man/kxsldbg-trinity.1
 delete mode 100644 ubuntu/_base/core/tdewebdev/debian/man/quanta-trinity.1
 delete mode 100644 ubuntu/_base/core/tdewebdev/debian/man/tdefilereplace-trinity.1
 delete mode 100644 ubuntu/_base/core/tdewebdev/debian/quanta-trinity.manpages
 delete mode 100644 ubuntu/_base/core/tdewebdev/debian/tdefilereplace-trinity.manpages

diff --git a/debian/_base/core/tdewebdev/debian/KUBUNTU-DEBIAN-DIFFERENCES b/debian/_base/core/tdewebdev/debian/KUBUNTU-DEBIAN-DIFFERENCES
deleted file mode 100644
index a81b1de92..000000000
--- a/debian/_base/core/tdewebdev/debian/KUBUNTU-DEBIAN-DIFFERENCES
+++ /dev/null
@@ -1,2 +0,0 @@
-  * Use -fpermissive when building with g++-4.3 (duplicate #define in
-    libxslt1-dev header). LP: #138601.
diff --git a/debian/_base/core/tdewebdev/debian/control b/debian/_base/core/tdewebdev/debian/control
index 62c773e80..fc47ec463 100644
--- a/debian/_base/core/tdewebdev/debian/control
+++ b/debian/_base/core/tdewebdev/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: Adeodato Sim <dato@net.com.org.es>, Ana Beatriz Guerrero Lopez <ana@debian.org>, Armin Berres <trigger+debian@space-based.de>, Sune Vuorela <debian@pusling.com>
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, autotools-dev, gawk, tdelibs14-trinity-dev, tqt3-doc, libreadline-dev | libreadline6-dev | libreadline5-dev, libxml2-dev, libxslt1-dev, sharutils, texinfo, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, tdelibs14-trinity-dev, tqt3-doc, libreadline-dev | libreadline6-dev | libreadline5-dev, libxml2-dev, libxslt1-dev, libcvsservice-trinity-dev
 Standards-Version: 3.8.4
 Homepage: http://trinity.pearsoncomputing.net
 
diff --git a/debian/_base/core/tdewebdev/debian/kimagemapeditor-trinity.install b/debian/_base/core/tdewebdev/debian/kimagemapeditor-trinity.install
index 947588c76..c06246386 100644
--- a/debian/_base/core/tdewebdev/debian/kimagemapeditor-trinity.install
+++ b/debian/_base/core/tdewebdev/debian/kimagemapeditor-trinity.install
@@ -21,4 +21,5 @@ debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kimagemapeditor.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kimagemapeditor.png
 debian/tmp/opt/trinity/share/icons/locolor/16x16/apps/kimagemapeditor.png
 debian/tmp/opt/trinity/share/icons/locolor/32x32/apps/kimagemapeditor.png
+debian/tmp/opt/trinity/share/man/man1/kimagemapeditor.1
 debian/tmp/opt/trinity/share/services/kimagemapeditorpart.desktop
diff --git a/debian/_base/core/tdewebdev/debian/kimagemapeditor-trinity.manpages b/debian/_base/core/tdewebdev/debian/kimagemapeditor-trinity.manpages
deleted file mode 100644
index e9fdcdb20..000000000
--- a/debian/_base/core/tdewebdev/debian/kimagemapeditor-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kimagemapeditor-trinity.1
diff --git a/debian/_base/core/tdewebdev/debian/klinkstatus-trinity.install b/debian/_base/core/tdewebdev/debian/klinkstatus-trinity.install
index 78d214bfb..0e99d9224 100644
--- a/debian/_base/core/tdewebdev/debian/klinkstatus-trinity.install
+++ b/debian/_base/core/tdewebdev/debian/klinkstatus-trinity.install
@@ -17,4 +17,5 @@ debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/klinkstatus.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/klinkstatus.png
 debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/klinkstatus.png
 debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/klinkstatus.png
+debian/tmp/opt/trinity/share/man/man1/klinkstatus.1
 debian/tmp/opt/trinity/share/services/klinkstatus_part.desktop
diff --git a/debian/_base/core/tdewebdev/debian/klinkstatus-trinity.manpages b/debian/_base/core/tdewebdev/debian/klinkstatus-trinity.manpages
deleted file mode 100644
index 0a9e537e1..000000000
--- a/debian/_base/core/tdewebdev/debian/klinkstatus-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/klinkstatus-trinity.1
diff --git a/debian/_base/core/tdewebdev/debian/kommander-trinity-dev.install b/debian/_base/core/tdewebdev/debian/kommander-trinity-dev.install
index 8d8db707b..64690a165 100644
--- a/debian/_base/core/tdewebdev/debian/kommander-trinity-dev.install
+++ b/debian/_base/core/tdewebdev/debian/kommander-trinity-dev.install
@@ -1,7 +1,7 @@
-debian/tmp/opt/trinity/include/tde/kommander*
+debian/tmp/opt/trinity/include/kommander*
+debian/tmp/opt/trinity/include/specials.h
 debian/tmp/opt/trinity/lib/libkommanderplugin.la
 debian/tmp/opt/trinity/lib/libkommanderplugin.so
 debian/tmp/opt/trinity/lib/libkommanderwidget.la
 debian/tmp/opt/trinity/lib/libkommanderwidget.so
 debian/tmp/opt/trinity/lib/libkommanderwidgets.so
-debian/tmp/opt/trinity/include/tde/specials.h
diff --git a/debian/_base/core/tdewebdev/debian/kommander-trinity.install b/debian/_base/core/tdewebdev/debian/kommander-trinity.install
index 1f10fc6c2..f18896875 100644
--- a/debian/_base/core/tdewebdev/debian/kommander-trinity.install
+++ b/debian/_base/core/tdewebdev/debian/kommander-trinity.install
@@ -84,4 +84,9 @@ debian/tmp/opt/trinity/share/apps/katepart/syntax/kommander-new.xml
 debian/tmp/opt/trinity/share/apps/tdevappwizard/kommanderplugin.png
 debian/tmp/opt/trinity/share/apps/tdevappwizard/kommanderplugin.tar.gz
 debian/tmp/opt/trinity/share/apps/tdevappwizard/templates/kommanderplugin.tdevtemplate
+debian/tmp/opt/trinity/share/man/man1/extractkmdr.1
+debian/tmp/opt/trinity/share/man/man1/kmdr-editor.1
+debian/tmp/opt/trinity/share/man/man1/kmdr-executor.1
+debian/tmp/opt/trinity/share/man/man1/kmdr-plugins.1
+debian/tmp/opt/trinity/share/man/man1/kmdr2po.1
 debian/tmp/opt/trinity/share/services/kommander_part.desktop
diff --git a/debian/_base/core/tdewebdev/debian/kommander-trinity.manpages b/debian/_base/core/tdewebdev/debian/kommander-trinity.manpages
deleted file mode 100644
index 718a10f1e..000000000
--- a/debian/_base/core/tdewebdev/debian/kommander-trinity.manpages
+++ /dev/null
@@ -1,5 +0,0 @@
-debian/man/extractkmdr-trinity.1
-debian/man/kmdr-editor-trinity.1
-debian/man/kmdr-executor-trinity.1
-debian/man/kmdr-plugins-trinity.1
-debian/man/kmdr2po-trinity.1
diff --git a/debian/_base/core/tdewebdev/debian/kxsldbg-trinity.install b/debian/_base/core/tdewebdev/debian/kxsldbg-trinity.install
index 28d1bba41..319e555c2 100644
--- a/debian/_base/core/tdewebdev/debian/kxsldbg-trinity.install
+++ b/debian/_base/core/tdewebdev/debian/kxsldbg-trinity.install
@@ -30,4 +30,5 @@ debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/next.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/system-run.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/step.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/xsldbg_*.png
+debian/tmp/opt/trinity/share/man/man1/kxsldbg.1
 debian/tmp/opt/trinity/share/services/kxsldbg_part.desktop
diff --git a/debian/_base/core/tdewebdev/debian/kxsldbg-trinity.manpages b/debian/_base/core/tdewebdev/debian/kxsldbg-trinity.manpages
deleted file mode 100644
index c56e17491..000000000
--- a/debian/_base/core/tdewebdev/debian/kxsldbg-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kxsldbg-trinity.1
diff --git a/debian/_base/core/tdewebdev/debian/man/extractkmdr-trinity.1 b/debian/_base/core/tdewebdev/debian/man/extractkmdr-trinity.1
deleted file mode 100644
index 5dfad28d7..000000000
--- a/debian/_base/core/tdewebdev/debian/man/extractkmdr-trinity.1
+++ /dev/null
@@ -1,53 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH EXTRACTKMDR 1 "March 25, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-extractkmdr \- extract message strings from Kommander dialogs
-.SH SYNOPSIS
-.B extractkmdr
-[ \fB\-\-tag=\fP\fIname\fP ... ]
-[ \fB\-\-context=\fP\fIname\fP ]
-\fIfile\fP ...
-.SH DESCRIPTION
-\fBextractkmdr\fP finds all text tags and other message strings within the
-given Kommander dialog (.kmdr) files.  It then writes the corresponding
-\fIi18n()\fP calls to standard output (usually redirected to rc.cpp)
-so that xgettext can parse them.
-.PP
-To create a complete gettext message file (PO-file) from a Kommander
-dialog, the
-.BR kmdr2po (1)
-utility is more convenient.
-.PP
-This utility is part of the TDE web development module.
-.SH OPTIONS
-.TP
-\fB\-\-tag=\fP\fIname\fP
-Extract also the contents of the tag \fIname\fP.
-This option may be used multiple times
-(e.g., \-\-tag=tag_one \-\-tag=tag_two).
-.TP
-\fB\-\-context=\fP\fIname\fP
-Give all i18n() calls the given context: i18n("\fIname\fP", ...).
-.SH SEE ALSO
-.BR kmdr-editor (1),
-.BR kmdr-executor (1),
-.BR kmdr-plugins (1),
-.BR kmdr2po (1).
-.SH AUTHOR
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdewebdev/debian/man/kimagemapeditor-trinity.1 b/debian/_base/core/tdewebdev/debian/man/kimagemapeditor-trinity.1
deleted file mode 100644
index 681db952f..000000000
--- a/debian/_base/core/tdewebdev/debian/man/kimagemapeditor-trinity.1
+++ /dev/null
@@ -1,47 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KIMAGEMAPEDITOR 1 "October 19, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kimagemapeditor \- an HTML image map editor for TDE
-.SH SYNOPSIS
-.B kimagemapeditor
-[ \fIgeneric-options\fP ]
-[ \fB\-c, \-\-stdout\fP ]
-[ \fIfile\fP ... ]
-.SH DESCRIPTION
-\fBKImageMapEditor\fP is a tool that allows you to edit image maps in
-HTML files.  As well as providing a standalone application,
-KImageMapEditor makes itself available as a KPart for embedding into
-larger applications.
-.PP
-The files passed on the command line may be either HTML files or image
-files.
-.PP
-This application is part of the official TDE web development module.
-.SH OPTIONS
-Below are the kimagemapeditor-specific options.
-For a full summary of options, run \fIkimagemapeditor \-\-help\fP.
-.TP
-\fB\-c, \-\-stdout\fP
-Write the resulting HTML code to standard output when exiting.
-.SH SEE ALSO
-.BR quanta (1).
-.SH AUTHOR
-KImageMapEditor was written by Jan Schafer <janschaefer@users.sourceforge.net>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdewebdev/debian/man/klinkstatus-trinity.1 b/debian/_base/core/tdewebdev/debian/man/klinkstatus-trinity.1
deleted file mode 100644
index c1b2b61b0..000000000
--- a/debian/_base/core/tdewebdev/debian/man/klinkstatus-trinity.1
+++ /dev/null
@@ -1,52 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KLINKSTATUS 1 "October 19, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-klinkstatus \- a web link validity checker for TDE
-.SH SYNOPSIS
-.B klinkstatus
-[ \fIgeneric-options\fP ]
-[ \fIURL\fP ]
-.SH DESCRIPTION
-\fBKLinkStatus\fP is a web link validity checker for TDE.  It allows you to
-search internal and external links throughout your web site.  Simply
-point it to a single page and choose the depth to search.
-.PP
-You can also check local files, or files over ftp:, fish: or any other
-KIO protocols.  For performance, links can be checked simultaneously.
-.PP
-This application is part of the official TDE web development module.
-.SH OPTIONS
-For a full summary of options, run \fIklinkstatus \-\-help\fP.
-.SH SEE ALSO
-.BR quanta (1).
-.PP
-Full user documentation is available through the TDE Help Centre.
-You can also enter the URL
-\fIhelp:/klinkstatus/\fP
-directly into konqueror or you can run
-`\fIkhelpcenter help:/klinkstatus/\fP'
-from the command-line.
-.PP
-If the TDE Help Centre is not installed then you can install the package
-\fItdewebdev-doc-html\fP and read this documentation in HTML format from
-\fI/opt/trinity/share/doc/tde/HTML/en/klinkstatus/\fP.
-.SH AUTHOR
-KLinkStatus was written by Paulo Moura Guedes <moura@tdewebdev.org>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdewebdev/debian/man/kmdr-editor-trinity.1 b/debian/_base/core/tdewebdev/debian/man/kmdr-editor-trinity.1
deleted file mode 100644
index 5ecb637c8..000000000
--- a/debian/_base/core/tdewebdev/debian/man/kmdr-editor-trinity.1
+++ /dev/null
@@ -1,70 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KMDR-EDITOR 1 "March 25, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kmdr-editor \- editor for the Kommander visual dialog building tool
-.SH SYNOPSIS
-.B kmdr-editor
-[ \fIgeneric-options\fP ]
-.SH DESCRIPTION
-\fBKommander\fP is a visual dialog building tool whose
-primary objective is to create
-as much functionality as possible without using any scripting language.
-.PP
-More specifically, Kommander is a set of tools that allow you to create
-dynamic GUI dialogs that generate, based on their state, a piece of text.
-The piece of text can be a command line to a program, any piece of code,
-business documents that contain a lot of repititious or templated text and so
-on.  The resulting generated text can then be executed as a command line
-program (hence the name "Kommander"), written to a file, passed to a
-script for extended processing, and literally anything else you can
-think of.  The best part of it all?  You aren't required to write a single
-line of code!
-.PP
-This editor (\fBkmdr-editor\fP) allows you to lay out your entire dialog
-through a graphical
-user interface.  Once a dialog has been created by the editor, it is
-saved as a file with extension \fI.kmdr\fP.  The dialog that this XML file
-represents can then be run instantly with the executor (\fBkmdr-executor\fP).
-.PP
-This application is part of the official TDE web development module.
-.SH OPTIONS
-For a full summary of options, run \fIkmdr-editor \-\-help\fP.
-.SH SEE ALSO
-.BR extractkmdr (1),
-.BR kmdr-executor (1),
-.BR kmdr-plugins (1),
-.BR kmdr2po (1),
-.BR quanta (1).
-.PP
-Full user documentation is available through the TDE Help Centre.
-You can also enter the URL
-\fIhelp:/kommander/\fP
-directly into konqueror or you can run
-`\fIkhelpcenter help:/kommander/\fP'
-from the command-line.
-.PP
-If the TDE Help Centre is not installed then you can install the package
-\fItdewebdev-doc-html\fP and read this documentation in HTML format from
-\fI/opt/trinity/share/doc/tde/HTML/en/kommander/\fP.
-.SH AUTHOR
-Kommander was written by Marc Britton <consume@optusnet.com.au>,
-Eric Laffoon <sequitur@kde.org>, Michal Rudolf <mrudolf@tdewebdev.org>,
-Andras Mantia <amantia@kde.org> and Trolltech.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdewebdev/debian/man/kmdr-executor-trinity.1 b/debian/_base/core/tdewebdev/debian/man/kmdr-executor-trinity.1
deleted file mode 100644
index cc197d69f..000000000
--- a/debian/_base/core/tdewebdev/debian/man/kmdr-executor-trinity.1
+++ /dev/null
@@ -1,87 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KMDR-EXECUTOR 1 "March 25, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kmdr-executor \- executor for the Kommander visual dialog building tool
-.SH SYNOPSIS
-.B kmdr-executor
-[ \fIgeneric-options\fP ]
-[ \fB\-c\fP \fIcatalog\fP ]
-{ \fB\-\-stdin\fP | \fIfile\fP }
-[ \fIarg\fP ... ]
-.SH DESCRIPTION
-\fBKommander\fP is a visual dialog building tool whose
-primary objective is to create
-as much functionality as possible without using any scripting language.
-.PP
-More specifically, Kommander is a set of tools that allow you to
-create dynamic GUI dialogs
-that generate, based on their state, a piece of text.  The piece of text
-can be a command line to a program, any piece of code, business
-documents that contain a lot of repititious or templated text and so on.
-The resulting generated text can then be executed as a command line
-program (hence the name "Kommander"), written to a file, passed to a
-script for extended processing, and literally anything else you can
-think of.  The best part of it all?  You aren't required to write a single
-line of code!
-.PP
-This executor (\fBkmdr-executor\fP) is used to run a dialog that has
-been created by the
-dialog editor (\fBkmdr-editor\fP).  Either the dialog file (generally
-a \fI.kmdr\fP file) should be passed on
-the command-line, or else the option \-\-stdin should be passed and the
-dialog description should be supplied as XML on standard input.
-Additional arguments for the dialog itself may also be supplied.
-.PP
-This application is part of the official TDE web development module.
-.SH OPTIONS
-Below are the kommander-specific options.
-For a full summary of options, run \fIkmdr-editor \-\-help\fP.
-.TP
-\fB\-c\fP \fIcatalog\fP
-Use the given catalog for translation.
-.TP
-\fB\-\-stdin\fP
-Read the XML dialog description from standard input instead of passing
-a \fI.kmdr\fP file on the command-line.
-.TP
-\fIarg\fP ...
-Additional arguments to be passed on to the dialog itself.
-.SH SEE ALSO
-.BR extractkmdr (1),
-.BR kmdr-editor (1),
-.BR kmdr-plugins (1),
-.BR kmdr2po (1),
-.BR quanta (1).
-.PP
-Full user documentation is available through the TDE Help Centre.
-You can also enter the URL
-\fIhelp:/kommander/\fP
-directly into konqueror or you can run
-`\fIkhelpcenter help:/kommander/\fP'
-from the command-line.
-.PP
-If the TDE Help Centre is not installed then you can install the package
-\fItdewebdev-doc-html\fP and read this documentation in HTML format from
-\fI/opt/trinity/share/doc/tde/HTML/en/kommander/\fP.
-.SH AUTHOR
-Kommander was written by Marc Britton <consume@optusnet.com.au>,
-Eric Laffoon <sequitur@kde.org>, Michal Rudolf <mrudolf@tdewebdev.org>,
-Andras Mantia <amantia@kde.org> and Trolltech.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdewebdev/debian/man/kmdr-plugins-trinity.1 b/debian/_base/core/tdewebdev/debian/man/kmdr-plugins-trinity.1
deleted file mode 100644
index 5a8d222bf..000000000
--- a/debian/_base/core/tdewebdev/debian/man/kmdr-plugins-trinity.1
+++ /dev/null
@@ -1,71 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KMDR-PLUGINS 1 "March 25, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kmdr-plugins \- plugin manager for the Kommander visual dialog building tool
-.SH SYNOPSIS
-.B kmdr-plugins
-[ \fIgeneric-options\fP ]
-.SH DESCRIPTION
-\fBKommander\fP is a visual dialog building tool whose
-primary objective is to create
-as much functionality as possible without using any scripting language.
-.PP
-It is possible to extend Kommander by writing your own plugins.  The
-plugin manager
-.B kmdr-plugins
-is a simple user interface to Kommander's configuration file, and
-can be used to select which external plugins Kommander should load.
-Closing the plugin manager will automatically save any changes.
-.PP
-By loading a plugin, the custom widgets that it defines
-will become available in Kommander's menus and toolbars, and these
-custom widgets can be used in Kommander dialogs.
-.PP
-See
-.BR kmdr-editor (1)
-and
-.BR kmdr-executor (1)
-for a more detailed description of Kommander.
-.PP
-This application is part of the official TDE web development module.
-.SH OPTIONS
-For a full summary of options, run \fIkmdr-plugins \-\-help\fP.
-.SH SEE ALSO
-.BR extractkmdr (1),
-.BR kmdr-editor (1),
-.BR kmdr-executor (1),
-.BR kmdr2po (1),
-.BR quanta (1).
-.PP
-Full user documentation is available through the TDE Help Centre.
-You can also enter the URL
-\fIhelp:/kommander/\fP
-directly into konqueror or you can run
-`\fIkhelpcenter help:/kommander/\fP'
-from the command-line.
-.PP
-If the TDE Help Centre is not installed then you can install the package
-\fItdewebdev-doc-html\fP and read this documentation in HTML format from
-\fI/opt/trinity/share/doc/tde/HTML/en/kommander/\fP.
-.SH AUTHOR
-Kommander was written by Marc Britton <consume@optusnet.com.au>,
-Eric Laffoon <sequitur@kde.org>, Michal Rudolf <mrudolf@tdewebdev.org>,
-Andras Mantia <amantia@kde.org> and Trolltech.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdewebdev/debian/man/kmdr2po-trinity.1 b/debian/_base/core/tdewebdev/debian/man/kmdr2po-trinity.1
deleted file mode 100644
index 4693644e4..000000000
--- a/debian/_base/core/tdewebdev/debian/man/kmdr2po-trinity.1
+++ /dev/null
@@ -1,47 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KMDR2PO 1 "March 25, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kmdr2po \- create a PO-file from a Kommander dialog
-.SH SYNOPSIS
-.B kmdr2po
-.I dialog
-.SH DESCRIPTION
-\fBkmdr2po\fP creates a gettext message file (PO-file) from the given
-Kommander dialog (.kmdr) file.  It does this by using
-.BR extractkmdr (1)
-to extract all text tags and other message strings, and then running
-.BR xgettext (1)
-to create the corresponding PO-file.
-.PP
-The final PO-file will be created in the current directory.  Its name
-will be derived from the dialog filename by replacing the suffix
-\fI.kmdr\fP with \fI.po\fP.
-.PP
-This utility is part of the TDE web development module.
-.SH WARNING
-A temporary file named \fI_from_rc.cc\fP in the current directory
-will be created and subsequently removed.
-.SH SEE ALSO
-.BR extractkmdr (1),
-.BR kmdr-editor (1),
-.BR kmdr-executor (1),
-.BR kmdr-plugins (1),
-.BR xgettext (1).
-.SH AUTHOR
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdewebdev/debian/man/kxsldbg-trinity.1 b/debian/_base/core/tdewebdev/debian/man/kxsldbg-trinity.1
deleted file mode 100644
index 11b551f69..000000000
--- a/debian/_base/core/tdewebdev/debian/man/kxsldbg-trinity.1
+++ /dev/null
@@ -1,54 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KXSLDBG 1 "October 19, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kxsldbg \- a graphical XSLT debugger for TDE
-.SH SYNOPSIS
-.B kxsldbg
-[ \fIgeneric-options\fP ]
-.SH DESCRIPTION
-\fBKXSLDbg\fP is a graphical debugger for XSLT scripts.  It provides
-a graphical front-end to the text-based debugger
-.BR xsldbg (1).
-KXSLDbg can be run as a standalone application or as an embedded TDE part.
-.PP
-XSLT is an XML language for defining transformations of XML files from
-XML to some other arbitrary format, such as XML, HTML, plain text, etc.,
-using standard XSLT stylesheets.
-.PP
-This application is part of the official TDE web development module.
-.SH OPTIONS
-For a full summary of options, run \fIkxsldbg \-\-help\fP.
-.SH SEE ALSO
-.BR quanta (1),
-.BR xsldbg (1).
-.PP
-Full user documentation is available through the TDE Help Centre.
-You can also enter the URL
-\fIhelp:/kxsldbg/\fP
-directly into konqueror or you can run
-`\fIkhelpcenter help:/kxsldbg/\fP'
-from the command-line.
-.PP
-If the TDE Help Centre is not installed then you can install the package
-\fItdewebdev-doc-html\fP and read this documentation in HTML format from
-\fI/opt/trinity/share/doc/tde/HTML/en/kxsldbg/\fP.
-.SH AUTHOR
-KXSLDbg was written by Keith Isdale <k_isdale@tpg.com.au>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdewebdev/debian/man/quanta-trinity.1 b/debian/_base/core/tdewebdev/debian/man/quanta-trinity.1
deleted file mode 100644
index 5640297b9..000000000
--- a/debian/_base/core/tdewebdev/debian/man/quanta-trinity.1
+++ /dev/null
@@ -1,71 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH QUANTA 1 "October 19, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-quanta \- a web development environment for TDE
-.SH SYNOPSIS
-.B quanta
-[ \fIgeneric-options\fP ] [ \fB\-\-unique\fP ]
-[ \fB\-\-nologo\fP ] [ \fIfile\fP ]
-.SH DESCRIPTION
-\fBQuanta Plus\fP is a web development environment for working with HTML
-and associated languages.  It strives to be neutral and transparent
-to all markup languages, while supporting popular web-based scripting
-languages, CSS and other emerging W3C recommendations.
-.PP
-Quanta Plus supports many external components, debuggers and other tools
-for web development, several of which are shipped with the TDE web development
-module.
-.PP
-Quanta Plus is not in any way affiliated with any commercial versions
-of Quanta.  The primary coders from the original team left the GPLed
-version to produce a commercial product.
-.PP
-This application is part of the official TDE web development module.
-.SH OPTIONS
-Below are the quanta-specific options.  For a full summary of options,
-run \fIquanta \-\-help\fP.
-.TP
-\fB\-\-unique\fP
-Run as a one-instance application.
-.TP
-\fB\-\-nologo\fP
-Do not show the logo during startup.
-.SH SEE ALSO
-.BR kimagemapeditor (1),
-.BR klinkstatus (1),
-.BR kmdr-editor (1),
-.BR kmdr-executor (1),
-.BR kxsldbg (1).
-.PP
-Full user documentation is available through the TDE Help Centre.
-You can also enter the URL
-\fIhelp:/quanta/\fP
-directly into konqueror or you can run
-`\fIkhelpcenter help:/quanta/\fP'
-from the command-line.
-.PP
-If the TDE Help Centre is not installed then you can install the package
-\fItdewebdev-doc-html\fP and read this documentation in HTML format from
-\fI/opt/trinity/share/doc/tde/HTML/en/quanta/\fP.
-.SH AUTHOR
-Quanta was written by Eric Laffoon <sequitur@kde.org>, Andras Mantia
-<amantia@kde.org> and others including inactive authors
-Dmitry Poplavsky <dima@kde.org> and Alexander Yakovlev <yshurik@kde.org>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdewebdev/debian/man/tdefilereplace-trinity.1 b/debian/_base/core/tdewebdev/debian/man/tdefilereplace-trinity.1
deleted file mode 100644
index 63557c928..000000000
--- a/debian/_base/core/tdewebdev/debian/man/tdefilereplace-trinity.1
+++ /dev/null
@@ -1,160 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH TDEFILEREPLACE 1 "June 2006" "Trinity Desktop Environment" "Batch search and replace tool"
-.SH NAME
-tdefilereplace
-\- Batch search and replace tool
-.SH SYNOPSIS
-\fBtdefilereplace\fP [Qt\-options] [TDE\-options] [PATH] 
-.SH DESCRIPTION
-\fBKFileReplace\fP is an application used to search and replace a list of strings in a file tree. The strings may be literal or Qt\-like regular expressions. There are also other options to tune your search.
-.SH OPTIONS
-.SS
-.SS Arguments:
-.TP
-.B PATH
-Starting folder
-.SS 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
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-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  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget - see man X for the argument format
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-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  <count>
-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  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-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  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-
-.SH SEE ALSO
-Full user documentation is available through the TDE Help Center.  You can also enter the URL
-.BR help:/tdefilereplace/
-directly into konqueror or you can run 
-.BR "khelpcenter help:/tdefilereplace/"
-from the command\-line.
-.br
-.SH AUTHORS
-.nf
-Andras Mantia <amantia@kde.org>
-.br
-Emiliano Gulmini <emi_barbarossa@yahoo.it>
-.br
-Francois Dupou <dupoux@dupoux.com>
-.br
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/debian/_base/core/tdewebdev/debian/quanta-trinity.install b/debian/_base/core/tdewebdev/debian/quanta-trinity.install
index 0d06b0bac..be1507897 100644
--- a/debian/_base/core/tdewebdev/debian/quanta-trinity.install
+++ b/debian/_base/core/tdewebdev/debian/quanta-trinity.install
@@ -16,6 +16,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/quanta.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/quanta.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/quanta.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/quanta.png
+debian/tmp/opt/trinity/share/man/man1/quanta.1
 debian/tmp/opt/trinity/share/mimelnk/application/x-webprj.desktop
 debian/tmp/opt/trinity/share/services/quantadebuggerdbgp.desktop
 debian/tmp/opt/trinity/share/services/quantadebuggergubed.desktop
diff --git a/debian/_base/core/tdewebdev/debian/quanta-trinity.manpages b/debian/_base/core/tdewebdev/debian/quanta-trinity.manpages
deleted file mode 100644
index e4b4a816c..000000000
--- a/debian/_base/core/tdewebdev/debian/quanta-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/quanta-trinity.1
diff --git a/debian/_base/core/tdewebdev/debian/rules b/debian/_base/core/tdewebdev/debian/rules
index 87d742093..7d28ae1b5 100755
--- a/debian/_base/core/tdewebdev/debian/rules
+++ b/debian/_base/core/tdewebdev/debian/rules
@@ -1,28 +1,14 @@
 #! /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 := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib
-
-DEB_INSTALL_CHANGELOGS_tdefilereplace-trinity    := tdefilereplace/ChangeLog
 DEB_INSTALL_CHANGELOGS_kimagemapeditor-trinity := kimagemapeditor/ChangeLog
 DEB_INSTALL_CHANGELOGS_klinkstatus-trinity     := klinkstatus/ChangeLog
 DEB_INSTALL_CHANGELOGS_kommander-trinity       := kommander/ChangeLog
 DEB_INSTALL_CHANGELOGS_quanta-trinity          := quanta/ChangeLog
-
-_P=)
-GCC_VERSION := $(shell gcc --version | sed -n "/^gcc/s/^[^$(_P)]*$(_P) \(.\..\).*/\1/p")
-ifeq ($(GCC_VERSION),4.3)
-  CXX = g++ -fpermissive
-endif
+DEB_INSTALL_CHANGELOGS_tdefilereplace-trinity  := tdefilereplace/ChangeLog
 
 DEB_DH_STRIP_ARGS  := --dbg-package=tdewebdev-trinity-dbg
 
@@ -33,3 +19,15 @@ PACKAGES_WITH_LIBS := kommander-trinity
 
 #shlibs_ver = 4:3.5.0-1
 #$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))
+
+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/debian/_base/core/tdewebdev/debian/tdefilereplace-trinity.install b/debian/_base/core/tdewebdev/debian/tdefilereplace-trinity.install
index 515142b40..43a252535 100644
--- a/debian/_base/core/tdewebdev/debian/tdefilereplace-trinity.install
+++ b/debian/_base/core/tdewebdev/debian/tdefilereplace-trinity.install
@@ -11,4 +11,5 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdefilereplace/*.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/tdefilereplace.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/tdefilereplace.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/tdefilereplace.png
+debian/tmp/opt/trinity/share/man/man1/tdefilereplace.1
 debian/tmp/opt/trinity/share/services/tdefilereplacepart.desktop
diff --git a/debian/_base/core/tdewebdev/debian/tdefilereplace-trinity.manpages b/debian/_base/core/tdewebdev/debian/tdefilereplace-trinity.manpages
deleted file mode 100644
index 694a538a0..000000000
--- a/debian/_base/core/tdewebdev/debian/tdefilereplace-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/tdefilereplace-trinity.1
diff --git a/ubuntu/_base/core/tdewebdev/debian/KUBUNTU-DEBIAN-DIFFERENCES b/ubuntu/_base/core/tdewebdev/debian/KUBUNTU-DEBIAN-DIFFERENCES
deleted file mode 100644
index a81b1de92..000000000
--- a/ubuntu/_base/core/tdewebdev/debian/KUBUNTU-DEBIAN-DIFFERENCES
+++ /dev/null
@@ -1,2 +0,0 @@
-  * Use -fpermissive when building with g++-4.3 (duplicate #define in
-    libxslt1-dev header). LP: #138601.
diff --git a/ubuntu/_base/core/tdewebdev/debian/control b/ubuntu/_base/core/tdewebdev/debian/control
index 10ec2385c..4afb327cd 100644
--- a/ubuntu/_base/core/tdewebdev/debian/control
+++ b/ubuntu/_base/core/tdewebdev/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: Adeodato Sim <dato@net.com.org.es>, Ana Beatriz Guerrero Lopez <ana@debian.org>, Armin Berres <trigger+debian@space-based.de>, Sune Vuorela <debian@pusling.com>
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, autotools-dev, gawk, tdelibs14-trinity-dev, tqt3-doc, libreadline-dev | libreadline6-dev | libreadline5-dev, libxml2-dev, libxslt1-dev, sharutils, texinfo, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, tdelibs14-trinity-dev, tqt3-doc, libreadline-dev | libreadline6-dev | libreadline5-dev, libxml2-dev, libxslt1-dev, libcvsservice-trinity-dev
 Standards-Version: 3.8.4
 Homepage: http://trinity.pearsoncomputing.net
 
diff --git a/ubuntu/_base/core/tdewebdev/debian/kimagemapeditor-trinity.install b/ubuntu/_base/core/tdewebdev/debian/kimagemapeditor-trinity.install
index 947588c76..c06246386 100644
--- a/ubuntu/_base/core/tdewebdev/debian/kimagemapeditor-trinity.install
+++ b/ubuntu/_base/core/tdewebdev/debian/kimagemapeditor-trinity.install
@@ -21,4 +21,5 @@ debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kimagemapeditor.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kimagemapeditor.png
 debian/tmp/opt/trinity/share/icons/locolor/16x16/apps/kimagemapeditor.png
 debian/tmp/opt/trinity/share/icons/locolor/32x32/apps/kimagemapeditor.png
+debian/tmp/opt/trinity/share/man/man1/kimagemapeditor.1
 debian/tmp/opt/trinity/share/services/kimagemapeditorpart.desktop
diff --git a/ubuntu/_base/core/tdewebdev/debian/kimagemapeditor-trinity.manpages b/ubuntu/_base/core/tdewebdev/debian/kimagemapeditor-trinity.manpages
deleted file mode 100644
index e9fdcdb20..000000000
--- a/ubuntu/_base/core/tdewebdev/debian/kimagemapeditor-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kimagemapeditor-trinity.1
diff --git a/ubuntu/_base/core/tdewebdev/debian/klinkstatus-trinity.install b/ubuntu/_base/core/tdewebdev/debian/klinkstatus-trinity.install
index 78d214bfb..0e99d9224 100644
--- a/ubuntu/_base/core/tdewebdev/debian/klinkstatus-trinity.install
+++ b/ubuntu/_base/core/tdewebdev/debian/klinkstatus-trinity.install
@@ -17,4 +17,5 @@ debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/klinkstatus.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/klinkstatus.png
 debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/klinkstatus.png
 debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/klinkstatus.png
+debian/tmp/opt/trinity/share/man/man1/klinkstatus.1
 debian/tmp/opt/trinity/share/services/klinkstatus_part.desktop
diff --git a/ubuntu/_base/core/tdewebdev/debian/klinkstatus-trinity.manpages b/ubuntu/_base/core/tdewebdev/debian/klinkstatus-trinity.manpages
deleted file mode 100644
index 0a9e537e1..000000000
--- a/ubuntu/_base/core/tdewebdev/debian/klinkstatus-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/klinkstatus-trinity.1
diff --git a/ubuntu/_base/core/tdewebdev/debian/kommander-trinity-dev.install b/ubuntu/_base/core/tdewebdev/debian/kommander-trinity-dev.install
index 8d8db707b..64690a165 100644
--- a/ubuntu/_base/core/tdewebdev/debian/kommander-trinity-dev.install
+++ b/ubuntu/_base/core/tdewebdev/debian/kommander-trinity-dev.install
@@ -1,7 +1,7 @@
-debian/tmp/opt/trinity/include/tde/kommander*
+debian/tmp/opt/trinity/include/kommander*
+debian/tmp/opt/trinity/include/specials.h
 debian/tmp/opt/trinity/lib/libkommanderplugin.la
 debian/tmp/opt/trinity/lib/libkommanderplugin.so
 debian/tmp/opt/trinity/lib/libkommanderwidget.la
 debian/tmp/opt/trinity/lib/libkommanderwidget.so
 debian/tmp/opt/trinity/lib/libkommanderwidgets.so
-debian/tmp/opt/trinity/include/tde/specials.h
diff --git a/ubuntu/_base/core/tdewebdev/debian/kommander-trinity.install b/ubuntu/_base/core/tdewebdev/debian/kommander-trinity.install
index 1f10fc6c2..f18896875 100644
--- a/ubuntu/_base/core/tdewebdev/debian/kommander-trinity.install
+++ b/ubuntu/_base/core/tdewebdev/debian/kommander-trinity.install
@@ -84,4 +84,9 @@ debian/tmp/opt/trinity/share/apps/katepart/syntax/kommander-new.xml
 debian/tmp/opt/trinity/share/apps/tdevappwizard/kommanderplugin.png
 debian/tmp/opt/trinity/share/apps/tdevappwizard/kommanderplugin.tar.gz
 debian/tmp/opt/trinity/share/apps/tdevappwizard/templates/kommanderplugin.tdevtemplate
+debian/tmp/opt/trinity/share/man/man1/extractkmdr.1
+debian/tmp/opt/trinity/share/man/man1/kmdr-editor.1
+debian/tmp/opt/trinity/share/man/man1/kmdr-executor.1
+debian/tmp/opt/trinity/share/man/man1/kmdr-plugins.1
+debian/tmp/opt/trinity/share/man/man1/kmdr2po.1
 debian/tmp/opt/trinity/share/services/kommander_part.desktop
diff --git a/ubuntu/_base/core/tdewebdev/debian/kommander-trinity.manpages b/ubuntu/_base/core/tdewebdev/debian/kommander-trinity.manpages
deleted file mode 100644
index 718a10f1e..000000000
--- a/ubuntu/_base/core/tdewebdev/debian/kommander-trinity.manpages
+++ /dev/null
@@ -1,5 +0,0 @@
-debian/man/extractkmdr-trinity.1
-debian/man/kmdr-editor-trinity.1
-debian/man/kmdr-executor-trinity.1
-debian/man/kmdr-plugins-trinity.1
-debian/man/kmdr2po-trinity.1
diff --git a/ubuntu/_base/core/tdewebdev/debian/kxsldbg-trinity.install b/ubuntu/_base/core/tdewebdev/debian/kxsldbg-trinity.install
index 28d1bba41..319e555c2 100644
--- a/ubuntu/_base/core/tdewebdev/debian/kxsldbg-trinity.install
+++ b/ubuntu/_base/core/tdewebdev/debian/kxsldbg-trinity.install
@@ -30,4 +30,5 @@ debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/next.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/system-run.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/step.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/xsldbg_*.png
+debian/tmp/opt/trinity/share/man/man1/kxsldbg.1
 debian/tmp/opt/trinity/share/services/kxsldbg_part.desktop
diff --git a/ubuntu/_base/core/tdewebdev/debian/kxsldbg-trinity.manpages b/ubuntu/_base/core/tdewebdev/debian/kxsldbg-trinity.manpages
deleted file mode 100644
index c56e17491..000000000
--- a/ubuntu/_base/core/tdewebdev/debian/kxsldbg-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kxsldbg-trinity.1
diff --git a/ubuntu/_base/core/tdewebdev/debian/man/extractkmdr-trinity.1 b/ubuntu/_base/core/tdewebdev/debian/man/extractkmdr-trinity.1
deleted file mode 100644
index 5dfad28d7..000000000
--- a/ubuntu/_base/core/tdewebdev/debian/man/extractkmdr-trinity.1
+++ /dev/null
@@ -1,53 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH EXTRACTKMDR 1 "March 25, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-extractkmdr \- extract message strings from Kommander dialogs
-.SH SYNOPSIS
-.B extractkmdr
-[ \fB\-\-tag=\fP\fIname\fP ... ]
-[ \fB\-\-context=\fP\fIname\fP ]
-\fIfile\fP ...
-.SH DESCRIPTION
-\fBextractkmdr\fP finds all text tags and other message strings within the
-given Kommander dialog (.kmdr) files.  It then writes the corresponding
-\fIi18n()\fP calls to standard output (usually redirected to rc.cpp)
-so that xgettext can parse them.
-.PP
-To create a complete gettext message file (PO-file) from a Kommander
-dialog, the
-.BR kmdr2po (1)
-utility is more convenient.
-.PP
-This utility is part of the TDE web development module.
-.SH OPTIONS
-.TP
-\fB\-\-tag=\fP\fIname\fP
-Extract also the contents of the tag \fIname\fP.
-This option may be used multiple times
-(e.g., \-\-tag=tag_one \-\-tag=tag_two).
-.TP
-\fB\-\-context=\fP\fIname\fP
-Give all i18n() calls the given context: i18n("\fIname\fP", ...).
-.SH SEE ALSO
-.BR kmdr-editor (1),
-.BR kmdr-executor (1),
-.BR kmdr-plugins (1),
-.BR kmdr2po (1).
-.SH AUTHOR
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdewebdev/debian/man/kimagemapeditor-trinity.1 b/ubuntu/_base/core/tdewebdev/debian/man/kimagemapeditor-trinity.1
deleted file mode 100644
index 681db952f..000000000
--- a/ubuntu/_base/core/tdewebdev/debian/man/kimagemapeditor-trinity.1
+++ /dev/null
@@ -1,47 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KIMAGEMAPEDITOR 1 "October 19, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kimagemapeditor \- an HTML image map editor for TDE
-.SH SYNOPSIS
-.B kimagemapeditor
-[ \fIgeneric-options\fP ]
-[ \fB\-c, \-\-stdout\fP ]
-[ \fIfile\fP ... ]
-.SH DESCRIPTION
-\fBKImageMapEditor\fP is a tool that allows you to edit image maps in
-HTML files.  As well as providing a standalone application,
-KImageMapEditor makes itself available as a KPart for embedding into
-larger applications.
-.PP
-The files passed on the command line may be either HTML files or image
-files.
-.PP
-This application is part of the official TDE web development module.
-.SH OPTIONS
-Below are the kimagemapeditor-specific options.
-For a full summary of options, run \fIkimagemapeditor \-\-help\fP.
-.TP
-\fB\-c, \-\-stdout\fP
-Write the resulting HTML code to standard output when exiting.
-.SH SEE ALSO
-.BR quanta (1).
-.SH AUTHOR
-KImageMapEditor was written by Jan Schafer <janschaefer@users.sourceforge.net>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdewebdev/debian/man/klinkstatus-trinity.1 b/ubuntu/_base/core/tdewebdev/debian/man/klinkstatus-trinity.1
deleted file mode 100644
index c1b2b61b0..000000000
--- a/ubuntu/_base/core/tdewebdev/debian/man/klinkstatus-trinity.1
+++ /dev/null
@@ -1,52 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KLINKSTATUS 1 "October 19, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-klinkstatus \- a web link validity checker for TDE
-.SH SYNOPSIS
-.B klinkstatus
-[ \fIgeneric-options\fP ]
-[ \fIURL\fP ]
-.SH DESCRIPTION
-\fBKLinkStatus\fP is a web link validity checker for TDE.  It allows you to
-search internal and external links throughout your web site.  Simply
-point it to a single page and choose the depth to search.
-.PP
-You can also check local files, or files over ftp:, fish: or any other
-KIO protocols.  For performance, links can be checked simultaneously.
-.PP
-This application is part of the official TDE web development module.
-.SH OPTIONS
-For a full summary of options, run \fIklinkstatus \-\-help\fP.
-.SH SEE ALSO
-.BR quanta (1).
-.PP
-Full user documentation is available through the TDE Help Centre.
-You can also enter the URL
-\fIhelp:/klinkstatus/\fP
-directly into konqueror or you can run
-`\fIkhelpcenter help:/klinkstatus/\fP'
-from the command-line.
-.PP
-If the TDE Help Centre is not installed then you can install the package
-\fItdewebdev-doc-html\fP and read this documentation in HTML format from
-\fI/opt/trinity/share/doc/tde/HTML/en/klinkstatus/\fP.
-.SH AUTHOR
-KLinkStatus was written by Paulo Moura Guedes <moura@tdewebdev.org>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdewebdev/debian/man/kmdr-editor-trinity.1 b/ubuntu/_base/core/tdewebdev/debian/man/kmdr-editor-trinity.1
deleted file mode 100644
index 5ecb637c8..000000000
--- a/ubuntu/_base/core/tdewebdev/debian/man/kmdr-editor-trinity.1
+++ /dev/null
@@ -1,70 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KMDR-EDITOR 1 "March 25, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kmdr-editor \- editor for the Kommander visual dialog building tool
-.SH SYNOPSIS
-.B kmdr-editor
-[ \fIgeneric-options\fP ]
-.SH DESCRIPTION
-\fBKommander\fP is a visual dialog building tool whose
-primary objective is to create
-as much functionality as possible without using any scripting language.
-.PP
-More specifically, Kommander is a set of tools that allow you to create
-dynamic GUI dialogs that generate, based on their state, a piece of text.
-The piece of text can be a command line to a program, any piece of code,
-business documents that contain a lot of repititious or templated text and so
-on.  The resulting generated text can then be executed as a command line
-program (hence the name "Kommander"), written to a file, passed to a
-script for extended processing, and literally anything else you can
-think of.  The best part of it all?  You aren't required to write a single
-line of code!
-.PP
-This editor (\fBkmdr-editor\fP) allows you to lay out your entire dialog
-through a graphical
-user interface.  Once a dialog has been created by the editor, it is
-saved as a file with extension \fI.kmdr\fP.  The dialog that this XML file
-represents can then be run instantly with the executor (\fBkmdr-executor\fP).
-.PP
-This application is part of the official TDE web development module.
-.SH OPTIONS
-For a full summary of options, run \fIkmdr-editor \-\-help\fP.
-.SH SEE ALSO
-.BR extractkmdr (1),
-.BR kmdr-executor (1),
-.BR kmdr-plugins (1),
-.BR kmdr2po (1),
-.BR quanta (1).
-.PP
-Full user documentation is available through the TDE Help Centre.
-You can also enter the URL
-\fIhelp:/kommander/\fP
-directly into konqueror or you can run
-`\fIkhelpcenter help:/kommander/\fP'
-from the command-line.
-.PP
-If the TDE Help Centre is not installed then you can install the package
-\fItdewebdev-doc-html\fP and read this documentation in HTML format from
-\fI/opt/trinity/share/doc/tde/HTML/en/kommander/\fP.
-.SH AUTHOR
-Kommander was written by Marc Britton <consume@optusnet.com.au>,
-Eric Laffoon <sequitur@kde.org>, Michal Rudolf <mrudolf@tdewebdev.org>,
-Andras Mantia <amantia@kde.org> and Trolltech.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdewebdev/debian/man/kmdr-executor-trinity.1 b/ubuntu/_base/core/tdewebdev/debian/man/kmdr-executor-trinity.1
deleted file mode 100644
index cc197d69f..000000000
--- a/ubuntu/_base/core/tdewebdev/debian/man/kmdr-executor-trinity.1
+++ /dev/null
@@ -1,87 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KMDR-EXECUTOR 1 "March 25, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kmdr-executor \- executor for the Kommander visual dialog building tool
-.SH SYNOPSIS
-.B kmdr-executor
-[ \fIgeneric-options\fP ]
-[ \fB\-c\fP \fIcatalog\fP ]
-{ \fB\-\-stdin\fP | \fIfile\fP }
-[ \fIarg\fP ... ]
-.SH DESCRIPTION
-\fBKommander\fP is a visual dialog building tool whose
-primary objective is to create
-as much functionality as possible without using any scripting language.
-.PP
-More specifically, Kommander is a set of tools that allow you to
-create dynamic GUI dialogs
-that generate, based on their state, a piece of text.  The piece of text
-can be a command line to a program, any piece of code, business
-documents that contain a lot of repititious or templated text and so on.
-The resulting generated text can then be executed as a command line
-program (hence the name "Kommander"), written to a file, passed to a
-script for extended processing, and literally anything else you can
-think of.  The best part of it all?  You aren't required to write a single
-line of code!
-.PP
-This executor (\fBkmdr-executor\fP) is used to run a dialog that has
-been created by the
-dialog editor (\fBkmdr-editor\fP).  Either the dialog file (generally
-a \fI.kmdr\fP file) should be passed on
-the command-line, or else the option \-\-stdin should be passed and the
-dialog description should be supplied as XML on standard input.
-Additional arguments for the dialog itself may also be supplied.
-.PP
-This application is part of the official TDE web development module.
-.SH OPTIONS
-Below are the kommander-specific options.
-For a full summary of options, run \fIkmdr-editor \-\-help\fP.
-.TP
-\fB\-c\fP \fIcatalog\fP
-Use the given catalog for translation.
-.TP
-\fB\-\-stdin\fP
-Read the XML dialog description from standard input instead of passing
-a \fI.kmdr\fP file on the command-line.
-.TP
-\fIarg\fP ...
-Additional arguments to be passed on to the dialog itself.
-.SH SEE ALSO
-.BR extractkmdr (1),
-.BR kmdr-editor (1),
-.BR kmdr-plugins (1),
-.BR kmdr2po (1),
-.BR quanta (1).
-.PP
-Full user documentation is available through the TDE Help Centre.
-You can also enter the URL
-\fIhelp:/kommander/\fP
-directly into konqueror or you can run
-`\fIkhelpcenter help:/kommander/\fP'
-from the command-line.
-.PP
-If the TDE Help Centre is not installed then you can install the package
-\fItdewebdev-doc-html\fP and read this documentation in HTML format from
-\fI/opt/trinity/share/doc/tde/HTML/en/kommander/\fP.
-.SH AUTHOR
-Kommander was written by Marc Britton <consume@optusnet.com.au>,
-Eric Laffoon <sequitur@kde.org>, Michal Rudolf <mrudolf@tdewebdev.org>,
-Andras Mantia <amantia@kde.org> and Trolltech.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdewebdev/debian/man/kmdr-plugins-trinity.1 b/ubuntu/_base/core/tdewebdev/debian/man/kmdr-plugins-trinity.1
deleted file mode 100644
index 5a8d222bf..000000000
--- a/ubuntu/_base/core/tdewebdev/debian/man/kmdr-plugins-trinity.1
+++ /dev/null
@@ -1,71 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KMDR-PLUGINS 1 "March 25, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kmdr-plugins \- plugin manager for the Kommander visual dialog building tool
-.SH SYNOPSIS
-.B kmdr-plugins
-[ \fIgeneric-options\fP ]
-.SH DESCRIPTION
-\fBKommander\fP is a visual dialog building tool whose
-primary objective is to create
-as much functionality as possible without using any scripting language.
-.PP
-It is possible to extend Kommander by writing your own plugins.  The
-plugin manager
-.B kmdr-plugins
-is a simple user interface to Kommander's configuration file, and
-can be used to select which external plugins Kommander should load.
-Closing the plugin manager will automatically save any changes.
-.PP
-By loading a plugin, the custom widgets that it defines
-will become available in Kommander's menus and toolbars, and these
-custom widgets can be used in Kommander dialogs.
-.PP
-See
-.BR kmdr-editor (1)
-and
-.BR kmdr-executor (1)
-for a more detailed description of Kommander.
-.PP
-This application is part of the official TDE web development module.
-.SH OPTIONS
-For a full summary of options, run \fIkmdr-plugins \-\-help\fP.
-.SH SEE ALSO
-.BR extractkmdr (1),
-.BR kmdr-editor (1),
-.BR kmdr-executor (1),
-.BR kmdr2po (1),
-.BR quanta (1).
-.PP
-Full user documentation is available through the TDE Help Centre.
-You can also enter the URL
-\fIhelp:/kommander/\fP
-directly into konqueror or you can run
-`\fIkhelpcenter help:/kommander/\fP'
-from the command-line.
-.PP
-If the TDE Help Centre is not installed then you can install the package
-\fItdewebdev-doc-html\fP and read this documentation in HTML format from
-\fI/opt/trinity/share/doc/tde/HTML/en/kommander/\fP.
-.SH AUTHOR
-Kommander was written by Marc Britton <consume@optusnet.com.au>,
-Eric Laffoon <sequitur@kde.org>, Michal Rudolf <mrudolf@tdewebdev.org>,
-Andras Mantia <amantia@kde.org> and Trolltech.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdewebdev/debian/man/kmdr2po-trinity.1 b/ubuntu/_base/core/tdewebdev/debian/man/kmdr2po-trinity.1
deleted file mode 100644
index 4693644e4..000000000
--- a/ubuntu/_base/core/tdewebdev/debian/man/kmdr2po-trinity.1
+++ /dev/null
@@ -1,47 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KMDR2PO 1 "March 25, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kmdr2po \- create a PO-file from a Kommander dialog
-.SH SYNOPSIS
-.B kmdr2po
-.I dialog
-.SH DESCRIPTION
-\fBkmdr2po\fP creates a gettext message file (PO-file) from the given
-Kommander dialog (.kmdr) file.  It does this by using
-.BR extractkmdr (1)
-to extract all text tags and other message strings, and then running
-.BR xgettext (1)
-to create the corresponding PO-file.
-.PP
-The final PO-file will be created in the current directory.  Its name
-will be derived from the dialog filename by replacing the suffix
-\fI.kmdr\fP with \fI.po\fP.
-.PP
-This utility is part of the TDE web development module.
-.SH WARNING
-A temporary file named \fI_from_rc.cc\fP in the current directory
-will be created and subsequently removed.
-.SH SEE ALSO
-.BR extractkmdr (1),
-.BR kmdr-editor (1),
-.BR kmdr-executor (1),
-.BR kmdr-plugins (1),
-.BR xgettext (1).
-.SH AUTHOR
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdewebdev/debian/man/kxsldbg-trinity.1 b/ubuntu/_base/core/tdewebdev/debian/man/kxsldbg-trinity.1
deleted file mode 100644
index 11b551f69..000000000
--- a/ubuntu/_base/core/tdewebdev/debian/man/kxsldbg-trinity.1
+++ /dev/null
@@ -1,54 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KXSLDBG 1 "October 19, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kxsldbg \- a graphical XSLT debugger for TDE
-.SH SYNOPSIS
-.B kxsldbg
-[ \fIgeneric-options\fP ]
-.SH DESCRIPTION
-\fBKXSLDbg\fP is a graphical debugger for XSLT scripts.  It provides
-a graphical front-end to the text-based debugger
-.BR xsldbg (1).
-KXSLDbg can be run as a standalone application or as an embedded TDE part.
-.PP
-XSLT is an XML language for defining transformations of XML files from
-XML to some other arbitrary format, such as XML, HTML, plain text, etc.,
-using standard XSLT stylesheets.
-.PP
-This application is part of the official TDE web development module.
-.SH OPTIONS
-For a full summary of options, run \fIkxsldbg \-\-help\fP.
-.SH SEE ALSO
-.BR quanta (1),
-.BR xsldbg (1).
-.PP
-Full user documentation is available through the TDE Help Centre.
-You can also enter the URL
-\fIhelp:/kxsldbg/\fP
-directly into konqueror or you can run
-`\fIkhelpcenter help:/kxsldbg/\fP'
-from the command-line.
-.PP
-If the TDE Help Centre is not installed then you can install the package
-\fItdewebdev-doc-html\fP and read this documentation in HTML format from
-\fI/opt/trinity/share/doc/tde/HTML/en/kxsldbg/\fP.
-.SH AUTHOR
-KXSLDbg was written by Keith Isdale <k_isdale@tpg.com.au>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdewebdev/debian/man/quanta-trinity.1 b/ubuntu/_base/core/tdewebdev/debian/man/quanta-trinity.1
deleted file mode 100644
index 5640297b9..000000000
--- a/ubuntu/_base/core/tdewebdev/debian/man/quanta-trinity.1
+++ /dev/null
@@ -1,71 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH QUANTA 1 "October 19, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-quanta \- a web development environment for TDE
-.SH SYNOPSIS
-.B quanta
-[ \fIgeneric-options\fP ] [ \fB\-\-unique\fP ]
-[ \fB\-\-nologo\fP ] [ \fIfile\fP ]
-.SH DESCRIPTION
-\fBQuanta Plus\fP is a web development environment for working with HTML
-and associated languages.  It strives to be neutral and transparent
-to all markup languages, while supporting popular web-based scripting
-languages, CSS and other emerging W3C recommendations.
-.PP
-Quanta Plus supports many external components, debuggers and other tools
-for web development, several of which are shipped with the TDE web development
-module.
-.PP
-Quanta Plus is not in any way affiliated with any commercial versions
-of Quanta.  The primary coders from the original team left the GPLed
-version to produce a commercial product.
-.PP
-This application is part of the official TDE web development module.
-.SH OPTIONS
-Below are the quanta-specific options.  For a full summary of options,
-run \fIquanta \-\-help\fP.
-.TP
-\fB\-\-unique\fP
-Run as a one-instance application.
-.TP
-\fB\-\-nologo\fP
-Do not show the logo during startup.
-.SH SEE ALSO
-.BR kimagemapeditor (1),
-.BR klinkstatus (1),
-.BR kmdr-editor (1),
-.BR kmdr-executor (1),
-.BR kxsldbg (1).
-.PP
-Full user documentation is available through the TDE Help Centre.
-You can also enter the URL
-\fIhelp:/quanta/\fP
-directly into konqueror or you can run
-`\fIkhelpcenter help:/quanta/\fP'
-from the command-line.
-.PP
-If the TDE Help Centre is not installed then you can install the package
-\fItdewebdev-doc-html\fP and read this documentation in HTML format from
-\fI/opt/trinity/share/doc/tde/HTML/en/quanta/\fP.
-.SH AUTHOR
-Quanta was written by Eric Laffoon <sequitur@kde.org>, Andras Mantia
-<amantia@kde.org> and others including inactive authors
-Dmitry Poplavsky <dima@kde.org> and Alexander Yakovlev <yshurik@kde.org>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdewebdev/debian/man/tdefilereplace-trinity.1 b/ubuntu/_base/core/tdewebdev/debian/man/tdefilereplace-trinity.1
deleted file mode 100644
index 63557c928..000000000
--- a/ubuntu/_base/core/tdewebdev/debian/man/tdefilereplace-trinity.1
+++ /dev/null
@@ -1,160 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH TDEFILEREPLACE 1 "June 2006" "Trinity Desktop Environment" "Batch search and replace tool"
-.SH NAME
-tdefilereplace
-\- Batch search and replace tool
-.SH SYNOPSIS
-\fBtdefilereplace\fP [Qt\-options] [TDE\-options] [PATH] 
-.SH DESCRIPTION
-\fBKFileReplace\fP is an application used to search and replace a list of strings in a file tree. The strings may be literal or Qt\-like regular expressions. There are also other options to tune your search.
-.SH OPTIONS
-.SS
-.SS Arguments:
-.TP
-.B PATH
-Starting folder
-.SS 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
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-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  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget - see man X for the argument format
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-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  <count>
-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  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-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  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-
-.SH SEE ALSO
-Full user documentation is available through the TDE Help Center.  You can also enter the URL
-.BR help:/tdefilereplace/
-directly into konqueror or you can run 
-.BR "khelpcenter help:/tdefilereplace/"
-from the command\-line.
-.br
-.SH AUTHORS
-.nf
-Andras Mantia <amantia@kde.org>
-.br
-Emiliano Gulmini <emi_barbarossa@yahoo.it>
-.br
-Francois Dupou <dupoux@dupoux.com>
-.br
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/ubuntu/_base/core/tdewebdev/debian/quanta-trinity.install b/ubuntu/_base/core/tdewebdev/debian/quanta-trinity.install
index 0d06b0bac..be1507897 100644
--- a/ubuntu/_base/core/tdewebdev/debian/quanta-trinity.install
+++ b/ubuntu/_base/core/tdewebdev/debian/quanta-trinity.install
@@ -16,6 +16,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/quanta.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/quanta.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/quanta.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/quanta.png
+debian/tmp/opt/trinity/share/man/man1/quanta.1
 debian/tmp/opt/trinity/share/mimelnk/application/x-webprj.desktop
 debian/tmp/opt/trinity/share/services/quantadebuggerdbgp.desktop
 debian/tmp/opt/trinity/share/services/quantadebuggergubed.desktop
diff --git a/ubuntu/_base/core/tdewebdev/debian/quanta-trinity.manpages b/ubuntu/_base/core/tdewebdev/debian/quanta-trinity.manpages
deleted file mode 100644
index e4b4a816c..000000000
--- a/ubuntu/_base/core/tdewebdev/debian/quanta-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/quanta-trinity.1
diff --git a/ubuntu/_base/core/tdewebdev/debian/rules b/ubuntu/_base/core/tdewebdev/debian/rules
index 87d742093..7d28ae1b5 100755
--- a/ubuntu/_base/core/tdewebdev/debian/rules
+++ b/ubuntu/_base/core/tdewebdev/debian/rules
@@ -1,28 +1,14 @@
 #! /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 := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib
-
-DEB_INSTALL_CHANGELOGS_tdefilereplace-trinity    := tdefilereplace/ChangeLog
 DEB_INSTALL_CHANGELOGS_kimagemapeditor-trinity := kimagemapeditor/ChangeLog
 DEB_INSTALL_CHANGELOGS_klinkstatus-trinity     := klinkstatus/ChangeLog
 DEB_INSTALL_CHANGELOGS_kommander-trinity       := kommander/ChangeLog
 DEB_INSTALL_CHANGELOGS_quanta-trinity          := quanta/ChangeLog
-
-_P=)
-GCC_VERSION := $(shell gcc --version | sed -n "/^gcc/s/^[^$(_P)]*$(_P) \(.\..\).*/\1/p")
-ifeq ($(GCC_VERSION),4.3)
-  CXX = g++ -fpermissive
-endif
+DEB_INSTALL_CHANGELOGS_tdefilereplace-trinity  := tdefilereplace/ChangeLog
 
 DEB_DH_STRIP_ARGS  := --dbg-package=tdewebdev-trinity-dbg
 
@@ -33,3 +19,15 @@ PACKAGES_WITH_LIBS := kommander-trinity
 
 #shlibs_ver = 4:3.5.0-1
 #$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))
+
+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/ubuntu/_base/core/tdewebdev/debian/tdefilereplace-trinity.install b/ubuntu/_base/core/tdewebdev/debian/tdefilereplace-trinity.install
index 515142b40..43a252535 100644
--- a/ubuntu/_base/core/tdewebdev/debian/tdefilereplace-trinity.install
+++ b/ubuntu/_base/core/tdewebdev/debian/tdefilereplace-trinity.install
@@ -11,4 +11,5 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdefilereplace/*.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/tdefilereplace.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/tdefilereplace.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/tdefilereplace.png
+debian/tmp/opt/trinity/share/man/man1/tdefilereplace.1
 debian/tmp/opt/trinity/share/services/tdefilereplacepart.desktop
diff --git a/ubuntu/_base/core/tdewebdev/debian/tdefilereplace-trinity.manpages b/ubuntu/_base/core/tdewebdev/debian/tdefilereplace-trinity.manpages
deleted file mode 100644
index 694a538a0..000000000
--- a/ubuntu/_base/core/tdewebdev/debian/tdefilereplace-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/tdefilereplace-trinity.1